commit 4884e248320c0b06ed2df8816b38e18e4eaeef9a
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Oct 08 16:32:36 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Oct 08 16:32:36 2021 +0200
tree 155a52f24859d3d455704df772247006a08d54bd
parent b9b5a2e3c03690d46d4e6c8eb7205cfd20ab4983

Only set result once in IllegalAccessDetector

Change-Id: I86dd06f73271839aa59ce29f4851607c36f66202

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

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index d169571..6ebd54b 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -1990,29 +1990,33 @@
       this.appView = appView;
     }
 
-    private void checkFieldReference(DexField field) {
+    private boolean checkFieldReference(DexField field) {
       DexType baseType =
           appView.graphLens().lookupType(field.holder.toBaseType(appView.dexItemFactory()));
       if (baseType.isClassType() && baseType.isSamePackage(getContext().getHolderType())) {
-        checkTypeReference(field.holder);
-        checkTypeReference(field.type);
+        if (checkTypeReference(field.holder) || checkTypeReference(field.type)) {
+          return true;
+        }
 
         DexEncodedField definition = appView.appInfo().resolveField(field).getResolvedField();
         if (definition == null || !definition.accessFlags.isPublic()) {
           setResult(true);
+          return true;
         }
       }
+      return false;
     }
 
-    private void checkMethodReference(DexMethod method, OptionalBool isInterface) {
+    private boolean checkMethodReference(DexMethod method, OptionalBool isInterface) {
       DexType baseType =
           appView.graphLens().lookupType(method.holder.toBaseType(appView.dexItemFactory()));
       if (baseType.isClassType() && baseType.isSamePackage(getContext().getHolderType())) {
-        checkTypeReference(method.holder);
-        checkTypeReference(method.proto.returnType);
-        for (DexType type : method.proto.parameters.values) {
-          checkTypeReference(type);
+        if (checkTypeReference(method.holder)
+            || checkTypeReference(method.proto.returnType)
+            || Iterables.any(method.getParameters(), this::checkTypeReference)) {
+          return true;
         }
+
         MethodResolutionResult resolutionResult =
             isInterface.isUnknown()
                 ? appView.appInfo().unsafeResolveMethodDueToDexFormat(method)
@@ -2020,18 +2024,22 @@
         if (!resolutionResult.isSingleResolution()
             || !resolutionResult.asSingleResolution().getResolvedMethod().isPublic()) {
           setResult(true);
+          return true;
         }
       }
+      return false;
     }
 
-    private void checkTypeReference(DexType type) {
+    private boolean checkTypeReference(DexType type) {
       DexType baseType = appView.graphLens().lookupType(type.toBaseType(appView.dexItemFactory()));
       if (baseType.isClassType() && baseType.isSamePackage(getContext().getHolderType())) {
         DexClass clazz = appView.definitionFor(baseType);
         if (clazz == null || !clazz.accessFlags.isPublic()) {
           setResult(true);
+          return true;
         }
       }
+      return false;
     }
 
     @Override