Merge pull request #10693 from atorralba/atorralba/fix-guard-bad-magic

aschackmull · web-flow · commit cbeff4efc8db · 2022-10-06T10:14:48.000+02:00
Java: Fixes bad magic in `Guard::guardControls_v3`
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -232,6 +232,7 @@ predicate guardControls_v2(Guard guard, BasicBlock controlled, boolean branch) {
   )
 }
 
+pragma[nomagic]
 private predicate guardControls_v3(Guard guard, BasicBlock controlled, boolean branch) {
   guard.directlyControls(controlled, branch)
   or

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ predicate guardControls_v2(Guard guard, BasicBlock controlled, boolean branch) {`
`232`	`232`	`)`
`233`	`233`	`}`
`234`	`234`
	`235`	`+pragma[nomagic]`
`235`	`236`	`private predicate guardControls_v3(Guard guard, BasicBlock controlled, boolean branch) {`
`236`	`237`	`guard.directlyControls(controlled, branch)`
`237`	`238`	`or`