wip

Author: hvitved

rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs

@@ -1,3 +1,4 @@
 pub fn hello() {
+    my_macro!(); // $ item=my_macro
     println!("Hello, world!"); // $ item=println
 } // HELLO

rust/ql/integration-tests/hello-workspace/lib/src/lib.rs

@@ -1 +1,10 @@
+#[macro_use]
+mod macros {
+    macro_rules! my_macro {
+        () => {
+            println!("my_macro!");
+        };
+    }
+}
+
 pub mod a_module;

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

@@ -1575,8 +1575,12 @@ private predicate unqualifiedPathLookup(ItemNode ancestor, string name, Namespac
     not (
       name = "Self" and
       mid = any(ImplOrTraitItemNode i).getAnItemInSelfScope()
-    ) and
+    )
+  |
     ancestor = getOuterScope(mid)
+    or
+    ns.isMacro() and
+    ancestor = mid.getImmediateParentModule()
   )
 }
 
@@ -1680,16 +1684,17 @@ private predicate expandsMacro(AstNode macroInvocation, AstNode expansion, Path
 }
 
 pragma[nomagic]
-predicate isInMacroFromCrateExpansion(CrateItemNode crate, AstNode n) {
-  exists(Path path |
-    expandsMacro(_, n, path) and
-    crate.getASourceFile().getFile() = resolvePathCand(path).getFile()
-  )
+predicate isInMacroExpansion(Path macroDefPath, AstNode macroInvocation, AstNode n) {
+  expandsMacro(macroInvocation, n, macroDefPath)
   or
-  exists(AstNode mid |
-    isInMacroFromCrateExpansion(crate, mid) and
-    n.getParentNode() = mid and
-    not expandsMacro(mid, n, _)
+  isInMacroExpansion(macroDefPath, macroInvocation, n.getParentNode())
+}
+
+pragma[nomagic]
+predicate isInMacroFromCrateExpansion(CrateItemNode crate, AstNode macroInvocation, AstNode n) {
+  exists(Path macroDefPath |
+    isInMacroExpansion(macroDefPath, macroInvocation, n) and
+    crate.getASourceFile().getFile() = resolvePathCand(macroDefPath).getFile()
   )
 }
 
@@ -1706,7 +1711,7 @@ private ItemNode resolvePathCand0(RelevantPath path, Namespace ns) {
   )
   or
   path.isDollarCrate() and
-  isInMacroFromCrateExpansion(result, path) and
+  isInMacroFromCrateExpansion(result, _, path) and
   ns = result.getNamespace()
   or
   result = resolvePathCandQualified(_, _, path, ns)