commit 93d3bd21627d5f9834491e3a11f33d1b5fdd0983
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Jan 24 10:02:19 2019 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Jan 24 10:02:19 2019 +0100
tree 95f9db59cf2ddcdb30000cc1b3bdb67504aa3059
parent 9ed84a663cb1e06aeb9850937d425cd01a871474

Disable redundant constant optimization until art-crash is fixed

Bug: 123284765
Change-Id: I992ebe3e852acd7eb698967f51884a893e4e2b34

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index ed1994b..5d2daed 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -1011,7 +1011,8 @@
     codeRewriter.rewriteSwitch(code);
     codeRewriter.processMethodsNeverReturningNormally(code);
     codeRewriter.simplifyIf(code);
-    codeRewriter.redundantConstNumberRemoval(code);
+    // TODO(b/123284765) This produces a runtime-crash in Q. Activate again when fixed.
+    // codeRewriter.redundantConstNumberRemoval(code);
     new RedundantFieldLoadElimination(appInfo, code, enableWholeProgramOptimizations).run();
 
     if (options.testing.invertConditionals) {