Repro compilation error when consuming library with inline suspend fun
Bug: b/446714233
Change-Id: Ia89934cb698904ad12aba8e4579e89a754b749fd
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInlineSuspendFunctionTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInlineSuspendFunctionTest.java
new file mode 100644
index 0000000..0bd3747
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInlineSuspendFunctionTest.java
@@ -0,0 +1,102 @@
+// Copyright (c) 2025, 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.kotlin.metadata;
+
+import com.android.tools.r8.KotlinCompileMemoizer;
+import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
+import com.android.tools.r8.KotlinTestParameters;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.StringUtils;
+import java.nio.file.Path;
+import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class MetadataRewriteInlineSuspendFunctionTest extends KotlinMetadataTestBase {
+
+ private final String EXPECTED = StringUtils.lines("foo");
+ private static final String PKG_LIB = PKG + ".inline_suspend_lib";
+ private static final String PKG_APP = PKG + ".inline_suspend_app";
+
+ @Parameterized.Parameters(name = "{0}, {1}")
+ public static Collection<Object[]> data() {
+ return buildParameters(
+ getTestParameters().withCfRuntimes().build(),
+ getKotlinTestParameters()
+ .withOldCompilers()
+ .withCompilersStartingFromIncluding(KotlinCompilerVersion.KOTLINC_1_6_0)
+ .withAllLambdaGenerations()
+ .withAllTargetVersions()
+ .build());
+ }
+
+ public MetadataRewriteInlineSuspendFunctionTest(
+ TestParameters parameters, KotlinTestParameters kotlinParameters) {
+ super(kotlinParameters);
+ this.parameters = parameters;
+ }
+
+ private static final KotlinCompileMemoizer libJars =
+ getCompileMemoizer(
+ getKotlinFileInTest(DescriptorUtils.getBinaryNameFromJavaType(PKG_LIB), "lib"))
+ .configure(
+ tool -> tool.addClasspathFiles(tool.getCompiler().getKotlinxCoroutinesCoreJar()));
+ private final TestParameters parameters;
+
+ @Test
+ public void smokeTest() throws Exception {
+ Path libJar = libJars.getForConfiguration(kotlinParameters);
+ Path output =
+ kotlinc(parameters.getRuntime().asCf(), kotlinc, targetVersion, lambdaGeneration)
+ .addClasspathFiles(kotlinc.getKotlinxCoroutinesCoreJar(), libJar)
+ .addSourceFiles(
+ getKotlinFileInTest(DescriptorUtils.getBinaryNameFromJavaType(PKG_APP), "main"))
+ .setOutputPath(temp.newFolder().toPath())
+ .compile();
+ testForJvm(parameters)
+ .addRunClasspathFiles(
+ kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinxCoroutinesCoreJar(), libJar)
+ .addClasspath(output)
+ .run(parameters.getRuntime(), PKG_APP + ".MainKt")
+ .assertSuccessWithOutput(EXPECTED);
+ }
+
+ @Test
+ public void testMetadataForLib() throws Exception {
+ Path libJar =
+ testForR8(parameters.getBackend())
+ .addProgramFiles(libJars.getForConfiguration(kotlinParameters))
+ .addClasspathFiles(
+ kotlinc.getKotlinStdlibJar(),
+ kotlinc.getKotlinAnnotationJar(),
+ kotlinc.getKotlinxCoroutinesCoreJar())
+ .addKeepAllClassesRule()
+ .addKeepAllAttributes()
+ .compile()
+ .writeToZip();
+ Assert.assertThrows(
+ AssertionError.class,
+ () -> {
+ Path output =
+ kotlinc(parameters.getRuntime().asCf(), kotlinc, targetVersion, lambdaGeneration)
+ .addClasspathFiles(libJar)
+ .addSourceFiles(
+ getKotlinFileInTest(
+ DescriptorUtils.getBinaryNameFromJavaType(PKG_APP), "main"))
+ .setOutputPath(temp.newFolder().toPath())
+ .compile();
+ testForJvm(parameters)
+ .addRunClasspathFiles(
+ kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinxCoroutinesCoreJar(), libJar)
+ .addClasspath(output)
+ .run(parameters.getRuntime(), PKG_APP + ".MainKt")
+ .assertSuccessWithOutput(EXPECTED);
+ });
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_app/main.kt
new file mode 100644
index 0000000..2f4b4bf
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_app/main.kt
@@ -0,0 +1,11 @@
+// Copyright (c) 2025, 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.kotlin.metadata.inline_suspend_app
+
+import com.android.tools.r8.kotlin.metadata.inline_suspend_lib.foo
+
+suspend fun main() {
+ foo()
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_lib/lib.kt
new file mode 100644
index 0000000..ffcc96c
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_suspend_lib/lib.kt
@@ -0,0 +1,16 @@
+// Copyright (c) 2025, 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.kotlin.metadata.inline_suspend_lib
+
+import kotlinx.coroutines.delay
+
+suspend inline fun foo() {
+ try {
+ println("foo")
+ delay(200)
+ } catch (t: Throwable) {
+ System.currentTimeMillis()
+ }
+}
diff --git a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
index 6a69246..02359cc 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -233,6 +233,12 @@
return annotationJar;
}
+ public Path getKotlinxCoroutinesCoreJar() {
+ Path kotlinxCoroutinesCoreJar = getFolder().resolve("kotlinx-coroutines-core-jvm.jar");
+ assert Files.exists(kotlinxCoroutinesCoreJar) : "Expected kotlinx-coroutines-core jar";
+ return kotlinxCoroutinesCoreJar;
+ }
+
public void checkClasspath() throws IOException {
try (ZipFile zipFile = new ZipFile(compiler.toFile(), UTF_8)) {
Manifest manifest =
