Add retrace test for static interface methods
Bug: 117815862
Change-Id: I63951109223acb07391967b1633a6552056a02d9
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
index 0329ac7..d47bb77 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
@@ -41,6 +41,8 @@
}
private int expectedActualStackTraceHeight() {
+ // In debug mode the expected stack trace height differs since there is no lambda desugaring
+ // for CF.
return mode == CompilationMode.RELEASE ? 2 : (backend == Backend.CF ? 4 : 5);
}
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/DesugarStaticInterfaceMethodsRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/DesugarStaticInterfaceMethodsRetraceTest.java
new file mode 100644
index 0000000..8114108
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/retrace/DesugarStaticInterfaceMethodsRetraceTest.java
@@ -0,0 +1,76 @@
+// 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.retrace;
+
+import static com.android.tools.r8.naming.retrace.StackTrace.isSameExceptForFileName;
+import static org.junit.Assert.assertThat;
+
+import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.NeverInline;
+import com.google.common.collect.ImmutableList;
+import java.util.Collection;
+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 DesugarStaticInterfaceMethodsRetraceTest extends RetraceTestBase {
+
+ @Parameters(name = "Backend: {0}, mode: {1}")
+ public static Collection<Object[]> data() {
+ return buildParameters(Backend.values(), CompilationMode.values());
+ }
+
+ public DesugarStaticInterfaceMethodsRetraceTest(Backend backend, CompilationMode mode) {
+ super(backend, mode);
+ }
+
+ @Override
+ public Collection<Class<?>> getClasses() {
+ return ImmutableList.of(
+ getMainClass(), InterfaceWithStaticMethod1.class, InterfaceWithStaticMethod2.class);
+ }
+
+ @Override
+ public Class<?> getMainClass() {
+ return MainDesugarStaticInterfaceMethodsRetraceTest.class;
+ }
+
+ @Test
+ public void testSourceFileAndLineNumberTable() throws Exception {
+ runTest(
+ ImmutableList.of("-keepattributes SourceFile,LineNumberTable"),
+ // For the desugaring to companion classes the retrace stacktrace is still the same
+ // as the mapping file has a fully qualified class name in the method mapping, e.g.:
+ //
+ // com.android.tools.r8.naming.retrace.InterfaceWithDefaultMethod1$-CC -> com.android.tools.r8.naming.retrace.a:
+ // 1:1:void com.android.tools.r8.naming.retrace.InterfaceWithDefaultMethod1.defaultMethod1():80:80 -> a
+ (StackTrace actualStackTrace, StackTrace retracedStackTrace) ->
+ assertThat(retracedStackTrace, isSameExceptForFileName(expectedStackTrace)));
+ }
+}
+
+interface InterfaceWithStaticMethod2 {
+
+ static void staticMethod1() {
+ throw null;
+ }
+}
+
+interface InterfaceWithStaticMethod1 {
+
+ @NeverInline
+ static void staticMethod2() {
+ InterfaceWithStaticMethod2.staticMethod1();
+ }
+}
+
+class MainDesugarStaticInterfaceMethodsRetraceTest {
+
+ public static void main(String[] args) {
+ InterfaceWithStaticMethod1.staticMethod2();
+ }
+}
