commit aee735de5274e736f23e19c817b22eb38245744f
author Christoffer Adamsen <christofferqa@google.com> Mon Jul 01 08:40:00 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Jul 01 09:37:46 2024 +0000
tree bc5d2c5a7fb881b255dd5075f604f6320b291c8e
parent 249274250292c0df27baba7e1ecb81fefa927e16

Analyze all field accesses for limited horizontal class merging

Bug: b/347676160
Change-Id: If1dc4510124582233df02d6b4c2595f34eee2fd5

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 ef0e11e..abee4a2 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -3356,18 +3356,6 @@
       getKeepInfo().keepField(field);
     }
 
-    if (mode.isFinalTreeShaking() && options.isOptimizing() && !field.getAccessFlags().isStatic()) {
-      DexType fieldBaseType = field.getType().toBaseType(appView.dexItemFactory());
-      if (fieldBaseType.isClassType()) {
-        DexClass clazz = definitionFor(fieldBaseType, context);
-        if (clazz != null
-            && AccessControl.isClassAccessible(clazz, context, appView).isPossiblyFalse()) {
-          applyMinimumKeepInfoWhenLive(
-              field.getHolder(), KeepClassInfo.newEmptyJoiner().disallowHorizontalClassMerging());
-        }
-      }
-    }
-
     // Notify analyses.
     analyses.forEach(analysis -> analysis.processNewlyLiveField(field, context, worklist));
   }
@@ -3384,6 +3372,8 @@
       markFieldAsLive(field, context, reason);
     }
 
+    handleFieldAccessWithInaccessibleFieldType(field, context);
+
     if (liveFields.contains(field)
         || !reachableInstanceFields
             .computeIfAbsent(field.getHolder(), ignore -> ProgramFieldSet.create())
@@ -3398,6 +3388,21 @@
     analyses.forEach(analysis -> analysis.notifyMarkFieldAsReachable(field, worklist));
   }
 
+  private void handleFieldAccessWithInaccessibleFieldType(
+      ProgramField field, ProgramDefinition context) {
+    if (mode.isFinalTreeShaking() && options.isOptimizing() && !field.getAccessFlags().isStatic()) {
+      DexType fieldBaseType = field.getType().toBaseType(appView.dexItemFactory());
+      if (fieldBaseType.isClassType()) {
+        DexClass clazz = definitionFor(fieldBaseType, context);
+        if (clazz != null
+            && AccessControl.isClassAccessible(clazz, context, appView).isPossiblyFalse()) {
+          applyMinimumKeepInfoWhenLive(
+              field.getHolder(), KeepClassInfo.newEmptyJoiner().disallowHorizontalClassMerging());
+        }
+      }
+    }
+  }
+
   private void traceFieldDefinition(ProgramField field) {
     markTypeAsLive(field.getHolder(), field);
     markTypeAsLive(field.getType(), field);