commit 56d480eb34d03afe7539724f4ca3a1dae2955126
author Christoffer Adamsen <christofferqa@google.com> Wed May 08 10:58:41 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon May 13 06:27:54 2024 +0000
tree 9b742ee9024e9969b328192fa1e12038da10fa53
parent c7aa550b8e3ca35bdabb46e7e52bb752a541b120

Extend RootSet pruning to conditional keep info

Change-Id: I6d864c12656fb619102e5905850f01b574feae42

src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java

diff --git a/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java b/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
index 9e9cdc3..7d812b2 100644
--- a/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
+++ b/src/main/java/com/android/tools/r8/shaking/DependentMinimumKeepInfoCollection.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 public abstract class DependentMinimumKeepInfoCollection {
 
@@ -159,6 +160,10 @@
     return internalRemove(preconditionEvent, minimumKeepInfo -> minimumKeepInfo.remove(method));
   }
 
+  public void removeIf(Predicate<? super MinimumKeepInfoCollection> predicate) {
+    dependentMinimumKeepInfo.values().removeIf(predicate);
+  }
+
   private <J extends Joiner<?, ?, ?>> J internalRemove(
       EnqueuerEvent preconditionEvent, Function<MinimumKeepInfoCollection, J> fn) {
     MinimumKeepInfoCollection minimumKeepInfo = get(preconditionEvent);

src/main/java/com/android/tools/r8/shaking/RootSetUtils.java

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index b22bea5..626dc9a 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -1985,14 +1985,12 @@
 
     public void pruneItems(PrunedItems prunedItems, Timing timing) {
       timing.begin("Prune RootSet");
-      MinimumKeepInfoCollection unconditionalMinimumKeepInfo =
-          getDependentMinimumKeepInfo().getUnconditionalMinimumKeepInfoOrDefault(null);
-      if (unconditionalMinimumKeepInfo != null) {
-        unconditionalMinimumKeepInfo.pruneItems(prunedItems);
-        if (unconditionalMinimumKeepInfo.isEmpty()) {
-          getDependentMinimumKeepInfo().remove(UnconditionalKeepInfoEvent.get());
-        }
-      }
+      getDependentMinimumKeepInfo()
+          .removeIf(
+              minimumKeepInfo -> {
+                minimumKeepInfo.pruneItems(prunedItems);
+                return minimumKeepInfo.isEmpty();
+              });
       timing.end();
     }