commit cadecea6fc1e60a401d143625d85058b093c259e
author Christoffer Adamsen <christofferqa@google.com> Fri Sep 13 09:03:32 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Sep 13 10:49:44 2024 +0000
tree c778ea0e1d118a2b8585ce2947fed9512182ca42
parent 7152ac3b8a8feb853e05574f981930f40dbc3490

Do not pin virtual service methods

Change-Id: I9311cc83fa456b70170fef199ffcc6385838f30c

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 be7b139..cf0c2b9 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.shaking;
 
-import static com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull;
 import static com.android.tools.r8.graph.DexProgramClass.asProgramClassOrNull;
 import static com.android.tools.r8.graph.FieldAccessInfoImpl.MISSING_FIELD_ACCESS_INFO;
 import static com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod;
@@ -57,7 +56,6 @@
 import com.android.tools.r8.graph.DexMember;
 import com.android.tools.r8.graph.DexMethod;
 import com.android.tools.r8.graph.DexMethodHandle;
-import com.android.tools.r8.graph.DexMethodSignature;
 import com.android.tools.r8.graph.DexProgramClass;
 import com.android.tools.r8.graph.DexProto;
 import com.android.tools.r8.graph.DexReference;
@@ -164,7 +162,6 @@
 import com.android.tools.r8.utils.Timing;
 import com.android.tools.r8.utils.Visibility;
 import com.android.tools.r8.utils.WorkList;
-import com.android.tools.r8.utils.collections.DexMethodSignatureSet;
 import com.android.tools.r8.utils.collections.ProgramFieldSet;
 import com.android.tools.r8.utils.collections.ProgramMethodMap;
 import com.android.tools.r8.utils.collections.ProgramMethodSet;
@@ -5484,7 +5481,7 @@
   }
 
   private void handleServiceLoaderInvocation(ProgramMethod method, InvokeMethod invoke) {
-    if (invoke.inValues().size() == 0) {
+    if (invoke.inValues().isEmpty()) {
       // Should never happen.
       return;
     }
@@ -5510,7 +5507,6 @@
       DexType serviceType, ProgramMethod context, KeepReason reason) {
     List<DexType> serviceImplementationTypes =
         appView.appServices().serviceImplementationsFor(serviceType);
-    DexMethodSignatureSet serviceMethods = getServiceMethods(serviceType, context);
     for (DexType serviceImplementationType : serviceImplementationTypes) {
       if (!serviceImplementationType.isClassType()) {
         // Should never happen.
@@ -5530,35 +5526,9 @@
         applyMinimumKeepInfoWhenLiveOrTargeted(
             defaultInitializer, KeepMethodInfo.newEmptyJoiner().disallowOptimization());
       }
-
-      for (DexMethodSignature serviceMethod : serviceMethods) {
-        ProgramMethod serviceImplementationMethod =
-            asProgramMethodOrNull(
-                serviceImplementationClass.getMethodCollection().getMethod(serviceMethod),
-                serviceImplementationClass);
-        if (serviceImplementationMethod != null) {
-          applyMinimumKeepInfoWhenLiveOrTargeted(
-              serviceImplementationMethod, KeepMethodInfo.newEmptyJoiner().disallowOptimization());
-        }
-      }
     }
   }
 
-  private DexMethodSignatureSet getServiceMethods(DexType serviceType, ProgramMethod context) {
-    DexMethodSignatureSet serviceMethods = DexMethodSignatureSet.create();
-    WorkList<DexType> serviceTypes = WorkList.newIdentityWorkList(serviceType);
-    while (serviceTypes.hasNext()) {
-      DexType current = serviceTypes.next();
-      DexClass clazz = getClassOrNullFromReflectiveAccess(current, context);
-      if (clazz == null) {
-        continue;
-      }
-      clazz.forEachClassMethodMatching(DexEncodedMethod::belongsToVirtualPool, serviceMethods::add);
-      serviceTypes.addIfNotSeen(clazz.getInterfaces());
-    }
-    return serviceMethods;
-  }
-
   private static class SetWithReportedReason<T> {
 
     private final Set<T> items = Sets.newIdentityHashSet();