[MappingCompose] Initial test and code for composition of mapping files
Bug: b/241763080
Change-Id: I03de53376a151da26b8ab639be88b5c596c69ee9
diff --git a/src/main/java/com/android/tools/r8/naming/ClassNamingForNameMapper.java b/src/main/java/com/android/tools/r8/naming/ClassNamingForNameMapper.java
index f9266b0..2cf9407 100644
--- a/src/main/java/com/android/tools/r8/naming/ClassNamingForNameMapper.java
+++ b/src/main/java/com/android/tools/r8/naming/ClassNamingForNameMapper.java
@@ -3,6 +3,8 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.naming;
+import static com.android.tools.r8.utils.FunctionUtils.ignoreArgument;
+
import com.android.tools.r8.naming.MemberNaming.FieldSignature;
import com.android.tools.r8.naming.MemberNaming.MethodSignature;
import com.android.tools.r8.naming.MemberNaming.Signature;
@@ -106,6 +108,12 @@
return range;
}
+ public void addMappedRange(MappedRange mappedRange) {
+ mappedRangesByName
+ .computeIfAbsent(mappedRange.renamedName, ignoreArgument(ArrayList::new))
+ .add(mappedRange);
+ }
+
@Override
public void addMappingInformation(
MappingInformation info, Consumer<MappingInformation> onProhibitedAddition) {
@@ -465,6 +473,15 @@
return result;
}
+ public void compose(Builder classNameMapperBuilder) {
+ // TODO(b/241763080): Account for previous mappings.
+ classNameMapperBuilder.additionalMappingInfo.addAll(additionalMappingInfo);
+ forAllFieldNaming(classNameMapperBuilder::addMemberEntry);
+ for (MappedRangesOfName ranges : mappedRangesByRenamedName.values()) {
+ ranges.mappedRanges.forEach(classNameMapperBuilder::addMappedRange);
+ }
+ }
+
/**
* MappedRange describes an (original line numbers, signature) <-> (minified line numbers)
* mapping. It can describe 3 different things:
diff --git a/src/main/java/com/android/tools/r8/naming/MappingComposer.java b/src/main/java/com/android/tools/r8/naming/MappingComposer.java
new file mode 100644
index 0000000..242aff0
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/naming/MappingComposer.java
@@ -0,0 +1,38 @@
+// 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.naming;
+
+import com.android.tools.r8.position.Position;
+
+/**
+ * MappingComposer is a utility to do composition of mapping files to map line numbers correctly
+ * when having shrunken input that will end up using DEX PC mappings.
+ */
+public class MappingComposer {
+
+ public static ClassNameMapper compose(ClassNameMapper... classNameMappers) {
+ assert classNameMappers.length > 0;
+ if (classNameMappers.length == 1) {
+ return classNameMappers[0];
+ }
+ ClassNameMapper.Builder builder = ClassNameMapper.builder();
+ for (ClassNameMapper classNameMapper : classNameMappers) {
+ compose(builder, classNameMapper);
+ }
+ return builder.build();
+ }
+
+ private static void compose(ClassNameMapper.Builder builder, ClassNameMapper toAdd) {
+ toAdd
+ .getClassNameMappings()
+ .forEach(
+ (key, classNamingForNameMapper) -> {
+ ClassNamingForNameMapper.Builder classNameMapperBuilder =
+ builder.classNamingBuilder(
+ key, classNamingForNameMapper.originalName, Position.UNKNOWN);
+ classNamingForNameMapper.compose(classNameMapperBuilder);
+ });
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java
new file mode 100644
index 0000000..3bdbedc
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/mappingcompose/ComposeDistinctClassesTest.java
@@ -0,0 +1,43 @@
+// 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.mappingcompose;
+
+import static org.junit.Assert.assertEquals;
+
+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.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.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class ComposeDistinctClassesTest extends TestBase {
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withNoneRuntime().build();
+ }
+
+ private static final String mappingFoo =
+ StringUtils.lines("com.foo -> a:", " 1:2:void m1() -> b");
+ private static final String mappingBar =
+ StringUtils.lines("com.bar -> b:", " 3:4:void m2() -> b");
+
+ @Test
+ public void testCompose() throws Exception {
+ ClassNameMapper mappingForFoo = ClassNameMapper.mapperFromString(mappingFoo);
+ ClassNameMapper mappingForBar = ClassNameMapper.mapperFromString(mappingBar);
+ ClassNameMapper composed = MappingComposer.compose(mappingForFoo, mappingForBar);
+ assertEquals(mappingBar + mappingFoo, composed.sorted().toString());
+ }
+}
