commit cfa181da5469cd795d90ce53768376a70449c678
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 05 12:58:38 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 05 10:59:07 2019 +0000
tree 4936293566d8b52d0fd8f1bc5f7df7be1638b58a
parent aed59e16e98456c728b866f7c4f4bebcdc5c2093

Fix activating enabling redundant constnumber for dalvik bug test

Bug: 138917494
Change-Id: I093b603134ba6fab65b3b7307241dc7c767dddf4

src/test/java/com/android/tools/r8/ir/optimize/redundantconstnumber/B124152497.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantconstnumber/B124152497.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantconstnumber/B124152497.java
index f26a7e3..2dd37f1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantconstnumber/B124152497.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantconstnumber/B124152497.java
@@ -58,10 +58,10 @@
             .addKeepMainRule(clazz)
             .addOptionsModification(
                 options -> {
+                  options.enableRedundantConstNumberOptimization = true;
                   if (forceRedundantConstNumberRemovalOnDalvik) {
                     assertTrue(isDalvik());
                     options.testing.forceRedundantConstNumberRemoval = true;
-                    options.enableRedundantConstNumberOptimization = true;
                   }
                 })
             .enableInliningAnnotations()