Rust: fix CFG for MacroPat

aibaars · aibaars · commit 883aa89ac6f6 · 2025-06-02T15:36:05.000+02:00
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -143,6 +143,8 @@ class LetStmtTree extends PreOrderTree, LetStmt {
 }
 
 class MacroCallTree extends StandardPostOrderTree, MacroCall {
+  MacroCallTree() { not this.getParentNode() instanceof MacroPat }
+
   override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCallExpansion() }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,8 @@ class LetStmtTree extends PreOrderTree, LetStmt {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`class MacroCallTree extends StandardPostOrderTree, MacroCall {`
	`146`	`+ MacroCallTree() { not this.getParentNode() instanceof MacroPat }`
	`147`	`+`
`146`	`148`	`override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCallExpansion() }`
`147`	`149`	`}`
`148`	`150`