From c7a9cc5a424c80dc4a3c538d20f934ad4d5f44c7 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Sep 2025 14:55:52 +0200
Subject: [PATCH 1/7] Rust: Use annotations also for items in macro expansions

---
 .../lib/utils/test/PathResolutionInlineExpectationsTest.qll   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
index c5a95ac90389..8d2fdb2d2ebf 100644
--- a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
+++ b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
@@ -25,9 +25,9 @@ private module ResolveTest implements TestSig {
 
   private predicate item(ItemNode i, string value) {
     exists(string filepath, int line, boolean inMacro | itemAt(i, filepath, line, inMacro) |
-      commmentAt(value, filepath, line) and inMacro = false
+      commmentAt(value, filepath, line)
       or
-      not (commmentAt(_, filepath, line) and inMacro = false) and
+      not commmentAt(_, filepath, line) and
       value = i.getName()
     )
   }

From 32365fd673e0520ae10cea12212adfd3e98d0b6e Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Sep 2025 15:15:29 +0200
Subject: [PATCH 2/7] Rust: Account for attribute expansions in path resolution

---
 rust/ql/lib/codeql/rust/internal/PathResolution.qll   | 11 ++++++-----
 rust/ql/test/library-tests/path-resolution/main.rs    |  7 +++----
 .../path-resolution/path-resolution.expected          | 10 ++++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index f819632ce100..980033811ddd 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/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();
 
@@ -660,11 +665,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
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index 5146373b8966..1ad55d36ad45 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -798,8 +798,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
 }
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index 067365a53864..7c30ebc4a1e3 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -66,7 +66,7 @@ resolvePath
 | main.rs:36:17:36:21 | super | main.rs:24:5:42:5 | mod m2 |
 | main.rs:36:17:36:24 | ...::f | main.rs:25:9:27:9 | fn f |
 | main.rs:39:17:39:17 | f | main.rs:25:9:27:9 | fn f |
-| main.rs:46:9:46:13 | super | main.rs:1:1:805:2 | SourceFile |
+| main.rs:46:9:46:13 | super | main.rs:1:1:804:2 | SourceFile |
 | main.rs:46:9:46:17 | ...::m1 | main.rs:19:1:43:1 | mod m1 |
 | main.rs:46:9:46:21 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
 | main.rs:46:9:46:24 | ...::g | main.rs:29:9:33:9 | fn g |
@@ -78,7 +78,7 @@ resolvePath
 | main.rs:67:17:67:19 | Foo | main.rs:65:9:65:21 | struct Foo |
 | main.rs:70:13:70:15 | Foo | main.rs:59:5:59:17 | struct Foo |
 | main.rs:72:5:72:5 | f | main.rs:61:5:68:5 | fn f |
-| main.rs:74:5:74:8 | self | main.rs:1:1:805:2 | SourceFile |
+| main.rs:74:5:74:8 | self | main.rs:1:1:804:2 | SourceFile |
 | main.rs:74:5:74:11 | ...::i | main.rs:77:1:89:1 | fn i |
 | main.rs:80:13:80:15 | Foo | main.rs:54:1:54:13 | struct Foo |
 | main.rs:84:16:84:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
@@ -93,7 +93,7 @@ resolvePath
 | main.rs:93:57:93:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:93:80:93:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:106:5:106:22 | f_defined_in_macro | main.rs:105:18:105:42 | fn f_defined_in_macro |
-| main.rs:123:13:123:17 | super | main.rs:1:1:805:2 | SourceFile |
+| main.rs:123:13:123:17 | super | main.rs:1:1:804:2 | SourceFile |
 | main.rs:123:13:123:21 | ...::m5 | main.rs:109:1:113:1 | mod m5 |
 | main.rs:124:9:124:9 | f | main.rs:110:5:112:5 | fn f |
 | main.rs:124:9:124:9 | f | main.rs:116:5:118:5 | fn f |
@@ -412,7 +412,9 @@ resolvePath
 | main.rs:799:5:799:10 | ...::f | main.rs:681:5:694:5 | fn f |
 | main.rs:800:5:800:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
 | main.rs:800:5:800:11 | ...::h | main.rs:56:1:75:1 | fn h |
+| main.rs:801:5:801:13 | z_changed | main.rs:700:1:700:8 | fn z_changed |
 | main.rs:802:5:802:11 | AStruct | main.rs:702:1:702:17 | struct AStruct |
