Version 1.4.65
Cherry-pick: Reproduce b/124177369:
CL: https://r8-review.googlesource.com/c/r8/+/34760
Cherry-pick: Partial fix of -applymapping for array types.
CL: https://r8-review.googlesource.com/c/r8/+/34840
Bug: 124177369
Change-Id: I58c4b284e5541ac81a132b431ee120b23ca24307
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 482b1b4..8a35a7d 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "1.4.64";
+ public static final String LABEL = "1.4.65";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java b/src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java
index b0e2f4c..d95f299 100644
--- a/src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java
+++ b/src/main/java/com/android/tools/r8/naming/ProguardMapApplier.java
@@ -230,6 +230,11 @@
}
private DexType applyClassMappingOnTheFly(DexType from) {
+ if (from.isArrayType()) {
+ DexType baseType = from.toBaseType(appInfo.dexItemFactory);
+ DexType appliedBaseType = applyClassMappingOnTheFly(baseType);
+ return from.replaceBaseType(appliedBaseType, appInfo.dexItemFactory);
+ }
if (seedMapper.hasMapping(from)) {
DexType appliedType = lenseBuilder.lookup(from);
if (appliedType != from) {
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/InnerEnumValuesTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/InnerEnumValuesTest.java
new file mode 100644
index 0000000..2500be1
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/InnerEnumValuesTest.java
@@ -0,0 +1,102 @@
+// 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.applymapping;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.naming.applymapping.Outer.InnerEnum;
+import com.android.tools.r8.utils.BooleanUtils;
+import com.android.tools.r8.utils.FileUtils;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.FieldSubject;
+import java.nio.file.Path;
+import java.util.Collection;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class InnerEnumValuesTest extends TestBase {
+ private static final Class<?> MAIN = TestApp.class;
+ private static final String RENAMED_NAME = "x.y.z$ie";
+ private static final String EXPECTED_OUTPUT = StringUtils.lines("STATE_A", "STATE_B");
+
+ private static Path mappingFile;
+ private final Backend backend;
+ private final boolean minification;
+
+ @Parameterized.Parameters(name = "Backend: {0} minification: {1}")
+ public static Collection<Object[]> data() {
+ return buildParameters(Backend.values(), BooleanUtils.values());
+ }
+
+ public InnerEnumValuesTest(Backend backend, boolean minification) {
+ this.backend = backend;
+ this.minification = minification;
+ }
+
+ @Before
+ public void setup() throws Exception {
+ // Mapping file that describes that inner enum has been renamed.
+ mappingFile = temp.newFile("mapping.txt").toPath();
+ FileUtils.writeTextFile(
+ mappingFile,
+ StringUtils.lines(
+ Outer.class.getTypeName() + " -> " + "x.y.z:",
+ " void <init>() -> <init>",
+ InnerEnum.class.getTypeName() + " -> " + RENAMED_NAME + ":",
+ " " + InnerEnum.class.getTypeName() + " STATE_A -> state_X",
+ " " + InnerEnum.class.getTypeName() + " STATE_B -> state_Y",
+ " " + InnerEnum.class.getTypeName() + "[] $VALUES -> XY",
+ " void <clinit>() -> <clinit>",
+ " void <init>(java.lang.String,int) -> <init>",
+ " " + InnerEnum.class.getTypeName() + " valueOf(java.lang.String) -> valueOf",
+ " " + InnerEnum.class.getTypeName() + "[] values() -> values"));
+ }
+
+ @Test
+ public void b124177369() throws Exception {
+ testForR8(backend)
+ .addProgramClassesAndInnerClasses(Outer.class)
+ .addProgramClasses(MAIN)
+ .addKeepMainRule(MAIN)
+ .addKeepRules("-applymapping " + mappingFile.toAbsolutePath())
+ .minification(minification)
+ .compile()
+ .inspect(inspector -> {
+ ClassSubject enumSubject = inspector.clazz(RENAMED_NAME);
+ assertThat(enumSubject, isPresent());
+ assertEquals(minification, enumSubject.isRenamed());
+ String fieldName =
+ minification
+ ? "a" // minified name
+ : "state_X"; // mapped name without minification
+ FieldSubject stateA = enumSubject.uniqueFieldWithName(fieldName);
+ assertThat(stateA, isPresent());
+ });
+ // TODO(b/124177369): method signature Object Outer$InnerEnum[]#clone() left in values().
+ // .run(MAIN)
+ // .assertSuccessWithOutput(EXPECTED_OUTPUT);
+ }
+}
+
+class Outer {
+ public enum InnerEnum {
+ STATE_A,
+ STATE_B
+ }
+}
+
+class TestApp {
+ public static void main(String[] args) {
+ for (InnerEnum i : InnerEnum.values()) {
+ System.out.println(i);
+ }
+ }
+}
