azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make start label of LVT record the point where variable becomes alive

Browse Source 
Otherwise, there will be overlapping LVT records, which leads to
removal of the whole LVT by R8.
 #KT-44714 Fixed
This commit is contained in:
Ilmir Usmanov
2021-03-03 00:46:14 +01:00
parent e17b7f01b6
commit b6bb8a576e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
+1 -2
View File
@@ -1252,8 +1252,7 @@ private fun updateLvtAccordingToLiveness(method: MethodNode, isForNamedFunction:
for (insnIndex in 0 until (method.instructions.size() - 1)) { for (insnIndex in 0 until (method.instructions.size() - 1)) {
val insn = method.instructions[insnIndex] val insn = method.instructions[insnIndex]
if (!isAlive(insnIndex, variableIndex) && isAlive(insnIndex + 1, variableIndex)) { if (!isAlive(insnIndex, variableIndex) && isAlive(insnIndex + 1, variableIndex)) {
val lvtRecord = oldLvt.findRecord(insnIndex, variableIndex) ?: continue startLabel = insn as? LabelNode ?: insn.findNextOrNull { it is LabelNode } as? LabelNode
startLabel = max(lvtRecord.start, previousSuspensionPointLabel(insn))
} }
if (isAlive(insnIndex, variableIndex) && !isAlive(insnIndex + 1, variableIndex)) { if (isAlive(insnIndex, variableIndex) && !isAlive(insnIndex + 1, variableIndex)) {
// No variable in LVT -> do not add one // No variable in LVT -> do not add one
compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
suspend fun SequenceScope<Int>.awaitSeq(): Int = 42 suspend fun SequenceScope<Int>.awaitSeq(): Int = 42
// 1 LOCALVARIABLE a I L[0-9]+ L4 // 1 LOCALVARIABLE a I L[0-9]+ L19
/* TODO: JVM_IR does not generate LINENUMBER at the end of the lambda */ /* TODO: JVM_IR does not generate LINENUMBER at the end of the lambda */
// JVM_TEMPLATES // JVM_TEMPLATES