wip2

This reverts commit 0f72015.

Author: hvitved

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

@@ -211,6 +211,22 @@ abstract class ItemNode extends Locatable {
       ).(Crate).getADependency*()
   }
 
+  /** Holds if this item has a canonical path belonging to the crate `c`. */
+  abstract predicate hasCanonicalPath(Crate c);
+
+  /** Holds if this node provides a canonical path prefix for `child` in crate `c`. */
+  pragma[nomagic]
+  predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    child.getImmediateParent() = this and
+    this.hasCanonicalPath(c)
+  }
+
+  /** Holds if this node has a canonical path prefix in crate `c`. */
+  pragma[nomagic]
+  final predicate hasCanonicalPathPrefix(Crate c) {
+    any(ItemNode parent).providesCanonicalPathPrefixFor(c, this)
+  }
+
   /**
    * Gets the canonical path of this item, if any.
    *
@@ -224,7 +240,7 @@ abstract class ItemNode extends Locatable {
   /** Gets the canonical path prefix that this node provides for `child`. */
   pragma[nomagic]
   string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
-    child.getImmediateParent() = this and
+    this.providesCanonicalPathPrefixFor(c, child) and
     result = this.getCanonicalPath(c)
   }
 
@@ -234,10 +250,6 @@ abstract class ItemNode extends Locatable {
     result = any(ItemNode parent).getCanonicalPathPrefixFor(c, this)
   }
 
-  /** Gets the canonical path prefix of this node, if any. */
-  pragma[nomagic]
-  final Crate getACanonicalPathCrate() { exists(this.getCanonicalPathPrefix(result)) }
-
   /** Gets the location of this item. */
   Location getLocation() { result = super.getLocation() }
 }
@@ -285,6 +297,8 @@ private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
 
   override TypeParam getTypeParam(int i) { none() }
 
+  override predicate hasCanonicalPath(Crate c) { none() }
+
   override string getCanonicalPath(Crate c) { none() }
 }
 
