commit 685d917ef0822369948d42bfc5153778260033e2
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jul 17 14:49:31 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jul 17 14:49:31 2019 +0200
tree 13e134068ec836ebef8b396ee448d0fa25d52e9c
parent 1b76b499311ca35a302f25511069478bc4938b7d

Class initializers cannot be postponed by default

Change-Id: Id673acfd399c5f8b2624d9f0a01cbdf560914177

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

diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index 9df8ba1..73381ce 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -1121,7 +1121,7 @@
 
     @Override
     public boolean classInitializerMayBePostponed() {
-      return true;
+      return false;
     }
 
     @Override

src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java b/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
index 88807fa..e1a323a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
@@ -8,8 +8,6 @@
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.TestRunResult;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;