Add tests for not removing bridges for interfaces
Bug: 197490164
Change-Id: I19f75f16505e231370148a767d66a1f863075737
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java
new file mode 100644
index 0000000..d569899
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java
@@ -0,0 +1,106 @@
+// 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.memberrebinding;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isSynthetic;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoHorizontalClassMerging;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.FoundMethodSubject;
+import com.android.tools.r8.utils.codeinspector.HorizontallyMergedClassesInspector;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class MemberRebindingRemoveInterfaceBridgeTest extends TestBase {
+
+ private final TestParameters parameters;
+ private final String newMainDescriptor = "La/Main;";
+ private final String newMainTypeName = DescriptorUtils.descriptorToJavaType(newMainDescriptor);
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public MemberRebindingRemoveInterfaceBridgeTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, I.class, J.class)
+ .addProgramClassFileData(
+ transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(newMainTypeName)
+ .addKeepClassAndMembersRules(I.class)
+ .enableInliningAnnotations()
+ .enableNoHorizontalClassMergingAnnotations()
+ .addHorizontallyMergedClassesInspector(
+ HorizontallyMergedClassesInspector::assertNoClassesMerged)
+ .run(parameters.getRuntime(), newMainTypeName)
+ .assertSuccessWithOutputLines("A::foo")
+ .inspect(
+ inspector -> {
+ ClassSubject clazz = inspector.clazz(J.class);
+ assertThat(clazz, isPresent());
+ // TODO(b/197490164): We should remove the bridge inserted here.
+ assertEquals(1, clazz.allMethods().size());
+ FoundMethodSubject foundMethodSubject = clazz.allMethods().get(0);
+ assertThat(foundMethodSubject, isSynthetic());
+ });
+ }
+
+ interface I {
+
+ void foo();
+ }
+
+ public interface J extends I {}
+
+ @NoHorizontalClassMerging
+ public static class A implements J {
+
+ @Override
+ @NeverInline
+ public void foo() {
+ System.out.println("A::foo");
+ }
+ }
+
+ @NoHorizontalClassMerging
+ public static class B implements J {
+
+ @Override
+ @NeverInline
+ public void foo() {
+ System.out.println("B::foo");
+ }
+ }
+
+ public static class /* a.Main */ Main {
+
+ public static void main(String[] args) {
+ callJ(args.length == 0 ? new A() : new B());
+ }
+
+ @NeverInline
+ private static void callJ(J j) {
+ j.foo();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
new file mode 100644
index 0000000..f1fc86d
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
@@ -0,0 +1,101 @@
+// 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.memberrebinding;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isSynthetic;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoHorizontalClassMerging;
+import com.android.tools.r8.NoVerticalClassMerging;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.FoundMethodSubject;
+import com.android.tools.r8.utils.codeinspector.HorizontallyMergedClassesInspector;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class MemberRebindingRemoveInterfaceBridgeWithSubTypeTest extends TestBase {
+
+ private final TestParameters parameters;
+ private final String newMainDescriptor = "La/Main;";
+ private final String newMainTypeName = DescriptorUtils.descriptorToJavaType(newMainDescriptor);
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public MemberRebindingRemoveInterfaceBridgeWithSubTypeTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, I.class)
+ .addProgramClassFileData(
+ transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(newMainTypeName)
+ .addKeepClassAndMembersRules(I.class)
+ .enableInliningAnnotations()
+ .enableNoHorizontalClassMergingAnnotations()
+ .enableNoVerticalClassMergingAnnotations()
+ .addHorizontallyMergedClassesInspector(
+ HorizontallyMergedClassesInspector::assertNoClassesMerged)
+ .noMinification()
+ .run(parameters.getRuntime(), newMainTypeName)
+ .assertSuccessWithOutputLines("B::foo")
+ .inspect(
+ inspector -> {
+ ClassSubject clazz = inspector.clazz(A.class);
+ assertThat(clazz, isPresent());
+ // TODO(b/197490164): We should remove the bridge inserted here.
+ assertEquals(1, clazz.virtualMethods().size());
+ FoundMethodSubject foundMethodSubject = clazz.virtualMethods().get(0);
+ assertThat(foundMethodSubject, isSynthetic());
+ });
+ }
+
+ interface I {
+
+ void foo();
+ }
+
+ @NoHorizontalClassMerging
+ @NoVerticalClassMerging
+ public abstract static class A implements I {}
+
+ @NoHorizontalClassMerging
+ public static class B extends A {
+
+ @Override
+ @NeverInline
+ public void foo() {
+ System.out.println("B::foo");
+ }
+ }
+
+ public static class /* a.Main */ Main {
+
+ public static void main(String[] args) {
+ callJ(args.length == 0 ? new B() : null);
+ }
+
+ @NeverInline
+ private static void callJ(A a) {
+ a.foo();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java
new file mode 100644
index 0000000..38eed54
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java
@@ -0,0 +1,99 @@
+// 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.memberrebinding;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NoHorizontalClassMerging;
+import com.android.tools.r8.NoVerticalClassMerging;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.FoundMethodSubject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class MemberRebindingRemoveInterfaceDefaultBridgeTest extends TestBase {
+
+ private final TestParameters parameters;
+ private final String newMainDescriptor = "La/Main;";
+ private final String newMainTypeName = DescriptorUtils.descriptorToJavaType(newMainDescriptor);
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public MemberRebindingRemoveInterfaceDefaultBridgeTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, I.class, J.class)
+ .addProgramClassFileData(
+ transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(newMainTypeName)
+ .addKeepClassAndMembersRules(I.class)
+ .enableInliningAnnotations()
+ .enableNoHorizontalClassMergingAnnotations()
+ .enableNoVerticalClassMergingAnnotations()
+ .run(parameters.getRuntime(), newMainTypeName)
+ .assertSuccessWithOutputLines("I::foo")
+ .inspect(
+ inspector -> {
+ ClassSubject clazz = inspector.clazz(J.class);
+ assertThat(clazz, isPresent());
+ assertTrue(clazz.allMethods().isEmpty());
+ if (!parameters.canUseDefaultAndStaticInterfaceMethods()) {
+ ClassSubject classSubject = clazz.toCompanionClass();
+ assertThat(classSubject, isPresent());
+ // TODO(b/197851381): We should be able to remove the bridge but it is problematic
+ // since this require rewriting the call sites. Moving desugaring to the enqueuer
+ // will also fix this.
+ assertEquals(2, classSubject.allMethods().size());
+ assertTrue(
+ classSubject.allMethods().stream().anyMatch(FoundMethodSubject::isBridge));
+ }
+ });
+ }
+
+ interface I {
+
+ @NeverInline
+ default void foo() {
+ System.out.println("I::foo");
+ }
+ }
+
+ @NoVerticalClassMerging
+ public interface J extends I {}
+
+ @NoHorizontalClassMerging
+ public static class A implements J {}
+
+ public static class /* a.Main */ Main {
+
+ public static void main(String[] args) {
+ callJ(args.length == 0 ? new A() : null);
+ }
+
+ @NeverInline
+ private static void callJ(J j) {
+ j.foo();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/ClassOrMemberSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/ClassOrMemberSubject.java
index bca691f..2dc0774 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/ClassOrMemberSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/ClassOrMemberSubject.java
@@ -43,6 +43,7 @@
return getAccessFlags().isStatic();
}
+ @Override
public final boolean isSynthetic() {
return getAccessFlags().isSynthetic();
}
