Fix: ensure is a switch block

smowton · smowton · commit 3971817c925a · 2023-11-30T11:24:07.000Z
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -1300,7 +1300,7 @@ private module ControlFlowGraphImpl {
     )
     or
     // Switch statements and expressions
-    exists(StmtParent switch |
+    exists(StmtParent switch | switch instanceof SwitchStmt or switch instanceof SwitchExpr |
       exists(Expr switchExpr |
         switchExpr = switch.(SwitchStmt).getExpr() or switchExpr = switch.(SwitchExpr).getExpr()
       |

Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,7 @@ private module ControlFlowGraphImpl {`
`1300`	`1300`	`)`
`1301`	`1301`	`or`
`1302`	`1302`	`// Switch statements and expressions`
`1303`		`- exists(StmtParent switch \|`
	`1303`	`+ exists(StmtParent switch \| switch instanceof SwitchStmt or switch instanceof SwitchExpr \|`
`1304`	`1304`	`exists(Expr switchExpr \|`
`1305`	`1305`	`switchExpr = switch.(SwitchStmt).getExpr() or switchExpr = switch.(SwitchExpr).getExpr()`
`1306`	`1306`	`\|`