Reproduce companion class for library class
Bug: b/234711664
Change-Id: Iba62dbec514f0b7f34f6d5687382027a945bf5ce
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
index ba07e77..cbf88a6 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
@@ -697,8 +697,7 @@
// resolution was implemented in full.
DexMethod amendedMethod =
amendDefaultMethod(context12.getHolder(), invokedMethod);
- // TODO(b/234711664): The assertion below is disabled on this release branch.
- assert true || method.getReference() == amendedMethod;
+ // assert method.getReference() == amendedMethod;
DexClassAndMethod companionMethod =
helper.ensureDefaultAsMethodOfCompanionClassStub(method);
acceptCompanionMethod(method, companionMethod, eventConsumer);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
new file mode 100644
index 0000000..0319cf1
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
@@ -0,0 +1,99 @@
+// 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.desugaring.interfacemethods;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+import com.android.tools.r8.utils.codeinspector.InstructionSubject;
+import java.util.function.Function;
+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 InvokeSuperInDefaultMethodResolvingToLibraryTest extends TestBase {
+
+ @Parameter() public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
+ }
+
+ private static final String EXPECTED_OUTPUT = StringUtils.lines("8");
+
+ private void inspect(CodeInspector inspector) {
+ if (parameters
+ .getApiLevel()
+ .isLessThan(TestBase.apiLevelWithDefaultInterfaceMethodsSupport())) {
+ assertTrue(
+ inspector
+ .clazz(B.class)
+ .uniqueMethodWithName("compose")
+ .streamInstructions()
+ .filter(InstructionSubject::isInvoke)
+ .map(invoke -> invoke.getMethod().getHolderType().toString())
+ // TODO(b/234711664): This should not happen.
+ .anyMatch(name -> name.equals("java.util.function.Function$-CC")));
+ } else {
+ assertTrue(
+ inspector
+ .clazz(B.class)
+ .uniqueMethodWithName("compose")
+ .streamInstructions()
+ .filter(InstructionSubject::isInvoke)
+ .map(invoke -> invoke.getMethod().getHolderType().toString())
+ .noneMatch(name -> name.endsWith("$-CC")));
+ }
+ }
+
+ @Test
+ public void testDesugaring() throws Exception {
+ testForD8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .inspect(this::inspect);
+ }
+
+ static class TestClass {
+
+ private static void m(C c) {
+ System.out.println(c.compose(c).apply(2));
+ }
+
+ public static void main(String[] args) {
+ m(new C());
+ }
+ }
+
+ interface MyFunction<V, R> extends Function<V, R> {}
+
+ abstract static class B<V, R> implements MyFunction<V, R> {
+
+ @Override
+ public <V1> Function<V1, R> compose(Function<? super V1, ? extends V> before) {
+ return MyFunction.super.compose(before);
+ }
+ }
+
+ static class C extends B<Integer, Integer> {
+
+ @Override
+ public Integer apply(Integer integer) {
+ return integer * 2;
+ }
+ }
+}
