Java: Adapt to changes in CFG library

hvitved · hvitved · commit 405818556498 · 2026-04-22T13:17:40.000+02:00
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -468,6 +468,7 @@ private module NonReturningCalls {
 
 private module Input implements InputSig1, InputSig2 {
   private import java as J
+  private import codeql.util.Void
 
   predicate cfgCachedStageRef() { CfgCachedStage::ref() }
 
@@ -533,6 +534,8 @@ private module Input implements InputSig1, InputSig2 {
     l = TYield() and n instanceof SwitchExpr
   }
 
+  class CallableBodyPartContext = Void;
+
   predicate inConditionalContext(Ast::AstNode n, ConditionKind kind) {
     kind.isBoolean() and
     (

Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,7 @@ private module NonReturningCalls {`
`468`	`468`
`469`	`469`	`private module Input implements InputSig1, InputSig2 {`
`470`	`470`	`private import java as J`
	`471`	`+ private import codeql.util.Void`
`471`	`472`
`472`	`473`	`predicate cfgCachedStageRef() { CfgCachedStage::ref() }`
`473`	`474`
`@@ -533,6 +534,8 @@ private module Input implements InputSig1, InputSig2 {`
`533`	`534`	`l = TYield() and n instanceof SwitchExpr`
`534`	`535`	`}`
`535`	`536`
	`537`	`+ class CallableBodyPartContext = Void;`
	`538`	`+`
`536`	`539`	`predicate inConditionalContext(Ast::AstNode n, ConditionKind kind) {`
`537`	`540`	`kind.isBoolean() and`
`538`	`541`	`(`