Reproduce intermediate names as original in mapping file
Bug: b/328837166
Change-Id: I596705281a00d72946cccca63b91ef0051198fec
diff --git a/src/test/java/com/android/tools/r8/repackage/MappingFileAfterRepackagingTest.java b/src/test/java/com/android/tools/r8/repackage/MappingFileAfterRepackagingTest.java
new file mode 100644
index 0000000..9290be4
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/repackage/MappingFileAfterRepackagingTest.java
@@ -0,0 +1,90 @@
+// Copyright (c) 2024, 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.repackage;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.StringUtils;
+import java.util.List;
+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;
+
+/** Reproduction of b/328837166. */
+@RunWith(Parameterized.class)
+public class MappingFileAfterRepackagingTest extends TestBase {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameter(1)
+ public boolean repackage;
+
+ @Parameters(name = "{0}, repackage: {1}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getTestParameters().withAllRuntimesAndApiLevels().build(), BooleanUtils.values());
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRule(Main.class)
+ .addHorizontallyMergedClassesInspector(
+ inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class))
+ .applyIf(repackage, testBuilder -> testBuilder.addKeepRules("-repackageclasses"))
+ .enableInliningAnnotations()
+ .setMinApi(parameters)
+ .compile()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("A")
+ .apply(
+ runResult -> {
+ long syntheticMatches =
+ StringUtils.splitLines(runResult.proguardMap()).stream()
+ .filter(
+ line ->
+ line.contains(
+ "java.lang.String MappingFileAfterRepackagingTest$A.toString()"))
+ .count();
+ assertEquals(repackage ? 2 : 0, syntheticMatches);
+
+ long unqualifiedMatches =
+ StringUtils.splitLines(runResult.proguardMap()).stream()
+ .filter(line -> line.contains("java.lang.String toString()"))
+ .count();
+ assertEquals(repackage ? 1 : 3, unqualifiedMatches);
+ });
+ }
+
+ static class Main {
+
+ public static void main(String[] args) {
+ System.out.println((System.currentTimeMillis() > 0 ? new A() : new B()));
+ }
+ }
+
+ public static class A {
+
+ @NeverInline
+ public String toString() {
+ System.out.print("");
+ return "A";
+ }
+ }
+
+ static class B {
+
+ public String toString() {
+ return "B";
+ }
+ }
+}
