commit 4b1e8d39e2fc46d3275b81fff407a41ad7d9b1e1
author Søren Gjesse <sgjesse@google.com> Mon Aug 03 16:22:11 2020 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Aug 03 14:29:59 2020 +0000
tree a9cabe6528a512ed5731ab46a70ca7e6716495c4
parent 46bc4cf471f4e5627b8a6a7fbf2af14c0b13991d

Don't rewrite invoke in bridge hoisting if the method has not changed

Change-Id: I14c1d6b579e2e3da42e2472248ef5037686863ae

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 28cb8d0..1cfe21f 100644
--- a/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java
+++ b/src/main/java/com/android/tools/r8/optimize/BridgeHoisting.java
@@ -305,55 +305,66 @@
 
   private CfCode createCfCodeForVirtualBridge(CfCode code, DexMethod methodToInvoke) {
     List<CfInstruction> newInstructions = new ArrayList<>();
+    boolean modified = false;
     for (CfInstruction instruction : code.getInstructions()) {
-      if (instruction.isInvoke()) {
+      if (instruction.isInvoke() && instruction.asInvoke().getMethod() != methodToInvoke) {
         CfInvoke invoke = instruction.asInvoke();
         assert invoke.isInvokeVirtual();
         assert !invoke.isInterface();
         assert invoke.getMethod().match(methodToInvoke);
         newInstructions.add(new CfInvoke(invoke.getOpcode(), methodToInvoke, false));
+        modified = true;
       } else {
         newInstructions.add(instruction);
       }
     }
-    return new CfCode(
-        methodToInvoke.holder,
-        code.getMaxStack(),
-        code.getMaxLocals(),
-        newInstructions,
-        code.getTryCatchRanges(),
-        code.getLocalVariables());
+    return modified
+        ? new CfCode(
+            methodToInvoke.holder,
+            code.getMaxStack(),
+            code.getMaxLocals(),
+            newInstructions,
+            code.getTryCatchRanges(),
+            code.getLocalVariables())
+        : code;
   }
 
   private DexCode createDexCodeForVirtualBridge(DexCode code, DexMethod methodToInvoke) {
     Instruction[] newInstructions = new Instruction[code.instructions.length];
+    boolean modified = false;
     for (int i = 0; i < code.instructions.length; i++) {
       Instruction instruction = code.instructions[i];
-      if (instruction.isInvokeVirtual()) {
+      if (instruction.isInvokeVirtual()
+          && instruction.asInvokeVirtual().getMethod() != methodToInvoke) {
         InvokeVirtual invoke = instruction.asInvokeVirtual();
         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 if (instruction.isInvokeVirtualRange()) {
+        modified = true;
+      } else if (instruction.isInvokeVirtualRange()
+          && instruction.asInvokeVirtualRange().getMethod() != methodToInvoke) {
         InvokeVirtualRange invoke = instruction.asInvokeVirtualRange();
         InvokeVirtualRange newInvoke =
             new InvokeVirtualRange(invoke.CCCC, invoke.AA, methodToInvoke);
         newInvoke.setOffset(invoke.getOffset());
+        modified = true;
         newInstructions[i] = newInvoke;
       } else {
         newInstructions[i] = instruction;
       }
     }
-    return new DexCode(
-        code.registerSize,
-        code.incomingRegisterSize,
-        code.outgoingRegisterSize,
-        newInstructions,
-        code.tries,
-        code.handlers,
-        code.getDebugInfo());
+    return modified
+        ? new DexCode(
+            code.registerSize,
+            code.incomingRegisterSize,
+            code.outgoingRegisterSize,
+            newInstructions,
+            code.tries,
+            code.handlers,
+            code.getDebugInfo())
+        : code;
   }
 
   static class BridgeHoistingLens extends NestedGraphLense {