+| main.rs:802:5:802:22 | ...::z_on_type | main.rs:706:5:706:16 | fn z_on_type |
 | main.rs:803:5:803:11 | AStruct | main.rs:702:1:702: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 |
@@ -434,7 +436,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:56:1:75:1 | fn h |
 | my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:805:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:804:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:56:1:75:1 | fn h |
 | my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |

From 2c84b49cede939e5f935213890910c0ad87d7643 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Wed, 17 Sep 2025 15:58:54 +0200
Subject: [PATCH 3/7] Rust: Update test expecations

---
 .../security/CWE-696/BadCTorInitialization.expected           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
index 3ac74a3cb13b..ed95a8d448ad 100644
--- a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
@@ -59,13 +59,11 @@ edges
 | test.rs:129:4:130:21 | fn bad3_1 | test.rs:130:5:130:19 | call_target3_1(...) |
 | test.rs:130:5:130:19 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
 | test.rs:144:1:144:7 | Attr | test.rs:145:4:147:21 | fn bad3_3 |
-| test.rs:144:1:148:1 | fn bad3_3 | test.rs:146:5:146:20 | call_target3_1(...) |
 | test.rs:145:4:147:21 | fn bad3_3 | test.rs:146:5:146:19 | call_target3_1(...) |
 | test.rs:146:5:146:19 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
-| test.rs:146:5:146:20 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
 | test.rs:150:1:150:7 | Attr | test.rs:151:4:152:13 | fn bad3_4 |
 | test.rs:151:4:152:13 | fn bad3_4 | test.rs:152:5:152:11 | bad3_3(...) |
-| test.rs:152:5:152:11 | bad3_3(...) | test.rs:144:1:148:1 | fn bad3_3 |
+| test.rs:152:5:152:11 | bad3_3(...) | test.rs:145:4:147:21 | fn bad3_3 |
 | test.rs:168:1:168:7 | Attr | test.rs:169:4:170:16 | fn bad4_1 |
 | test.rs:169:4:170:16 | fn bad4_1 | test.rs:168:1:168:7 | ... .write(...) |
 | test.rs:169:4:170:16 | fn bad4_1 | test.rs:168:1:168:7 | ...::stdout(...) |

From a9d7662bb7a20a08bdc794bc67c1d10f60c5f3f9 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Fri, 19 Sep 2025 13:09:07 +0200
Subject: [PATCH 4/7] Rust: Add path resolution test with attribute on impl
 block

---
 .../library-tests/path-resolution/main.rs     |  22 +++
 .../path-resolution/path-resolution.expected  | 161 ++++++++++--------
 .../path-resolution/proc_macro.rs             |   8 +-
 3 files changed, 116 insertions(+), 75 deletions(-)

diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index 1ad55d36ad45..42107ec5fd4c 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -767,6 +767,27 @@ use std::{self as ztd}; // $ item=std
 
 fn use_ztd(x: ztd::string::String) {} // $ item=String
 
