Merge pull request github#3608 from aschackmull/java/backport-switchexpr-cfg-fix

aibaars · web-flow · commit f917b9e3cb92 · 2020-07-06T11:43:16.000+02:00
Java: Backport missing CFG edge fix for switch expressions
diff --git a/java/ql/src/semmle/code/java/ControlFlowGraph.qll b/java/ql/src/semmle/code/java/ControlFlowGraph.qll
@@ -578,6 +578,8 @@ private module ControlFlowGraphImpl {
     n instanceof Stmt and
     not n instanceof PostOrderNode and
     not n instanceof SynchronizedStmt
+    or
+    result = n and n instanceof SwitchExpr
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -578,6 +578,8 @@ private module ControlFlowGraphImpl {`
`578`	`578`	`n instanceof Stmt and`
`579`	`579`	`not n instanceof PostOrderNode and`
`580`	`580`	`not n instanceof SynchronizedStmt`
	`581`	`+ or`
	`582`	`+ result = n and n instanceof SwitchExpr`
`581`	`583`	`}`
`582`	`584`
`583`	`585`	`/**`