commit e82b562b9c94543b4773b85877ab3be00d773716
author Christoffer Adamsen <christofferqa@google.com> Mon Jan 27 15:00:18 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Jan 27 06:54:10 2025 -0800
tree 55e946d26833e1d7d77d6c75850a985dc3c703a9
parent 3f4e21dae3b353cfe2e0aec7bdf9e8f5948344d6

Only keep once in R8 partial use of trace references

Change-Id: I2fcfa76fc84af91d3235b6249d5c708dc1c5ca53

src/main/java/com/android/tools/r8/partial/R8PartialUseCollector.java

diff --git a/src/main/java/com/android/tools/r8/partial/R8PartialUseCollector.java b/src/main/java/com/android/tools/r8/partial/R8PartialUseCollector.java
index 5fe7e73..670eafe 100644
--- a/src/main/java/com/android/tools/r8/partial/R8PartialUseCollector.java
+++ b/src/main/java/com/android/tools/r8/partial/R8PartialUseCollector.java
@@ -13,6 +13,7 @@
 import com.android.tools.r8.graph.DexClass;
 import com.android.tools.r8.graph.DexClassAndField;
 import com.android.tools.r8.graph.DexClassAndMethod;
+import com.android.tools.r8.graph.DexReference;
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.partial.R8PartialSubCompilationConfiguration.R8PartialR8SubCompilationConfiguration;
 import com.android.tools.r8.references.PackageReference;
@@ -34,6 +35,7 @@
 
 public abstract class R8PartialUseCollector extends UseCollector {
 
+  private final Set<DexReference> seen = ConcurrentHashMap.newKeySet();
   private final Set<String> packagesToKeep = ConcurrentHashMap.newKeySet();
 
   public R8PartialUseCollector(AppView<? extends AppInfoWithClassHierarchy> appView) {
@@ -81,17 +83,23 @@
 
   @Override
   protected void notifyPresentClass(DexClass clazz, DefinitionContext referencedFrom) {
-    keep(clazz);
+    notifyPresentItem(clazz);
   }
 
   @Override
   protected void notifyPresentField(DexClassAndField field, DefinitionContext referencedFrom) {
-    keep(field);
+    notifyPresentItem(field);
   }
 
   @Override
   protected void notifyPresentMethod(DexClassAndMethod method, DefinitionContext referencedFrom) {
-    keep(method);
+    notifyPresentItem(method);
+  }
+
+  private void notifyPresentItem(Definition definition) {
+    if (seen.add(definition.getReference())) {
+      keep(definition);
+    }
   }
 
   @Override