1 files changed, 5 insertions, 1 deletions
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 a6b3fd0d7..c65b3709a 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
@@ -428,7 +428,11 @@ public class BasicBlockInstructionIterator implements InstructionIterator, Instr
     }
 
     // Insert inlinee blocks into the IR code.
-    inlinee.blocks.forEach(blocksIterator::add);
+    int blockNumber = code.getHighestBlockNumber() + 1;
+    for (BasicBlock bb : inlinee.blocks) {
+      bb.setNumber(blockNumber++);
+      blocksIterator.add(bb);
+    }
 
     // If the invoke block had catch handlers copy those down to all inlined blocks.
     if (invokeBlock.hasCatchHandlers()) {