eliminate recursion from GuardControlFlowNode::dominates

erik-krogh · erik-krogh · commit 6d05b40d234f · 2020-05-10T22:15:34.000+02:00
diff --git a/javascript/ql/src/semmle/javascript/CFG.qll b/javascript/ql/src/semmle/javascript/CFG.qll
@@ -379,8 +379,9 @@ class GuardControlFlowNode extends SyntheticControlFlowNode, @guard_node {
    * is known to hold at `bb`.
    */
   predicate dominates(ReachableBasicBlock bb) {
-    this = bb.getANode() or
-    dominates(bb.getImmediateDominator())
+    this = bb.getANode()
+    or
+    exists(ReachableBasicBlock prev | prev.strictlyDominates(bb) | this = prev.getANode())
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -379,8 +379,9 @@ class GuardControlFlowNode extends SyntheticControlFlowNode, @guard_node {`
`379`	`379`	* is known to hold at `bb`.
`380`	`380`	`*/`
`381`	`381`	`predicate dominates(ReachableBasicBlock bb) {`
`382`		`- this = bb.getANode() or`
`383`		`- dominates(bb.getImmediateDominator())`
	`382`	`+ this = bb.getANode()`
	`383`	`+ or`
	`384`	`+ exists(ReachableBasicBlock prev \| prev.strictlyDominates(bb) \| this = prev.getANode())`
`384`	`385`	`}`
`385`	`386`	`}`
`386`	`387`