Merge "Add a test for b/114554345"
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index f3ada7d..22bb5e5 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -13,6 +13,7 @@
import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.code.Instruction;
+import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.DexCode;
import com.android.tools.r8.graph.DexEncodedMethod;
import com.android.tools.r8.graph.SmaliWriter;
@@ -581,13 +582,8 @@
*/
protected String runOnJava(Class mainClass) throws Exception {
ProcessResult result = ToolHelper.runJava(mainClass);
- if (result.exitCode != 0) {
- System.out.println("Std out:");
- System.out.println(result.stdout);
- System.out.println("Std err:");
- System.out.println(result.stderr);
- assertEquals(0, result.exitCode);
- }
+ ToolHelper.failOnProcessFailure(result);
+ ToolHelper.failOnVerificationErrors(result);
return result.stdout;
}
@@ -603,9 +599,17 @@
}
/** Run application on Java with the specified main class and provided arguments. */
+ protected String runOnJava(AndroidApp app, String mainClass, String... args) throws IOException {
+ return runOnJava(app, mainClass, Arrays.asList(args));
+ }
+
+ /** Run application on Java with the specified main class and provided arguments. */
protected String runOnJava(AndroidApp app, String mainClass, List<String> args)
throws IOException {
- return runOnJavaRaw(app, mainClass, args).stdout;
+ ProcessResult result = runOnJavaRaw(app, mainClass, args);
+ ToolHelper.failOnProcessFailure(result);
+ ToolHelper.failOnVerificationErrors(result);
+ return result.stdout;
}
protected ProcessResult runOnJavaRawNoVerify(String main, byte[]... classes) throws IOException {
@@ -647,6 +651,18 @@
return ToolHelper.runJavaNoVerify(out, mainClass, args.toArray(new String[0]));
}
+ /** Run application on Art or Java with the specified main class. */
+ protected String runOnVM(AndroidApp app, String mainClass, Backend backend) throws IOException {
+ switch (backend) {
+ case CF:
+ return runOnJava(app, mainClass);
+ case DEX:
+ return runOnArt(app, mainClass);
+ default:
+ throw new Unreachable("Unexpected backend: " + backend);
+ }
+ }
+
private String extractClassName(byte[] ccc) {
class ClassNameExtractor extends ClassVisitor {
private String className;
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 76edce7..e34282d 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -1296,13 +1296,13 @@
return runArtNoVerificationErrorsRaw(files, mainClass, extras, version).stdout;
}
- private static void failOnProcessFailure(ProcessResult result) {
+ protected static void failOnProcessFailure(ProcessResult result) {
if (result.exitCode != 0) {
- fail("Unexpected art failure: '" + result.stderr + "'\n" + result.stdout);
+ fail("Unexpected failure: '" + result.stderr + "'\n" + result.stdout);
}
}
- private static void failOnVerificationErrors(ProcessResult result) {
+ protected static void failOnVerificationErrors(ProcessResult result) {
if (result.stderr.contains("Verification error")) {
fail("Verification error: \n" + result.stderr);
}
diff --git a/src/test/java/com/android/tools/r8/naming/b114554345/B114554345.java b/src/test/java/com/android/tools/r8/naming/b114554345/B114554345.java
new file mode 100644
index 0000000..edf77b0
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/b114554345/B114554345.java
@@ -0,0 +1,136 @@
+// Copyright (c) 2018, 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.b114554345;
+
+import static junit.framework.TestCase.assertEquals;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.utils.AndroidApp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.junit.Ignore;
+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 B114554345 extends TestBase {
+
+ private final Backend backend;
+
+ @Parameters(name = "mode:{0}")
+ public static Collection<Object[]> data() {
+ List<Object[]> parameters = new ArrayList<>();
+ for (Backend backend : Backend.values()) {
+ parameters.add(new Object[] {backend});
+ }
+ return parameters;
+ }
+
+ public B114554345(Backend backend) {
+ this.backend = backend;
+ }
+
+ @Ignore("b/114554345")
+ @Test
+ public void test() throws Exception {
+ AndroidApp input =
+ AndroidApp.builder()
+ .addProgramFiles(
+ ToolHelper.getClassFilesForTestDirectory(
+ ToolHelper.getPackageDirectoryForTestPackage(this.getClass().getPackage()),
+ path -> !path.toString().contains("B114554345")))
+ .build();
+ AndroidApp output =
+ compileWithR8(
+ input,
+ keepMainProguardConfiguration(TestDriver.class),
+ options -> options.enableInlining = false,
+ backend);
+ String mainClass = TestDriver.class.getName();
+ assertEquals(runOnJava(TestDriver.class), runOnVM(output, mainClass, backend));
+ }
+}
+
+// Interface and two implementations.
+
+interface Interface {
+ Interface method();
+}
+
+class InterfaceImpl implements Interface {
+
+ @Override
+ public InterfaceImpl method() {
+ System.out.println("In InterfaceImpl.method()");
+ return this;
+ }
+}
+
+class OtherInterfaceImpl extends InterfaceImpl {
+
+ @Override
+ public OtherInterfaceImpl method() {
+ System.out.println("In OtherInterfaceImpl.method()");
+ return this;
+ }
+}
+
+// Sub-interface and three implementations.
+
+interface SubInterface extends Interface {
+ SubInterface method();
+}
+
+class SubInterfaceImpl implements SubInterface {
+
+ @Override
+ public SubInterfaceImpl method() {
+ System.out.println("In SubInterfaceImpl.method()");
+ return this;
+ }
+}
+
+class OtherSubInterfaceImpl implements SubInterface {
+
+ @Override
+ public OtherSubInterfaceImpl method() {
+ System.out.println("In OtherSubInterfaceImpl.method()");
+ return this;
+ }
+}
+
+class YetAnotherSubInterfaceImpl extends InterfaceImpl implements SubInterface {
+
+ @Override
+ public YetAnotherSubInterfaceImpl method() {
+ System.out.println("In YetAnotherSubInterfaceImpl.method()");
+ return this;
+ }
+}
+
+class TestDriver {
+
+ public static void main(String[] args) {
+ foo(new InterfaceImpl());
+ foo(new OtherInterfaceImpl());
+ foo(new SubInterfaceImpl());
+ foo(new YetAnotherSubInterfaceImpl());
+ bar(new SubInterfaceImpl());
+ bar(new OtherSubInterfaceImpl());
+ bar(new YetAnotherSubInterfaceImpl());
+ }
+
+ private static void foo(Interface obj) {
+ obj.method();
+ }
+
+ private static void bar(SubInterface obj) {
+ obj.method();
+ }
+}
