commit 78ffa2b368a3c569cdde736b94247c6dd6786695
author Clément Béra <clementbera@google.com> Thu May 15 14:26:13 2025 +0200
committer Clément Béra <clementbera@google.com> Thu May 15 14:26:13 2025 +0200
tree cb5f2fd6e21d7cdcc0664e3e80af33f425f361b5
parent 1c9d0ce82f25c1f2ea275366ecbe3ebe8484cab6

Use TreeSet in ReflectiveCallExtractor

Change-Id: Icca489bfcc5baec5ce5bb8d83df202ca6bd8efcc

src/test/java/com/android/tools/r8/assistant/ReflectiveCallExtractor.java

diff --git a/src/test/java/com/android/tools/r8/assistant/ReflectiveCallExtractor.java b/src/test/java/com/android/tools/r8/assistant/ReflectiveCallExtractor.java
index ff544a4..1419d3c 100644
--- a/src/test/java/com/android/tools/r8/assistant/ReflectiveCallExtractor.java
+++ b/src/test/java/com/android/tools/r8/assistant/ReflectiveCallExtractor.java
@@ -23,7 +23,6 @@
 import com.android.tools.r8.utils.Reporter;
 import com.android.tools.r8.utils.ThreadUtils;
 import com.android.tools.r8.utils.timing.Timing;
-import com.google.common.collect.Sets;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -32,6 +31,7 @@
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeSet;
 
 public class ReflectiveCallExtractor {
 
@@ -62,9 +62,7 @@
                 if (holderType.toSourceString().startsWith("java.lang.reflect")
                     || holderType.isIdenticalTo(factory.unsafeType)
                     || holderType.isIdenticalTo(factory.classType)) {
-                  methods
-                      .computeIfAbsent(holderType, t -> Sets.newIdentityHashSet())
-                      .add(theMethod);
+                  methods.computeIfAbsent(holderType, t -> new TreeSet<>()).add(theMethod);
                 }
               }
             }
@@ -72,11 +70,6 @@
         }
       }
     }
-    for (DexType dexType : methods.keySet()) {
-      ArrayList<DexMethod> sorted = new ArrayList<>(methods.get(dexType));
-      sorted.sort(Comparator.naturalOrder());
-      methods.put(dexType, sorted);
-    }
     return methods;
   }