commit 5391b2742c0db6f5b6536ff488674c4fa04be7e9
author Christoffer Quist Adamsen <christofferqa@google.com> Thu May 05 06:19:06 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu May 05 04:23:05 2022 +0000
tree 49a2fa033f3043456a50af5862dd0125bb7aac72
parent ac369528e402ad28413bfa827407af02cf1a1fa1

Account for invoke-interface instructions in StringMethodOptimizer

Bug: b/230821936
Change-Id: Ic5990fd7ce6e83100501011ca6c3239637f92026

src/main/java/com/android/tools/r8/ir/optimize/library/StringMethodOptimizer.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/library/StringMethodOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/library/StringMethodOptimizer.java
index e5483db..6e4abef 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/library/StringMethodOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/library/StringMethodOptimizer.java
@@ -19,8 +19,8 @@
 import com.android.tools.r8.ir.code.Instruction;
 import com.android.tools.r8.ir.code.InstructionListIterator;
 import com.android.tools.r8.ir.code.InvokeMethod;
+import com.android.tools.r8.ir.code.InvokeMethodWithReceiver;
 import com.android.tools.r8.ir.code.InvokeStatic;
-import com.android.tools.r8.ir.code.InvokeVirtual;
 import com.android.tools.r8.ir.code.Value;
 import java.util.Set;
 
@@ -50,14 +50,14 @@
       Set<BasicBlock> blocksToRemove) {
     DexMethod singleTargetReference = singleTarget.getReference();
     if (singleTargetReference == dexItemFactory.stringMembers.equals) {
-      optimizeEquals(code, instructionIterator, invoke.asInvokeVirtual());
+      optimizeEquals(code, instructionIterator, invoke.asInvokeMethodWithReceiver());
     } else if (singleTargetReference == dexItemFactory.stringMembers.valueOf) {
       optimizeValueOf(code, instructionIterator, invoke.asInvokeStatic(), affectedValues);
     }
   }
 
   private void optimizeEquals(
-      IRCode code, InstructionListIterator instructionIterator, InvokeVirtual invoke) {
+      IRCode code, InstructionListIterator instructionIterator, InvokeMethodWithReceiver invoke) {
     if (appView.appInfo().hasLiveness()) {
       ProgramMethod context = code.context();
       Value first = invoke.getReceiver().getAliasedValue();