commit 36fcb8d75af0cebc952231fee766c8593e8583cf
author Christoffer Adamsen <christofferqa@google.com> Mon Feb 17 12:41:50 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Feb 17 03:46:49 2025 -0800
tree f7979d5c635eb3d6d95f37f2ca0fc767e434dd59
parent 0e47ab2b463abb9bfb721b914587a7ac72b7cc7b

Remove unused field liveMethodsWithKeepActions

Change-Id: I2f98e9a2ee51cc0afac57660f98e3e921f64e8d2

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

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index fbcab01..72b5c8c 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -4131,10 +4131,6 @@
     private final Map<DexProgramClass, Set<DexClass>> injectedInterfaces =
         new ConcurrentHashMap<>();
 
-    // Subset of live methods that need have keep requirements.
-    private final List<Pair<ProgramMethod, Consumer<KeepMethodInfo.Joiner>>>
-        liveMethodsWithKeepActions = new ArrayList<>();
-
     SyntheticAdditions(ProcessorContext processorContext) {
       this.processorContext = processorContext;
     }
@@ -4150,7 +4146,6 @@
               && liveMethods.isEmpty()
               && syntheticClasspathClasses.isEmpty()
               && injectedInterfaces.isEmpty();
-      assert !empty || liveMethodsWithKeepActions.isEmpty();
       return empty;
     }
 
@@ -4191,13 +4186,9 @@
 
       // All synthetic additions are initial tree shaking only. No need to track keep reasons.
       KeepReasonWitness fakeReason = enqueuer.graphReporter.fakeReportShouldNotBeUsed();
-
       for (ProgramMethod desugaredMethod : desugaredMethods) {
         enqueuer.worklist.enqueueTraceCodeAction(desugaredMethod);
       }
-
-      liveMethodsWithKeepActions.forEach(
-          item -> enqueuer.keepInfo.joinMethod(item.getFirst(), item.getSecond()));
       for (ProgramMethod liveMethod : liveMethods.values()) {
         assert !enqueuer.targetedMethods.contains(liveMethod.getDefinition());
         enqueuer.markMethodAsTargeted(liveMethod, fakeReason);
@@ -4209,7 +4200,6 @@
             enqueuer.objectAllocationInfoCollection.injectInterfaces(
                 enqueuer.appInfo(), clazz, itfs);
           });
-
       minimumSyntheticKeepInfo.forEach(
           (method, minimumKeepInfoForMethod) -> {
             enqueuer.getKeepInfo().registerCompilerSynthesizedMethod(method);