Reproduce inadequate value propagation for restart methods with defaults
Bug: b/302281503
Change-Id: Ibc5ccd167f7f5dd2f66679ef05fa68b1e82fbd8b
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/RestartLambdaPropagationWithDefaultArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/RestartLambdaPropagationWithDefaultArgumentTest.java
new file mode 100644
index 0000000..9d571ee
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/RestartLambdaPropagationWithDefaultArgumentTest.java
@@ -0,0 +1,154 @@
+// Copyright (c) 2024, 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.callsites;
+
+import static com.android.tools.r8.utils.codeinspector.CodeMatchers.isInvokeWithTarget;
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.synthesis.SyntheticItemsTestUtils;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+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 RestartLambdaPropagationWithDefaultArgumentTest extends TestBase {
+
+ // Deliberately setting the highest bit in this mask to be able to distinguish it from the int 2.
+ private static final int FLAGS = 0b10 | (1 << 31);
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withDexRuntimesAndAllApiLevels().build();
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRule(Main.class)
+ .enableInliningAnnotations()
+ .setMinApi(parameters)
+ .compile()
+ .inspect(
+ inspector -> {
+ ClassSubject mainClassSubject = inspector.clazz(Main.class);
+ assertThat(mainClassSubject, isPresent());
+
+ ClassSubject lambdaClassSubject =
+ inspector.clazz(SyntheticItemsTestUtils.syntheticLambdaClass(Main.class, 0));
+ assertThat(lambdaClassSubject, isPresent());
+ // TODO(b/302281503): Lambda should not capture the two constant string arguments.
+ assertEquals(2, lambdaClassSubject.allInstanceFields().size());
+
+ MethodSubject lambdaInitSubject = lambdaClassSubject.uniqueInstanceInitializer();
+ assertThat(lambdaInitSubject, isPresent());
+ // TODO(b/302281503): Lambda should not capture the two constant string arguments.
+ assertEquals(2, lambdaInitSubject.getParameters().size());
+ assertTrue(lambdaInitSubject.getParameter(0).is(String.class));
+ assertTrue(lambdaInitSubject.getParameter(1).is(String.class));
+
+ MethodSubject mainMethodSubject = mainClassSubject.mainMethod();
+ assertThat(mainMethodSubject, isPresent());
+ // TODO(b/302281503): This argument should be removed as a result of constant
+ // propagation into the restartableMethod.
+ assertTrue(
+ mainMethodSubject
+ .streamInstructions()
+ .anyMatch(instruction -> instruction.isConstString("DefaultValueNeverUsed")));
+ // TODO(b/302281503): This argument is never used and should be removed.
+ assertTrue(
+ mainMethodSubject
+ .streamInstructions()
+ .anyMatch(
+ instruction ->
+ instruction.isConstString("Unused[DefaultValueAlwaysUsed]")));
+
+ MethodSubject restartableMethodSubject =
+ mainClassSubject.uniqueMethodWithOriginalName("restartableMethod");
+ assertThat(restartableMethodSubject, isPresent());
+ assertTrue(
+ restartableMethodSubject
+ .streamInstructions()
+ .anyMatch(instruction -> instruction.isConstNumber(FLAGS)));
+ assertTrue(
+ restartableMethodSubject
+ .streamInstructions()
+ .noneMatch(
+ instruction ->
+ instruction.isConstString("Unused[DefaultValueNeverUsed]")));
+ assertTrue(
+ restartableMethodSubject
+ .streamInstructions()
+ .anyMatch(
+ instruction -> instruction.isConstString("DefaultValueAlwaysUsed")));
+ assertTrue(
+ restartableMethodSubject
+ .streamInstructions()
+ .anyMatch(
+ instruction -> isInvokeWithTarget(lambdaInitSubject).test(instruction)));
+ })
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines(
+ "Postponing!",
+ "Restarting!",
+ "DefaultValueNeverUsed",
+ "DefaultValueAlwaysUsed",
+ Integer.toString(FLAGS),
+ "Stopping!");
+ }
+
+ static class Main {
+
+ public static void main(String[] args) {
+ Runnable restarter =
+ restartableMethod("DefaultValueNeverUsed", "Unused[DefaultValueAlwaysUsed]", FLAGS, true);
+ restarter.run();
+ }
+
+ @NeverInline
+ static Runnable restartableMethod(
+ String defaultValueNeverUsed, String defaultValueAlwaysUsed, int flags, boolean doRestart) {
+ if ((flags & 1) != 0) {
+ defaultValueNeverUsed = "Unused[DefaultValueNeverUsed]";
+ }
+ if ((flags & 2) != 0) {
+ defaultValueAlwaysUsed = "DefaultValueAlwaysUsed";
+ }
+ if (doRestart) {
+ System.out.println("Postponing!");
+ String finalDefaultValueNeverUsed = defaultValueNeverUsed;
+ String finalDefaultValueAlwaysUsed = defaultValueAlwaysUsed;
+ return () -> {
+ System.out.println("Restarting!");
+ Runnable restarter =
+ restartableMethod(
+ finalDefaultValueNeverUsed, finalDefaultValueAlwaysUsed, flags, false);
+ if (restarter == null) {
+ System.out.println("Stopping!");
+ } else {
+ throw new RuntimeException();
+ }
+ };
+ }
+ System.out.println(defaultValueNeverUsed);
+ System.out.println(defaultValueAlwaysUsed);
+ System.out.println(flags);
+ return null;
+ }
+ }
+}
diff --git a/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/TypeSubject.java b/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/TypeSubject.java
index efa2c30..1140771 100644
--- a/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/TypeSubject.java
+++ b/src/test/testbase/java/com/android/tools/r8/utils/codeinspector/TypeSubject.java
@@ -41,6 +41,10 @@
throw new Unreachable("Cannot determine if a type is synthetic");
}
+ public boolean is(Class<?> clazz) {
+ return is(clazz.getTypeName());
+ }
+
public boolean is(String type) {
return dexType.equals(codeInspector.toDexType(type));
}
