Merge pull request github#14242 from alexet/simplify-ir-guards

alexet · web-flow · commit 1f4a5301cdd1 · 2023-09-19T10:35:09.000+01:00
CPP: Simplify some code in IRGuards.
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -240,7 +240,7 @@ private class GuardConditionFromIR extends GuardCondition {
    */
   private predicate controlsBlock(BasicBlock controlled, boolean testIsTrue) {
     exists(IRBlock irb |
-      forex(IRGuardCondition inst | inst = ir | inst.controls(irb, testIsTrue)) and
+      ir.controls(irb, testIsTrue) and
       irb.getAnInstruction().getAst().(ControlFlowNode).getBasicBlock() = controlled and
       not isUnreachedBlock(irb)
     )

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ private class GuardConditionFromIR extends GuardCondition {`
`240`	`240`	`*/`
`241`	`241`	`private predicate controlsBlock(BasicBlock controlled, boolean testIsTrue) {`
`242`	`242`	`exists(IRBlock irb \|`
`243`		`- forex(IRGuardCondition inst \| inst = ir \| inst.controls(irb, testIsTrue)) and`
	`243`	`+ ir.controls(irb, testIsTrue) and`
`244`	`244`	`irb.getAnInstruction().getAst().(ControlFlowNode).getBasicBlock() = controlled and`
`245`	`245`	`not isUnreachedBlock(irb)`
`246`	`246`	`)`