commit e03c903462b9292542599ab9d47c4a0cae79d2bc
author Christoffer Adamsen <christofferqa@google.com> Wed Apr 23 11:51:29 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Wed Apr 23 11:51:29 2025 +0000
tree 64bd543536de1a79bc38729ccef77be1e47bc4fc
parent fb308670a1d80ab9156b7425af7bff0c899d41ad

Always notify through event consumer in UseConsumer

Change-Id: If276f98a1591c782d44147b400f9ed1a07c026dc

src/main/java/com/android/tools/r8/tracereferences/UseCollector.java

diff --git a/src/main/java/com/android/tools/r8/tracereferences/UseCollector.java b/src/main/java/com/android/tools/r8/tracereferences/UseCollector.java
index 7fc2660..3a64b1d 100644
--- a/src/main/java/com/android/tools/r8/tracereferences/UseCollector.java
+++ b/src/main/java/com/android/tools/r8/tracereferences/UseCollector.java
@@ -300,21 +300,24 @@
       DexMember<?, ?> reference,
       DexClassAndMember<?, ?> member,
       DexProgramClass context,
-      DefinitionContext referencedFrom) {
+      DefinitionContext referencedFrom,
+      UseCollectorEventConsumer eventConsumer) {
     DexClass holder = member.getHolder();
     assert isTargetType(holder.getType());
     if (member.getHolderType().isNotIdenticalTo(reference.getHolderType())) {
-      notifyPresentClass(holder, referencedFrom);
+      eventConsumer.notifyPresentClass(holder, referencedFrom);
     }
-    ensurePackageAccessToMember(member, context);
+    ensurePackageAccessToMember(member, context, eventConsumer);
   }
 
   private void ensurePackageAccessToMember(
-      DexClassAndMember<?, ?> member, DexProgramClass context) {
+      DexClassAndMember<?, ?> member,
+      DexProgramClass context,
+      UseCollectorEventConsumer eventConsumer) {
     if (member.getAccessFlags().isPackagePrivateOrProtected()) {
       if (member.getAccessFlags().isPackagePrivate()
           || !appInfo().isSubtype(context, member.getHolder())) {
-        notifyPackageOf(member);
+        eventConsumer.notifyPackageOf(member);
       }
     }
   }
@@ -405,17 +408,17 @@
             // - The holder type is registered from visiting the extends/implements clause of the
             //   sub class.
             if (resolvedMethod.getHolderType().isIdenticalTo(superType)) {
-              notifyPresentMethod(resolvedMethod, referencedFrom);
+              eventConsumer.notifyPresentMethod(resolvedMethod, referencedFrom);
             } else if (isTargetType(superType)) {
-              notifyPresentMethod(
+              eventConsumer.notifyPresentMethod(
                   resolvedMethod,
                   referencedFrom,
                   resolvedMethod.getReference().withHolder(superType, factory));
             } else {
-              notifyPresentMethod(resolvedMethod, referencedFrom);
+              eventConsumer.notifyPresentMethod(resolvedMethod, referencedFrom);
               addClass(resolvedMethod.getHolder(), referencedFrom, eventConsumer);
             }
-            ensurePackageAccessToMember(resolvedMethod, method.getHolder());
+            ensurePackageAccessToMember(resolvedMethod, method.getHolder(), eventConsumer);
           }
         });
   }
@@ -500,7 +503,7 @@
                 if (isTargetType(resolvedClass.getType())) {
                   resolvedClass.forEachClassMethodMatching(
                       method -> method.getName().isIdenticalTo(element.name),
-                      method -> notifyPresentMethod(method, referencedFrom));
+                      method -> eventConsumer.notifyPresentMethod(method, referencedFrom));
                 }
                 // Handle the argument values passed to the annotation "method".
                 registerDexValue(element.getValue(), context, referencedFrom, eventConsumer);
@@ -538,12 +541,12 @@
           singleResolutionResult -> {
             DexClassAndField resolvedField = singleResolutionResult.getResolutionPair();
             if (isTargetType(resolvedField.getHolderType())) {
-              handleMemberResolution(field, resolvedField, context, referencedFrom);
-              notifyPresentField(resolvedField, referencedFrom);
+              handleMemberResolution(field, resolvedField, context, referencedFrom, eventConsumer);
+              eventConsumer.notifyPresentField(resolvedField, referencedFrom);
             }
           });
     } else {
-      notifyMissingField(field, referencedFrom);
+      eventConsumer.notifyMissingField(field, referencedFrom);
     }
   }
 
@@ -684,11 +687,12 @@
         assert resolvedMethod.getReference().match(method)
             || resolvedMethod.getHolder().isSignaturePolymorphicMethod(definition, factory);
         if (isTargetType(resolvedMethod.getHolderType())) {
-          handleMemberResolution(method, resolvedMethod, getContext().getHolder(), referencedFrom);
-          notifyPresentMethod(resolvedMethod, referencedFrom);
+          handleMemberResolution(
+              method, resolvedMethod, getContext().getHolder(), referencedFrom, eventConsumer);
+          eventConsumer.notifyPresentMethod(resolvedMethod, referencedFrom);
         }
       } else {
-        notifyMissingMethod(method, referencedFrom);
+        eventConsumer.notifyMissingMethod(method, referencedFrom);
       }
     }
 
@@ -766,7 +770,7 @@
                   }
                 });
           } else {
-            notifyMissingClass(interfaceType, referencedFrom);
+            eventConsumer.notifyMissingClass(interfaceType, referencedFrom);
           }
         }
       }