take2

Author: hvitved

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

@@ -72,9 +72,9 @@ private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind ki
       if item instanceof ImplOrTraitItemNode and result instanceof AssocItem
       then kind.isExternal()
       else
-        if result instanceof Use
-        then kind.isInternal()
-        else kind.isBoth()
+        if result.hasVisibility() and not result instanceof Use
+        then kind.isBoth()
+        else kind.isInternal()
   )
 }
 
@@ -165,6 +165,8 @@ abstract class ItemNode extends Locatable {
   /** Gets the visibility of this item, if any. */
   abstract Visibility getVisibility();
 
+  predicate hasVisibility() { exists(this.getVisibility()) }
+
   /** Gets the `i`th type parameter of this item, if any. */
   abstract TypeParam getTypeParam(int i);
 
@@ -1300,7 +1302,8 @@ private predicate useTreeDeclares(UseTree tree, string name) {
  */
 pragma[nomagic]
 private predicate declaresDirectly(ItemNode item, Namespace ns, string name) {
-  exists(ItemNode child, SuccessorKind kind | child = getAChildSuccessor(item, name, kind) |
+  exists(ItemNode child, SuccessorKind kind |
+    child = getAChildSuccessor(item, name, kind) and
     child.getNamespace() = ns and
     kind.isInternalOrBoth()
   )
@@ -1501,8 +1504,13 @@ private ItemNode resolvePathCandQualified(
 ) {
   exists(string name, SuccessorKind kind |
     q = resolvePathCandQualifier(qualifier, path, name) and
-    result = getASuccessor(q, name, ns, kind) and
+    result = getASuccessor(q, name, ns, kind)
+  |
     kind.isExternalOrBoth()
+    or
+    qualifier.getText() = "super"
+    or
+    q instanceof Enum
   )
 }
 
@@ -1657,7 +1665,7 @@ private ItemNode resolveUseTreeListItem(Use use, UseTree tree) {
 /** Holds if `use` imports `item` as `name`. */
 pragma[nomagic]
 private predicate useImportEdge(Use use, string name, ItemNode item, SuccessorKind kind) {
-  kind.isBoth() and
+  (if use.hasVisibility() then kind.isBoth() else kind.isInternal()) and
   exists(UseTree tree, ItemNode used |
     used = resolveUseTreeListItem(use, tree) and
     not tree.hasUseTreeList() and