Hack attributes for continuation of suspend function in SAM-adapter

This commit is contained in:
Ilmir Usmanov
2020-08-11 00:10:17 +02:00
parent 2e131b870a
commit d861373c6d
6 changed files with 58 additions and 0 deletions
@@ -7073,6 +7073,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines");
}
@TestMetadata("funInterface.kt")
public void testFunInterface() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/featureIntersection/funInterface.kt");
}
@TestMetadata("inlineSuspendFinally.kt")
public void testInlineSuspendFinally_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines");
@@ -48,6 +48,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.DFS
import org.jetbrains.org.objectweb.asm.Type
internal val addContinuationPhase = makeIrFilePhase(
::AddContinuationLowering,
@@ -597,6 +598,16 @@ private class AddContinuationLowering(private val context: JvmBackendContext) :
val result = mutableListOf(view)
if (function.body == null || !function.hasContinuation()) return result
// This is a suspend function inside of SAM adapter.
// The attribute of function reference is used for the SAM adapter.
// So, we hack new attributes for continuation class.
if (function.parentAsClass.origin == JvmLoweredDeclarationOrigin.LAMBDA_IMPL) {
context.putLocalClassType(
function.attributeOwnerId,
Type.getObjectType("${context.getLocalClassType(function.parentAsClass)!!.internalName}$${function.name}$1")
)
}
if (flag.capturesCrossinline || function.isInline) {
result += context.irFactory.buildFun {
containerSource = view.containerSource
@@ -0,0 +1,27 @@
// WITH_RUNTIME
// WITH_COROUTINES
// TARGET_BACKEND: JVM
// IGNORE_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
import helpers.*
import kotlin.coroutines.*
fun interface Action {
suspend fun run()
}
suspend fun runAction(a: Action) {
a.run()
}
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
fun box(): String {
var res = "FAIL"
builder {
runAction {
res = "OK"
}
}
return res
}
@@ -7673,6 +7673,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines");
}
@TestMetadata("funInterface.kt")
public void testFunInterface() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/featureIntersection/funInterface.kt");
}
@TestMetadata("inlineSuspendFinally.kt")
public void testInlineSuspendFinally_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines.experimental");
@@ -7631,6 +7631,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FeatureIntersection extends AbstractLightAnalysisModeTest {
@TestMetadata("funInterface.kt")
public void ignoreFunInterface() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/featureIntersection/funInterface.kt");
}
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
@@ -7073,6 +7073,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines");
}
@TestMetadata("funInterface.kt")
public void testFunInterface() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/featureIntersection/funInterface.kt");
}
@TestMetadata("inlineSuspendFinally.kt")
public void testInlineSuspendFinally_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines");