hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-23 07:45:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move condition into isNonFallThroughPredecessor

Browse Source
This commit is contained in:
Chris Smowton
2023-11-28 12:10:53 +00:00
parent 94819e37c4
commit aa8f798853
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/ql/lib/semmle/code/java/controlflow/Guards.qll
View File

@@ -111,11 +111,14 @@ private PatternCase getClosestPrecedingPatternCase(SwitchCase case) {
* test or guard failing and proceeding to then consider subsequent cases.
*/
private predicate isNonFallThroughPredecessor(SwitchCase sc, ControlFlowNode pred) {
pred.(Expr).getParent*() = sc.getSelectorExpr()
or
pred.(Expr).getParent*() = getClosestPrecedingPatternCase(sc).getGuard()
or
pred = getClosestPrecedingPatternCase(sc)
pred = sc.getControlFlowNode().getAPredecessor() and
(
pred.(Expr).getParent*() = sc.getSelectorExpr()
or
pred.(Expr).getParent*() = getClosestPrecedingPatternCase(sc).getGuard()
or
pred = getClosestPrecedingPatternCase(sc)
)
}
/**
@@ -230,7 +233,6 @@ class Guard extends ExprParent {
not sc instanceof PatternCase and
branch = true and
bb2.getFirstNode() = sc.getControlFlowNode() and
pred = sc.getControlFlowNode().getAPredecessor() and
isNonFallThroughPredecessor(sc, pred) and
bb1 = pred.getBasicBlock()
)