commit c9ae2a5d6e5363c988ebb4f5e76a624a01b77754
author Søren Gjesse <sgjesse@google.com> Thu Aug 03 12:14:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 03 12:14:06 2017 +0000
tree b747dcfe2f8cae85d7d4d986dd4bdd2ddd65ef5f
parent f02f527cf21644e1c87181dcbc88b8615355aa32
parent c801ecc5db4a541ffcc0a19457574fc5e5749435

Merge "Add option --main-dex-list to D8 command line"

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

diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
index 44721ae..5c9d171 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlock.java
@@ -1107,7 +1107,7 @@
       catchSuccessor.splitCriticalExceptionEdges(
           code.valueNumberGenerator,
           newBlock -> {
-            newBlock.setNumber(code.blocks.size());
+            newBlock.setNumber(code.getHighestBlockNumber() + 1);
             blockIterator.add(newBlock);
           });
     }

src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java b/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
index eb66537..bd7efce 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/SingleBlockSourceCode.java
@@ -155,6 +155,7 @@
     if (receiver != null) {
       receiverValue = builder.writeRegister(receiverRegister, MoveType.OBJECT, NO_THROW);
       builder.add(new Argument(receiverValue));
+      receiverValue.markAsThis();
     }
 
     // Fill in the Argument instructions in the argument block.