@@ -334,33 +348,28 @@ class CrateItemNode extends ItemNode instanceof Crate {
 
   override TypeParam getTypeParam(int i) { none() }
 
-  override string getCanonicalPath(Crate c) {
-    c = this and
-    result = Crate.super.getName() and
-    not exists(FunctionItemNode main |
-      main.getImmediateParent() = this.getModuleNode() and
-      main.getName() = "main"
-    )
-  }
+  override predicate hasCanonicalPath(Crate c) { c = this }
 
-  override string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
-    exists(ModuleLikeNode m |
-      result = this.getCanonicalPath(c) and
-      m = this.getModuleNode()
-    |
+  override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    this.hasCanonicalPath(c) and
+    exists(ModuleLikeNode m | m = this.getModuleNode() |
       child = m
       or
       child.getImmediateParent() = m.(SourceFile) and
       not m = child.(SourceFileItemNode).getSuper()
     )
   }
+
+  override string getCanonicalPath(Crate c) { c = this and result = Crate.super.getName() }
 }
 
 /** An item that can occur in a trait or an `impl` block. */
 abstract private class AssocItemNode extends ItemNode, AssocItem {
   /** Holds if this associated item has an implementation. */
   abstract predicate hasImplementation();
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -375,7 +384,7 @@ abstract private class AssocItemNode extends ItemNode, AssocItem {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
@@ -401,6 +410,8 @@ private class EnumItemNode extends ItemNode instanceof Enum {
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -415,7 +426,7 @@ private class EnumItemNode extends ItemNode instanceof Enum {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
@@ -433,6 +444,8 @@ private class VariantItemNode extends ItemNode instanceof Variant {
 
   override Visibility getVisibility() { result = super.getEnum().getVisibility() }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -447,7 +460,7 @@ private class VariantItemNode extends ItemNode instanceof Variant {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
@@ -572,12 +585,14 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
 
   override Visibility getVisibility() { result = Impl.super.getVisibility() }
 
+  override predicate hasCanonicalPath(Crate c) { this.resolveSelfTy().hasCanonicalPathPrefix(c) }
+
   pragma[nomagic]
   private string getCanonicalPathTraitPart(Crate c) {
-    exists(Crate c2 | result = this.resolveTraitTy().getCanonicalPath(c2) |
-      c = c2
-      or
-      c2 = c.getADependency()
+    exists(Crate c2, TraitItemNode trait |
+      trait = this.resolveTraitTy() and
+      result = trait.getCanonicalPath(c2) and
+      if this.hasCanonicalPath(c2) then c = c2 else c2 = c.getADependency()
     )
   }
 
@@ -607,7 +622,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     exists(int m | if exists(this.getTraitPath()) then m = 4 else m = 2 |
       result = strictconcat(int i | i in [0 .. m] | this.getCanonicalPathPart(c, i) order by i)
     )
@@ -625,6 +640,8 @@ private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
 
   override Visibility getVisibility() { none() }
 
+  override predicate hasCanonicalPath(Crate c) { none() }
+
   override string getCanonicalPath(Crate c) { none() }
 }
 
@@ -637,6 +654,25 @@ private class ModuleItemNode extends ModuleLikeNode instanceof Module {
 
   override TypeParam getTypeParam(int i) { none() }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
+  override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    this.hasCanonicalPath(c) and
+    (
+      exists(SourceFile f |
+        fileImport(this, f) and
+        sourceFileEdge(f, _, child)
+      )
+      or
+      this = child.getImmediateParent()
+      or
+      exists(ItemNode mid |
+        this.providesCanonicalPathPrefixFor(c, mid) and
+        mid.(MacroCallItemNode) = child.getImmediateParent()
+      )
+    )
+  }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -651,29 +687,9 @@ private class ModuleItemNode extends ModuleLikeNode instanceof Module {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
-
-  pragma[nomagic]
-  private ItemNode getACanonicalPathChild() {
-    exists(SourceFile f |
-      fileImport(this, f) and
-      sourceFileEdge(f, _, result)
-    )
-    or
-    this = result.getImmediateParent()
-    or
-    exists(ItemNode mid |
-      mid = this.getACanonicalPathChild() and
-      mid.(MacroCallItemNode) = result.getImmediateParent()
-    )
-  }
-
-  override string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
-    child = this.getACanonicalPathChild() and
-    result = this.getCanonicalPath(c)
-  }
 }
 
 private class StructItemNode extends ItemNode instanceof Struct {
@@ -690,6 +706,8 @@ private class StructItemNode extends ItemNode instanceof Struct {
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -704,7 +722,7 @@ private class StructItemNode extends ItemNode instanceof Struct {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
@@ -728,6 +746,13 @@ class TraitItemNode extends ImplOrTraitItemNode instanceof Trait {
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
+  override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    this.hasCanonicalPath(c) and
+    child = this.getAnAssocItem()
+  }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -748,14 +773,14 @@ class TraitItemNode extends ImplOrTraitItemNode instanceof Trait {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [1 .. 3] | this.getCanonicalPathPart(c, i) order by i)
   }
 
   language[monotonicAggregates]
   override string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
-    result = strictconcat(int i | i in [0 .. 4] | this.getCanonicalPathPart(c, i) order by i) and
-    child = this.getAnAssocItem()
+    this.providesCanonicalPathPrefixFor(c, child) and
+    result = strictconcat(int i | i in [0 .. 4] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
 
@@ -780,6 +805,8 @@ private class UnionItemNode extends ItemNode instanceof Union {
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
   bindingset[c]
   private string getCanonicalPathPart(Crate c, int i) {
     i = 0 and
@@ -794,7 +821,7 @@ private class UnionItemNode extends ItemNode instanceof Union {
 
   language[monotonicAggregates]
   override string getCanonicalPath(Crate c) {
-    c = this.getACanonicalPathCrate() and
+    this.hasCanonicalPath(c) and
     result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
   }
 }
@@ -808,6 +835,8 @@ private class UseItemNode extends ItemNode instanceof Use {
 
   override TypeParam getTypeParam(int i) { none() }
 
+  override predicate hasCanonicalPath(Crate c) { none() }
+
   override string getCanonicalPath(Crate c) { none() }
 }
 
@@ -820,6 +849,8 @@ private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
 
   override TypeParam getTypeParam(int i) { none() }
 
+  override predicate hasCanonicalPath(Crate c) { none() }
+
   override string getCanonicalPath(Crate c) { none() }
 }
 
@@ -878,6 +909,8 @@ private class TypeParamItemNode extends ItemNode instanceof TypeParam {
 
   override Location getLocation() { result = TypeParam.super.getName().getLocation() }
 
+  override predicate hasCanonicalPath(Crate c) { none() }
+
   override string getCanonicalPath(Crate c) { none() }
 }
 

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

@@ -59,4 +59,7 @@ int getPathResolutionInconsistencyCounts(string type) {
   or
   type = "Multiple tuple fields" and
   result = count(FieldExpr fe | multipleTupleFields(fe, _) | fe)
+  or
+  type = "Multiple canonical paths" and
+  result = count(ItemNode i | multipleCanonicalPaths(i, _, _) | i)
 }