From 12b6371209221a68beed5db2ea4b04fe6543d10e Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Thu, 1 May 2014 23:40:20 +0400
Subject: [PATCH] core: fix basic block initial id

---
 .../java/jadx/core/dex/visitors/BlockMakerVisitor.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/BlockMakerVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/BlockMakerVisitor.java
index 5885a6a19..934fa6ecf 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/BlockMakerVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/BlockMakerVisitor.java
@@ -24,7 +24,6 @@ import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import java.util.ArrayList;
 import java.util.BitSet;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -44,8 +43,6 @@ public class BlockMakerVisitor extends AbstractVisitor {
 
 	private static final BitSet EMPTY_BITSET = new EmptyBitSet();
 
-	private static int nextBlockId;
-
 	@Override
 	public void visit(MethodNode mth) {
 		if (mth.isNoCode()) {
@@ -59,8 +56,6 @@ public class BlockMakerVisitor extends AbstractVisitor {
 	}
 
 	private static void splitBasicBlocks(MethodNode mth) {
-		nextBlockId = 0;
-
 		InsnNode prevInsn = null;
 		Map<Integer, BlockNode> blocksMap = new HashMap<Integer, BlockNode>();
 		BlockNode curBlock = startNewBlock(mth, 0);
@@ -221,13 +216,13 @@ public class BlockMakerVisitor extends AbstractVisitor {
 	}
 
 	private static BlockNode startNewBlock(MethodNode mth, int offset) {
-		BlockNode block = new BlockNode(++nextBlockId, offset);
+		BlockNode block = new BlockNode(mth.getBasicBlocks().size(), offset);
 		mth.getBasicBlocks().add(block);
 		return block;
 	}
 
 	private static void computeDominators(MethodNode mth) {
-		List<BlockNode> basicBlocks = Collections.unmodifiableList(mth.getBasicBlocks());
+		List<BlockNode> basicBlocks = mth.getBasicBlocks();
 		int nBlocks = basicBlocks.size();
 		for (int i = 0; i < nBlocks; i++) {
 			BlockNode block = basicBlocks.get(i);