Fix #357 - dropped else block

leibnitz27 · Jul 21, 2024 · 3d1d0f4 · 3d1d0f4
1 parent d6f6758
commit 3d1d0f4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/org/benf/cfr/reader/bytecode/analysis/opgraph/op3rewriters/ConditionalRewriter.java b/src/org/benf/cfr/reader/bytecode/analysis/opgraph/op3rewriters/ConditionalRewriter.java
@@ -587,7 +587,9 @@ public boolean test(BlockIdentifier in) {
             if (blocksAtStart.size() == blocksAtEnd.size()+1) {
                 List<BlockIdentifier> change = SetUtil.differenceAtakeBtoList(blocksAtStart, blocksAtEnd);
                 // size == 1 already verified, but...
-                if (change.size() == 1 && change.get(0).getBlockType() == BlockType.CASE) {
+                if (change.size() == 1 &&
+                        (change.get(0).getBlockType() == BlockType.CASE ||
+                         change.get(0).getBlockType() == BlockType.CATCHBLOCK)) {
                     if (takenTarget.getStatement() instanceof CaseStatement) {
                         // We need to check if the statement LINEARLY preceeding this is in the block we've left.
                         if (stmtLastBlock.getBlockIdentifiers().contains(change.get(0))) {