commit 0b6cda9489a00c0be27fe6cee73f095bcc065f6e
author Clément Béra <clementbera@google.com> Mon Jul 29 13:20:17 2024 +0200
committer Clément Béra <clementbera@google.com> Tue Jul 30 08:56:49 2024 +0000
tree 08af9e2763268b3229ba5a4ef5cc6c5c6f7c622b
parent efb63734ed9dd0b695eb8110053a61a1bb1f6567

Fix invalid removal of value used in phi

Bug: b/354625681
Change-Id: I8b3ccd82d6261814fad8b2b1d1ab552efb373cb7

src/main/java/com/android/tools/r8/ir/conversion/passes/FilledNewArrayRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/FilledNewArrayRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/FilledNewArrayRewriter.java
index eb90225..c5e7aaa 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/FilledNewArrayRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/FilledNewArrayRewriter.java
@@ -110,7 +110,7 @@
                 next.inValues()
                     .forEach(
                         value -> {
-                          if (value.hasSingleUniqueUser()) {
+                          if (value.hasSingleUniqueUser() && !value.hasPhiUsers()) {
                             additionalToRemove.add(value.getDefinition());
                           }
                         });

src/test/java/com/android/tools/r8/regress/B354625681Test.java

diff --git a/src/test/java/com/android/tools/r8/regress/B354625681Test.java b/src/test/java/com/android/tools/r8/regress/B354625681Test.java
index ca6025d..338ca7f 100644
--- a/src/test/java/com/android/tools/r8/regress/B354625681Test.java
+++ b/src/test/java/com/android/tools/r8/regress/B354625681Test.java
@@ -6,10 +6,8 @@
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.utils.AndroidApiLevel;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -39,26 +37,12 @@
 
   @Test
   public void testR8() throws Exception {
-    if (parameters.isCfRuntime()
-        || (parameters.isDexRuntime()
-            && parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.N))) {
-      testForR8(parameters.getBackend())
-          .addInnerClasses(getClass())
-          .addKeepMainRule(TestClass.class)
-          .setMinApi(parameters)
-          .run(parameters.getRuntime(), TestClass.class)
-          .assertSuccessWithOutputLines(EXPECTED_OUTPUT);
-    } else {
-      Assert.assertThrows(
-          Throwable.class,
-          () ->
-              testForR8(parameters.getBackend())
-                  .addInnerClasses(getClass())
-                  .addKeepMainRule(TestClass.class)
-                  .setMinApi(parameters)
-                  .run(parameters.getRuntime(), TestClass.class)
-                  .assertSuccessWithOutputLines(EXPECTED_OUTPUT));
-    }
+    testForR8(parameters.getBackend())
+        .addInnerClasses(getClass())
+        .addKeepMainRule(TestClass.class)
+        .setMinApi(parameters)
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutputLines(EXPECTED_OUTPUT);
   }
 
   static class TestClass {