commit 10240f1403d43696e1da9920ae7729520de80d1a
author Stephan Herhut <herhut@google.com> Fri Jul 21 11:41:06 2017 +0200
committer Stephan Herhut <herhut@google.com> Fri Jul 21 11:41:06 2017 +0200
tree c6a347fd8fcbafdc26c9ee6934224eac8eee9c27
parent 554c8c7ca10ba0364efdca5000ef06f8176f2ee5

Ensure basic blocks have unique number after split.

Bug:
Change-Id: I1da61bdbb642811b562b1fb7c790a33e464ec6e7

src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
index c65b370..f93f996 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
@@ -176,7 +176,7 @@
     List<BasicBlock> blocks = code.blocks;
     assert blocksIterator == null || peekPrevious(blocksIterator) == block;
 
-    int blockNumber = blocks.size();
+    int blockNumber = code.getHighestBlockNumber() + 1;
     BasicBlock newBlock;
 
     // Don't allow splitting after the last instruction.