wip3

Author: hvitved

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

@@ -1605,7 +1605,7 @@ private module MethodResolution {
         pos.isPositional() and
         FunctionOverloading::functionResolutionDependsOnArgument(i, f, pos, path, t0) and
         t.appliesTo(f, pos, i) and
-        not t0 instanceof TypeParameter
+        not t0 instanceof TypeParameter // skip parametric types, as we ought to check type bounds
       )
     }
 
@@ -1817,12 +1817,9 @@ private module NonMethodResolution {
     TraitItemNode trait, NonMethodFunction traitFunction, FunctionTypePosition pos,
     NonMethodFunction implFunction
   ) {
-    exists(TypePath path, Type type |
-      functionTypeAtPath(implFunction, pos, path, type) and
-      implFunction.implements(traitFunction) and
-      traitTypeParameterOccurrence(trait, traitFunction, _, pos, _, _) and
-      not type instanceof TypeParameter
-    |
+    implFunction.implements(traitFunction) and
+    traitTypeParameterOccurrence(trait, traitFunction, _, pos, _, _) and
+    (
       not pos.isReturn()
       or
       // We only check that the context of the call provides relevant type information
@@ -1975,7 +1972,7 @@ private module NonMethodResolution {
     }
 
     pragma[nomagic]
-    NonMethodFunction resolveAssocCallTargetCand(ImplOrTraitItemNode i) {
+    NonMethodFunction resolveAssocCallTargetCand(ImplItemNode i) {
       not this.(Call).hasTrait() and
       result = this.getPathResolutionResolved() and
       result = i.getASuccessor(_)
@@ -2033,10 +2030,17 @@ private module NonMethodResolution {
       exists(Type t0 |
         FunctionOverloading::functionResolutionDependsOnArgument(i, f, pos, _, t0) and
         t.appliesTo(f, pos, i) and
-        not t0 instanceof TypeParameter
+        not t0 instanceof TypeParameter // skip parametric types, as we ought to check type bounds
       )
       or
-      traitFunctionDependsOnArgument(_, _, pos, f) and
+      (
+        traitFunctionDependsOnArgument(_, _, pos, f)
+        or
+        exists(Trait trait |
+          traitFunctionDependsOnArgument(trait, f, pos, _) and
+          t.getTypeAt(_) = TTrait(trait)
+        )
+      ) and
       t.appliesTo(f, pos, i)
     }
 
@@ -2048,10 +2052,14 @@ private module NonMethodResolution {
       predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
         f = this.resolveAssocCallTargetCand(i)
         or
-        exists(TraitItemNode trait, NonMethodFunction resolved |
+        exists(TraitItemNode trait, NonMethodFunction resolved, Function f1 |
           this.hasTraitResolved(trait, resolved) and
-          traitFunctionDependsOnArgument(trait, resolved, _, f) and
+          traitFunctionDependsOnArgument(trait, resolved, _, f1) and
           f = i.getASuccessor(_)
+        |
+          f = f1
+          or
+          f = resolved
         )
       }
     }
@@ -3055,8 +3063,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 = 701
     )
   }
 

rust/ql/test/library-tests/type-inference/main.rs

@@ -698,9 +698,9 @@ mod function_trait_bounds {
         T2::assoc(x) // $ target=assoc
     }
     fn call_trait_assoc_2<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
-        let y = MyTrait::assoc(x); // $ MISSING: target=assoc
-        y; // $ MISSING: type=y:T1
-        MyTrait::assoc(x) // $ MISSING: target=assoc
+        let y = MyTrait::assoc(x); // $ target=assoc
+        y; // $ type=y:T1
+        MyTrait::assoc(x) // $ target=assoc
     }
 
     // Type parameter with bound occurs nested within another type.
@@ -2446,9 +2446,9 @@ mod loops {
             String::from("bar"), // $ target=from
             String::from("baz"), // $ target=from
         ];
-        for s in strings3 {} // $ MISSING: type=s:String
+        for s in strings3 {} // $ type=s:&T.String
 
-        let callables = [MyCallable::new(), MyCallable::new(), MyCallable::new()]; // $ target=new $ MISSING: type=callables:[T;...].MyCallable; 3
+        let callables = [MyCallable::new(), MyCallable::new(), MyCallable::new()]; // $ target=new $ type=callables:[T;...].MyCallable
         for c // $ type=c:MyCallable
         in callables
         {
@@ -2502,10 +2502,10 @@ mod loops {
         let mut map1 = std::collections::HashMap::new(); // $ target=new type=map1:K.i32 type=map1:V.Box $ MISSING: type=map1:Hashmap type1=map1:V.T.&T.str
         map1.insert(1, Box::new("one")); // $ target=insert target=new
         map1.insert(2, Box::new("two")); // $ target=insert target=new
-        for key in map1.keys() {} // $ target=keys MISSING: type=key:i32
-        for value in map1.values() {} // $ target=values MISSING: type=value:Box type=value:T.&T.str
-        for (key, value) in map1.iter() {} // $ target=iter MISSING: type=key:i32 type=value:Box type=value:T.&T.str
-        for (key, value) in &map1 {} // $ MISSING: type=key:i32 type=value:Box type=value:T.&T.str
+        for key in map1.keys() {} // $ target=keys type=key:&T.i32
+        for value in map1.values() {} // $ target=values type=value:&T.Box type=value:&T.T.&T.str
+        for (key, value) in map1.iter() {} // $ target=iter type=key:&T.i32 type=value:&T.Box type=value:&T.T.&T.str
+        for (key, value) in &map1 {} // $ type=key:&T.i32 type=value:&T.Box type=value:&T.T.&T.str
 
         // while loops
 

rust/ql/test/library-tests/type-inference/type-inference.expected

@@ -1992,7 +1992,10 @@ inferType
 | main.rs:698:19:698:19 | x |  | main.rs:695:31:695:52 | T2 |
 | main.rs:700:55:700:55 | x |  | main.rs:700:31:700:52 | T2 |
 | main.rs:700:68:704:5 | { ... } |  | main.rs:700:27:700:28 | T1 |
+| main.rs:701:13:701:13 | y |  | main.rs:700:27:700:28 | T1 |
+| main.rs:701:17:701:33 | ...::assoc(...) |  | main.rs:700:27:700:28 | T1 |
 | main.rs:701:32:701:32 | x |  | main.rs:700:31:700:52 | T2 |
+| main.rs:702:9:702:9 | y |  | main.rs:700:27:700:28 | T1 |
 | main.rs:703:9:703:25 | ...::assoc(...) |  | main.rs:700:27:700:28 | T1 |
 | main.rs:703:24:703:24 | x |  | main.rs:700:31:700:52 | T2 |
 | main.rs:708:49:708:49 | x |  | main.rs:656:5:659:5 | MyThing |