C#: Replace reference to controlsBlock and simplify.

aschackmull · aschackmull · commit 4de564eb4e35 · 2025-10-31T14:17:35.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
@@ -72,17 +72,10 @@ class ReverseDnsSource extends Source {
   }
 }
 
-pragma[noinline]
-private predicate conditionControlsCall0(
-  SensitiveExecutionMethodCall call, Expr e, ControlFlow::BooleanSuccessor s
-) {
-  forex(BasicBlock bb | bb = call.getAControlFlowNode().getBasicBlock() | e.controlsBlock(bb, s, _))
-}
-
 private predicate conditionControlsCall(
   SensitiveExecutionMethodCall call, SensitiveExecutionMethod def, Expr e, boolean cond
 ) {
-  exists(ControlFlow::BooleanSuccessor s | cond = s.getValue() | conditionControlsCall0(call, e, s)) and
+  e.(Guard).directlyControls(call.getBasicBlock(), cond) and
   def = call.getTarget().getUnboundDeclaration()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,17 +72,10 @@ class ReverseDnsSource extends Source {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-pragma[noinline]`
`76`		`-private predicate conditionControlsCall0(`
`77`		`- SensitiveExecutionMethodCall call, Expr e, ControlFlow::BooleanSuccessor s`
`78`		`-) {`
`79`		`- forex(BasicBlock bb \| bb = call.getAControlFlowNode().getBasicBlock() \| e.controlsBlock(bb, s, _))`
`80`		`-}`
`81`		`-`
`82`	`75`	`private predicate conditionControlsCall(`
`83`	`76`	`SensitiveExecutionMethodCall call, SensitiveExecutionMethod def, Expr e, boolean cond`
`84`	`77`	`) {`
`85`		`- exists(ControlFlow::BooleanSuccessor s \| cond = s.getValue() \| conditionControlsCall0(call, e, s)) and`
	`78`	`+ e.(Guard).directlyControls(call.getBasicBlock(), cond) and`
`86`	`79`	`def = call.getTarget().getUnboundDeclaration()`
`87`	`80`	`}`
`88`	`81`