Enable all switch tests on Cf to Cf
- All tests run on D8 cf to cf
- All tests run on R8 cf to cf
Bug: b/336510513
Change-Id: I148e9f451aade69f4f1ecfc95d23964947777488
diff --git a/src/main/java/com/android/tools/r8/shaking/DefaultEnqueuerUseRegistry.java b/src/main/java/com/android/tools/r8/shaking/DefaultEnqueuerUseRegistry.java
index 7c11f12..73429d6 100644
--- a/src/main/java/com/android/tools/r8/shaking/DefaultEnqueuerUseRegistry.java
+++ b/src/main/java/com/android/tools/r8/shaking/DefaultEnqueuerUseRegistry.java
@@ -327,8 +327,10 @@
} else if (bootstrapArg.isDexValueString()) {
DexString fieldName = bootstrapArg.asDexValueString().value;
DexField enumField = getEnumField(fieldName, enumType, appView);
- registerStaticFieldReadFromSwitchMethodHandle(enumField);
- registerEnumMethods(enumType);
+ if (enumField != null) {
+ registerStaticFieldReadFromSwitchMethodHandle(enumField);
+ registerEnumMethods(enumType);
+ }
}
}
}
diff --git a/src/test/examplesJava21/switchpatternmatching/EnumLessCasesAtRuntimeSwitchTest.java b/src/test/examplesJava21/switchpatternmatching/EnumLessCasesAtRuntimeSwitchTest.java
index 935f4b6..dbb7dcc 100644
--- a/src/test/examplesJava21/switchpatternmatching/EnumLessCasesAtRuntimeSwitchTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/EnumLessCasesAtRuntimeSwitchTest.java
@@ -8,6 +8,7 @@
import static switchpatternmatching.SwitchTestHelper.hasJdk21EnumSwitch;
import static switchpatternmatching.SwitchTestHelper.hasJdk21TypeSwitch;
+import com.android.tools.r8.JdkClassFileProvider;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestBuilder;
import com.android.tools.r8.TestParameters;
@@ -30,7 +31,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -74,8 +75,7 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
@@ -84,9 +84,16 @@
@Test
public void testR8() throws Exception {
- Assume.assumeTrue("For Cf we should compile with Jdk 21 library", parameters.isDexRuntime());
+ parameters.assumeR8TestParameters();
+ Assume.assumeTrue(
+ parameters.isDexRuntime()
+ || (parameters.isCfRuntime()
+ && parameters.getCfRuntime().isNewerThanOrEqual(CfVm.JDK21)));
testForR8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
+ .applyIf(
+ parameters.isCfRuntime(),
+ b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
.setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/examplesJava21/switchpatternmatching/EnumMoreCasesAtRuntimeSwitchTest.java b/src/test/examplesJava21/switchpatternmatching/EnumMoreCasesAtRuntimeSwitchTest.java
index 5d6802f..0913bc7 100644
--- a/src/test/examplesJava21/switchpatternmatching/EnumMoreCasesAtRuntimeSwitchTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/EnumMoreCasesAtRuntimeSwitchTest.java
@@ -5,9 +5,12 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
+import static switchpatternmatching.SwitchTestHelper.desugarMatchException;
import static switchpatternmatching.SwitchTestHelper.hasJdk21EnumSwitch;
import static switchpatternmatching.SwitchTestHelper.hasJdk21TypeSwitch;
+import static switchpatternmatching.SwitchTestHelper.matchException;
+import com.android.tools.r8.JdkClassFileProvider;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestBuilder;
import com.android.tools.r8.TestParameters;
@@ -30,7 +33,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -68,8 +71,7 @@
parameters.getCfRuntime().isNewerThanOrEqual(CfVm.JDK21),
r ->
r.assertSuccessWithOutput(
- String.format(
- EXPECTED_OUTPUT, "java.lang.MatchException", "java.lang.MatchException")),
+ String.format(EXPECTED_OUTPUT, matchException(), matchException())),
r -> r.assertFailureWithErrorThatThrows(UnsupportedClassVersionError.class));
}
@@ -105,27 +107,31 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(
- String.format(
- EXPECTED_OUTPUT, "java.lang.RuntimeException", "java.lang.RuntimeException"));
+ String.format(EXPECTED_OUTPUT, desugarMatchException(), desugarMatchException()));
}
@Test
public void testR8() throws Exception {
- Assume.assumeTrue("For Cf we should compile with Jdk 21 library", parameters.isDexRuntime());
+ parameters.assumeR8TestParameters();
+ Assume.assumeTrue(
+ parameters.isDexRuntime()
+ || (parameters.isCfRuntime()
+ && parameters.getCfRuntime().isNewerThanOrEqual(CfVm.JDK21)));
testForR8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
+ .applyIf(
+ parameters.isCfRuntime(),
+ b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
.setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(
- String.format(
- EXPECTED_OUTPUT, "java.lang.RuntimeException", "java.lang.RuntimeException"));
+ String.format(EXPECTED_OUTPUT, matchException(parameters), matchException(parameters)));
}
sealed interface I permits CompileTimeE, C {}
diff --git a/src/test/examplesJava21/switchpatternmatching/EnumSwitchTest.java b/src/test/examplesJava21/switchpatternmatching/EnumSwitchTest.java
index 85eadfc..9cdfb74 100644
--- a/src/test/examplesJava21/switchpatternmatching/EnumSwitchTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/EnumSwitchTest.java
@@ -5,7 +5,9 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
+import static switchpatternmatching.SwitchTestHelper.desugarMatchException;
import static switchpatternmatching.SwitchTestHelper.hasJdk21TypeSwitch;
+import static switchpatternmatching.SwitchTestHelper.matchException;
import com.android.tools.r8.JdkClassFileProvider;
import com.android.tools.r8.TestBase;
@@ -30,7 +32,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -49,9 +51,7 @@
.run(parameters.getRuntime(), Main.class)
.applyIf(
parameters.getCfRuntime().isNewerThanOrEqual(CfVm.JDK21),
- r ->
- r.assertSuccessWithOutput(
- String.format(EXPECTED_OUTPUT, "java.lang.MatchException")),
+ r -> r.assertSuccessWithOutput(String.format(EXPECTED_OUTPUT, matchException())),
r -> r.assertFailureWithErrorThatThrows(UnsupportedClassVersionError.class));
}
@@ -87,16 +87,16 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
- .assertSuccessWithOutput(String.format(EXPECTED_OUTPUT, "java.lang.RuntimeException"));
+ .assertSuccessWithOutput(String.format(EXPECTED_OUTPUT, desugarMatchException()));
}
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
Assume.assumeTrue(
parameters.isDexRuntime()
|| (parameters.isCfRuntime()
@@ -109,12 +109,7 @@
.setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
- .assertSuccessWithOutput(
- String.format(
- EXPECTED_OUTPUT,
- parameters.isCfRuntime()
- ? "java.lang.MatchException"
- : "java.lang.RuntimeException"));
+ .assertSuccessWithOutput(String.format(EXPECTED_OUTPUT, matchException(parameters)));
}
// D is added to the list of permitted subclasses to reproduce the MatchException.
diff --git a/src/test/examplesJava21/switchpatternmatching/EnumSwitchUsingEnumSwitchBootstrapMethod.java b/src/test/examplesJava21/switchpatternmatching/EnumSwitchUsingEnumSwitchBootstrapMethod.java
index 582712f..a8b9366 100644
--- a/src/test/examplesJava21/switchpatternmatching/EnumSwitchUsingEnumSwitchBootstrapMethod.java
+++ b/src/test/examplesJava21/switchpatternmatching/EnumSwitchUsingEnumSwitchBootstrapMethod.java
@@ -29,7 +29,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -61,8 +61,7 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.addInnerClassesAndStrippedOuter(getClass())
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
@@ -71,6 +70,7 @@
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
Assume.assumeTrue(
parameters.isDexRuntime()
|| (parameters.isCfRuntime()
diff --git a/src/test/examplesJava21/switchpatternmatching/StringSwitchTest.java b/src/test/examplesJava21/switchpatternmatching/StringSwitchTest.java
index 496faa6..27c3374 100644
--- a/src/test/examplesJava21/switchpatternmatching/StringSwitchTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/StringSwitchTest.java
@@ -30,7 +30,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -57,8 +57,7 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.addInnerClassesAndStrippedOuter(getClass())
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
@@ -67,6 +66,7 @@
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
Assume.assumeTrue(
parameters.isDexRuntime()
|| (parameters.isCfRuntime()
diff --git a/src/test/examplesJava21/switchpatternmatching/SwitchTestHelper.java b/src/test/examplesJava21/switchpatternmatching/SwitchTestHelper.java
index 1cc4f82..03ad175 100644
--- a/src/test/examplesJava21/switchpatternmatching/SwitchTestHelper.java
+++ b/src/test/examplesJava21/switchpatternmatching/SwitchTestHelper.java
@@ -4,6 +4,7 @@
package switchpatternmatching;
+import com.android.tools.r8.TestParameters;
import com.android.tools.r8.utils.codeinspector.InstructionSubject;
import com.android.tools.r8.utils.codeinspector.MethodSubject;
@@ -39,4 +40,16 @@
method.getHolderType().toString().contains("java.lang.runtime.SwitchBootstraps"))
.anyMatch(method -> method.toString().contains(switchMethod));
}
+
+ public static String matchException(TestParameters parameters) {
+ return parameters.isCfRuntime() ? matchException() : desugarMatchException();
+ }
+
+ public static String matchException() {
+ return "java.lang.MatchException";
+ }
+
+ public static String desugarMatchException() {
+ return "java.lang.RuntimeException";
+ }
}
diff --git a/src/test/examplesJava21/switchpatternmatching/TypeSwitchMissingClassTest.java b/src/test/examplesJava21/switchpatternmatching/TypeSwitchMissingClassTest.java
index 4acb88f..41b820c 100644
--- a/src/test/examplesJava21/switchpatternmatching/TypeSwitchMissingClassTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/TypeSwitchMissingClassTest.java
@@ -37,7 +37,7 @@
@Parameters(name = "{0}, {1}")
public static List<Object[]> data() {
return buildParameters(
- getTestParameters().withAllRuntimesAndApiLevels().build(),
+ getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build(),
ImmutableList.of(new ClassHolder(C.class), new ClassHolder(Color.class)));
}
@@ -92,8 +92,7 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.apply(this::addModifiedProgramClasses)
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
@@ -102,6 +101,7 @@
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
Assume.assumeTrue(
parameters.isDexRuntime()
|| (parameters.isCfRuntime()
diff --git a/src/test/examplesJava21/switchpatternmatching/TypeSwitchTest.java b/src/test/examplesJava21/switchpatternmatching/TypeSwitchTest.java
index 3e91d39..ba355ca 100644
--- a/src/test/examplesJava21/switchpatternmatching/TypeSwitchTest.java
+++ b/src/test/examplesJava21/switchpatternmatching/TypeSwitchTest.java
@@ -30,7 +30,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
}
public static String EXPECTED_OUTPUT =
@@ -56,8 +56,7 @@
@Test
public void testD8() throws Exception {
- parameters.assumeDexRuntime();
- testForD8()
+ testForD8(parameters.getBackend())
.addInnerClassesAndStrippedOuter(getClass())
.setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
@@ -66,6 +65,7 @@
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
Assume.assumeTrue(
parameters.isDexRuntime()
|| (parameters.isCfRuntime()
