Java: Simplify recursion prevention.

aschackmull · aschackmull · commit a4a004a32251 · 2022-05-18T09:27:55.000+02:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -127,7 +127,7 @@ predicate simpleLocalFlowStep(Node node1, Node node2) {
   pragma[only_bind_out](node1.getEnclosingCallable()) =
     pragma[only_bind_out](node2.getEnclosingCallable()) and
   // prevent recursive call
-  (any() or strictcount(Node n1, Node n2, AdditionalValueStep a | a.step(n1, n2)) < 0)
+  (any(AdditionalValueStep a).step(_, _) implies any())
 }
 
 private predicate simpleLocalFlowStep0(Node node1, Node node2) {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ predicate simpleLocalFlowStep(Node node1, Node node2) {`
`127`	`127`	`pragma[only_bind_out](node1.getEnclosingCallable()) =`
`128`	`128`	`pragma[only_bind_out](node2.getEnclosingCallable()) and`
`129`	`129`	`// prevent recursive call`
`130`		`- (any() or strictcount(Node n1, Node n2, AdditionalValueStep a \| a.step(n1, n2)) < 0)`
	`130`	`+ (any(AdditionalValueStep a).step(_, _) implies any())`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`private predicate simpleLocalFlowStep0(Node node1, Node node2) {`