commit a3d63b8d015044d0ca4bc6d7a726154ca15e98bd
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jun 30 11:35:37 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Thu Jun 30 12:58:18 2022 +0000
tree 79a2e1e5e0eb649e02946dc06d505ecfa046569c
parent 12ab345c790393ae107b893f25aee28968f1e5f0

Fix dead-array after dead code elimination

Change-Id: Iab64df49bfc58c33b03423d29fccb8e9f2de1a45

src/main/java/com/android/tools/r8/ir/code/ArrayPut.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/ArrayPut.java b/src/main/java/com/android/tools/r8/ir/code/ArrayPut.java
index 4e43590..13f8213 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ArrayPut.java
+++ b/src/main/java/com/android/tools/r8/ir/code/ArrayPut.java
@@ -159,18 +159,24 @@
       return true;
     }
 
-    // Check that all usages of the array are array stores.
-    for (Instruction user : array.uniqueUsers()) {
-      if (!user.isArrayPut() || user.asArrayPut().array() != array) {
-        return true;
-      }
-    }
-
-    if (array.numberOfPhiUsers() > 0) {
+    if (array.hasPhiUsers()) {
       // The array could be used indirectly.
       return true;
     }
 
+    // Check that all usages of the array are array stores.
+    for (Instruction user : array.aliasedUsers()) {
+      if (user.isAssume()) {
+        if (user.outValue().hasPhiUsers()) {
+          return true;
+        }
+        continue;
+      }
+      if (!user.isArrayPut() || user.asArrayPut().array().getAliasedValue() != array) {
+        return true;
+      }
+    }
+
     return false;
   }