Reproduce NPE due to incorrect accessibility judgement
Change-Id: I8f05fe298e55d273f710809e9387bc480a974ce9
Bug: 149831282
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index d3bc8da..c0be63f 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -1432,4 +1432,16 @@
throws IOException, CompilationFailedException {
return buildOnDexRuntime(parameters, Arrays.asList(paths));
}
+
+ public static String binaryName(Class<?> clazz) {
+ return DescriptorUtils.getBinaryNameFromJavaType(typeName(clazz));
+ }
+
+ public static String descriptor(Class<?> clazz) {
+ return DescriptorUtils.javaTypeToDescriptor(typeName(clazz));
+ }
+
+ public static String typeName(Class<?> clazz) {
+ return clazz.getTypeName();
+ }
}
diff --git a/src/test/java/com/android/tools/r8/shaking/B149831282.java b/src/test/java/com/android/tools/r8/shaking/B149831282.java
new file mode 100644
index 0000000..64254f0
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/B149831282.java
@@ -0,0 +1,110 @@
+// 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.shaking;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NeverMerge;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestBuilder;
+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.Parameters;
+
+@RunWith(Parameterized.class)
+public class B149831282 extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public B149831282(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testRuntime() throws Exception {
+ testForRuntime(parameters)
+ .apply(this::addProgramInputs)
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutputLines("In A.m()");
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ testForR8(parameters.getBackend())
+ .apply(this::addProgramInputs)
+ .addKeepMainRule(TestClass.class)
+ .enableInliningAnnotations()
+ .enableMergeAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ // TODO(b/149831282): Should succeed with "In A.m()".
+ .assertFailureWithErrorThatMatches(
+ containsString(NullPointerException.class.getTypeName()));
+ }
+
+ private void addProgramInputs(TestBuilder<?, ?> builder) throws Exception {
+ builder
+ .addProgramClasses(A.class, B.class)
+ .addProgramClassFileData(
+ transformer(TestClass.class)
+ .transformTypeInsnInMethod(
+ "main",
+ (opcode, type, continuation) -> {
+ assertEquals(binaryName(C.class), type);
+ continuation.apply(opcode, "b149831282/C");
+ })
+ .transformMethodInsnInMethod(
+ "main",
+ (opcode, owner, name, descriptor, isInterface, continuation) -> {
+ assertEquals(binaryName(C.class), owner);
+ continuation.apply(opcode, "b149831282/C", name, descriptor, isInterface);
+ })
+ .transform())
+ .addProgramClassFileData(
+ transformer(C.class).setClassDescriptor("Lb149831282/C;").transform());
+ }
+
+ static class TestClass {
+
+ public static void main(String[] args) {
+ new C().m();
+ }
+ }
+
+ @NeverMerge
+ static class A {
+
+ @NeverInline
+ protected void m() {
+ System.out.println("In A.m()");
+ }
+ }
+
+ @NeverMerge
+ public static class B extends A {}
+
+ @NeverClassInline
+ public static class /*b149831282.*/ C extends B {
+
+ @NeverInline
+ @Override
+ public void m() {
+ super.m();
+ }
+ }
+}
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 eb3929c..baadc68 100644
--- a/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
+++ b/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
@@ -348,6 +348,18 @@
void apply(int opcode, String owner, String name, String descriptor, boolean isInterface);
}
+ /** Abstraction of the MethodVisitor.visitTypeInsn method with its continuation. */
+ @FunctionalInterface
+ public interface TypeInsnTransform {
+ void visitTypeInsn(int opcode, String type, TypeInsnTransformContinuation continuation);
+ }
+
+ /** Continuation for transforming a method. Will continue with the super visitor if called. */
+ @FunctionalInterface
+ public interface TypeInsnTransformContinuation {
+ void apply(int opcode, String type);
+ }
+
public ClassFileTransformer transformMethodInsnInMethod(
String methodName, MethodInsnTransform transform) {
return addMethodTransformer(
@@ -365,6 +377,21 @@
});
}
+ public ClassFileTransformer transformTypeInsnInMethod(
+ String methodName, TypeInsnTransform transform) {
+ return addMethodTransformer(
+ new MethodTransformer() {
+ @Override
+ public void visitTypeInsn(int opcode, String type) {
+ if (getContext().method.getMethodName().equals(methodName)) {
+ transform.visitTypeInsn(opcode, type, super::visitTypeInsn);
+ } else {
+ super.visitTypeInsn(opcode, type);
+ }
+ }
+ });
+ }
+
/** Abstraction of the MethodVisitor.visitLdcInsn method with its continuation. */
@FunctionalInterface
public interface LdcInsnTransform {
