Rust: Take derive macros into account in is{In,From}MacroExpansion

hvitved · hvitved · commit 73501960446c · 2025-06-23T15:23:06.000+02:00
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
@@ -70,9 +70,9 @@ module Impl {
      */
     pragma[nomagic]
     predicate isFromMacroExpansion() {
-      exists(MacroCall mc |
-        MacroCallImpl::isInMacroExpansion(mc, this) and
-        not this = mc.getATokenTreeNode()
+      exists(AstNode root |
+        MacroCallImpl::isInMacroExpansion(root, this) and
+        not this = root.(MacroCall).getATokenTreeNode()
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -14,10 +14,12 @@ module Impl {
   private import rust
 
   pragma[nomagic]
-  predicate isInMacroExpansion(MacroCall mc, AstNode n) {
-    n = mc.getMacroCallExpansion()
+  predicate isInMacroExpansion(AstNode root, AstNode n) {
+    n = root.(MacroCall).getMacroCallExpansion()
     or
-    isInMacroExpansion(mc, n.getParentNode())
+    n = root.(Adt).getDeriveMacroExpansion(_)
+    or
+    isInMacroExpansion(root, n.getParentNode())
   }
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ module Impl {`
`70`	`70`	`*/`
`71`	`71`	`pragma[nomagic]`
`72`	`72`	`predicate isFromMacroExpansion() {`
`73`		`- exists(MacroCall mc \|`
`74`		`- MacroCallImpl::isInMacroExpansion(mc, this) and`
`75`		`- not this = mc.getATokenTreeNode()`
	`73`	`+ exists(AstNode root \|`
	`74`	`+ MacroCallImpl::isInMacroExpansion(root, this) and`
	`75`	`+ not this = root.(MacroCall).getATokenTreeNode()`
`76`	`76`	`)`
`77`	`77`	`}`
`78`	`78`