Add a test for R8 type ref in D8 signature in R8 partial
Bug: b/410726575
Change-Id: Icd8f811b7b91f119fbd967ec3225280a7cd51029
diff --git a/src/test/java/com/android/tools/r8/partial/PartialCompilationIfClassRetentionAnnotationTest.java b/src/test/java/com/android/tools/r8/partial/PartialCompilationIfClassRetentionAnnotationTest.java
index b110164..69bbcee 100644
--- a/src/test/java/com/android/tools/r8/partial/PartialCompilationIfClassRetentionAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/partial/PartialCompilationIfClassRetentionAnnotationTest.java
@@ -32,7 +32,6 @@
@Test
public void test() throws Exception {
- parameters.assumeCanUseR8Partial();
testForR8Partial(parameters)
.addR8ExcludedClasses(ClassRetentionAnnotation.class, Main.class)
.addR8IncludedClasses(Unused.class)
diff --git a/src/test/java/com/android/tools/r8/partial/PartialCompilationSignatureRewritingTest.java b/src/test/java/com/android/tools/r8/partial/PartialCompilationSignatureRewritingTest.java
new file mode 100644
index 0000000..77d2a87
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/partial/PartialCompilationSignatureRewritingTest.java
@@ -0,0 +1,75 @@
+// Copyright (c) 2025, 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.partial;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class PartialCompilationSignatureRewritingTest extends TestBase {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void testD8() throws Exception {
+ parameters.assumeDexRuntime();
+ parameters.assumeNoPartialCompilation();
+ testForD8(parameters)
+ .addInnerClasses(getClass())
+ .release()
+ .run(parameters.getRuntime(), ExcludedClass.class)
+ .assertSuccessWithOutputLines("class " + IncludedClass.class.getTypeName());
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8Partial(parameters)
+ .addR8ExcludedClasses(ExcludedClass.class)
+ .addR8IncludedClasses(IncludedClass.class)
+ .compile()
+ .apply(
+ compileResult -> {
+ // TODO(b/410726575): IncludedClass should be present.
+ ClassSubject includedClassSubject =
+ compileResult.inspector().clazz(IncludedClass.class);
+ assertThat(includedClassSubject, isAbsent());
+ compileResult
+ .run(parameters.getRuntime(), ExcludedClass.class)
+ .assertFailureWithErrorThatThrows(ClassNotFoundException.class);
+ });
+ }
+
+ static class ExcludedClass<T extends IncludedClass> {
+
+ @SuppressWarnings("rawtypes")
+ public static void main(String[] args) {
+ for (TypeVariable<Class<ExcludedClass>> typeParameter :
+ ExcludedClass.class.getTypeParameters()) {
+ for (Type bound : typeParameter.getBounds()) {
+ System.out.println(bound);
+ }
+ }
+ }
+ }
+
+ static class IncludedClass {}
+}
diff --git a/src/test/testbase/java/com/android/tools/r8/TestBase.java b/src/test/testbase/java/com/android/tools/r8/TestBase.java
index a1b39e9..b6f0971 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestBase.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestBase.java
@@ -256,6 +256,7 @@
}
public R8PartialTestBuilder testForR8Partial(TestParameters parameters) {
+ parameters.assumeCanUseR8Partial();
return testForR8Partial(parameters.getBackend()).setMinApi(parameters);
}
diff --git a/src/test/testbase/java/com/android/tools/r8/TestParameters.java b/src/test/testbase/java/com/android/tools/r8/TestParameters.java
index d980f2c..c9fcca5 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestParameters.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestParameters.java
@@ -279,6 +279,10 @@
return this;
}
+ public TestParameters assumeNoPartialCompilation() {
+ return assumeNoPartialCompilation(null);
+ }
+
public TestParameters assumeNoPartialCompilation(String unusedReason) {
assumeTrue(getPartialCompilationTestParameters().isNone());
return this;