wip2

Author: hvitved

rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll

@@ -1249,7 +1249,7 @@ private predicate assocFunctionInfo(
   AssocFunctionType t
 ) {
   f = i.getASuccessor(name) and
-  arity = f.getParamList().getNumberOfParams() and
+  arity = f.getNumberOfParamsInclSelf() and
   t.appliesTo(f, i, pos)
 }
 
@@ -1454,9 +1454,9 @@ private module MethodResolution {
       )
   }
 
-  private module MethodTraitIsVisible = TraitIsVisible<assocFunctionCallTraitCandidate/2>;
+  private module AssocFunctionTraitIsVisible = TraitIsVisible<assocFunctionCallTraitCandidate/2>;
 
-  private predicate methodCallVisibleTraitCandidate = MethodTraitIsVisible::traitIsVisible/2;
+  private predicate methodCallVisibleTraitCandidate = AssocFunctionTraitIsVisible::traitIsVisible/2;
 
   bindingset[mc, impl]
   pragma[inline_late]
@@ -1478,12 +1478,12 @@ private module MethodResolution {
   bindingset[mc, strippedTypePath, strippedType]
   pragma[inline_late]
   private predicate methodCallNonBlanketCandidate(
-    MethodCall mc, Method m, FunctionPosition selfPos, ImplOrTraitItemNode i,
+    MethodCall mc, Function f, FunctionPosition selfPos, ImplOrTraitItemNode i,
     AssocFunctionType self, TypePath strippedTypePath, Type strippedType
   ) {
     exists(string name, int arity |
       mc.hasNameAndArity(name, arity) and
-      assocFunctionInfoNonBlanket(m, name, arity, selfPos, i, self, strippedTypePath, strippedType)
+      assocFunctionInfoNonBlanket(f, name, arity, selfPos, i, self, strippedTypePath, strippedType)
     |
       i =
         any(Impl impl |
@@ -1512,12 +1512,12 @@ private module MethodResolution {
   bindingset[mc]
   pragma[inline_late]
   private predicate methodCallBlanketLikeCandidate(
-    MethodCall mc, Method m, FunctionPosition selfPos, ImplItemNode impl, AssocFunctionType self,
+    MethodCall mc, Function f, FunctionPosition selfPos, ImplItemNode impl, AssocFunctionType self,
     TypePath blanketPath, TypeParam blanketTypeParam
   ) {
     exists(string name, int arity |
       mc.hasNameAndArity(name, arity) and
-      assocFunctionSelfInfoBlanketLike(m, name, arity, selfPos, impl, _, self, blanketPath,
+      assocFunctionSelfInfoBlanketLike(f, name, arity, selfPos, impl, _, self, blanketPath,
         blanketTypeParam)
     |
       methodCallVisibleImplTraitCandidate(mc, impl)
@@ -1935,7 +1935,7 @@ private module MethodResolution {
      * and `borrow`.
      */
     pragma[nomagic]
-    Method resolveCallTarget(ImplOrTraitItemNode i, DerefChain derefChain, BorrowKind borrow) {
+    Function resolveCallTarget(ImplOrTraitItemNode i, DerefChain derefChain, BorrowKind borrow) {
       exists(MethodCallCand mcc |
         mcc = MkMethodCallCand(this, _, derefChain, borrow) and
         result = mcc.resolveCallTarget(i)
@@ -1958,7 +1958,7 @@ private module MethodResolution {
     pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
       name = super.getIdentifier().getText() and
-      arity = super.getArgList().getNumberOfArgs()
+      arity = super.getArgList().getNumberOfArgs() + 1
     }
 
     override Expr getArg(ArgumentPosition pos) {
@@ -1979,7 +1979,7 @@ private module MethodResolution {
     pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
       (if this.isInMutableContext() then name = "index_mut" else name = "index") and
-      arity = 1
+      arity = 2
     }
 
     override Expr getArg(ArgumentPosition pos) {
@@ -2004,13 +2004,14 @@ private module MethodResolution {
       exists(getCallExprPathQualifier(this)) and
       // even if a method cannot be resolved by path resolution, it may still
       // be possible to resolve a blanket implementation (so not `forex`)
-      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Method)
+      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Function)
     }
 
     pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
+      // this = Debug::getRelevantLocatable() and
       name = CallExprImpl::getFunctionPath(this).getText() and
-      arity = super.getArgList().getNumberOfArgs() - 1
+      arity = super.getArgList().getNumberOfArgs()
     }
 
     override Expr getArg(ArgumentPosition pos) {
@@ -2042,7 +2043,7 @@ private module MethodResolution {
     pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
       super.isOverloaded(_, name, _) and
-      arity = super.getNumberOfOperands() - 1
+      arity = super.getNumberOfOperands()
     }
 
     override Expr getArg(ArgumentPosition pos) {
@@ -2099,9 +2100,9 @@ private module MethodResolution {
   }
 
   pragma[nomagic]
-  private Method getMethodSuccessor(ImplOrTraitItemNode i, string name, int arity) {
+  private Function getFunctionSuccessor(ImplOrTraitItemNode i, string name, int arity) {
     result = i.getASuccessor(name) and
-    arity = result.getParamList().getNumberOfParams()
+    arity = result.getNumberOfParamsInclSelf()
   }
 
   private newtype TMethodCallCand =
@@ -2187,16 +2188,16 @@ private module MethodResolution {
     }
 
     pragma[nomagic]
-    Method resolveCallTargetCand(ImplOrTraitItemNode i) {
+    Function resolveCallTargetCand(ImplOrTraitItemNode i) {
       exists(string name, int arity |
         this.argIsInstantiationOf(i, name, arity) and
-        result = getMethodSuccessor(i, name, arity)
+        result = getFunctionSuccessor(i, name, arity)
       )
     }
 
-    /** Gets a method that matches this method call. */
+    /** Gets a function that matches this method call. */
     pragma[nomagic]
-    Method resolveCallTarget(ImplOrTraitItemNode i) {
+    Function resolveCallTarget(ImplOrTraitItemNode i) {
       result = this.resolveCallTargetCand(i) and
       not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _)
       or
@@ -2316,14 +2317,14 @@ private module MethodResolution {
       MethodCallCand mcc, ImplOrTraitItemNode i, AssocFunctionType selfType
     ) {
       exists(
-        MethodCall mc, FunctionPosition selfPos, Method m, string name, int arity,
+        MethodCall mc, FunctionPosition selfPos, Function f, string name, int arity,
         TypePath strippedTypePath, Type strippedType
       |
         mcc.hasSignature(mc, selfPos, strippedTypePath, strippedType, name, arity)
       |
-        methodCallNonBlanketCandidate(mc, m, selfPos, i, selfType, strippedTypePath, strippedType)
+        methodCallNonBlanketCandidate(mc, f, selfPos, i, selfType, strippedTypePath, strippedType)
         or
-        methodCallBlanketLikeCandidate(mc, m, selfPos, i, selfType, _, _) and
+        methodCallBlanketLikeCandidate(mc, f, selfPos, i, selfType, _, _) and
         ReceiverSatisfiesBlanketLikeConstraint::satisfiesBlanketConstraint(mcc, i)
       )
     }