Add test for retracing of overloads without line numbers
Bug: 221015863
Change-Id: Ic4b2af540955f9efe5fc0e8f70a4431540044172
diff --git a/src/test/java/com/android/tools/r8/TestParameters.java b/src/test/java/com/android/tools/r8/TestParameters.java
index 20256e1..a9b67e3 100644
--- a/src/test/java/com/android/tools/r8/TestParameters.java
+++ b/src/test/java/com/android/tools/r8/TestParameters.java
@@ -47,6 +47,11 @@
.isGreaterThanOrEqualTo(TestBase.apiLevelWithDefaultInterfaceMethodsSupport());
}
+ public boolean canUseNativeDexPC() {
+ assert isCfRuntime() || isDexRuntime();
+ return isDexRuntime() && getDexRuntimeVersion().isNewerThanOrEqual(DexVm.Version.V8_1_0);
+ }
+
public boolean canUseNestBasedAccesses() {
assert isCfRuntime() || isDexRuntime();
return isCfRuntime() && getRuntime().asCf().isNewerThanOrEqual(CfVm.JDK11);
diff --git a/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java b/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
new file mode 100644
index 0000000..56622ac
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
@@ -0,0 +1,103 @@
+// Copyright (c) 2022, 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.retrace;
+
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertEquals;
+
+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.transformers.ClassFileTransformer.MethodPredicate;
+import com.android.tools.r8.utils.Box;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class OverloadsWithoutLineNumberTest extends TestBase {
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ R8TestRunResult run =
+ testForR8(parameters.getBackend())
+ .addProgramClasses(Main.class)
+ .addProgramClassFileData(
+ transformer(ClassWithOverload.class)
+ .removeLineNumberTable(MethodPredicate.all())
+ .transform())
+ .addKeepAttributeLineNumberTable()
+ .setMinApi(parameters.getApiLevel())
+ .addKeepRules(
+ "-keepclassmembers class " + typeName(ClassWithOverload.class) + " { *; }")
+ .addKeepClassAndMembersRules(Main.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertFailureWithErrorThatMatches(containsString("FOO"));
+
+ Box<List<String>> box = new Box<>();
+ List<String> originalStackTrace =
+ run.getOriginalStackTrace().getStackTraceLines().stream()
+ .map(x -> x.originalLine)
+ .collect(Collectors.toList());
+ RetraceCommand.Builder builder =
+ RetraceCommand.builder()
+ .setProguardMapProducer(ProguardMapProducer.fromString(run.proguardMap()))
+ .setStackTrace(originalStackTrace)
+ .setRetracedStackTraceConsumer(box::set)
+ .setVerbose(true);
+ RetraceHelper.runForTesting(builder.build(), false);
+ // TODO(b/221015863): This should ideally be:
+ // at " + typeName(ClassWithOverload.class) + ".test(int)(OverloadsWithoutLineNumberTest.java)
+ if (parameters.canUseNativeDexPC()) {
+ assertEquals(
+ "\tat "
+ + typeName(ClassWithOverload.class)
+ + ".test(OverloadsWithoutLineNumberTest.java:0)",
+ box.get().get(1));
+ } else {
+ assertEquals(
+ "\tat "
+ + typeName(ClassWithOverload.class)
+ + ".test(OverloadsWithoutLineNumberTest.java)",
+ box.get().get(1));
+ }
+ }
+
+ public static class ClassWithOverload {
+
+ public static void test() {
+ Main.throwError(1);
+ }
+
+ public static void test(int i) {
+ Main.throwError(i);
+ }
+ }
+
+ public static class Main {
+
+ public static void throwError(int i) {
+ if (i == 0) {
+ throw new RuntimeException("FOO");
+ }
+ }
+
+ public static void main(String[] args) {
+ ClassWithOverload.test(args.length);
+ }
+ }
+}
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 d8557a0..889f7a7 100644
--- a/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
+++ b/src/test/java/com/android/tools/r8/transformers/ClassFileTransformer.java
@@ -949,6 +949,20 @@
};
}
+ public ClassFileTransformer removeLineNumberTable(MethodPredicate predicate) {
+ return addMethodTransformer(
+ new MethodTransformer() {
+ @Override
+ public void visitLineNumber(int line, Label start) {
+ if (MethodPredicate.testContext(predicate, getContext())) {
+ // Empty to ensure no line numbers are added to the code.
+ } else {
+ super.visitLineNumber(line, start);
+ }
+ }
+ });
+ }
+
public ClassFileTransformer transformInvokeDynamicInsnInMethod(
String methodName, InvokeDynamicInsnTransform transform) {
return addMethodTransformer(
