Merge pull request #14336 from aschackmull/java/switch-rule-stmt-cfg

Java: Fix CFG for case rule statements.

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -871,7 +871,13 @@ private module ControlFlowGraphImpl {
     )
     or
     // the last node in a case rule is the last node in the right-hand side
-    last(n.(SwitchCase).getRuleStatement(), last, completion)
+    // if the rhs is a statement we wrap the completion as a break
+    exists(Completion caseCompletion |
+      last(n.(SwitchCase).getRuleStatement(), last, caseCompletion) and
+      if caseCompletion instanceof NormalOrBooleanCompletion
+      then completion = anonymousBreakCompletion()
+      else completion = caseCompletion
+    )
     or
     // ...and if the rhs is an expression we wrap the completion as a yield
     exists(Completion caseCompletion |

java/ql/lib/semmle/code/java/controlflow/internal/GuardsLogic.qll

@@ -57,6 +57,8 @@ predicate implies_v1(Guard g1, boolean b1, Guard g2, boolean b2) {
   or
   g1.(DefaultCase).getSwitch().getAConstCase() = g2 and b1 = true and b2 = false
   or
+  g1.(DefaultCase).getSwitchExpr().getAConstCase() = g2 and b1 = true and b2 = false
+  or
   exists(MethodAccess check, int argIndex | check = g1 |
     conditionCheckArgument(check, argIndex, _) and
     g2 = check.getArgument(argIndex) and