commit 5ef5c8cb8ec25a57f499e4ccf3ab01cd767dc4ea
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 11:38:00 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 10:43:59 2021 +0000
tree a11a8bf9c38b3fdfcfa686911a3ca39285365c0f
parent 641e79a96e06217e7819379fa2f0fd2df91cd530

Ensure accessibility in field access optimizer

Fixes: 181837660
Change-Id: I67723a24eb399e26edf1497b453c8af53ca83003

src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
index d642723..05259ca 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
@@ -295,6 +295,13 @@
       DexClassAndField field = resolutionResult.getResolutionPair();
       DexEncodedField definition = field.getDefinition();
 
+      if (definition.isStatic() != isStatic
+          || appView.isCfByteCodePassThrough(method.getDefinition())
+          || resolutionResult.isAccessibleFrom(method, appView).isPossiblyFalse()) {
+        recordAccessThatCannotBeOptimized(field, definition);
+        return;
+      }
+
       // Record access.
       if (field.isProgramField() && appView.appInfo().mayPropagateValueFor(field)) {
         if (field.getAccessFlags().isStatic() == isStatic) {
@@ -308,20 +315,17 @@
         }
       }
 
-      // We cannot remove references from pass through functions.
-      if (appView.isCfByteCodePassThrough(method.getDefinition())) {
-        constantFields.remove(definition);
-        return;
+      if (constantFields.contains(definition)
+          || (!isWrite && nonConstantFields.contains(definition))) {
+        methodsToReprocess.add(method);
       }
+    }
 
-      if (definition.isStatic() == isStatic) {
-        if (constantFields.contains(definition)
-            || (!isWrite && nonConstantFields.contains(definition))) {
-          methodsToReprocess.add(method);
-        }
-      } else {
-        // Should generally not happen.
-        constantFields.remove(definition);
+    private void recordAccessThatCannotBeOptimized(
+        DexClassAndField field, DexEncodedField definition) {
+      constantFields.remove(definition);
+      if (field.isProgramField() && appView.appInfo().mayPropagateValueFor(field)) {
+        destroyFieldAccessContexts(definition);
       }
     }