Add additional tests for package private overloads
Bug: 149363086
Change-Id: Ia6f2299d3f0d1a7b4f55094e5de61581ba447ed1
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java
new file mode 100644
index 0000000..f465727
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java
@@ -0,0 +1,114 @@
+// Copyright (c) 2020, 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.resolution.packageprivate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.LookupResult;
+import com.android.tools.r8.graph.ResolutionResult;
+import com.android.tools.r8.resolution.packageprivate.a.A;
+import com.android.tools.r8.resolution.packageprivate.a.A.B;
+import com.android.tools.r8.resolution.packageprivate.a.D;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+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 PackagePrivateReentryTest extends TestBase {
+
+ private final TestParameters parameters;
+ private static final String[] EXPECTED = new String[] {"D.foo", "D.bar", "D.foo", "D.bar"};
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public PackagePrivateReentryTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testResolution() throws Exception {
+ assumeTrue(parameters.useRuntimeAsNoneRuntime());
+ AppView<AppInfoWithLiveness> appView =
+ computeAppViewWithLiveness(
+ buildClasses(A.class, B.class, C.class, D.class, Main.class).build(), Main.class);
+ AppInfoWithLiveness appInfo = appView.appInfo();
+ DexMethod method = buildNullaryVoidMethod(A.class, "bar", appInfo.dexItemFactory());
+ ResolutionResult resolutionResult = appInfo.resolveMethod(method.holder, method);
+ LookupResult lookupResult = resolutionResult.lookupVirtualDispatchTargets(appView);
+ assertTrue(lookupResult.isLookupResultSuccess());
+ Set<String> targets =
+ lookupResult.asLookupResultSuccess().getMethodTargets().stream()
+ .map(DexEncodedMethod::qualifiedName)
+ .collect(Collectors.toSet());
+ // TODO(b/149363086): Fix expection, should not include C.bar().
+ ImmutableSet<String> expected =
+ ImmutableSet.of(
+ A.class.getTypeName() + ".bar",
+ B.class.getTypeName() + ".bar",
+ C.class.getTypeName() + ".bar",
+ D.class.getTypeName() + ".bar");
+ assertEquals(expected, targets);
+ }
+
+ @Test
+ public void testRuntime() throws ExecutionException, CompilationFailedException, IOException {
+ TestRunResult<?> runResult =
+ testForRuntime(parameters)
+ .addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED);
+ }
+
+ @Test
+ public void testR8() throws ExecutionException, CompilationFailedException, IOException {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(EXPECTED);
+ }
+
+ public static class C extends B {
+ @Override
+ public void foo() {
+ System.out.println("C.foo");
+ }
+
+ public void bar() {
+ System.out.println("C.bar");
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ D d = new D();
+ A.run(d);
+ d.foo();
+ d.bar();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java
new file mode 100644
index 0000000..35791e7
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java
@@ -0,0 +1,123 @@
+// Copyright (c) 2020, 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.resolution.packageprivate;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.LookupResult;
+import com.android.tools.r8.graph.ResolutionResult;
+import com.android.tools.r8.resolution.packageprivate.PackagePrivateReentryTest.C;
+import com.android.tools.r8.resolution.packageprivate.a.A;
+import com.android.tools.r8.resolution.packageprivate.a.A.B;
+import com.android.tools.r8.resolution.packageprivate.a.D;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+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 PackagePrivateReentryWithNarrowingTest extends TestBase {
+
+ private final TestParameters parameters;
+ private static final String[] EXPECTED = new String[] {"D.foo", "D.bar", "D.foo", "D.bar"};
+ private static final String[] EXPECTED_ART = new String[] {"D.foo", "D.bar", "D.foo", "C.bar"};
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public PackagePrivateReentryWithNarrowingTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testResolution() throws Exception {
+ assumeTrue(parameters.useRuntimeAsNoneRuntime());
+ AppView<AppInfoWithLiveness> appView =
+ computeAppViewWithLiveness(
+ buildClasses(A.class, B.class, C.class, D.class, Main.class).build(), Main.class);
+ AppInfoWithLiveness appInfo = appView.appInfo();
+ DexMethod method = buildNullaryVoidMethod(A.class, "bar", appInfo.dexItemFactory());
+ ResolutionResult resolutionResult = appInfo.resolveMethod(method.holder, method);
+ LookupResult lookupResult = resolutionResult.lookupVirtualDispatchTargets(appView);
+ assertTrue(lookupResult.isLookupResultSuccess());
+ Set<String> targets =
+ lookupResult.asLookupResultSuccess().getMethodTargets().stream()
+ .map(DexEncodedMethod::qualifiedName)
+ .collect(Collectors.toSet());
+ // TODO(b/149363086): Fix expection, should not include C.bar().
+ ImmutableSet<String> expected =
+ ImmutableSet.of(
+ A.class.getTypeName() + ".bar",
+ B.class.getTypeName() + ".bar",
+ C.class.getTypeName() + ".bar",
+ D.class.getTypeName() + ".bar");
+ assertEquals(expected, targets);
+ }
+
+ @Test
+ public void testRuntime()
+ throws ExecutionException, CompilationFailedException, IOException, NoSuchMethodException {
+ TestRunResult<?> runResult =
+ testForRuntime(parameters)
+ .addProgramClasses(A.class, B.class, C.class, Main.class)
+ .addProgramClassFileData(getDWithPackagePrivateFoo())
+ .run(parameters.getRuntime(), Main.class);
+ if (parameters.isCfRuntime()
+ || parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_4_4_4_TARGET)) {
+ runResult.assertSuccessWithOutputLines(EXPECTED);
+ } else {
+ runResult.assertSuccessWithOutputLines(EXPECTED_ART);
+ }
+ }
+
+ @Test
+ public void testR8()
+ throws ExecutionException, CompilationFailedException, IOException, NoSuchMethodException {
+ // TODO(b/149363086): Fix test.
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, C.class, Main.class)
+ .addProgramClassFileData(getDWithPackagePrivateFoo())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertFailureWithErrorThatMatches(containsString("IllegalAccessError"));
+ }
+
+ private byte[] getDWithPackagePrivateFoo() throws NoSuchMethodException, IOException {
+ return transformer(D.class)
+ .setAccessFlags(D.class.getDeclaredMethod("bar", null), m -> m.unsetPublic())
+ .transform();
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ C d = (C) ((Object) new D());
+ A.run(d);
+ d.foo();
+ d.bar();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java
new file mode 100644
index 0000000..c2d041c
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java
@@ -0,0 +1,149 @@
+// Copyright (c) 2020, 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.resolution.packageprivate;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.R8TestRunResult;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.graph.DexEncodedMethod;
+import com.android.tools.r8.graph.DexMethod;
+import com.android.tools.r8.graph.LookupResult;
+import com.android.tools.r8.graph.ResolutionResult;
+import com.android.tools.r8.resolution.packageprivate.a.Abstract;
+import com.android.tools.r8.resolution.packageprivate.a.I;
+import com.android.tools.r8.resolution.packageprivate.a.J;
+import com.android.tools.r8.resolution.packageprivate.a.NonAbstract;
+import com.android.tools.r8.resolution.packageprivate.a.NonAbstractExtendingA;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import com.android.tools.r8.transformers.ClassTransformer;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.objectweb.asm.MethodVisitor;
+
+@RunWith(Parameterized.class)
+public class PackagePrivateWithDefaultMethodTest extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public PackagePrivateWithDefaultMethodTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testResolution() throws Exception {
+ assumeTrue(parameters.useRuntimeAsNoneRuntime());
+ AppView<AppInfoWithLiveness> appView =
+ computeAppViewWithLiveness(
+ buildClasses(
+ Abstract.class,
+ I.class,
+ A.class,
+ NonAbstractExtendingA.class,
+ J.class,
+ Main.class)
+ .addClassProgramData(getNonAbstractWithoutDeclaredMethods())
+ .build(),
+ Main.class);
+ AppInfoWithLiveness appInfo = appView.appInfo();
+ DexMethod method = buildNullaryVoidMethod(A.class, "foo", appInfo.dexItemFactory());
+ ResolutionResult resolutionResult = appInfo.resolveMethod(method.holder, method);
+ LookupResult lookupResult = resolutionResult.lookupVirtualDispatchTargets(appView);
+ assertTrue(lookupResult.isLookupResultSuccess());
+ Set<String> targets =
+ lookupResult.asLookupResultSuccess().getMethodTargets().stream()
+ .map(DexEncodedMethod::qualifiedName)
+ .collect(Collectors.toSet());
+ // TODO(b/148591377): The set should be empty.
+ ImmutableSet<String> expected = ImmutableSet.of(Abstract.class.getTypeName() + ".foo");
+ assertEquals(expected, targets);
+ }
+
+ @Test
+ public void testRuntime() throws ExecutionException, CompilationFailedException, IOException {
+ TestRunResult<?> runResult =
+ testForRuntime(parameters)
+ .addProgramClasses(
+ Abstract.class, I.class, A.class, NonAbstractExtendingA.class, J.class, Main.class)
+ .addProgramClassFileData(getNonAbstractWithoutDeclaredMethods())
+ .run(parameters.getRuntime(), Main.class);
+ if (parameters.isDexRuntime()
+ && parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_4_4_4_TARGET)) {
+ runResult.assertFailure();
+ } else {
+ runResult.assertFailureWithErrorThatMatches(containsString("AbstractMethodError"));
+ }
+ }
+
+ @Test
+ public void testR8() throws ExecutionException, CompilationFailedException, IOException {
+ R8TestRunResult runResult =
+ testForR8(parameters.getBackend())
+ .addProgramClasses(
+ Abstract.class, I.class, A.class, NonAbstractExtendingA.class, J.class, Main.class)
+ .addProgramClassFileData(getNonAbstractWithoutDeclaredMethods())
+ .setMinApi(parameters.getApiLevel())
+ .addKeepMainRule(Main.class)
+ .run(parameters.getRuntime(), Main.class);
+ if (parameters.isDexRuntime()
+ && parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_4_4_4_TARGET)) {
+ runResult.assertFailure();
+ } else {
+ runResult.assertFailureWithErrorThatMatches(containsString("AbstractMethodError"));
+ }
+ }
+
+ private byte[] getNonAbstractWithoutDeclaredMethods() throws IOException {
+ return transformer(NonAbstract.class)
+ .addClassTransformer(
+ new ClassTransformer() {
+ @Override
+ public MethodVisitor visitMethod(
+ int access,
+ String name,
+ String descriptor,
+ String signature,
+ String[] exceptions) {
+ if (!name.equals("foo")) {
+ return super.visitMethod(access, name, descriptor, signature, exceptions);
+ }
+ return null;
+ }
+ })
+ .transform();
+ }
+
+ public static class A extends NonAbstract {}
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ NonAbstractExtendingA d = new NonAbstractExtendingA();
+ Abstract.run(d);
+ d.foo();
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
index e66f502..28c8c2f 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
@@ -92,7 +92,6 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, B.class, C.class, Main.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED_DALVIK);
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/Abstract.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/Abstract.java
new file mode 100644
index 0000000..bd4f5b2
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/Abstract.java
@@ -0,0 +1,14 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+public abstract class Abstract {
+
+ abstract void foo();
+
+ public static void run(Abstract a) {
+ a.foo();
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/D.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/D.java
new file mode 100644
index 0000000..1d7c54e
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/D.java
@@ -0,0 +1,19 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+import com.android.tools.r8.resolution.packageprivate.PackagePrivateReentryTest.C;
+
+public class D extends C {
+ @Override
+ public void foo() {
+ System.out.println("D.foo");
+ }
+
+ @Override
+ public void bar() {
+ System.out.println("D.bar");
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/I.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/I.java
new file mode 100644
index 0000000..a510f12
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/I.java
@@ -0,0 +1,12 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+public interface I {
+
+ default void foo() {
+ System.out.println("I.foo");
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/J.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/J.java
new file mode 100644
index 0000000..6f3d327
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/J.java
@@ -0,0 +1,12 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+public interface J {
+
+ default void foo() {
+ System.out.println("J.foo");
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstract.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstract.java
new file mode 100644
index 0000000..75e25a5
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstract.java
@@ -0,0 +1,13 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+public class NonAbstract extends Abstract implements I {
+
+ @Override
+ public void foo() {
+ System.out.println("Method declaration will be removed");
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstractExtendingA.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstractExtendingA.java
new file mode 100644
index 0000000..4478062
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/a/NonAbstractExtendingA.java
@@ -0,0 +1,9 @@
+// Copyright (c) 2020, 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.resolution.packageprivate.a;
+
+import com.android.tools.r8.resolution.packageprivate.PackagePrivateWithDefaultMethodTest;
+
+public class NonAbstractExtendingA extends PackagePrivateWithDefaultMethodTest.A implements J {}
diff --git a/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java b/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
index 0c2358a..eb3929c 100644
--- a/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
+++ b/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
@@ -166,7 +166,7 @@
}
});
}
-
+
/** Unconditionally replace the descriptor (ie, qualified name) of a class. */
public ClassFileTransformer setClassDescriptor(String descriptor) {
assert DescriptorUtils.isClassDescriptor(descriptor);
