commit c1fa4e8d4fd2652a0eba557fe7e77f1126aca3cf
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Jun 03 16:08:16 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 04 13:03:34 2019 +0000
tree 6e4fa3294e417071a14f03e648e7f8161f67cc7b
parent 345d3b8c2fcc4568469ae3b564dc3b74cea4dad2

Ignore class initialization for dead field elimination

Change-Id: I7d66607127461ab0b03f65cc57cf782151b3a661

src/main/java/com/android/tools/r8/graph/DexEncodedField.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedField.java b/src/main/java/com/android/tools/r8/graph/DexEncodedField.java
index 27ba1a1..e95cb5e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedField.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedField.java
@@ -161,7 +161,14 @@
           // Types that are a super type of the current context are guaranteed to be initialized
           // already.
           type -> appView.isSubtype(context, type).isTrue())) {
-        return null;
+        // Ignore class initialization side-effects for dead proto extension fields to ensure that
+        // we force replace these field reads by null.
+        boolean ignore =
+            appView.withGeneratedExtensionRegistryShrinker(
+                shrinker -> shrinker.isDeadProtoExtensionField(field), false);
+        if (!ignore) {
+          return null;
+        }
       }
     }