+#[rustfmt::skip]
+mod impl_with_attribute_macro {
+    struct Foo; // IFoo
+
+    trait ATrait {
+        type Foo;
+    } // IATrait
+
+    #[proc_macro::identity] // $ item=identity
+    impl ATrait for i64 { // $ item=IATrait item=i64
+        type Foo =
+          i64 // $ item=i64
+        ; // IATrait_i64_Foo
+    }
+
+    pub fn test() {
+        // This should resolve to the struct, not the associated type.
+        let _x: Foo; // $ item=IFoo SPURIOUS: item=IATrait_i64_Foo
+    } // impl_with_attribute_macro::test
+}
+
 fn main() {
     my::nested::nested1::nested2::f(); // $ item=I4
     my::f(); // $ item=I38
@@ -801,4 +822,5 @@ fn main() {
     z_changed(); // $ item=I122
     AStruct::z_on_type(); // $ item=I124
     AStruct {}.z_on_instance(); // $ item=I123 item=I125
+    impl_with_attribute_macro::test(); // $ item=impl_with_attribute_macro::test
 }
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index 7c30ebc4a1e3..e9bb668f6816 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -31,6 +31,7 @@ mod
 | main.rs:600:1:625:1 | mod m23 |
 | main.rs:627:1:695:1 | mod m24 |
 | main.rs:712:1:764:1 | mod associated_types |
+| main.rs:770:1:789:1 | mod impl_with_attribute_macro |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:18:1:18:12 | mod my3 |
 | my2/mod.rs:20:1:21:10 | mod mymod |
@@ -66,7 +67,7 @@ resolvePath
 | main.rs:36:17:36:21 | super | main.rs:24:5:42:5 | mod m2 |
 | main.rs:36:17:36:24 | ...::f | main.rs:25:9:27:9 | fn f |
 | main.rs:39:17:39:17 | f | main.rs:25:9:27:9 | fn f |
-| main.rs:46:9:46:13 | super | main.rs:1:1:804:2 | SourceFile |
+| main.rs:46:9:46:13 | super | main.rs:1:1:826:2 | SourceFile |
 | main.rs:46:9:46:17 | ...::m1 | main.rs:19:1:43:1 | mod m1 |
 | main.rs:46:9:46:21 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
 | main.rs:46:9:46:24 | ...::g | main.rs:29:9:33:9 | fn g |
@@ -78,7 +79,7 @@ resolvePath
 | main.rs:67:17:67:19 | Foo | main.rs:65:9:65:21 | struct Foo |
 | main.rs:70:13:70:15 | Foo | main.rs:59:5:59:17 | struct Foo |
 | main.rs:72:5:72:5 | f | main.rs:61:5:68:5 | fn f |
-| main.rs:74:5:74:8 | self | main.rs:1:1:804:2 | SourceFile |
+| main.rs:74:5:74:8 | self | main.rs:1:1:826:2 | SourceFile |
 | main.rs:74:5:74:11 | ...::i | main.rs:77:1:89:1 | fn i |
 | main.rs:80:13:80:15 | Foo | main.rs:54:1:54:13 | struct Foo |
 | main.rs:84:16:84:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
@@ -93,7 +94,7 @@ resolvePath
 | main.rs:93:57:93:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:93:80:93:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:106:5:106:22 | f_defined_in_macro | main.rs:105:18:105:42 | fn f_defined_in_macro |
-| main.rs:123:13:123:17 | super | main.rs:1:1:804:2 | SourceFile |
+| main.rs:123:13:123:17 | super | main.rs:1:1:826:2 | SourceFile |
 | main.rs:123:13:123:21 | ...::m5 | main.rs:109:1:113:1 | mod m5 |
 | main.rs:124:9:124:9 | f | main.rs:110:5:112:5 | fn f |
 | main.rs:124:9:124:9 | f | main.rs:116:5:118:5 | fn f |
@@ -303,12 +304,12 @@ resolvePath
 | main.rs:693:9:693:47 | ...::call_both | main.rs:659:9:662:9 | fn call_both |
 | main.rs:693:25:693:35 | Implementor | main.rs:665:5:665:23 | struct Implementor |
 | main.rs:699:3:699:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:699:3:699:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:699:3:699:24 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
 | main.rs:703:6:703:12 | AStruct | main.rs:702:1:702:17 | struct AStruct |
 | main.rs:705:7:705:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:705:7:705:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:705:7:705:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
 | main.rs:708:7:708:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:708:7:708:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:708:7:708:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
 | main.rs:713:9:713:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
 | main.rs:713:9:713:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
 | main.rs:713:9:713:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
@@ -349,73 +350,82 @@ resolvePath
 | main.rs:768:15:768:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
 | main.rs:768:15:768:25 | ...::string | {EXTERNAL LOCATION} | mod string |
 | main.rs:768:15:768:33 | ...::String | {EXTERNAL LOCATION} | struct String |
-| main.rs:771:5:771:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:771:5:771:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:771:5:771:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:771:5:771:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:771:5:771:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:772:5:772:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:772:5:772:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:773:5:773:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:773:5:773:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:773:5:773:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:773:5:773:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:774:5:774:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:775:5:775:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:776:5:776:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:776:5:776:12 | ...::h | main.rs:56:1:75:1 | fn h |
-| main.rs:777:5:777:6 | m1 | main.rs:19:1:43:1 | mod m1 |
-| main.rs:777:5:777:10 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
-| main.rs:777:5:777:13 | ...::g | main.rs:29:9:33:9 | fn g |
-| main.rs:778:5:778:6 | m1 | main.rs:19:1:43:1 | mod m1 |
-| main.rs:778:5:778:10 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
-| main.rs:778:5:778:14 | ...::m3 | main.rs:35:9:41:9 | mod m3 |
-| main.rs:778:5:778:17 | ...::h | main.rs:36:27:40:13 | fn h |
-| main.rs:779:5:779:6 | m4 | main.rs:45:1:52:1 | mod m4 |
-| main.rs:779:5:779:9 | ...::i | main.rs:48:5:51:5 | fn i |
-| main.rs:780:5:780:5 | h | main.rs:56:1:75:1 | fn h |
-| main.rs:781:5:781:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:782:5:782:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:783:5:783:5 | j | main.rs:103:1:107:1 | fn j |
-| main.rs:784:5:784:6 | m6 | main.rs:115:1:126:1 | mod m6 |
-| main.rs:784:5:784:9 | ...::g | main.rs:120:5:125:5 | fn g |
-| main.rs:785:5:785:6 | m7 | main.rs:128:1:147:1 | mod m7 |
-| main.rs:785:5:785:9 | ...::f | main.rs:139:5:146:5 | fn f |
-| main.rs:786:5:786:6 | m8 | main.rs:149:1:203:1 | mod m8 |
-| main.rs:786:5:786:9 | ...::g | main.rs:187:5:202:5 | fn g |
-| main.rs:787:5:787:6 | m9 | main.rs:205:1:213:1 | mod m9 |
-| main.rs:787:5:787:9 | ...::f | main.rs:208:5:212:5 | fn f |
-| main.rs:788:5:788:7 | m11 | main.rs:236:1:273:1 | mod m11 |
-| main.rs:788:5:788:10 | ...::f | main.rs:241:5:244:5 | fn f |
-| main.rs:789:5:789:7 | m15 | main.rs:304:1:373:1 | mod m15 |
-| main.rs:789:5:789:10 | ...::f | main.rs:360:5:372:5 | fn f |
-| main.rs:790:5:790:7 | m16 | main.rs:375:1:467:1 | mod m16 |
-| main.rs:790:5:790:10 | ...::f | main.rs:442:5:466:5 | fn f |
-| main.rs:791:5:791:20 | trait_visibility | main.rs:469:1:519:1 | mod trait_visibility |
-| main.rs:791:5:791:23 | ...::f | main.rs:496:5:518:5 | fn f |
-| main.rs:792:5:792:7 | m17 | main.rs:521:1:551:1 | mod m17 |
-| main.rs:792:5:792:10 | ...::f | main.rs:545:5:550:5 | fn f |
-| main.rs:793:5:793:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
-| main.rs:793:5:793:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| main.rs:794:5:794:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| main.rs:794:5:794:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:795:5:795:7 | my3 | my2/mod.rs:18:1:18:12 | mod my3 |
-| main.rs:795:5:795:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
-| main.rs:796:5:796:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:797:5:797:7 | m18 | main.rs:553:1:571:1 | mod m18 |
-| main.rs:797:5:797:12 | ...::m19 | main.rs:558:5:570:5 | mod m19 |
-| main.rs:797:5:797:17 | ...::m20 | main.rs:563:9:569:9 | mod m20 |
-| main.rs:797:5:797:20 | ...::g | main.rs:564:13:568:13 | fn g |
-| main.rs:798:5:798:7 | m23 | main.rs:600:1:625:1 | mod m23 |
-| main.rs:798:5:798:10 | ...::f | main.rs:620:5:624:5 | fn f |
-| main.rs:799:5:799:7 | m24 | main.rs:627:1:695:1 | mod m24 |
-| main.rs:799:5:799:10 | ...::f | main.rs:681:5:694:5 | fn f |
-| main.rs:800:5:800:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:800:5:800:11 | ...::h | main.rs:56:1:75:1 | fn h |
-| main.rs:801:5:801:13 | z_changed | main.rs:700:1:700:8 | fn z_changed |
-| main.rs:802:5:802:11 | AStruct | main.rs:702:1:702:17 | struct AStruct |
-| main.rs:802:5:802:22 | ...::z_on_type | main.rs:706:5:706:16 | fn z_on_type |
-| main.rs:803:5:803:11 | AStruct | main.rs:702:1:702:17 | struct AStruct |
+| main.rs:778:7:778:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:778:7:778:26 | ...::identity | proc_macro.rs:15:1:18:1 | fn identity |
+| main.rs:779:10:779:15 | ATrait | main.rs:774:5:776:5 | trait ATrait |
+| main.rs:779:21:779:23 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:781:11:781:13 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:787:17:787:19 | Foo | main.rs:772:5:772:15 | struct Foo |
+| main.rs:787:17:787:19 | Foo | main.rs:779:27:782:9 | type Foo |
+| main.rs:792:5:792:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:792:5:792:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:792:5:792:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:792:5:792:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:792:5:792:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:793:5:793:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:793:5:793:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:794:5:794:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:794:5:794:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:794:5:794:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:794:5:794:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:795:5:795:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:796:5:796:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:797:5:797:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:797:5:797:12 | ...::h | main.rs:56:1:75:1 | fn h |
+| main.rs:798:5:798:6 | m1 | main.rs:19:1:43:1 | mod m1 |
+| main.rs:798:5:798:10 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
+| main.rs:798:5:798:13 | ...::g | main.rs:29:9:33:9 | fn g |
+| main.rs:799:5:799:6 | m1 | main.rs:19:1:43:1 | mod m1 |
+| main.rs:799:5:799:10 | ...::m2 | main.rs:24:5:42:5 | mod m2 |
+| main.rs:799:5:799:14 | ...::m3 | main.rs:35:9:41:9 | mod m3 |
+| main.rs:799:5:799:17 | ...::h | main.rs:36:27:40:13 | fn h |
+| main.rs:800:5:800:6 | m4 | main.rs:45:1:52:1 | mod m4 |
+| main.rs:800:5:800:9 | ...::i | main.rs:48:5:51:5 | fn i |
+| main.rs:801:5:801:5 | h | main.rs:56:1:75:1 | fn h |
+| main.rs:802:5:802:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:803:5:803:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:804:5:804:5 | j | main.rs:103:1:107:1 | fn j |
+| main.rs:805:5:805:6 | m6 | main.rs:115:1:126:1 | mod m6 |
+| main.rs:805:5:805:9 | ...::g | main.rs:120:5:125:5 | fn g |
+| main.rs:806:5:806:6 | m7 | main.rs:128:1:147:1 | mod m7 |
+| main.rs:806:5:806:9 | ...::f | main.rs:139:5:146:5 | fn f |
+| main.rs:807:5:807:6 | m8 | main.rs:149:1:203:1 | mod m8 |
+| main.rs:807:5:807:9 | ...::g | main.rs:187:5:202:5 | fn g |
+| main.rs:808:5:808:6 | m9 | main.rs:205:1:213:1 | mod m9 |
+| main.rs:808:5:808:9 | ...::f | main.rs:208:5:212:5 | fn f |
+| main.rs:809:5:809:7 | m11 | main.rs:236:1:273:1 | mod m11 |
+| main.rs:809:5:809:10 | ...::f | main.rs:241:5:244:5 | fn f |
+| main.rs:810:5:810:7 | m15 | main.rs:304:1:373:1 | mod m15 |
+| main.rs:810:5:810:10 | ...::f | main.rs:360:5:372:5 | fn f |
+| main.rs:811:5:811:7 | m16 | main.rs:375:1:467:1 | mod m16 |
+| main.rs:811:5:811:10 | ...::f | main.rs:442:5:466:5 | fn f |
+| main.rs:812:5:812:20 | trait_visibility | main.rs:469:1:519:1 | mod trait_visibility |
+| main.rs:812:5:812:23 | ...::f | main.rs:496:5:518:5 | fn f |
+| main.rs:813:5:813:7 | m17 | main.rs:521:1:551:1 | mod m17 |
+| main.rs:813:5:813:10 | ...::f | main.rs:545:5:550:5 | fn f |
+| main.rs:814:5:814:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:814:5:814:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:815:5:815:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:815:5:815:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:816:5:816:7 | my3 | my2/mod.rs:18:1:18:12 | mod my3 |
+| main.rs:816:5:816:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
+| main.rs:817:5:817:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:818:5:818:7 | m18 | main.rs:553:1:571:1 | mod m18 |
+| main.rs:818:5:818:12 | ...::m19 | main.rs:558:5:570:5 | mod m19 |
+| main.rs:818:5:818:17 | ...::m20 | main.rs:563:9:569:9 | mod m20 |
+| main.rs:818:5:818:20 | ...::g | main.rs:564:13:568:13 | fn g |
+| main.rs:819:5:819:7 | m23 | main.rs:600:1:625:1 | mod m23 |
+| main.rs:819:5:819:10 | ...::f | main.rs:620:5:624:5 | fn f |
+| main.rs:820:5:820:7 | m24 | main.rs:627:1:695:1 | mod m24 |
+| main.rs:820:5:820:10 | ...::f | main.rs:681:5:694:5 | fn f |
+| main.rs:821:5:821:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:821:5:821:11 | ...::h | main.rs:56:1:75:1 | fn h |
+| main.rs:822:5:822:13 | z_changed | main.rs:700:1:700:8 | fn z_changed |
+| main.rs:823:5:823:11 | AStruct | main.rs:702:1:702:17 | struct AStruct |
+| main.rs:823:5:823:22 | ...::z_on_type | main.rs:706:5:706:16 | fn z_on_type |
+| main.rs:824:5:824:11 | AStruct | main.rs:702:1:702:17 | struct AStruct |
+| main.rs:825:5:825:29 | impl_with_attribute_macro | main.rs:770:1:789:1 | mod impl_with_attribute_macro |
+| main.rs:825:5:825:35 | ...::test | main.rs:785:5:788:5 | fn test |
 | 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 |
 | my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
@@ -436,7 +446,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:56:1:75:1 | fn h |
 | my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:804:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:826:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:56:1:75:1 | fn h |
 | my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:23:34 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
@@ -482,4 +492,7 @@ resolvePath
 | proc_macro.rs:8:21:8:23 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
 | proc_macro.rs:8:21:8:30 | ...::Ident | {EXTERNAL LOCATION} | struct Ident |
 | proc_macro.rs:8:21:8:35 | ...::new | {EXTERNAL LOCATION} | fn new |
+| proc_macro.rs:16:24:16:34 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
+| proc_macro.rs:16:43:16:53 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
+| proc_macro.rs:16:59:16:69 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 testFailures
diff --git a/rust/ql/test/library-tests/path-resolution/proc_macro.rs b/rust/ql/test/library-tests/path-resolution/proc_macro.rs
index c95fc6fe6401..11e3a7024ae6 100644
--- a/rust/ql/test/library-tests/path-resolution/proc_macro.rs
+++ b/rust/ql/test/library-tests/path-resolution/proc_macro.rs
@@ -8,5 +8,11 @@ pub fn add_suffix(attr: TokenStream, item: TokenStream) -> TokenStream {
     ast.sig.ident = syn::Ident::new(&format!("{}_{}", ast.sig.ident, suff), ast.sig.ident.span());
     quote! {
         #ast
-    }.into()
+    }
+    .into()
+}
+
+#[proc_macro_attribute]
+pub fn identity(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
 }

