commit 122cb1a9fe6ff273e99afff154c8323529c78b9c
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 04 12:12:20 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 04 12:12:20 2019 +0200
tree 5726f484bf94e4f115dd667955ee76d457444e5b
parent 8e7833b706a9ac1326b5257199537f5a93b24b80

Mark non-rebound field accesses as targeted

Change-Id: I49b78239b6563109554272a9247de875baf8c776

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 ec97730..451529f 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -824,6 +824,10 @@
         }
       }
 
+      if (encodedField.field != field) {
+        markFieldAsTargeted(field);
+      }
+
       markStaticFieldAsLive(encodedField, KeepReason.fieldReferencedIn(currentMethod));
       return true;
     }
@@ -869,6 +873,10 @@
         staticFieldsWrittenOutsideEnclosingStaticInitializer.add(encodedField.field);
       }
 
+      if (encodedField.field != field) {
+        markFieldAsTargeted(field);
+      }
+
       markStaticFieldAsLive(encodedField, KeepReason.fieldReferencedIn(currentMethod));
       return true;
     }