Add test for NPE when doing redundant bridge removal
Bug: b/261008449
Change-Id: Ib0f754ffca12bd5a27887e0135604349f4241b71
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java
new file mode 100644
index 0000000..4d96edd
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java
@@ -0,0 +1,112 @@
+// Copyright (c) 2022, 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 org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.DiagnosticsMatcher;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+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 MemberRebindingLibraryBridgeVerticallyMergeTest extends TestBase {
+
+ private final String[] EXPECTED = new String[] {"Lib::foo", "B::foo"};
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void testJvm() throws Exception {
+ assumeTrue(parameters.isCfRuntime());
+ testForJvm()
+ .addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
+ .addLibraryClasses(Lib.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED);
+ }
+
+ @Test
+ public void testD8() throws Exception {
+ assumeTrue(parameters.isDexRuntime());
+ testForD8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
+ .addLibraryClasses(Lib.class)
+ .addDefaultRuntimeLibrary(parameters)
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .addBootClasspathClasses(Lib.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
+ .addLibraryClasses(Lib.class)
+ .addDefaultRuntimeLibrary(parameters)
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .addKeepClassRules(C.class, D.class)
+ .enableInliningAnnotations()
+ .allowAccessModification()
+ // TODO(b/261008449): We should not fail with an NPE.
+ .compileWithExpectedDiagnostics(
+ diagnostics ->
+ diagnostics.assertErrorThatMatches(
+ DiagnosticsMatcher.diagnosticException(NullPointerException.class))));
+ }
+
+ public static class Lib {
+
+ public void foo() {
+ System.out.println("Lib::foo");
+ }
+ }
+
+ public static class A extends Lib {}
+
+ public static class B extends A {
+
+ @Override
+ @NeverInline
+ public void foo() {
+ super.foo();
+ System.out.println("B::foo");
+ }
+ }
+
+ public static class C extends B {}
+
+ public static class D extends B {}
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ callFoo(System.currentTimeMillis() > 0 ? new C() : new B());
+ }
+
+ public static void callFoo(B b) {
+ b.foo();
+ }
+ }
+}
