wip

Author: hvitved

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

@@ -602,7 +602,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
 
   Path getTraitPath() { result = super.getTrait().(PathTypeRepr).getPath() }
 
-  ItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
+  TypeItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
 
   TraitItemNode resolveTraitTy() { result = resolvePath(this.getTraitPath()) }
 
@@ -691,7 +691,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
   }
 }
 
-private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTypeRepr {
+private class ImplTraitTypeReprItemNode extends TypeItemNode instanceof ImplTraitTypeRepr {
   pragma[nomagic]
   Path getABoundPath() {
     result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
@@ -1350,7 +1350,17 @@ private predicate pathUsesNamespace(Path p, Namespace n) {
 /** Gets the item that `path` resolves to, if any. */
 cached
 ItemNode resolvePath(RelevantPath path) {
-  exists(Namespace ns | result = resolvePath0(path, ns, _) |
+  exists(Namespace ns |
+    result = resolvePath0(path, ns, _) and
+    if path = any(ImplItemNode i).getSelfPath()
+    then
+      result instanceof TypeItemNode and
+      not result instanceof TraitItemNode
+    else
+      if path = any(ImplItemNode i).getTraitPath()
+      then result instanceof TraitItemNode
+      else any()
+  |
     pathUsesNamespace(path, ns)
     or
     not pathUsesNamespace(path, _) and

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

@@ -224,8 +224,9 @@ private import M2
 module Consistency {
   import M2::Consistency
 
-  query predicate nonUniqueCertainType(AstNode n, TypePath path) {
-    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1
+  predicate nonUniqueCertainType(AstNode n, TypePath path, Type t) {
+    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1 and
+    t = CertainTypeInference::inferCertainType(n, path)
   }
 }
 
@@ -2484,7 +2485,6 @@ private module Debug {
 
   Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    Consistency::nonUniqueCertainType(n, path) and
-    result = CertainTypeInference::inferCertainType(n, path)
+    Consistency::nonUniqueCertainType(n, path, result)
   }
 }

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

@@ -17,6 +17,10 @@ query predicate illFormedTypeMention(TypeMention tm) {
   tm.fromSource()
 }
 
+query predicate nonUniqueCertainType(AstNode n, TypePath path) {
+  Consistency::nonUniqueCertainType(n, path, _)
+}
+
 int getTypeInferenceInconsistencyCounts(string type) {
   type = "Missing type parameter ID" and
   result = count(TypeParameter tp | missingTypeParameterId(tp) | tp)
@@ -31,5 +35,5 @@ int getTypeInferenceInconsistencyCounts(string type) {
   result = count(TypeMention tm | illFormedTypeMention(tm) | tm)
   or
   type = "Non-unique certain type information" and
-  result = count(AstNode n, TypePath path | nonUniqueCertainType(n, path) | n)
+  result = count(AstNode n, TypePath path | nonUniqueCertainType(n, path, _) | n)
 }

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

@@ -11,8 +11,6 @@ multipleCallTargets
 | test.rs:179:30:179:68 | ...::_print(...) |
 | test.rs:188:26:188:105 | ...::_print(...) |
 | test.rs:229:22:229:72 | ... .read_to_string(...) |
-| test.rs:483:22:483:50 | file.read_to_end(...) |
-| test.rs:489:22:489:53 | file.read_to_string(...) |
 | test.rs:610:18:610:38 | ...::_print(...) |
 | test.rs:615:18:615:45 | ...::_print(...) |
 | test.rs:619:25:619:49 | address.to_socket_addrs() |

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

@@ -1,10 +1 @@
-nonUniqueCertainType
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:46:13:46:36 | SelfParam | Ptr.&T.Fut2 |
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:84:18:84:41 | SelfParam | Ptr.&T.Fut2 |
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:112:19:112:42 | SelfParam | Ptr.&T.Fut2 |
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:127:19:127:38 | SelfParam | Ptr.&T.Fut2 |
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:135:19:135:38 | SelfParam | Ptr.&T.Fut2 |
-| file:///home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-util-0.3.31/src/future/future/flatten.rs:143:19:143:42 | SelfParam | Ptr.&T.Fut2 |
-| web_frameworks.rs:139:30:139:39 | ...::get(...) |  |
-| web_frameworks.rs:140:34:140:43 | ...::get(...) |  |
-| web_frameworks.rs:141:30:141:39 | ...::get(...) |  |
+ERROR: query module contains multiple query predicates with the name 'nonUniqueCertainType' (TypeInferenceConsistency.ql:1,1-1)