From 60ceb89f01be59ecba08fc972d5a9bdd84e11ff2 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Fri, 19 Sep 2025 13:26:36 +0200
Subject: [PATCH 5/7] Rust: Add debug predicate for `ItemNode`

---
 rust/ql/lib/codeql/rust/internal/PathResolution.qll | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 980033811ddd..6b7df0db58ae 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -1807,6 +1807,8 @@ private module Debug {
     path = p.toStringDebug()
   }
 
+  predicate debugItemNode(ItemNode item) { item = getRelevantLocatable() }
+
   ItemNode debugResolvePath(RelevantPath path) {
     path = getRelevantLocatable() and
     result = resolvePath(path)

From 72103adacc7cf9712acd464a38adebeb240d5fb5 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Fri, 19 Sep 2025 13:27:02 +0200
Subject: [PATCH 6/7] Rust: Fix spurious path resolution

The annotated impl block was filtered away, but it's children where not. This caused the associated type `Foo` to appear as if it was an item in the scope outside of the impl block.
---
 .../codeql/rust/internal/PathResolution.qll   | 20 ++++++++++++++++++-
 .../library-tests/path-resolution/main.rs     |  2 +-
 .../path-resolution/path-resolution.expected  |  1 -
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 6b7df0db58ae..46197b6189e8 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -78,6 +78,24 @@ private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind ki
   )
 }
 
