github
diff --git a/‎csharp/ql/src/semmle/code/csharp/controlflow/ControlFlowGraph.qll‎
Lines changed: 46 additions & 17 deletions b/‎csharp/ql/src/semmle/code/csharp/controlflow/ControlFlowGraph.qll‎
Lines changed: 46 additions & 17 deletions
@@ -736,6 +736,7 @@ module ControlFlow {
         TLastRecBooleanNegationCompletion() or
         TLastRecNonBooleanCompletion() or
         TLastRecBreakCompletion() or
+        TLastRecNonBreakCompletion() or
         TLastRecSwitchAbnormalCompletion() or
         TLastRecInvalidOperationException() or
         TLastRecNonContinueCompletion() or
@@ -941,7 +942,7 @@ module ControlFlow {
             // Last statement exits with any non-break completion
             exists(int last | last = max(int i | exists(ss.getStmt(i))) |
               result = ss.getStmt(last) and
-              c = TRec(TLastRecSpecificNegCompletion(any(BreakCompletion bc)))
+              c = TRec(TLastRecNonBreakCompletion())
             )
           )
         or
@@ -1098,7 +1099,7 @@ module ControlFlow {
         or
         result = lastRecSpecific(cfe, c, c)
         or
-        exists(TLastRecComputation rec, Completion c0 | result = lastRec(cfe, c0, rec) |
+        exists(TLastRecComputation rec, Completion c0 | result = lastRec(rec, cfe, c0) |
           rec = TLastRecSpecificNegCompletion(any(Completion c1 | c1 != c0)) and
           c = c0
           or
@@ -1109,7 +1110,7 @@ module ControlFlow {
           c = c0
           or
           rec = TLastRecAbnormalCompletion() and
-          not c0 instanceof NormalCompletion and
+          c0 instanceof AbnormalCompletion and
           c = c0
           or
           rec = TLastRecBooleanNegationCompletion() and
@@ -1128,6 +1129,10 @@ module ControlFlow {
           c0 instanceof BreakCompletion and
           c instanceof BreakNormalCompletion
           or
+          rec = TLastRecNonBreakCompletion() and
+          not c0 instanceof BreakCompletion and
+          c = c0
+          or
           rec = TLastRecSwitchAbnormalCompletion() and
           not c instanceof BreakCompletion and
           not c instanceof NormalCompletion and
@@ -1137,10 +1142,14 @@ module ControlFlow {
           or
           rec = TLastRecInvalidOperationException() and
           (c0.(MatchingCompletion).isNonMatch() or c0 instanceof FalseCompletion) and
-          c
-              .(ThrowCompletion)
-              .getExceptionClass()
-              .hasQualifiedName("System.InvalidOperationException")
+          c = any(InheritedCompletion ic |
+              ic.getUnderlyingCompletion() = c0 and
+              ic
+                  .getInheritedCompletion()
+                  .(ThrowCompletionDirect)
+                  .getExceptionClass()
+                  .hasQualifiedName("System.InvalidOperationException")
+            )
           or
           rec = TLastRecNonContinueCompletion() and
           not c0 instanceof BreakCompletion and
@@ -1156,16 +1165,30 @@ module ControlFlow {
         or
         // Last `catch` clause inherits throw completions from the `try` block,
         // when the clause does not match
-        exists(SpecificCatchClause scc |
+        exists(SpecificCatchClause scc, ThrowCompletion tc |
           scc = cfe and
           scc.isLast() and
-          throwMayBeUncaught(scc, c)
+          throwMayBeUncaught(scc, tc)
         |
           // Incompatible exception type: clause itself
-          result = scc
+          result = scc and
+          exists(MatchingCompletion mc |
+            mc.isNonMatch() and
+            mc.isValidFor(scc) and
+            c = any(InheritedCompletion ic |
+                ic.getUnderlyingCompletion() = mc and
+                ic.getInheritedCompletion() = tc.getInheritedCompletion()
+              )
+          )
           or
           // Incompatible filter
-          result = lastSpecificCatchClauseFilterClause(scc)
+          exists(FalseCompletion fc |
+            result = lastSpecificCatchClauseFilterClause(scc, fc) and
+            c = any(InheritedCompletion ic |
+                ic.getUnderlyingCompletion() = fc and
+                ic.getInheritedCompletion() = tc.getInheritedCompletion()
+              )
+          )
         )
         or
         cfe = any(TryStmt ts |
@@ -1187,8 +1210,12 @@ module ControlFlow {
                 exists(getBlockOrCatchFinallyPred(ts, any(NormalCompletion nc))) and
                 c = c0
                 or
-                exists(getBlockOrCatchFinallyPred(ts, c)) and
-                not c instanceof NormalCompletion
+                exists(AbnormalCompletion ac, InheritedCompletion ic |
+                  c = ic and
+                  exists(getBlockOrCatchFinallyPred(ts, ac)) and
+                  ac.getInheritedCompletion() = ic.getInheritedCompletion() and
+                  ic.getUnderlyingCompletion() = c0
+                )
               )
             )
           )
@@ -1201,7 +1228,7 @@ module ControlFlow {
        */
       pragma[nomagic]
       private ControlFlowElement lastRec(
-        ControlFlowElement cfe, Completion c, TLastRecComputation rec
+        TLastRecComputation rec, ControlFlowElement cfe, Completion c
       ) {
         result = last(lastNonRec(cfe, TRec(rec)), c)
       }
@@ -1210,7 +1237,7 @@ module ControlFlow {
       private ControlFlowElement lastRecSpecific(
         ControlFlowElement cfe, Completion c1, Completion c2
       ) {
-        result = lastRec(cfe, c1, TLastRecSpecificCompletion(c2))
+        result = lastRec(TLastRecSpecificCompletion(c2), cfe, c1)
       }
 
       pragma[nomagic]
@@ -1234,8 +1261,10 @@ module ControlFlow {
         result = last(cc.getBlock(), c)
       }
 
-      private ControlFlowElement lastSpecificCatchClauseFilterClause(SpecificCatchClause scc) {
-        result = last(scc.getFilterClause(), _)
+      private ControlFlowElement lastSpecificCatchClauseFilterClause(
+        SpecificCatchClause scc, Completion c
+      ) {
+        result = last(scc.getFilterClause(), c)
       }
 
       /**