Rust: Take where clauses into account in path resolution

Author: hvitved

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

@@ -579,9 +579,21 @@ private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
 }
 
 private class TypeParamItemNode extends ItemNode instanceof TypeParam {
+  private WherePred getAWherePred() {
+    exists(ItemNode declaringItem |
+      this = resolveTypeParamPathTypeRepr(result.getTypeRepr()) and
+      result = declaringItem.getADescendant() and
+      this = declaringItem.getADescendant()
+    )
+  }
+
   pragma[nomagic]
   Path getABoundPath() {
-    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
+    exists(TypeBoundList tbl | result = tbl.getABound().getTypeRepr().(PathTypeRepr).getPath() |
+      tbl = super.getTypeBoundList()
+      or
+      tbl = this.getAWherePred().getTypeBoundList()
+    )
   }
 
   pragma[nomagic]
@@ -602,11 +614,7 @@ private class TypeParamItemNode extends ItemNode instanceof TypeParam {
   predicate hasTraitBound() {
     exists(this.getABoundPath())
     or
-    exists(ItemNode declaringItem, WherePred wp |
-      this = resolveTypeParamPathTypeRepr(wp.getTypeRepr()) and
-      wp = declaringItem.getADescendant() and
-      this = declaringItem.getADescendant()
-    )
+    exists(this.getAWherePred())
   }
 
   /**

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

@@ -568,7 +568,7 @@ mod m24 {
         T: TraitA // $ item=I111 item=I1151
     {
         fn call_trait_a(&self) {
-            self.data.trait_a_method(); // $ MISSING: item=I110
+            self.data.trait_a_method(); // $ item=I110
         } // I116
     }
 
@@ -580,8 +580,8 @@ mod m24 {
         T: TraitA, // $ item=I111 item=I1161
     {
         fn call_both(&self) {
-            self.data.trait_a_method(); // $ MISSING: item=I110
-            self.data.trait_b_method(); // $ MISSING: item=I112
+            self.data.trait_a_method(); // $ item=I110
+            self.data.trait_b_method(); // $ item=I112
         } // I117
     }