commit 88fd4b4f8cbe8177cfa38afe4b2fcfdbdc4d95e5
author Ian Zerny <zerny@google.com> Tue Oct 25 12:28:48 2022 +0200
committer Ian Zerny <zerny@google.com> Fri Oct 28 11:43:46 2022 +0000
tree 7bfdca1126b3a8ba283343b02fe1cada74282c85
parent d3af0999c56c95e76f80e114faa1edba757cc699

Make debug info disassemble more forgiving.

Change-Id: If5d5aecd796f8990b3d16a7aa411831e911d53b1

src/main/java/com/android/tools/r8/graph/DexCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexCode.java b/src/main/java/com/android/tools/r8/graph/DexCode.java
index b8613b8..ad59604 100644
--- a/src/main/java/com/android/tools/r8/graph/DexCode.java
+++ b/src/main/java/com/android/tools/r8/graph/DexCode.java
@@ -11,7 +11,6 @@
 import com.android.tools.r8.dex.code.DexInstruction;
 import com.android.tools.r8.dex.code.DexReturnVoid;
 import com.android.tools.r8.dex.code.DexSwitchPayload;
-import com.android.tools.r8.errors.Unreachable;
 import com.android.tools.r8.graph.DexCode.TryHandler.TypeAddrPair;
 import com.android.tools.r8.graph.DexDebugEvent.SetPositionFrame;
 import com.android.tools.r8.graph.DexDebugEvent.StartLocal;
@@ -508,7 +507,11 @@
       DexInstruction lastInstruction = ArrayUtils.last(instructions);
       debugInfo = advanceToOffset(lastInstruction.getOffset(), debugInfo, debugInfoIterator);
       if (debugInfo != null) {
-        throw new Unreachable("Could not print all debug information.");
+        builder
+            .append("(warning: has unhandled debug events @ pc:")
+            .append(debugInfo.address)
+            .append(", line:")
+            .append(debugInfo.line);
       } else {
         builder.append("(has debug events past last pc)\n");
       }