commit 808d1e0a43ebd3c8b8f48f29e0add8f242ce713b
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Nov 17 11:46:12 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Nov 17 11:46:12 2021 +0100
tree e66373ea7a6ae2664fd503d9e51e485346551fe5
parent ca7b3aba42d42a0226aff83c79f2852a74f2fe60

Enable deadlock after class merging detection

Bug: 205611444
Change-Id: Ib470eb3ab6b4a78360cd43711c062ecfe95afd02

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 85e4535..fca35a8 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1373,7 +1373,7 @@
         !Version.isDevelopmentVersion()
             || System.getProperty("com.android.tools.r8.disableHorizontalClassMerging") == null;
     // TODO(b/205611444): Enable by default.
-    private boolean enableClassInitializerDeadlockDetection = false;
+    private boolean enableClassInitializerDeadlockDetection = true;
     private boolean enableInterfaceMerging =
         System.getProperty("com.android.tools.r8.disableHorizontalInterfaceMerging") == null;
     private boolean enableInterfaceMergingInInitial = false;