Version 1.6.75
Cherry-pick: Interfaces in Clazz.forName should be marked as live
CL: https://r8-review.googlesource.com/c/r8/+/47041
Merge conflicts where resolved.
Bug: 146534384
Change-Id: I1b3e4f4c852db1f935a987e17d1af8ae100e8dea
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 81b0ce0..411389c 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.6.74";
+ public static final String LABEL = "1.6.75";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 674db97..e09ff90 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -2584,7 +2584,9 @@
if (clazz == null) {
return;
}
- if (!clazz.isInterface()) {
+ if (clazz.isInterface()) {
+ markTypeAsLive(clazz.type, KeepReason.reflectiveUseIn(method));
+ } else {
markInstantiated(clazz, KeepReason.reflectiveUseIn(method));
if (clazz.hasDefaultInitializer()) {
DexEncodedMethod initializer = clazz.getDefaultInitializer();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java
new file mode 100644
index 0000000..31f8463
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java
@@ -0,0 +1,60 @@
+// 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.ir.optimize.reflection;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+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 ForNameInterfaceTest extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public ForNameInterfaceTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ public interface I {}
+
+ public @interface J {}
+
+ public static class Main {
+
+ public static void main(String[] args) throws ClassNotFoundException {
+ Class<?> aClass =
+ Class.forName("com.android.tools.r8.ir.optimize.reflection.ForNameInterfaceTest$I");
+ System.out.println(aClass.getName());
+ aClass = Class.forName("com.android.tools.r8.ir.optimize.reflection.ForNameInterfaceTest$J");
+ System.out.println(aClass.getName());
+ }
+ }
+
+ @Test
+ public void testForNameOnInterface()
+ throws ExecutionException, CompilationFailedException, IOException {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(ForNameInterfaceTest.class)
+ .addKeepMainRule(Main.class)
+ .minification(false)
+ .setMinApi(parameters.getApiLevel())
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(
+ "com.android.tools.r8.ir.optimize.reflection.ForNameInterfaceTest$I",
+ "com.android.tools.r8.ir.optimize.reflection.ForNameInterfaceTest$J");
+ }
+}
