Cfg: Step directly from a failed case guard to the next case.

aschackmull · aschackmull · commit d9ea78bfb880 · 2026-03-03T13:42:13.000+01:00
diff --git a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
@@ -1412,6 +1412,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
           exists(int i |
             n1.isAfterValue(getRankedCaseCfgOrder(switch, i),
               any(MatchingSuccessor t | t.getValue() = false))
+            or
+            n1.isAfterFalse(getRankedCaseCfgOrder(switch, i).getGuard())
           |
             n2.isBefore(getRankedCaseCfgOrder(switch, i + 1))
             or
@@ -1456,9 +1458,6 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
             or
             n1.isAfterTrue(case.getGuard()) and
             n2 = beforeBody
-            or
-            n1.isAfterFalse(case.getGuard()) and
-            n2.isAfterValue(case, any(MatchingSuccessor t | t.getValue() = false))
           )
         )
         or

Original file line number	Diff line number	Diff line change
`@@ -1412,6 +1412,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {`
`1412`	`1412`	`exists(int i \|`
`1413`	`1413`	`n1.isAfterValue(getRankedCaseCfgOrder(switch, i),`
`1414`	`1414`	`any(MatchingSuccessor t \| t.getValue() = false))`
	`1415`	`+ or`
	`1416`	`+ n1.isAfterFalse(getRankedCaseCfgOrder(switch, i).getGuard())`
`1415`	`1417`	`\|`
`1416`	`1418`	`n2.isBefore(getRankedCaseCfgOrder(switch, i + 1))`
`1417`	`1419`	`or`
`@@ -1456,9 +1458,6 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {`
`1456`	`1458`	`or`
`1457`	`1459`	`n1.isAfterTrue(case.getGuard()) and`
`1458`	`1460`	`n2 = beforeBody`
`1459`		`- or`
`1460`		`- n1.isAfterFalse(case.getGuard()) and`
`1461`		`- n2.isAfterValue(case, any(MatchingSuccessor t \| t.getValue() = false))`
`1462`	`1461`	`)`
`1463`	`1462`	`)`
`1464`	`1463`	`or`