| commit | 5b5d72a1a85514fc79a82e11de21f178045deff0 | [log] [tgz] |
|---|---|---|
| author | Clément Béra <clementbera@google.com> | Thu Jul 09 11:47:33 2020 +0000 |
| committer | Clément Béra <clementbera@google.com> | Thu Jul 09 12:33:40 2020 +0000 |
| tree | 9d8c1dc6a7979bd0f5414a077d788a14730f2047 | |
| parent | 37376309ad2cd863f7a9c97e20c89b45c042272f [diff] |
Disable Enum unboxing Bug: 160854837 Bug: 160769257 Change-Id: Ic80712b5992f7bf564735c85729053dc1ec1cf6f
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 f7353d9..6cc73f4 100644 --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -225,7 +225,8 @@ public boolean enableInlining = !Version.isDevelopmentVersion() || System.getProperty("com.android.tools.r8.disableinlining") == null; - public boolean enableEnumUnboxing = true; + // TODO(b/160854837): re-enable enum unboxing. + public boolean enableEnumUnboxing = false; // TODO(b/141451716): Evaluate the effect of allowing inlining in the inlinee. public boolean applyInliningToInlinee = System.getProperty("com.android.tools.r8.applyInliningToInlinee") != null;
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java index 1f82de1..65aee25 100644 --- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java +++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
@@ -63,6 +63,7 @@ } void enableEnumOptions(InternalOptions options, boolean enumValueOptimization) { + // TODO(b/160854837): re-enable enum unboxing. options.enableEnumUnboxing = true; options.enableEnumValueOptimization = enumValueOptimization; options.enableEnumSwitchMapRemoval = enumValueOptimization;