commit 856ae3c0b99a1615b7b139442e2574ba4cc7cf39
author Christoffer Quist Adamsen <christofferqa@google.com> Mon May 18 21:07:25 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon May 18 21:07:25 2020 +0200
tree 61ce150a8b92b3f6e3f40e46b77a4ea937147d71
parent 7a3cd93a754bd34f9d9b8e85e6ee89bb3eac5a8b

Set dex instruction offset in bridge hoisting

Change-Id: I44e20a2f19d4003e4f7070b1018d998c81b18b4e

src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java

diff --git a/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java b/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java
index 6a42889..31e239b 100644
--- a/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java
+++ b/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java
@@ -329,9 +329,11 @@
       Instruction instruction = code.instructions[i];
       if (instruction.isInvokeVirtual()) {
         InvokeVirtual invoke = instruction.asInvokeVirtual();
-        newInstructions[i] =
+        InvokeVirtual newInvoke =
             new InvokeVirtual(
                 invoke.A, methodToInvoke, invoke.C, invoke.D, invoke.E, invoke.F, invoke.G);
+        newInvoke.setOffset(invoke.getOffset());
+        newInstructions[i] = newInvoke;
       } else {
         newInstructions[i] = instruction;
       }