commit e6999f8b8dafa8267b4a2322d2f961a54c3618e5
author Christoffer Adamsen <christofferqa@google.com> Fri Oct 03 14:31:23 2025 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Oct 03 14:31:23 2025 +0200
tree bef938fb62250c4433085cfd824c15c54f224963
parent 37cb55abf84b074cffa7fbb534a9fc07708873b4

Remove unused processing of fully inlined methods map

Bug: b/448841318
Change-Id: I67de1e1a69e420df9f97b27b0d5a2d8b8ba8efc3

src/main/java/com/android/tools/r8/graph/PrunedItems.java

diff --git a/src/main/java/com/android/tools/r8/graph/PrunedItems.java b/src/main/java/com/android/tools/r8/graph/PrunedItems.java
index 0b8ea47..510fa9f 100644
--- a/src/main/java/com/android/tools/r8/graph/PrunedItems.java
+++ b/src/main/java/com/android/tools/r8/graph/PrunedItems.java
@@ -4,14 +4,11 @@
 
 package com.android.tools.r8.graph;
 
-import com.android.tools.r8.utils.DequeUtils;
 import com.android.tools.r8.utils.SetUtils;
 import com.google.common.collect.Sets;
 import java.util.Collection;
-import java.util.Deque;
 import java.util.IdentityHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -221,9 +218,6 @@
     }
 
     public PrunedItems build() {
-      if (hasFullyInlinedMethods()) {
-        compressInliningPaths();
-      }
       return new PrunedItems(
           prunedApp,
           additionalPinnedItems,
@@ -231,38 +225,6 @@
           removedFields,
           removedMethods);
     }
-
-    private void compressInliningPaths() {
-      Map<DexMethod, ProgramMethod> fullyInlinedMethodsUpdate = new IdentityHashMap<>();
-      for (Entry<DexMethod, ProgramMethod> entry : fullyInlinedMethods.entrySet()) {
-        DexMethod innermostCallee = entry.getKey();
-        if (fullyInlinedMethodsUpdate.containsKey(innermostCallee)) {
-          // Already processed as a result of previously processing a callee of the current callee.
-          continue;
-        }
-        ProgramMethod innermostCaller = entry.getValue();
-        ProgramMethod outermostCaller = fullyInlinedMethods.get(innermostCaller.getReference());
-        if (outermostCaller == null) {
-          continue;
-        }
-        Deque<DexMethod> fullyInlinedMethodChain =
-            DequeUtils.newArrayDeque(innermostCallee, innermostCaller.getReference());
-        while (true) {
-          DexMethod currentCallee = outermostCaller.getReference();
-          ProgramMethod currentCaller = fullyInlinedMethods.get(currentCallee);
-          if (currentCaller == null) {
-            break;
-          }
-          fullyInlinedMethodChain.addLast(currentCallee);
-          outermostCaller = currentCaller;
-        }
-        assert !removedMethods.contains(outermostCaller.getReference());
-        for (DexMethod callee : fullyInlinedMethodChain) {
-          fullyInlinedMethodsUpdate.put(callee, outermostCaller);
-        }
-      }
-      fullyInlinedMethods.putAll(fullyInlinedMethodsUpdate);
-    }
   }
 
   public static class ConcurrentBuilder extends Builder {