Add tests for remaining fields and <clinit> after assumevalues.
Bug: 130561746
Change-Id: I215ed733209b340619eec54bb88dd7f7641883ba
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/DeadFieldAfterAssumevaluesTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/DeadFieldAfterAssumevaluesTest.java
new file mode 100644
index 0000000..6dbd97e
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/DeadFieldAfterAssumevaluesTest.java
@@ -0,0 +1,85 @@
+// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+package com.android.tools.r8.shaking.assumevalues;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import com.android.tools.r8.utils.codeinspector.FieldSubject;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+class TestClass {
+ private static final boolean HAS_R8 = Boolean.parseBoolean("false");
+
+ public static void main(String... args) {
+ if (HAS_R8) {
+ System.out.println("R8");
+ } else {
+ System.out.println("No R8");
+ }
+ }
+}
+
+@RunWith(Parameterized.class)
+public class DeadFieldAfterAssumevaluesTest extends TestBase {
+ private static final Class<?> MAIN = TestClass.class;
+ private static final String EXPECTED_OUTPUT = StringUtils.lines("R8");
+ private static final String RULES = StringUtils.lines(
+ "-assumevalues class **.TestClass {",
+ " static boolean HAS_R8 return true;",
+ "}"
+ );
+
+ @Parameterized.Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().build();
+ }
+
+ private final TestParameters parameters;
+
+ public DeadFieldAfterAssumevaluesTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void b130561746() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(MAIN)
+ .addKeepMainRule(MAIN)
+ .addKeepRules(RULES)
+ .setMinApi(parameters.getRuntime())
+ .run(parameters.getRuntime(), MAIN)
+ .assertSuccessWithOutput(EXPECTED_OUTPUT)
+ .inspect(this::inspect);
+ }
+
+ private void inspect(CodeInspector inspector) {
+ ClassSubject main = inspector.clazz(MAIN);
+ assertThat(main, isPresent());
+
+ MethodSubject mainMethod = main.mainMethod();
+ assertThat(mainMethod, isPresent());
+ // After applying -assumevalues, no more branching in the main method.
+ assertTrue(mainMethod.streamInstructions()
+ .noneMatch(i -> i.isIf() || i.isIfEqz() || i.isIfNez()));
+
+ FieldSubject hasR8 = main.uniqueFieldWithName("HAS_R8");
+ // TODO(b/130561746): can be removed.
+ assertThat(hasR8, isPresent());
+
+ MethodSubject clinit = main.clinit();
+ // TODO(b/130561746): can be removed if the above static field is gone.
+ assertThat(clinit, isPresent());
+ }
+}
