Rust: Account for attribute expansions in path resolution

Author: paldepind

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

@@ -156,6 +156,11 @@ private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind ki
  * - https://doc.rust-lang.org/reference/names/namespaces.html
  */
 abstract class ItemNode extends Locatable {
+  ItemNode() {
+    // Exclude items that are superceded by the expansion of an attribute macro.
+    not this.(Item).hasAttributeMacroExpansion()
+  }
+
   /** Gets the (original) name of this item. */
   abstract string getName();
 
@@ -648,11 +653,7 @@ final class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
 
   override Visibility getVisibility() { result = Impl.super.getVisibility() }
 
-  TypeParamItemNode getBlanketImplementationTypeParam() {
-    result = this.resolveSelfTy() and
-    // This impl block is not superseded by the expansion of an attribute macro.
-    not exists(super.getAttributeMacroExpansion())
-  }
+  TypeParamItemNode getBlanketImplementationTypeParam() { result = this.resolveSelfTy() }
 
   /**
    * Holds if this impl block is a blanket implementation. That is, the

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

@@ -792,8 +792,8 @@ fn main() {
     m23::f(); // $ item=I108
     m24::f(); // $ item=I121
     zelf::h(); // $ item=I25
-    z_changed(); // $ MISSING: item=I122
-    AStruct::z_on_type(); // $ MISSING: item=I124
+    z_changed(); // $ item=I122
+    AStruct::z_on_type(); // $ item=I124
     AStruct {} // $ item=I123
-        .z_on_instance(); // MISSING: item=I125
+        .z_on_instance(); // item=I125
 }