commit d4090757fa8c122cd724c24319185e6498cfd0ac
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 10 16:45:26 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 10 14:46:24 2019 +0000
tree 74a299b81f2cc4b92077a2e4566fcaa3a62a5de6
parent b8f15a2142c844588464f94e7ab93e5cc23b4e36

Fix successor manipulation issue in appendCatchHandler()

Change-Id: I1741b4c6c8dd3ce9cf7a982e1a8c76cfcd132940

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 c9c6c86..78018f9 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
@@ -918,7 +918,8 @@
         if (numberOfNormalSuccessors > 0) {
           // Increase the size of the successor list by 1, and increase the index of each normal
           // successor by 1.
-          successors.add(numberOfSuccessors - numberOfNormalSuccessors - 1, target);
+          targetIndex = numberOfSuccessors - numberOfNormalSuccessors;
+          successors.add(targetIndex, target);
         } else {
           // If there are no normal successors we can simply add the new catch handler.
           targetIndex = successors.size();