Merge "Tests for -if rules after member renaming"
diff --git a/.gitignore b/.gitignore
index f15c3c1..51e0c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,8 @@
third_party/gradle/gradle
third_party/gradle-plugin
third_party/gradle-plugin.tar.gz
+third_party/jacoco/*
+third_party/jacoco.tar.gz
third_party/jasmin.tar.gz
third_party/jasmin
third_party/jdwp-tests.tar.gz
diff --git a/build.gradle b/build.gradle
index cfaacdb..b3846fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -283,6 +283,7 @@
"proguard/proguard6.0.1",
"gradle/gradle",
"jdwp-tests",
+ "jacoco",
"jasmin",
"jctf",
"kotlin",
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index d83ad75..65d1e3a 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -582,9 +582,7 @@
//
// See b/116683601 and b/116837585.
public boolean canHaveThisJitCodeDebuggingBug() {
- // TODO(b/116841249): Make this an actual min-sdk guard once we know that Art no longer crashes
- // on these accesses.
- return true;
+ return minApiLevel < AndroidApiLevel.Q.getLevel();
}
// The dalvik jit had a bug where the long operations add, sub, or, xor and and would write
diff --git a/src/test/java/com/android/tools/r8/JacocoRegressionTest.java b/src/test/java/com/android/tools/r8/JacocoRegressionTest.java
new file mode 100644
index 0000000..235b7c6
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/JacocoRegressionTest.java
@@ -0,0 +1,115 @@
+// 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;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.ClassFileConsumer.ArchiveConsumer;
+import com.android.tools.r8.ToolHelper.ProcessResult;
+import com.android.tools.r8.utils.DescriptorUtils;
+import java.nio.file.Path;
+import org.junit.Test;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/** Jacoco does invalid instrumentation when R8 clobber locals of arguments: TODO(b/117589870) */
+public class JacocoRegressionTest extends TestBase implements Opcodes {
+
+ @Test
+ public void test() throws Exception {
+ Path output = temp.newFolder().toPath();
+ String name = "Test";
+ String desc = DescriptorUtils.javaTypeToDescriptor(name);
+ byte[] bytes = dump();
+ Path path = output.resolve("out.jar");
+ ArchiveConsumer archiveConsumer = new ArchiveConsumer(path);
+ archiveConsumer.accept(ByteDataView.of(bytes), desc, null);
+ archiveConsumer.finished(null);
+
+ String expected = "15" + System.lineSeparator();
+ ProcessResult result = ToolHelper.runJava(path, name);
+ assertEquals(expected, result.stdout);
+
+ Path agentOutput = output.resolve("agent.out");
+ ProcessResult result1 =
+ ToolHelper.runJava(
+ path,
+ String.format(
+ "-javaagent:%s=destfile=%s,dumponexit=true,output=file",
+ ToolHelper.JACOCO_AGENT, agentOutput),
+ name);
+ assertEquals(1, result1.exitCode);
+ assertTrue(result1.toString().contains("java.lang.VerifyError: Bad local variable type"));
+ }
+
+ public static byte[] dump() throws Exception {
+
+ ClassWriter classWriter = new ClassWriter(0);
+ FieldVisitor fieldVisitor;
+ MethodVisitor methodVisitor;
+ AnnotationVisitor annotationVisitor0;
+
+ classWriter.visit(
+ V1_8, ACC_FINAL | ACC_SUPER | ACC_PUBLIC, "Test", null, "java/lang/Object", null);
+ classWriter.visitSource("Test.java", null);
+
+ {
+ methodVisitor = classWriter.visitMethod(ACC_PRIVATE, "<init>", "()V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(32, label0);
+ methodVisitor.visitVarInsn(ALOAD, 0);
+ methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ methodVisitor.visitInsn(RETURN);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLocalVariable("this", "LTest;", null, label0, label1, 0);
+ methodVisitor.visitMaxs(1, 1);
+ methodVisitor.visitEnd();
+ }
+
+ // This is the problematic part for Jacoco, where we clobber local 1 with long_2nd
+ {
+ methodVisitor = classWriter.visitMethod(ACC_STATIC, "foo", "(I)I", null, null);
+ methodVisitor.visitCode();
+ methodVisitor.visitVarInsn(ILOAD, 0);
+ methodVisitor.visitInsn(I2L);
+ methodVisitor.visitVarInsn(LSTORE, 0);
+ methodVisitor.visitIntInsn(BIPUSH, 15);
+ methodVisitor.visitInsn(IRETURN);
+ methodVisitor.visitMaxs(4, 4);
+ methodVisitor.visitEnd();
+ }
+
+ {
+ methodVisitor =
+ classWriter.visitMethod(
+ ACC_PUBLIC | ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
+ methodVisitor.visitCode();
+ Label label0 = new Label();
+ methodVisitor.visitLabel(label0);
+ methodVisitor.visitLineNumber(6, label0);
+ methodVisitor.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ methodVisitor.visitIntInsn(BIPUSH, 42);
+ methodVisitor.visitMethodInsn(INVOKESTATIC, "Test", "foo", "(I)I", false);
+ methodVisitor.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(I)V", false);
+ Label label1 = new Label();
+ methodVisitor.visitLabel(label1);
+ methodVisitor.visitLineNumber(7, label1);
+ methodVisitor.visitInsn(RETURN);
+ methodVisitor.visitMaxs(2, 1);
+ methodVisitor.visitEnd();
+ }
+
+ classWriter.visitEnd();
+
+ return classWriter.toByteArray();
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/TestRunResult.java b/src/test/java/com/android/tools/r8/TestRunResult.java
index 462ca1f..91c01c4 100644
--- a/src/test/java/com/android/tools/r8/TestRunResult.java
+++ b/src/test/java/com/android/tools/r8/TestRunResult.java
@@ -11,6 +11,7 @@
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import java.io.IOException;
+import java.io.PrintStream;
import java.util.concurrent.ExecutionException;
public class TestRunResult {
@@ -47,22 +48,43 @@
private String errorMessage(String message) {
StringBuilder builder = new StringBuilder(message).append('\n');
- printInfo(builder);
+ appendInfo(builder);
return builder.toString();
}
- private void printInfo(StringBuilder builder) {
+ private void appendInfo(StringBuilder builder) {
builder.append("APPLICATION: ");
- printApplication(builder);
+ appendApplication(builder);
builder.append('\n');
- printProcessResult(builder);
+ appendProcessResult(builder);
}
- private void printApplication(StringBuilder builder) {
+ private void appendApplication(StringBuilder builder) {
builder.append(app == null ? "<default>" : app.toString());
}
- private void printProcessResult(StringBuilder builder) {
+ private void appendProcessResult(StringBuilder builder) {
builder.append("COMMAND: ").append(result.command).append('\n').append(result);
}
+
+ public TestRunResult writeInfo(PrintStream ps) {
+ StringBuilder sb = new StringBuilder();
+ appendInfo(sb);
+ ps.println(sb.toString());
+ return this;
+ }
+
+ public TestRunResult writeApplicaion(PrintStream ps) {
+ StringBuilder sb = new StringBuilder();
+ appendApplication(sb);
+ ps.println(sb.toString());
+ return this;
+ }
+
+ public TestRunResult writeProcessResult(PrintStream ps) {
+ StringBuilder sb = new StringBuilder();
+ appendProcessResult(sb);
+ ps.println(sb.toString());
+ return this;
+ }
}
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index a1a1cdb..4fa8738 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -104,6 +104,7 @@
private static final String PROGUARD5_2_1 = "third_party/proguard/proguard5.2.1/bin/proguard";
private static final String PROGUARD6_0_1 = "third_party/proguard/proguard6.0.1/bin/proguard";
private static final String PROGUARD = PROGUARD5_2_1;
+ public static final String JACOCO_AGENT = "third_party/jacoco/org.jacoco.agent-0.8.2-runtime.jar";
private static final String RETRACE6_0_1 = "third_party/proguard/proguard6.0.1/bin/retrace";
private static final String RETRACE = RETRACE6_0_1;
diff --git a/third_party/jacoco.tar.gz.sha1 b/third_party/jacoco.tar.gz.sha1
new file mode 100644
index 0000000..8a0462f
--- /dev/null
+++ b/third_party/jacoco.tar.gz.sha1
@@ -0,0 +1 @@
+b968df99f88434e2a2a35445ac860ee6a2fa16e3
\ No newline at end of file
