Merge pull request #1289 from jbj/dominanceFrontier-iterated-ir

semmle-qlci · web-flow · commit 0ffba8b4eb8f · 2019-04-29T18:14:20.000+01:00
Approved by dave-bartolomeo
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/reachability/Dominance.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/reachability/Dominance.qll
@@ -11,11 +11,12 @@ predicate blockDominates(Graph::Block dominator, Graph::Block block) {
   blockStrictlyDominates(dominator, block) or dominator = block
 }
 
-pragma[noinline]
 Graph::Block getDominanceFrontier(Graph::Block dominator) {
-  exists(Graph::Block pred |
-    Graph::blockSuccessor(pred, result) and
-    blockDominates(dominator, pred) and
-    not blockStrictlyDominates(dominator, result)
+  Graph::blockSuccessor(dominator, result) and
+  not blockImmediatelyDominates(dominator, result)
+  or
+  exists(Graph::Block prev | result = getDominanceFrontier(prev) |
+    blockImmediatelyDominates(dominator, prev) and
+    not blockImmediatelyDominates(dominator, result)
   )
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/Dominance.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/Dominance.qll
@@ -11,11 +11,12 @@ predicate blockDominates(Graph::Block dominator, Graph::Block block) {
   blockStrictlyDominates(dominator, block) or dominator = block
 }
 
-pragma[noinline]
 Graph::Block getDominanceFrontier(Graph::Block dominator) {
-  exists(Graph::Block pred |
-    Graph::blockSuccessor(pred, result) and
-    blockDominates(dominator, pred) and
-    not blockStrictlyDominates(dominator, result)
+  Graph::blockSuccessor(dominator, result) and
+  not blockImmediatelyDominates(dominator, result)
+  or
+  exists(Graph::Block prev | result = getDominanceFrontier(prev) |
+    blockImmediatelyDominates(dominator, prev) and
+    not blockImmediatelyDominates(dominator, result)
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@ predicate blockDominates(Graph::Block dominator, Graph::Block block) {`
`11`	`11`	`blockStrictlyDominates(dominator, block) or dominator = block`
`12`	`12`	`}`
`13`	`13`
`14`		`-pragma[noinline]`
`15`	`14`	`Graph::Block getDominanceFrontier(Graph::Block dominator) {`
`16`		`- exists(Graph::Block pred \|`
`17`		`- Graph::blockSuccessor(pred, result) and`
`18`		`- blockDominates(dominator, pred) and`
`19`		`- not blockStrictlyDominates(dominator, result)`
	`15`	`+ Graph::blockSuccessor(dominator, result) and`
	`16`	`+ not blockImmediatelyDominates(dominator, result)`
	`17`	`+ or`
	`18`	`+ exists(Graph::Block prev \| result = getDominanceFrontier(prev) \|`
	`19`	`+ blockImmediatelyDominates(dominator, prev) and`
	`20`	`+ not blockImmediatelyDominates(dominator, result)`
`20`	`21`	`)`
`21`	`22`	`}`