commit 87ba6087e8fddf8dfc791e96ed30c9d6b44892c8
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Dec 03 16:11:22 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Dec 03 15:11:44 2019 +0000
tree 7363ea55a814d4eeabe4daf03eb4b3f958d42855
parent 11cfde2fb3258348bb0fb5ab06f0fe991d9ae38f

Update test expectations after relanding value propagation for instance fields

Change-Id: Ibbc29038a5aa03b0af05f471f0a0d249665f6108

src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java

diff --git a/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java b/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
index 9da1f4a..94c6be6 100644
--- a/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
@@ -48,6 +48,10 @@
 
   private void configure(InternalOptions options) {
     options.enableEnumValueOptimization = enableOptimization;
+
+    // TODO(b/125282093): Remove options modification once landed.
+    assert !options.enableValuePropagationForInstanceFields;
+    options.enableValuePropagationForInstanceFields = true;
   }
 
   @Test

src/test/java/com/android/tools/r8/shaking/EffectivelyFinalInstanceFieldsTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/EffectivelyFinalInstanceFieldsTest.java b/src/test/java/com/android/tools/r8/shaking/EffectivelyFinalInstanceFieldsTest.java
index 92d16ae..3985648 100644
--- a/src/test/java/com/android/tools/r8/shaking/EffectivelyFinalInstanceFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/EffectivelyFinalInstanceFieldsTest.java
@@ -51,6 +51,12 @@
     testForR8(parameters.getBackend())
         .addInnerClasses(EffectivelyFinalInstanceFieldsTest.class)
         .addKeepMainRule(MAIN)
+        .addOptionsModification(
+            options -> {
+              // TODO(b/125282093): Remove options modification once landed.
+              assert !options.enableValuePropagationForInstanceFields;
+              options.enableValuePropagationForInstanceFields = true;
+            })
         .enableInliningAnnotations()
         .enableClassInliningAnnotations()
         .enableMergeAnnotations()

src/test/java/com/android/tools/r8/shaking/examples/TreeShaking18Test.java

diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShaking18Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShaking18Test.java
index f28f242..564902a 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShaking18Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShaking18Test.java
@@ -40,7 +40,12 @@
         TreeShaking18Test::unusedRemoved,
         null,
         null,
-        ImmutableList.of("src/test/examples/shaking18/keep-rules.txt"));
+        ImmutableList.of("src/test/examples/shaking18/keep-rules.txt"),
+        options -> {
+          // TODO(b/125282093): Remove options modification once landed.
+          assert !options.enableValuePropagationForInstanceFields;
+          options.enableValuePropagationForInstanceFields = true;
+        });
   }
 
   private static void unusedRemoved(CodeInspector inspector) {