Add test for inlining of outline callsite
Bug: b/288117378
Change-Id: I2db1b8b3441f8a7830a518343a6045ba1242acb9
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineCallSiteInlinedTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineCallSiteInlinedTest.java
new file mode 100644
index 0000000..f31da16
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeOutlineCallSiteInlinedTest.java
@@ -0,0 +1,72 @@
+// Copyright (c) 2023, 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.mappingcompose;
+
+import static org.junit.Assert.assertThrows;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.naming.ClassNameMapper;
+import com.android.tools.r8.naming.MappingComposeException;
+import com.android.tools.r8.naming.MappingComposer;
+import com.android.tools.r8.utils.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/** This is a regression test for b/288117378. */
+@RunWith(Parameterized.class)
+public class ComposeOutlineCallSiteInlinedTest extends TestBase {
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withNoneRuntime().build();
+ }
+
+ public ComposeOutlineCallSiteInlinedTest(TestParameters parameters) {
+ parameters.assertNoneRuntime();
+ }
+
+ private static final String mappingFoo =
+ StringUtils.unixLines(
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+ "com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:",
+ "# {'id':'sourceFile','fileName':'D8Command.java'}",
+ " 1:1:java.util.List getParseFlagsInformation():592:592 -> getParseFlagsInformation",
+ " 1:1:foo.MapConsumer lambda$bar$0(foo.StringConsumer):0:0 -> lambda$bar$0",
+ " # {'id':'com.android.tools.r8.residualsignature',"
+ + "'signature':'(Lfoo/StringConsumer;)Lfoo/internal/MapConsumer;'}",
+ " # {'id':'com.android.tools.r8.outlineCallsite',"
+ + "'positions':{'23':724,'24':725,'25':726},"
+ + "'outline':'Lfoo/SomeClass;outline(JJJ)V'}",
+ " 724:724:foo.MapConsumer lambda$bar$0(foo.StringConsumer):720:720 -> lambda$bar$0",
+ " 725:725:foo.PGMapConsumer foo.PGMapConsumer.builder():52:52 -> lambda$bar$0",
+ " 725:725:foo.MapConsumer lambda$bar$0(foo.StringConsumer):720 -> lambda$bar$0",
+ " 726:726:void foo.PGMapConsumer.<init>():55:55 -> lambda$bar$0",
+ " 726:726:foo.PGMapConsumer foo.PGMapConsumer.builder():52 -> lambda$bar$0",
+ " 726:726:foo.MapConsumer lambda$bar$0(foo.StringConsumer):720 -> lambda$bar$0");
+ private static final String mappingBar =
+ StringUtils.unixLines(
+ "# {'id':'com.android.tools.r8.mapping','version':'2.2'}",
+ "com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:",
+ "# {'id':'sourceFile','fileName':'SourceFile'}",
+ " 1:724:foo.internal.MapConsumer lambda$bar$0(foo.StringConsumer):0:723"
+ + " -> lambda$bar$0$com-android-tools-r8-D8Command",
+ " 1:724:foo.internal.MapConsumer"
+ + " lambda$bar$0$com-android-tools-r8-D8Command(foo.StringConsumer):0"
+ + " -> lambda$bar$0$com-android-tools-r8-D8Command",
+ " # {'id':'com.android.tools.r8.synthesized'}");
+
+ @Test
+ public void testCompose() throws Exception {
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromString(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromString(mappingBar);
+ // TODO(b/288117378): We should not fail for inlining of call sites.
+ assertThrows(
+ MappingComposeException.class, () -> MappingComposer.compose(mappingForFoo, mappingForBar));
+ }
+}
