commit a99eaea971f3a633b4fb366bfd7880b9c9d5ab01
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 04 13:25:33 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 04 11:39:55 2019 +0000
tree 2280f3eedc92566f2a9eca8af0545c69c44276f0
parent 0c5d438e6e7e5d61240b36ca1c47ce2ab0552eb4

Do not mark library fields as targeted

Change-Id: I346a2c1797d6912fc40abee00f8bcb0fb9fc3a6c

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 89c917a..9838946 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -356,6 +356,10 @@
     return this;
   }
 
+  private boolean isProgramClass(DexType type) {
+    return getProgramClassOrNull(type) != null;
+  }
+
   private DexProgramClass getProgramClassOrNull(DexType type) {
     DexClass clazz = appView.definitionFor(type);
     if (clazz != null) {
@@ -799,12 +803,14 @@
 
       DexEncodedField encodedField = appInfo.resolveField(field);
       if (encodedField == null) {
-        reportMissingField(field);
-      }
-
-      if (encodedField == null || getProgramClassOrNull(encodedField.field.holder) == null) {
         // Must mark the field as targeted even if it does not exist.
         markFieldAsTargeted(field);
+        reportMissingField(field);
+        return false;
+      }
+
+      if (!isProgramClass(encodedField.field.holder)) {
+        // No need to trace into the non-program code.
         return false;
       }
 
@@ -825,6 +831,8 @@
       }
 
       if (encodedField.field != field) {
+        // Mark the non-rebound field access as targeted. Note that this should only be done if the
+        // field is not a dead proto field (in which case we bail-out above).
         markFieldAsTargeted(field);
       }
 
@@ -840,12 +848,14 @@
 
       DexEncodedField encodedField = appInfo.resolveField(field);
       if (encodedField == null) {
-        reportMissingField(field);
-      }
-
-      if (encodedField == null || getProgramClassOrNull(encodedField.field.holder) == null) {
         // Must mark the field as targeted even if it does not exist.
         markFieldAsTargeted(field);
+        reportMissingField(field);
+        return false;
+      }
+
+      if (!isProgramClass(encodedField.field.holder)) {
+        // No need to trace into the non-program code.
         return false;
       }
 
@@ -874,6 +884,8 @@
       }
 
       if (encodedField.field != field) {
+        // Mark the non-rebound field access as targeted. Note that this should only be done if the
+        // field is not a dead proto field (in which case we bail-out above).
         markFieldAsTargeted(field);
       }