wip

Author: hvitved

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

@@ -2654,7 +2654,7 @@ private module NonMethodResolution {
    * to `traitTp` being the special `Self` type parameter).
    */
   pragma[nomagic]
-  private predicate functionResolutionDependsOnArgument(
+  private predicate functionResolutionDependsOnArgument0(
     TraitItemNode trait, NonMethodFunction traitFunction, FunctionPosition pos, ImplItemNode impl,
     NonMethodFunction implFunction, TypePath path, TypeParameter traitTp
   ) {
@@ -2668,6 +2668,19 @@ private module NonMethodResolution {
     )
   }
 
+  pragma[nomagic]
+  private predicate functionResolutionDependsOnArgument(
+    ImplItemNode impl, NonMethodFunction f, FunctionPosition pos, TypeParameter traitTp
+  ) {
+    functionResolutionDependsOnArgument0(_, _, pos, impl, f, _, traitTp)
+    or
+    f = impl.getASuccessor(_) and
+    not impl.(Impl).hasTrait() and
+    traitTp = TTypeParamTypeParameter(impl.resolveSelfTy().getTypeParam(0)) and
+    pos.isSelf() and
+    not f.hasSelfParam()
+  }
+
   pragma[nomagic]
   private predicate functionInfoBlanketLikeRelevantPos(
     NonMethodFunction f, string name, int arity, ImplItemNode impl, Trait trait,
@@ -2763,7 +2776,7 @@ private module NonMethodResolution {
       result = this.getPathResolutionResolved() and
       result = i.getASuccessor(_) and
       not exists(this.resolveCallTargetViaPathResolution()) and
-      functionResolutionDependsOnArgument(_, _, _, i, result, _, _)
+      functionResolutionDependsOnArgument(i, result, _, _)
     }
 
     pragma[nomagic]
@@ -2811,7 +2824,7 @@ private module NonMethodResolution {
     ItemNode resolveCallTargetViaPathResolution() {
       not this.hasTrait() and
       result = this.getPathResolutionResolved() and
-      not functionResolutionDependsOnArgument(_, _, _, _, result, _, _)
+      not functionResolutionDependsOnArgument(_, result, _, _)
     }
 
     /**
@@ -2917,7 +2930,7 @@ private module NonMethodResolution {
     ArgsAreInstantiationsOfInputSig
   {
     predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
-      functionResolutionDependsOnArgument(_, _, pos, i, f, _, traitTp)
+      functionResolutionDependsOnArgument(i, f, pos, traitTp)
     }
 
     final class Call extends NonMethodCall {
@@ -2938,7 +2951,7 @@ private module NonMethodResolution {
     ArgsAreInstantiationsOfInputSig
   {
     predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
-      functionResolutionDependsOnArgument(_, _, pos, i, f, _, traitTp)
+      functionResolutionDependsOnArgument(i, f, pos, traitTp)
       or
       // Also match against the trait function itself
       FunctionOverloading::traitTypeParameterOccurrence(i, f, _, pos, _, traitTp) and
@@ -2950,12 +2963,19 @@ private module NonMethodResolution {
         result = getArgType(this, pos, path, _)
       }
 
+      // private predicate testhasTargetCand(
+      //   ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos
+      // ) {
+      //   this = Debug::getRelevantLocatable() and
+      //   this.hasTargetCand(i, f) and
+      //   toCheck(i, f, traitTp, pos)
+      // }
       predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
         f = this.resolveCallTargetNonBlanketCand(i)
         or
         exists(TraitItemNode trait, NonMethodFunction resolved, ImplItemNode i1, Function f1 |
           this.hasTraitResolved(trait, resolved) and
-          functionResolutionDependsOnArgument(trait, resolved, _, i1, f1, _, _) and
+          functionResolutionDependsOnArgument0(trait, resolved, _, i1, f1, _, _) and
           not BlanketImplementation::isBlanketLike(i, _, _)
         |
           f = resolved and
@@ -2965,10 +2985,10 @@ private module NonMethodResolution {
           i = i1 and
           // Exclude functions where we cannot resolve all relevant type mentions
           forall(TypeParameter traitTp |
-            functionResolutionDependsOnArgument(trait, resolved, _, i1, f1, _, traitTp)
+            functionResolutionDependsOnArgument0(trait, resolved, _, i1, f1, _, traitTp)
           |
             exists(FunctionPosition pos, TypePath path |
-              functionResolutionDependsOnArgument(trait, resolved, pos, i1, f1, path, traitTp) and
+              functionResolutionDependsOnArgument0(trait, resolved, pos, i1, f1, path, traitTp) and
               exists(getAssocFunctionTypeAt(f, i, pos, path))
             )
           )
@@ -4117,8 +4137,8 @@ private module Debug {
   Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/sqlx.rs") and
-      startline = [56 .. 60]
+      filepath.matches("%/main.rs") and
+      startline = [568]
     )
   }
 

rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected

@@ -4,5 +4,3 @@ multipleResolvedTargets
 | main.rs:369:9:371:16 | ...::f(...) |
 | main.rs:450:9:454:16 | ...::f(...) |
 | main.rs:455:9:459:16 | ...::f(...) |
-| main.rs:568:9:569:12 | ...::f1(...) |
-| main.rs:571:9:572:12 | ...::f1(...) |

rust/ql/test/library-tests/path-resolution/main.rs

@@ -566,10 +566,10 @@ mod m16 {
         Assoc(); // $ item=S3i32AssocFunc
 
         S3::<bool>:: // $ item=bool
-        f1(); // $ item=S3boolf1 $ SPURIOUS: item=S3i32f1
+        f1(); // $ item=S3boolf1
 
         S3::<i32>:: // $ item=i32
-        f1(); // $ item=S3i32f1 $ SPURIOUS: item=S3boolf1
+        f1(); // $ item=S3i32f1
     }
 }
 

rust/ql/test/library-tests/path-resolution/path-resolution.expected

@@ -324,12 +324,10 @@ resolvePath
 | main.rs:565:9:566:13 | ...::Assoc | main.rs:532:9:535:9 | fn Assoc |
 | main.rs:565:14:565:16 | i32 | {EXTERNAL LOCATION} | struct i32 |
 | main.rs:568:9:568:18 | S3::<...> | main.rs:525:5:525:22 | struct S3 |
-| main.rs:568:9:569:10 | ...::f1 | main.rs:550:20:553:9 | fn f1 |
 | main.rs:568:9:569:10 | ...::f1 | main.rs:557:21:560:9 | fn f1 |
 | main.rs:568:14:568:17 | bool | {EXTERNAL LOCATION} | struct bool |
 | main.rs:571:9:571:17 | S3::<...> | main.rs:525:5:525:22 | struct S3 |
 | main.rs:571:9:572:10 | ...::f1 | main.rs:550:20:553:9 | fn f1 |
-| main.rs:571:9:572:10 | ...::f1 | main.rs:557:21:560:9 | fn f1 |
 | main.rs:571:14:571:16 | i32 | {EXTERNAL LOCATION} | struct i32 |
 | main.rs:588:14:588:16 | Foo | main.rs:578:9:580:9 | trait Foo |
 | main.rs:588:22:588:22 | X | main.rs:586:9:586:21 | struct X |

rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected

@@ -0,0 +1,2 @@
+multipleResolvedTargets
+| test_cipher.rs:114:23:114:50 | ...::new(...) |