wip2

Author: hvitved

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

@@ -1699,7 +1699,7 @@ private module AssocFunctionResolution {
       exists(AssocFunctionType selfType |
         ArgIsInstantiationOfSelfParam::argIsInstantiationOf(this, i, selfPos, derefChain, borrow,
           selfType) and
-        CallArgsAreInstantiationsOf::argsAreNotInstantiationsOf(this, i, _) and
+        CallArgsAreInstantiationsOf::argsAreNotInstantiationsOf(this, i) and
         root = selfType.getTypeAt(TypePath::nil())
       )
     }
@@ -2297,7 +2297,7 @@ private module AssocFunctionResolution {
     }
 
   /** A call with a dereference chain and a potential borrow. */
-  private class AssocFunctionCallCand extends MkAssocFunctionCallCand {
+  final private class AssocFunctionCallCand extends MkAssocFunctionCallCand {
     AssocFunctionCall afc_;
     FunctionPosition selfPos;
     FunctionPosition selfPosAdj;
@@ -2394,7 +2394,7 @@ private module AssocFunctionResolution {
       result = this.resolveCallTargetCand(i) and
       not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _)
       or
-      CallArgsAreInstantiationsOf::argsAreInstantiationsOf(afc_, i, result)
+      CallArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
     }
 
     string toString() {
@@ -2621,21 +2621,25 @@ private module AssocFunctionResolution {
       FunctionOverloading::functionResolutionDependsOnArgument(i, f, traitTp, pos)
     }
 
-    final private class AssocFunctionCallFinal = AssocFunctionCall;
-
-    class Call extends AssocFunctionCallFinal {
-      Type getArgType(FunctionPosition pos, TypePath path) { result = this.getTypeAt(pos, path) }
+    class Call extends AssocFunctionCallCand {
+      Type getArgType(FunctionPosition pos, TypePath path) {
+        result = this.getAssocFunctionCall().getTypeAt(pos, path)
+      }
 
       predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
-        f =
-          any(AssocFunctionCallCand afcc | afcc = MkAssocFunctionCallCand(this, _, _, _, _))
-              .resolveCallTargetCand(i)
+        f = this.resolveCallTargetCand(i)
       }
     }
   }
 
-  private module CallArgsAreInstantiationsOf =
-    ArgsAreInstantiationsOf<CallArgsAreInstantiationsOfInput>;
+  private module CallArgsAreInstantiationsOf {
+    import ArgsAreInstantiationsOf<CallArgsAreInstantiationsOfInput>
+
+    pragma[nomagic]
+    predicate argsAreNotInstantiationsOf(AssocFunctionCall afc, ImplOrTraitItemNode i) {
+      argsAreNotInstantiationsOf(MkAssocFunctionCallCand(afc, _, _, _, _), i, _)
+    }
+  }
 }
 
 /**

rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,6 +0,0 @@
-multipleResolvedTargets
-| test.rs:389:30:389:67 | pinned.poll_read(...) |
-| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) |
-| test.rs:423:27:423:71 | ... .poll_fill_buf(...) |
-| test.rs:447:30:447:67 | pinned.poll_read(...) |
-| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) |