Test for not propagating non-public singleton value to isolated split
Bug: b/300247439
Change-Id: Iff8bcaad8b0f05eb0d206da1eb7fe54d2b26f935
diff --git a/src/test/java/com/android/tools/r8/features/IllegalValuePropagationIntoIsolatedSplitTest.java b/src/test/java/com/android/tools/r8/features/IllegalValuePropagationIntoIsolatedSplitTest.java
new file mode 100644
index 0000000..595c0e5
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/features/IllegalValuePropagationIntoIsolatedSplitTest.java
@@ -0,0 +1,118 @@
+// Copyright (c) 2023, 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.features;
+
+import static com.android.tools.r8.utils.codeinspector.CodeMatchers.invokesMethod;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPackagePrivate;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentIf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoAccessModification;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.Box;
+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 java.util.List;
+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 IllegalValuePropagationIntoIsolatedSplitTest extends TestBase {
+
+ @Parameter(0)
+ public boolean enableIsolatedSplits;
+
+ @Parameter(1)
+ public TestParameters parameters;
+
+ @Parameters(name = "{1}, isolated splits: {0}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ BooleanUtils.values(), getTestParameters().withDexRuntimesAndAllApiLevels().build());
+ }
+
+ @Test
+ public void test() throws Exception {
+ Box<CodeInspector> baseInspectorBox = new Box<>();
+ testForR8(parameters.getBackend())
+ .addProgramClasses(Base.class, NonPublicBaseEnum.class)
+ .addKeepClassRules(Base.class)
+ .addFeatureSplit(Feature.class)
+ .addKeepClassAndMembersRules(Feature.class)
+ .enableIsolatedSplits(enableIsolatedSplits)
+ .enableInliningAnnotations()
+ .enableNoAccessModificationAnnotationsForClasses()
+ .setMinApi(parameters)
+ .compile()
+ .inspect(
+ baseInspectorBox::set,
+ featureInspector -> {
+ CodeInspector baseInspector = baseInspectorBox.get();
+ ClassSubject baseClassSubject = baseInspector.clazz(Base.class);
+ assertThat(baseClassSubject, isPresent());
+
+ MethodSubject getMethodSubject = baseClassSubject.uniqueMethodWithOriginalName("get");
+ assertThat(getMethodSubject, isPresentIf(enableIsolatedSplits));
+
+ ClassSubject enumClassSubject = baseInspector.clazz(NonPublicBaseEnum.class);
+ assertThat(enumClassSubject, isPresent());
+ assertThat(enumClassSubject, isPackagePrivate());
+
+ FieldSubject enumFieldSubject = enumClassSubject.uniqueFieldWithOriginalName("A");
+ assertThat(enumFieldSubject, isPresent());
+
+ ClassSubject featureClassSubject = featureInspector.clazz(Feature.class);
+ assertThat(featureClassSubject, isPresent());
+
+ MethodSubject featureMethodSubject =
+ featureClassSubject.uniqueMethodWithOriginalName("test");
+ assertThat(featureMethodSubject, isPresent());
+ assertEquals(
+ enableIsolatedSplits,
+ featureMethodSubject
+ .streamInstructions()
+ .noneMatch(
+ instruction ->
+ instruction.isStaticGet()
+ && instruction
+ .getField()
+ .asFieldReference()
+ .equals(enumFieldSubject.getFinalReference())));
+ if (enableIsolatedSplits) {
+ assertThat(featureMethodSubject, invokesMethod(getMethodSubject));
+ }
+ });
+ }
+
+ public static class Base {
+
+ @NeverInline
+ public static Enum<?> get() {
+ return NonPublicBaseEnum.A;
+ }
+ }
+
+ @NoAccessModification
+ enum NonPublicBaseEnum {
+ A
+ }
+
+ public static class Feature {
+
+ public static void test() {
+ Enum<?> a = Base.get();
+ System.out.println(a);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
index d5fa8bf..04202fd 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
@@ -380,11 +380,11 @@
};
}
- public static <T extends MemberSubject> Matcher<T> isPrivate() {
+ public static <T extends ClassOrMemberSubject> Matcher<T> isPrivate() {
return hasVisibility(Visibility.PRIVATE);
}
- public static <T extends MemberSubject> Matcher<T> isPackagePrivate() {
+ public static <T extends ClassOrMemberSubject> Matcher<T> isPackagePrivate() {
return hasVisibility(Visibility.PACKAGE_PRIVATE);
}
