dbg2

Author: hvitved

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

@@ -826,8 +826,9 @@ private Type inferCallExprBaseType(AstNode n, TypePath path) {
     TypePath path0
   |
     n = a.getNodeAt(apos) and
-    result = CallExprBaseMatching::inferAccessType(a, apos, path0)
+    result = CallExprBaseMatching::inferAccessType(a, apos, path0) //and
   |
+    // not apos.getArgumentPosition().isSelf()
     if
       apos.isBorrowed(true)
       or
@@ -1608,8 +1609,10 @@ private module Debug {
   private 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("%/src/solve/inspect/build.rs") and
+      startline = [107, 117, 103]
+      // filepath.matches("%/main.rs") and
+      // startline = 2218
     )
   }
 

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

@@ -13,22 +13,32 @@ abstract class TypeMention extends AstNode {
   /** Gets the type that this node resolves to, if any. */
   abstract Type resolveType();
 
-  /** Gets the sub mention at `path`. */
-  pragma[nomagic]
-  private TypeMention getMentionAt(TypePath path) {
+  // /** Gets the sub mention at `path`. */
+  // pragma[nomagic]
+  // private TypeMention getMentionAt(TypePath path) {
+  //   path.isEmpty() and
+  //   result = this
+  //   or
+  //   exists(int i, TypeParameter tp, TypeMention arg, TypePath suffix |
+  //     arg = this.getTypeArgument(pragma[only_bind_into](i)) and
+  //     result = arg.getMentionAt(suffix) and
+  //     path = TypePath::cons(tp, suffix) and
+  //     tp = this.resolveType().getTypeParameter(pragma[only_bind_into](i))
+  //   )
+  // }
+  /** Gets the type that the sub mention at `path` resolves to, if any. */
+  Type resolveTypeAt(TypePath path) {
     path.isEmpty() and
-    result = this
+    result = this.resolveType()
     or
     exists(int i, TypeParameter tp, TypeMention arg, TypePath suffix |
       arg = this.getTypeArgument(pragma[only_bind_into](i)) and
-      result = arg.getMentionAt(suffix) and
+      result = arg.resolveTypeAt(suffix) and
       path = TypePath::cons(tp, suffix) and
       tp = this.resolveType().getTypeParameter(pragma[only_bind_into](i))
     )
   }
-
-  /** Gets the type that the sub mention at `path` resolves to, if any. */
-  Type resolveTypeAt(TypePath path) { result = this.getMentionAt(path).resolveType() }
+  // result = this.getMentionAt(path).resolveType() }
 }
 
 class ArrayTypeReprMention extends TypeMention instanceof ArrayTypeRepr {

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

@@ -1057,7 +1057,7 @@ mod type_aliases {
 
         g(PairOption::PairSnd(PairOption::PairSnd(S3)));
 
-        let x: S7<S2>; // $ type=x:Result $ type=x:E.S1 $ type=x:T.S4 $ type=x:T.T41.S2 $ MISSING: type=x:T.T42.S5 $ MISSING: type=x:T.T42.T5.S2
+        let x: S7<S2>; // $ type=x:Result $ type=x:E.S1 $ type=x:T.S4 $ type=x:T.T41.S2 $ type=x:T.T42.S5 $ type=x:T.T42.T5.S2
     }
 }
 

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

@@ -1375,6 +1375,8 @@ inferType
 | main.rs:1060:13:1060:13 | x | E | main.rs:1007:5:1008:14 | S1 |
 | main.rs:1060:13:1060:13 | x | T | main.rs:1033:5:1033:34 | S4 |
 | main.rs:1060:13:1060:13 | x | T.T41 | main.rs:1010:5:1011:14 | S2 |
+| main.rs:1060:13:1060:13 | x | T.T42 | main.rs:1035:5:1035:22 | S5 |
+| main.rs:1060:13:1060:13 | x | T.T42.T5 | main.rs:1010:5:1011:14 | S2 |
 | main.rs:1073:16:1073:24 | SelfParam |  | file://:0:0:0:0 | & |
 | main.rs:1073:16:1073:24 | SelfParam | &T | main.rs:1071:5:1078:5 | Self [trait MyTrait] |
 | main.rs:1073:27:1073:31 | value |  | main.rs:1071:19:1071:19 | S |