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,7 @@ 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
-    AStruct {} // $ item=I123
-        .z_on_instance(); // MISSING: item=I125
+    z_changed(); // $ item=I122
+    AStruct::z_on_type(); // $ item=I124
+    AStruct {}.z_on_instance(); // $ item=I123 item=I125
 }

rust/ql/test/library-tests/path-resolution/path-resolution.expected

@@ -64,7 +64,7 @@ resolvePath
 | main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
 | main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
 | main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:40:9:40:13 | super | main.rs:1:1:799:2 | SourceFile |
+| main.rs:40:9:40:13 | super | main.rs:1:1:798:2 | SourceFile |
 | main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
 | main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
 | main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -76,7 +76,7 @@ resolvePath
 | main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
 | main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
 | main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
-| main.rs:68:5:68:8 | self | main.rs:1:1:799:2 | SourceFile |
+| main.rs:68:5:68:8 | self | main.rs:1:1:798:2 | SourceFile |
 | main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
 | main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
 | main.rs:78:16:78:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
@@ -91,7 +91,7 @@ resolvePath
 | main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
-| main.rs:117:13:117:17 | super | main.rs:1:1:799:2 | SourceFile |
+| main.rs:117:13:117:17 | super | main.rs:1:1:798:2 | SourceFile |
 | main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -410,7 +410,9 @@ resolvePath
 | main.rs:793:5:793:10 | ...::f | main.rs:675:5:688:5 | fn f |
 | main.rs:794:5:794:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
 | main.rs:794:5:794:11 | ...::h | main.rs:50:1:69:1 | fn h |
+| main.rs:795:5:795:13 | z_changed | main.rs:694:1:694:8 | fn z_changed |
 | main.rs:796:5:796:11 | AStruct | main.rs:696:1:696:17 | struct AStruct |
+| main.rs:796:5:796:22 | ...::z_on_type | main.rs:700:5:700:16 | fn z_on_type |
 | main.rs:797:5:797:11 | AStruct | main.rs:696:1:696:17 | struct AStruct |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
@@ -427,7 +429,7 @@ resolvePath
 | my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
 | my2/my3/mod.rs:4:5:4:5 | h | main.rs:50:1:69:1 | fn h |
 | my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:799:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:798:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:50:1:69:1 | fn h |
 | my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |