Reproduce horizontal class merging not respecting interface visibility
Bug: 191248536
Change-Id: Ib3698b31ffaad04119b52bf642d28990f21b15fe
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
new file mode 100644
index 0000000..2c7a8b3
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
@@ -0,0 +1,81 @@
+// Copyright (c) 2021, 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.classmerging.horizontal;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isImplementing;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.classmerging.horizontal.testclasses.InterfacesVisibilityTestClasses;
+import com.android.tools.r8.classmerging.horizontal.testclasses.InterfacesVisibilityTestClasses.ImplementingPackagePrivateInterface;
+import com.android.tools.r8.classmerging.horizontal.testclasses.InterfacesVisibilityTestClasses.Invoker;
+import org.junit.Test;
+
+public class InterfacesVisibilityTest extends HorizontalClassMergingTestBase {
+ public InterfacesVisibilityTest(TestParameters parameters) {
+ super(parameters);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ String packagePrivateInterfaceName =
+ InterfacesVisibilityTestClasses.class.getTypeName() + "$PackagePrivateInterface";
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addProgramClasses(ImplementingPackagePrivateInterface.class, Invoker.class)
+ .addProgramClasses(Class.forName(packagePrivateInterfaceName))
+ .addKeepMainRule(Main.class)
+ .enableInliningAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .enableNoVerticalClassMergingAnnotations()
+ .enableNoHorizontalClassMergingAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ // TODO(b/191248536): These classes should not be merged.
+ .addHorizontallyMergedClassesInspector(
+ inspector ->
+ inspector
+ .assertMergedInto(ImplementingPackagePrivateInterface.class, A.class)
+ .assertClassesMerged(ImplementingPackagePrivateInterface.class, A.class)
+ .assertNoOtherClassesMerged())
+ .compile()
+ .inspect(
+ codeInspector -> {
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(packagePrivateInterfaceName), isPresent());
+ assertThat(
+ codeInspector.clazz(A.class),
+ isImplementing(codeInspector.clazz(packagePrivateInterfaceName)));
+ })
+ .run(parameters.getRuntime(), Main.class)
+ // TODO(b/191248536) Should be .assertSuccessWithOutputLines("foo", "bar");
+ .assertFailure();
+ }
+
+ @NeverClassInline
+ public static class A {
+ @NeverInline
+ public void bar() {
+ System.out.println("bar");
+ }
+ }
+
+ public static class Main {
+ @NeverInline
+ public static void foo(ImplementingPackagePrivateInterface o) {
+ Invoker.invokeFoo(o);
+ }
+
+ public static void main(String[] args) {
+ ImplementingPackagePrivateInterface implementingPackagePrivateInterface =
+ new ImplementingPackagePrivateInterface();
+ A a = new A();
+ Invoker.invokeFoo(implementingPackagePrivateInterface);
+ a.bar();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java
new file mode 100644
index 0000000..d5a5c14
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/testclasses/InterfacesVisibilityTestClasses.java
@@ -0,0 +1,34 @@
+// Copyright (c) 2021, 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.classmerging.horizontal.testclasses;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoHorizontalClassMerging;
+import com.android.tools.r8.NoVerticalClassMerging;
+
+public class InterfacesVisibilityTestClasses {
+ public static class Invoker {
+ @NeverInline
+ public static void invokeFoo(PackagePrivateInterface i) {
+ i.foo();
+ }
+ }
+
+ @NoVerticalClassMerging
+ @NeverClassInline
+ public static class ImplementingPackagePrivateInterface implements PackagePrivateInterface {
+ @Override
+ public void foo() {
+ System.out.println("foo");
+ }
+ }
+
+ @NoHorizontalClassMerging
+ @NoVerticalClassMerging
+ interface PackagePrivateInterface {
+ void foo();
+ }
+}
