Add a test for b/146957343
Bug: 146957343
Change-Id: I326d780693d5512bc0ec71981ba5c9c94fa9c71c
diff --git a/src/main/java/com/android/tools/r8/graph/DexType.java b/src/main/java/com/android/tools/r8/graph/DexType.java
index bbed9bc..9a8a73c 100644
--- a/src/main/java/com/android/tools/r8/graph/DexType.java
+++ b/src/main/java/com/android/tools/r8/graph/DexType.java
@@ -82,7 +82,14 @@
public boolean isAlwaysNull(AppView<AppInfoWithLiveness> appView) {
if (isClassType()) {
DexProgramClass clazz = asProgramClassOrNull(appView.definitionFor(this));
- return clazz != null && !appView.appInfo().isInstantiatedDirectlyOrIndirectly(clazz);
+ if (clazz == null) {
+ return false;
+ }
+ if (appView.options().enableUninstantiatedTypeOptimizationForInterfaces) {
+ return !appView.appInfo().isInstantiatedDirectlyOrIndirectly(clazz);
+ } else {
+ return !clazz.isInterface() && !appView.appInfo().isInstantiatedDirectlyOrIndirectly(clazz);
+ }
}
return false;
}
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 114715a..1425bc0 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -242,6 +242,7 @@
// TODO(b/125282093): Enable member value propagation for instance fields.
public boolean enableValuePropagationForInstanceFields = false;
public boolean enableUninstantiatedTypeOptimization = true;
+ public boolean enableUninstantiatedTypeOptimizationForInterfaces = true;
// TODO(b/138917494): Disable until we have numbers on potential performance penalties.
public boolean enableRedundantConstNumberOptimization = false;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java
new file mode 100644
index 0000000..289e095
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java
@@ -0,0 +1,93 @@
+// Copyright (c) 2020, 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.uninstantiatedtypes;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import java.io.IOException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.objectweb.asm.Opcodes;
+
+@RunWith(Parameterized.class)
+public class B146957343 extends TestBase implements Opcodes {
+
+ private final TestParameters parameters;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().withAllApiLevels().build();
+ }
+
+ public B146957343(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ private byte[] getAimplementsI() throws IOException {
+ return transformer(A.class).setImplements(I.class).transform();
+ }
+
+ @Test
+ public void testWithoutR8() throws Exception {
+ testForRuntime(parameters)
+ .addProgramClasses(I.class, J.class, Main.class)
+ .addProgramClassFileData(getAimplementsI())
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("In A.f()");
+ }
+
+ @Test
+ public void testWithUninstantiatedTypeOptimizationForInterfaces() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(I.class, J.class, Main.class)
+ .addProgramClassFileData(getAimplementsI())
+ .addKeepMainRule(Main.class)
+ .addKeepRules("-keep class **A { createA(); }")
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(
+ options -> options.enableUninstantiatedTypeOptimizationForInterfaces = true)
+ .compile()
+ .disassemble()
+ .run(parameters.getRuntime(), Main.class)
+ .assertFailureWithErrorThatThrows(NullPointerException.class);
+ }
+
+ @Test
+ public void testWithoutUninstantiatedTypeOptimizationForInterfaces() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(I.class, J.class, Main.class)
+ .addProgramClassFileData(getAimplementsI())
+ .addKeepMainRule(Main.class)
+ .addKeepRules("-keep class **A { createA(); }")
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(
+ options -> options.enableUninstantiatedTypeOptimizationForInterfaces = false)
+ .compile()
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("In A.f()");
+ }
+
+ public interface I {}
+
+ public interface J extends I {}
+
+ public static class A implements J {
+ public static J createA() {
+ return new A();
+ }
+
+ public void f() {
+ System.out.println("In A.f()");
+ }
+ }
+
+ public static class Main {
+ public static void main(String[] args) {
+ ((A) A.createA()).f();
+ }
+ }
+}