+/**
+ * Holds if `n` is superceded by an attribute macro expansion. That is, `n` is
+ * an item or a transitive child of an item with an attribute macro expansion.
+ */
+predicate supercededByAttributeMacroExpansion(AstNode n) {
+  n.(Item).hasAttributeMacroExpansion()
+  or
+  exists(AstNode parent |
+    n.getParentNode() = parent and
+    supercededByAttributeMacroExpansion(parent) and
+    // Don't exclude expansions themselves as they supercede other nodes.
+    not n = parent.(Item).getAttributeMacroExpansion() and
+    // Don't consider attributes themselves to be superceded.  E.g., in `#[a] fn
+    // f() {}` the macro expansion supercedes `fn f() {}` but not `#[a]`.
+    not n instanceof Attr
+  )
+}
+
 /**
  * An item that may be referred to by a path, and which is a node in
  * the _item graph_.
@@ -158,7 +176,7 @@ private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind ki
 abstract class ItemNode extends Locatable {
   ItemNode() {
     // Exclude items that are superceded by the expansion of an attribute macro.
-    not this.(Item).hasAttributeMacroExpansion()
+    not supercededByAttributeMacroExpansion(this)
   }
 
   /** Gets the (original) name of this item. */
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index 42107ec5fd4c..9051f7f8412e 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -784,7 +784,7 @@ mod impl_with_attribute_macro {
 
     pub fn test() {
         // This should resolve to the struct, not the associated type.
-        let _x: Foo; // $ item=IFoo SPURIOUS: item=IATrait_i64_Foo
+        let _x: Foo; // $ item=IFoo
     } // impl_with_attribute_macro::test
 }
 
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index e9bb668f6816..a908ec1e5c17 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -356,7 +356,6 @@ resolvePath
 | main.rs:779:21:779:23 | i64 | {EXTERNAL LOCATION} | struct i64 |
 | main.rs:781:11:781:13 | i64 | {EXTERNAL LOCATION} | struct i64 |
 | main.rs:787:17:787:19 | Foo | main.rs:772:5:772:15 | struct Foo |
