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 {
|
||||
val text = Textifier()
|
||||
val tmv = TraceMethodVisitor(text)
|
||||
this.instructions.asSequence().forEach { it.accept(tmv) }
|
||||
localVariables.forEach { text.visitLocalVariable(it.name, it.desc, it.signature, it.start.label, it.end.label, it.index) }
|
||||
accept(tmv)
|
||||
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"
|
||||
}
|
||||
|
||||
|
||||
+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.findPreviousOrNull
|
||||
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.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
@@ -251,6 +252,7 @@ class SurroundSuspendLambdaCallsWithSuspendMarkersMethodVisitor(
|
||||
override fun performTransformations(methodNode: MethodNode) {
|
||||
fun AbstractInsnNode.index() = methodNode.instructions.indexOf(this)
|
||||
|
||||
FixStackMethodTransformer().transform(thisName, methodNode)
|
||||
val sourceFrames = MethodTransformer.analyze(thisName, methodNode, SourceInterpreter())
|
||||
|
||||
val noinlineInvokes = arrayListOf<Pair<AbstractInsnNode, AbstractInsnNode>>()
|
||||
|
||||
Reference in New Issue
Block a user