Regression test for insertion of multiple interface bridges.
Bug: b/228791247
Change-Id: I7591d8c02847a8908397a8a7966875b40dcd0fc1
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/utils/DepthFirstTopDownClassHierarchyTraversal.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/utils/DepthFirstTopDownClassHierarchyTraversal.java
index 14d47ac..cc81166 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/utils/DepthFirstTopDownClassHierarchyTraversal.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/utils/DepthFirstTopDownClassHierarchyTraversal.java
@@ -84,7 +84,11 @@
}
public boolean isRoot(DexProgramClass clazz) {
- DexProgramClass superclass = asProgramClassOrNull(appView.definitionFor(clazz.getSuperType()));
+ DexType superType = clazz.getSuperType();
+ if (superType == null) {
+ return true;
+ }
+ DexProgramClass superclass = asProgramClassOrNull(appView.definitionFor(superType));
if (superclass != null) {
return false;
}
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 98562f9..6d9a07b 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -2941,6 +2941,9 @@
markFieldAsLive(field, clazz, reason);
}
}
+ if (clazz.superType == null) {
+ break;
+ }
clazz = getProgramClassOrNull(clazz.superType, clazz);
} while (clazz != null && !objectAllocationInfoCollection.isInstantiatedDirectly(clazz));
}
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index 3b96973..2fa7609 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -574,7 +574,9 @@
visitAllSuperInterfaces(iface);
}
if (!clazz.isInterface()) {
- visitAllSuperInterfaces(clazz.superType);
+ if (clazz.superType != null) {
+ visitAllSuperInterfaces(clazz.superType);
+ }
return;
}
if (originalClazz == clazz) {
diff --git a/src/test/java/com/android/tools/r8/shaking/interfacebridge/MultipleRulesRegression228791247Test.java b/src/test/java/com/android/tools/r8/shaking/interfacebridge/MultipleRulesRegression228791247Test.java
new file mode 100644
index 0000000..d3d9804
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/interfacebridge/MultipleRulesRegression228791247Test.java
@@ -0,0 +1,86 @@
+// 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.shaking.interfacebridge;
+
+import static com.android.tools.r8.references.Reference.classFromClass;
+import static org.junit.Assert.assertTrue;
+
+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 com.android.tools.r8.utils.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class MultipleRulesRegression228791247Test extends TestBase {
+
+ private static final String EXPECTED = StringUtils.lines("Hello!");
+
+ private final TestParameters parameters;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public MultipleRulesRegression228791247Test(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void testReference() throws Exception {
+ testForRuntime(parameters)
+ .addProgramClasses(I.class, J.class, A.class, TestClass.class)
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutput(EXPECTED);
+ }
+
+ @Test
+ public void testR8() throws Exception {
+ // Regression adds two rules causes the forwarding method to be generated twice.
+ String rule1 = "-keep class " + classFromClass(J.class).getTypeName() + "{ void *oo(); }";
+ String rule2 = "-keep class " + classFromClass(J.class).getTypeName() + "{ void fo*(); }";
+ try {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(I.class, J.class, A.class, TestClass.class)
+ .addKeepMainRule(TestClass.class)
+ .addKeepRules(rule1, rule2)
+ .setMinApi(parameters.getApiLevel())
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutput(EXPECTED);
+ assertTrue(
+ parameters.isCfRuntime()
+ || parameters
+ .getApiLevel()
+ .isGreaterThanOrEqualTo(apiLevelWithDefaultInterfaceMethodsSupport()));
+ } catch (CompilationFailedException e) {
+ assertTrue(parameters.getApiLevel().isLessThan(apiLevelWithDefaultInterfaceMethodsSupport()));
+ }
+ }
+
+ public interface I {
+ default void foo() {
+ if (System.nanoTime() > 0) {
+ System.out.println("Hello!");
+ }
+ }
+ }
+
+ public interface J extends I {
+ // No foo, but it will be kept at J::foo.
+ }
+
+ public static class A implements J {}
+
+ public static class TestClass {
+
+ public static void main(String[] args) {
+ J j = System.nanoTime() > 0 ? new A() : null;
+ j.foo();
+ }
+ }
+}
