Account for pattern-cases in more places

smowton · smowton · commit 9a450b09bed1 · 2023-11-30T11:23:59.000Z
diff --git a/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll b/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll
@@ -73,13 +73,15 @@ class MetricCallable extends Callable {
 // so there should be a branching point for each non-default switch
 // case (ignoring those that just fall through to the next case).
 private predicate branchingSwitchCase(ConstCase sc) {
-  not sc.(ControlFlowNode).getASuccessor() instanceof ConstCase and
-  not sc.(ControlFlowNode).getASuccessor() instanceof DefaultCase and
+  not sc.(ControlFlowNode).getASuccessor() instanceof SwitchCase and
   not defaultFallThrough(sc)
 }
 
 private predicate defaultFallThrough(ConstCase sc) {
-  exists(DefaultCase default | default.(ControlFlowNode).getASuccessor() = sc) or
+  exists(SwitchCase default | default.hasDefaultLabel() |
+    default.(ControlFlowNode).getASuccessor() = sc
+  )
+  or
   defaultFallThrough(sc.(ControlFlowNode).getAPredecessor())
 }
 
@@ -90,6 +92,7 @@ private predicate branchingStmt(Stmt stmt) {
   stmt instanceof DoStmt or
   stmt instanceof ForStmt or
   stmt instanceof EnhancedForStmt or
+  stmt instanceof PatternCase or
   branchingSwitchCase(stmt) or
   stmt instanceof CatchClause
 }
diff --git a/java/ql/src/Violations of Best Practice/Declarations/BreakInSwitchCase.ql b/java/ql/src/Violations of Best Practice/Declarations/BreakInSwitchCase.ql
@@ -17,8 +17,7 @@ import Common
 from SwitchStmt s, Stmt c
 where
   c = s.getACase() and
-  not c.(ControlFlowNode).getASuccessor() instanceof ConstCase and
-  not c.(ControlFlowNode).getASuccessor() instanceof DefaultCase and
+  not c.(ControlFlowNode).getASuccessor() instanceof SwitchCase and
   not s.(Annotatable).suppressesWarningsAbout("fallthrough") and
   mayDropThroughWithoutComment(s, c)
 select c,
