commit 363905b9dbe3752bf7c33e4a8a1245cff1dc17ca
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 06 10:36:54 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 06 08:54:29 2019 +0000
tree b5ca3d11187ab4307a5193400a5165b3a8555ded
parent 452fe235afb3312f5958d3b4ca16d0d8392d62af

Remove redundant debug positions before numbering instructions

Change-Id: I94a9d24b67bc2e7ad7120a46d2dc7483c7a55135

src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
index a6e556d..7803adc 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
@@ -182,13 +182,13 @@
       // large for the if encoding.
       rewriteIfs();
 
-      // Reset the state of the builder to start from scratch.
-      reset();
-
       // Remove redundant debug position instructions. They would otherwise materialize as
       // unnecessary nops.
       removeRedundantDebugPositions(ir);
 
+      // Reset the state of the builder to start from scratch.
+      reset();
+
       // Populate the builder info objects.
       numberOfInstructions = 0;
 
@@ -667,10 +667,12 @@
 
   // Helper used by the info objects.
   private Info getInfo(com.android.tools.r8.ir.code.Instruction instruction) {
+    assert instruction.getNumber() >= 0;
     return instructionToInfo[instructionNumberToIndex(instruction.getNumber())];
   }
 
   private void setInfo(com.android.tools.r8.ir.code.Instruction instruction, Info info) {
+    assert instruction.getNumber() >= 0;
     if (!(info instanceof FallThroughInfo)) {
       previousNonFallthroughInfo = info;
     }