wip

Author: hvitved

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

@@ -275,7 +275,7 @@ abstract class ItemNode extends Locatable {
     )
   }
 
-  ItemNode getASuccessorExternal(string name) {
+  ItemNode getASuccessor(string name) {
     exists(SuccessorKind kind | result = this.getASuccessor(name, kind) |
       kind.isExternal()
       or
@@ -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()
@@ -1138,11 +1138,6 @@ private class BuiltinSourceFile extends SourceFileItemNode {
 pragma[nomagic]
 private predicate crateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
   exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
-  or
-  // Give builtin files access to `std`
-  file instanceof BuiltinSourceFile and
-  dep.getName() = name and
-  name = "std"
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {
@@ -1350,7 +1345,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
@@ -1462,12 +1467,20 @@ private predicate externCrateEdge(ExternCrateItemNode ec, string name, CrateItem
 
 pragma[nomagic]
 private predicate preludeItem(string name, ItemNode i) {
-  exists(Crate stdOrCore, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
-    stdOrCore.getName() = ["std", "core"] and
+  exists(
+    Crate stdOrCore, string stdOrCoreName, ModuleLikeNode mod, ModuleItemNode prelude,
+    ModuleItemNode rust
+  |
+    stdOrCore.getName() = stdOrCoreName and
+    stdOrCoreName = ["std", "core"]
+  |
+    name = stdOrCoreName and
+    i = stdOrCore
+    or
     mod = stdOrCore.getSourceFile() and
-    prelude = mod.getASuccessorExternal("prelude") and
-    rust = prelude.getASuccessorExternal(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
-    i = rust.getASuccessorExternal(name) and
+    prelude = mod.getASuccessor("prelude") and
+    rust = prelude.getASuccessor(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
+    i = rust.getASuccessor(name, _) and
     not name = ["super", "self"]
   )
 }
@@ -1492,7 +1505,7 @@ pragma[nomagic]
 private predicate builtin(string name, ItemNode i) {
   exists(BuiltinSourceFile builtins |
     builtins.getFile().getBaseName() = "types.rs" and
-    i = builtins.getASuccessorExternal(name)
+    i = builtins.getASuccessor(name, _)
   )
 }
 

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)
   }
 }
 
@@ -1846,7 +1847,7 @@ pragma[nomagic]
 private predicate methodCandidate(Type type, string name, int arity, Impl impl) {
   type = impl.getSelfTy().(TypeMention).resolveType() and
   exists(Function f |
-    f = impl.(ImplItemNode).getASuccessorExternal(name) and
+    f = impl.(ImplItemNode).getASuccessor(name) and
     f.getParamList().hasSelfParam() and
     arity = f.getParamList().getNumberOfParams()
   )
@@ -1891,7 +1892,7 @@ private module IsInstantiationOfInput implements IsInstantiationOfInputSig<Metho
 bindingset[item, name]
 pragma[inline_late]
 private Function getMethodSuccessor(ItemNode item, string name) {
-  result = item.getASuccessorExternal(name)
+  result = item.getASuccessor(name)
 }
 
 bindingset[tp, name]
@@ -2513,7 +2514,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)

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

@@ -207,7 +207,7 @@ class NonAliasPathTypeMention extends PathTypeMention {
       this = impl.getTraitPath() and
       param.getTrait() = resolved and
       name = param.getTypeAlias().getName().getText() and
-      alias = impl.getASuccessorExternal(pragma[only_bind_into](name)) and
+      alias = impl.getASuccessor(pragma[only_bind_into](name)) and
       result = alias.getTypeRepr() and
       tp =
         TAssociatedTypeTypeParameter(resolved

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

@@ -1,10 +1,4 @@
 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(...) |  |