commit e617ebe5428b35002cda923f31f29ba239d688f9
author Søren Gjesse <sgjesse@google.com> Tue Oct 09 13:07:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 09 13:07:13 2018 +0000
tree 2a7830e2f17ba13ea623a065b19c976146472811
parent 1caddb2cbd581b95eb08156863d49e13d118f02e
parent e5873b75ba7c38b91ce2a490162f9543f8f645d5

Merge "Skip emitting initial advance pc of zero"

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

diff --git a/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java b/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
index fa856cb..6c6fda4 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDebugEventBuilder.java
@@ -206,7 +206,10 @@
     if (localsChanged()) {
       assert emittedPc != pc;
       int pcDelta = emittedPc == NO_PC_INFO ? pc : pc - emittedPc;
-      events.add(factory.createAdvancePC(pcDelta));
+      assert pcDelta > 0 || emittedPc == NO_PC_INFO;
+      if (pcDelta > 0) {
+        events.add(factory.createAdvancePC(pcDelta));
+      }
       emittedPc = pc;
       emitLocalChangeEvents(emittedLocals, pendingLocals, lastKnownLocals, events, factory);
       pendingLocalChanges = false;