commit ad79e4bb655c1c748b60018ae96329bd063e08b2
author Andrew Grieve <agrieve@google.com> Wed Nov 08 14:20:28 2023 -0500
committer Christoffer Adamsen <christofferqa@google.com> Thu Nov 09 07:40:32 2023 +0000
tree 06e50aee770fa3bf94f40fcfe129de4509c7cb70
parent c18048a395153156197d8ea3bd4adad8d6bd6527

Minor optimization to Value.aliasedUsers()

Removes the need for a separate "seen" collection by reusing
"collectedUsers" for that purpose.

Bug: None
Change-Id: I4a74cacbd24e6cd4d2f7388c18046646cf5235f5

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

diff --git a/src/main/java/com/android/tools/r8/ir/code/Value.java b/src/main/java/com/android/tools/r8/ir/code/Value.java
index f08a4e2..c8d9dc5 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Value.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Value.java
@@ -38,7 +38,6 @@
 import com.android.tools.r8.utils.IterableUtils;
 import com.android.tools.r8.utils.LongInterval;
 import com.android.tools.r8.utils.Reporter;
-import com.android.tools.r8.utils.SetUtils;
 import com.android.tools.r8.utils.StringDiagnostic;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
@@ -378,25 +377,19 @@
   }
 
   public Set<Instruction> aliasedUsers(AliasedValueConfiguration configuration) {
-    Set<Instruction> users = SetUtils.newIdentityHashSet(uniqueUsers());
-    Set<Instruction> visited = Sets.newIdentityHashSet();
-    collectAliasedUsersViaAssume(configuration, visited, uniqueUsers(), users);
+    Set<Instruction> users = Sets.newIdentityHashSet();
+    collectAliasedUsersViaAssume(configuration, this, users);
     return users;
   }
 
   private static void collectAliasedUsersViaAssume(
-      AliasedValueConfiguration configuration,
-      Set<Instruction> visited,
-      Set<Instruction> usersToTest,
-      Set<Instruction> collectedUsers) {
-    for (Instruction user : usersToTest) {
-      if (!visited.add(user)) {
+      AliasedValueConfiguration configuration, Value value, Set<Instruction> collectedUsers) {
+    for (Instruction user : value.uniqueUsers()) {
+      if (!collectedUsers.add(user)) {
         continue;
       }
       if (configuration.isIntroducingAnAlias(user)) {
-        collectedUsers.addAll(user.outValue().uniqueUsers());
-        collectAliasedUsersViaAssume(
-            configuration, visited, user.outValue().uniqueUsers(), collectedUsers);
+        collectAliasedUsersViaAssume(configuration, user.outValue(), collectedUsers);
       }
     }
   }