Spill stack before analyzing it when looking for non-inline suspend lambda
parameters of inline function. Otherwise, it leads to AnalyzerException, when inlined lambda contains try-catch block. The reason is simple: in try block, we leave some variables on stack, while on catch block the stack is empty. Spilling the variables before try block does the trick. #KT-34708 Fixed
This commit is contained in:
@@ -439,10 +439,13 @@ inline fun FrameMap.evaluateOnce(
|
|||||||
fun MethodNode.textifyMethodNode(): String {
|
fun MethodNode.textifyMethodNode(): String {
|
||||||
val text = Textifier()
|
val text = Textifier()
|
||||||
val tmv = TraceMethodVisitor(text)
|
val tmv = TraceMethodVisitor(text)
|
||||||
this.instructions.asSequence().forEach { it.accept(tmv) }
|
accept(tmv)
|
||||||
localVariables.forEach { text.visitLocalVariable(it.name, it.desc, it.signature, it.start.label, it.end.label, it.index) }
|
|
||||||
val sw = StringWriter()
|
val sw = StringWriter()
|
||||||
text.print(PrintWriter(sw))
|
val pw = PrintWriter(sw)
|
||||||
|
pw.print(name)
|
||||||
|
pw.print(desc)
|
||||||
|
pw.print("\n")
|
||||||
|
text.print(pw)
|
||||||
return "$sw"
|
return "$sw"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.codegen.inline.*
|
|||||||
import org.jetbrains.kotlin.codegen.optimization.common.asSequence
|
import org.jetbrains.kotlin.codegen.optimization.common.asSequence
|
||||||
import org.jetbrains.kotlin.codegen.optimization.common.findPreviousOrNull
|
import org.jetbrains.kotlin.codegen.optimization.common.findPreviousOrNull
|
||||||
import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer
|
import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer
|
||||||
|
import org.jetbrains.kotlin.codegen.optimization.fixStack.FixStackMethodTransformer
|
||||||
import org.jetbrains.kotlin.config.isReleaseCoroutines
|
import org.jetbrains.kotlin.config.isReleaseCoroutines
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
@@ -251,6 +252,7 @@ class SurroundSuspendLambdaCallsWithSuspendMarkersMethodVisitor(
|
|||||||
override fun performTransformations(methodNode: MethodNode) {
|
override fun performTransformations(methodNode: MethodNode) {
|
||||||
fun AbstractInsnNode.index() = methodNode.instructions.indexOf(this)
|
fun AbstractInsnNode.index() = methodNode.instructions.indexOf(this)
|
||||||
|
|
||||||
|
FixStackMethodTransformer().transform(thisName, methodNode)
|
||||||
val sourceFrames = MethodTransformer.analyze(thisName, methodNode, SourceInterpreter())
|
val sourceFrames = MethodTransformer.analyze(thisName, methodNode, SourceInterpreter())
|
||||||
|
|
||||||
val noinlineInvokes = arrayListOf<Pair<AbstractInsnNode, AbstractInsnNode>>()
|
val noinlineInvokes = arrayListOf<Pair<AbstractInsnNode, AbstractInsnNode>>()
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
// FILE: inlined.kt
|
||||||
|
// COMMON_COROUTINES_TEST
|
||||||
|
// WITH_RUNTIME
|
||||||
|
// WITH_COROUTINES
|
||||||
|
// NO_CHECK_LAMBDA_INLINING
|
||||||
|
|
||||||
|
interface Flow<out T> {
|
||||||
|
suspend fun collect(collector: FlowCollector<T>)
|
||||||
|
}
|
||||||
|
|
||||||
|
interface FlowCollector<in T> {
|
||||||
|
suspend fun emit(value: T)
|
||||||
|
}
|
||||||
|
|
||||||
|
inline suspend fun <T> Flow<T>.collect(crossinline action: suspend (value: T) -> Unit): Unit =
|
||||||
|
collect(object : FlowCollector<T> {
|
||||||
|
override suspend fun emit(value: T) = action(value)
|
||||||
|
})
|
||||||
|
|
||||||
|
inline fun <T, R> Flow<T>.transform(
|
||||||
|
crossinline transform: suspend FlowCollector<R>.(value: T) -> Unit
|
||||||
|
): Flow<R> = flow {
|
||||||
|
collect { value ->
|
||||||
|
return@collect transform(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <T, R> Flow<T>.map(crossinline transform: suspend (value: T) -> R): Flow<R> = transform { value ->
|
||||||
|
return@transform emit(transform(value))
|
||||||
|
}
|
||||||
|
|
||||||
|
public fun <T> flow(block: suspend FlowCollector<T>.() -> Unit): Flow<T> = SafeFlow(block)
|
||||||
|
|
||||||
|
private class SafeFlow<T>(private val block: suspend FlowCollector<T>.() -> Unit) : Flow<T> {
|
||||||
|
override suspend fun collect(collector: FlowCollector<T>) {
|
||||||
|
collector.block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FILE: inlineSite.kt
|
||||||
|
// COMMON_COROUTINES_TEST
|
||||||
|
import COROUTINES_PACKAGE.*
|
||||||
|
import helpers.*
|
||||||
|
|
||||||
|
fun Flow<String>.abc() = map { line ->
|
||||||
|
try {
|
||||||
|
line
|
||||||
|
} catch (e: Exception) {
|
||||||
|
e.message!!
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun builder(c: suspend () -> Unit) {
|
||||||
|
c.startCoroutine(EmptyContinuation)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
var res = "FAIL"
|
||||||
|
builder {
|
||||||
|
flow<String> {
|
||||||
|
emit("OK")
|
||||||
|
}.abc().collect {
|
||||||
|
res = it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
+10
@@ -3813,6 +3813,16 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_2() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines.experimental");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_2() throws Exception {
|
public void testTryCatchStackTransform_1_2() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental");
|
||||||
|
|||||||
Generated
+10
@@ -3813,6 +3813,16 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_2() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines.experimental");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_2() throws Exception {
|
public void testTryCatchStackTransform_1_2() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental");
|
||||||
|
|||||||
+5
@@ -3728,6 +3728,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_3() throws Exception {
|
public void testTryCatchStackTransform_1_3() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
||||||
|
|||||||
Generated
+5
@@ -3728,6 +3728,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_3() throws Exception {
|
public void testTryCatchStackTransform_1_3() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
||||||
|
|||||||
Generated
+5
@@ -113,6 +113,11 @@ public class IrInlineSuspendTestsGenerated extends AbstractIrInlineSuspendTests
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_3() throws Exception {
|
public void testTryCatchStackTransform_1_3() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
||||||
|
|||||||
+5
@@ -113,6 +113,11 @@ public class InlineSuspendTestsGenerated extends AbstractInlineSuspendTests {
|
|||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("tryCatchReceiver.kt")
|
||||||
|
public void testTryCatchReceiver_1_3() throws Exception {
|
||||||
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("tryCatchStackTransform.kt")
|
@TestMetadata("tryCatchStackTransform.kt")
|
||||||
public void testTryCatchStackTransform_1_3() throws Exception {
|
public void testTryCatchStackTransform_1_3() throws Exception {
|
||||||
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines");
|
||||||
|
|||||||
Reference in New Issue
Block a user