commit d96c10cf8f38b8393ae68666b1481f77c473e969
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 12 09:24:34 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 12 09:24:34 2020 +0100
tree 547bd368bd303a50e3fc6593297edb2afee5997e
parent 41a7b13398a97ee5697c58ef8e17c7129ba2ecd8

Only use public fields for triggering clinit

Change-Id: Ic577f142b54eac5d4b6851ed54f1bef607e24c06

src/main/java/com/android/tools/r8/shaking/ClassInitFieldSynthesizer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ClassInitFieldSynthesizer.java b/src/main/java/com/android/tools/r8/shaking/ClassInitFieldSynthesizer.java
index 128a695..7e5847e 100644
--- a/src/main/java/com/android/tools/r8/shaking/ClassInitFieldSynthesizer.java
+++ b/src/main/java/com/android/tools/r8/shaking/ClassInitFieldSynthesizer.java
@@ -46,7 +46,7 @@
     // allocated a single register for the out-value of each ClassInit instruction).
     DexEncodedField encodedClinitField = null;
     for (DexEncodedField staticField : clazz.staticFields()) {
-      if (!staticField.field.type.isWideType()) {
+      if (staticField.isPublic() && !staticField.field.type.isWideType()) {
         encodedClinitField = staticField;
         break;
       }