Regression test for incorrect renaming of clinit on interfaces.
Bug: 129455984
Change-Id: Id1dcb778e3700fb0674fe003565ed9da93d8bfb5
diff --git a/src/test/java/com/android/tools/r8/TestBaseBuilder.java b/src/test/java/com/android/tools/r8/TestBaseBuilder.java
index 7e21839f..61d6996 100644
--- a/src/test/java/com/android/tools/r8/TestBaseBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestBaseBuilder.java
@@ -50,6 +50,11 @@
return self();
}
+ public T addLibraryProvider(ClassFileResourceProvider provider) {
+ builder.addLibraryResourceProvider(provider);
+ return self();
+ }
+
@Override
public T addLibraryFiles(Collection<Path> files) {
builder.addLibraryFiles(files);
@@ -58,7 +63,7 @@
@Override
public T addLibraryClasses(Collection<Class<?>> classes) {
- builder.addLibraryResourceProvider(
+ addLibraryProvider(
new ClassFileResourceProvider() {
final Map<String, ProgramResource> resources;
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index b0df374..94c15db 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -193,6 +193,18 @@
return super.addLibraryFiles(files);
}
+ @Override
+ public T addLibraryClasses(Collection<Class<?>> classes) {
+ defaultLibrary = null;
+ return super.addLibraryClasses(classes);
+ }
+
+ @Override
+ public T addLibraryProvider(ClassFileResourceProvider provider) {
+ defaultLibrary = null;
+ return super.addLibraryProvider(provider);
+ }
+
public T addClasspathClasses(Class<?>... classes) {
return addClasspathClasses(Arrays.asList(classes));
}
diff --git a/src/test/java/com/android/tools/r8/naming/InterfaceConstructorRenamingTest.java b/src/test/java/com/android/tools/r8/naming/InterfaceConstructorRenamingTest.java
new file mode 100644
index 0000000..e333b63
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/InterfaceConstructorRenamingTest.java
@@ -0,0 +1,107 @@
+// Copyright (c) 2019, 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.naming;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.ArchiveClassFileProvider;
+import com.android.tools.r8.R8TestCompileResult;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.references.Reference;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.BeforeParam;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class InterfaceConstructorRenamingTest extends TestBase {
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().build();
+ }
+
+ private static final String EXPECTED = StringUtils.lines("true");
+
+ private static Function<Backend, R8TestCompileResult> compilation =
+ memoizeFunction(InterfaceConstructorRenamingTest::compile);
+
+ @ClassRule public static TemporaryFolder staticTemp = ToolHelper.getTemporaryFolderForTest();
+
+ @BeforeParam
+ public static void forceCompilation(TestParameters parameters) {
+ compilation.apply(parameters.getBackend());
+ }
+
+ private static R8TestCompileResult compile(Backend backend)
+ throws com.android.tools.r8.CompilationFailedException, IOException, ExecutionException {
+ R8TestCompileResult compileResult =
+ testForR8(staticTemp, backend)
+ .addProgramClasses(TestInterface.class, TestClass.class)
+ .addKeepMainRule(TestClass.class)
+ .addLibraryProvider(
+ new ArchiveClassFileProvider(
+ ToolHelper.getJava8RuntimeJar(),
+ name ->
+ ImmutableSet.of("java/lang/Object", "java/lang/System")
+ .contains(name.replace(".class", ""))))
+ .setMinApi(AndroidApiLevel.B)
+ .compile()
+ .assertNoMessages();
+ MethodSubject clinit =
+ compileResult
+ .inspector()
+ .method(
+ Reference.method(
+ Reference.classFromClass(TestInterface.class),
+ "<clinit>",
+ Collections.emptyList(),
+ null));
+ assertTrue(clinit.isPresent());
+ // TODO(b/129455984): Assert false. <clinit> should never be renamed!
+ assertTrue(clinit.isRenamed());
+ return compileResult;
+ }
+
+ private final TestParameters parameters;
+
+ public InterfaceConstructorRenamingTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Throwable {
+ R8TestCompileResult compileResult = compile(parameters.getBackend());
+ // TODO(b/129455984): Run once fixed!
+ if (false) {
+ compileResult.run(parameters.getRuntime(), TestClass.class).assertSuccessWithOutput(EXPECTED);
+ }
+ }
+
+ public interface TestInterface {
+ // Force <clinit> to exist.
+ long x = System.nanoTime();
+ }
+
+ public static class TestClass {
+
+ public static void main(String[] args) {
+ System.out.println(TestInterface.x > 0);
+ }
+ }
+}