-| main.rs:787:17:787:19 | Foo | main.rs:779:27:782:9 | type Foo |
 | main.rs:792:5:792:6 | my | main.rs:1:1:1:7 | mod my |
 | main.rs:792:5:792:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
 | main.rs:792:5:792:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |

From afb6d307624ce482bf7f6f09c18b29353829bd34 Mon Sep 17 00:00:00 2001
From: Simon Friis Vindum <simonfv@gmail.com>
Date: Fri, 19 Sep 2025 14:27:14 +0200
Subject: [PATCH 7/7] Rust: Fix typo in superseded

---
 rust/ql/lib/codeql/rust/internal/PathResolution.qll | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 46197b6189e8..44e8b4522554 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -79,18 +79,18 @@ private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind ki
 }
 
 /**
- * Holds if `n` is superceded by an attribute macro expansion. That is, `n` is
+ * Holds if `n` is superseded by an attribute macro expansion. That is, `n` is
  * an item or a transitive child of an item with an attribute macro expansion.
  */
-predicate supercededByAttributeMacroExpansion(AstNode n) {
+predicate supersededByAttributeMacroExpansion(AstNode n) {
   n.(Item).hasAttributeMacroExpansion()
   or
   exists(AstNode parent |
     n.getParentNode() = parent and
-    supercededByAttributeMacroExpansion(parent) and
+    supersededByAttributeMacroExpansion(parent) and
     // Don't exclude expansions themselves as they supercede other nodes.
     not n = parent.(Item).getAttributeMacroExpansion() and
-    // Don't consider attributes themselves to be superceded.  E.g., in `#[a] fn
+    // Don't consider attributes themselves to be superseded.  E.g., in `#[a] fn
     // f() {}` the macro expansion supercedes `fn f() {}` but not `#[a]`.
     not n instanceof Attr
   )
@@ -175,8 +175,8 @@ predicate supercededByAttributeMacroExpansion(AstNode n) {
  */
 abstract class ItemNode extends Locatable {
   ItemNode() {
-    // Exclude items that are superceded by the expansion of an attribute macro.
-    not supercededByAttributeMacroExpansion(this)
+    // Exclude items that are superseded by the expansion of an attribute macro.
+    not supersededByAttributeMacroExpansion(this)
   }
 
   /** Gets the (original) name of this item. */