fix: removeUnreachable not searching in all blocks (PR #2082)

Co-authored-by: Away-pp <vladimir@DESKTOP-KESF23K>
skylot · Jan 14, 2024 · 2805770 · 2805770
1 parent 03052ba
commit 2805770
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java
@@ -644,14 +644,13 @@ public static void removeMarkedBlocks(MethodNode mth) {
 	}
 
 	private static void removeUnreachableBlocks(MethodNode mth) {
-		Set<BlockNode> toRemove = null;
+		Set<BlockNode> toRemove = new LinkedHashSet<>();
 		for (BlockNode block : mth.getBasicBlocks()) {
 			if (block.getPredecessors().isEmpty() && block != mth.getEnterBlock()) {
-				toRemove = new LinkedHashSet<>();
 				BlockSplitter.collectSuccessors(block, mth.getEnterBlock(), toRemove);
 			}
 		}
-		if (toRemove == null || toRemove.isEmpty()) {
+		if (toRemove.isEmpty()) {
 			return;
 		}