commit 5ce98b35c4252f8dfef2521c05052e3dc93f84b8
author Andrew Grieve <agrieve@google.com> Wed Dec 04 11:01:39 2024 -0500
committer Andrew Grieve <agrieve@google.com> Mon Dec 09 15:02:14 2024 +0000
tree f18d5e74b61d9c190969f6a693fc8abe2704d0b9
parent 25ffd2a2247ae54d8bf4e559848c19e0038f2e32

Remove redundant dead code check in LibraryMemberOptimizer

LibraryMemberOptimizer's job isn't to generically remove unused
side-effect free invokes. We can leave that to the dead code remover.

Change-Id: I4ed76c27cbc29c00759b5ce0425aae32eb4a8a52

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/library/LibraryMemberOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/library/LibraryMemberOptimizer.java
index af730b3..788cbf6 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/library/LibraryMemberOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/library/LibraryMemberOptimizer.java
@@ -162,13 +162,6 @@
           continue;
         }
 
-        if (invoke.hasUnusedOutValue()
-            && !singleTarget.getDefinition().isInstanceInitializer()
-            && !invoke.instructionMayHaveSideEffects(appView, code.context())) {
-          instructionIterator.removeOrReplaceByDebugLocalRead();
-          continue;
-        }
-
         LibraryMethodModelCollection.State optimizationState =
             optimizationStates.computeIfAbsent(
                 optimizer, LibraryMethodModelCollection::createInitialState);

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/library/primitive/PrimitiveMethodOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/library/primitive/PrimitiveMethodOptimizer.java
index 96d23ce..65a5583 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/library/primitive/PrimitiveMethodOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/library/primitive/PrimitiveMethodOptimizer.java
@@ -98,10 +98,11 @@
   void optimizeUnboxMethod(
       IRCode code, InstructionListIterator instructionIterator, InvokeMethod unboxInvoke) {
     Value firstArg = unboxInvoke.getFirstArgument();
+    Value outValue = unboxInvoke.outValue();
     AbstractValue abstractValue = firstArg.getAbstractValue(appView, code.context());
     if (isMatchingSingleBoxedPrimitive(abstractValue)) {
       // Optimize Primitive.box(cst).unbox() into cst, possibly inter-procedurally.
-      if (unboxInvoke.hasOutValue()) {
+      if (outValue != null) {
         SingleBoxedPrimitiveValue singleBoxedNumber = abstractValue.asSingleBoxedPrimitive();
         instructionIterator.replaceCurrentInstruction(
             singleBoxedNumber
@@ -118,7 +119,9 @@
       // Optimize Primitive.box(unboxed).unbox() into unboxed.
       InvokeMethod boxInvoke = firstArg.getAliasedValue().getDefinition().asInvokeMethod();
       assert boxInvoke.isInvokeStatic();
-      unboxInvoke.outValue().replaceUsers(boxInvoke.getFirstArgument());
+      if (outValue != null) {
+        outValue.replaceUsers(boxInvoke.getFirstArgument());
+      }
       instructionIterator.replaceCurrentInstructionByNullCheckIfPossible(appView, code.context());
     }
   }