commit fce0d90f3a5d19e6c61fe57af9542800525a2446
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 23 12:21:27 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 23 12:21:27 2020 +0200
tree d79974beffb6256f88d33789c54e4a64226c2fd8
parent 546bff3d5fe7266085cb1f80c8588de4239691cc

Disallow use of InitClass when tree shaking is disabled

If tree shaking is disabled there is no point in using InitClass instructions to avoid referring to program members.

Bug: 154293776
Change-Id: Ic8056bc22db4b46419ddc5574138a3c343ccf45a

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

diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index 3a55054..ef76217 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -324,7 +324,7 @@
   }
 
   public boolean canUseInitClass() {
-    return options.shouldRerunEnqueuer() && !initClassLens.isFinal();
+    return options.isShrinking() && !initClassLens.isFinal();
   }
 
   public InitClassLens initClassLens() {