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

Put $completion parameter to LVT

Browse Source 
The parameter, unlike other ones, should span the whole method, since
throughout the whole method it has some value and thus should be
visible.

This effectively rolls bb5a99ec back

 #KT-64309 Fixed
This commit is contained in:
Ilmir Usmanov
2024-02-05 08:35:01 +01:00
committed by Space Team
parent 77c850f0d0
commit f1fd84f539
11 changed files with 174 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
+34 -2
View File
@@ -1325,8 +1325,8 @@ private fun updateLvtAccordingToLiveness(method: MethodNode, isForNamedFunction:
}
for (variable in oldLvt) {
// $continuation and $result are dead, but they are used by debugger, as well as fake inliner variables
// For example, $continuation is used to create async stack trace
// $continuation, $completion and $result are dead, but they are used by debugger, as well as fake inliner variables
// $continuation is used to create async stack trace
if (variable.name == CONTINUATION_VARIABLE_NAME ||
variable.name == SUSPEND_CALL_RESULT_NAME ||
isFakeLocalVariableForInline(variable.name)
@@ -1334,6 +1334,22 @@ private fun updateLvtAccordingToLiveness(method: MethodNode, isForNamedFunction:
method.localVariables.add(variable)
continue
}
// $completion is used for stepping
if (variable.name == SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME) {
// There can be multiple $completion variables because of inlining, do not duplicate them
if (method.localVariables.any { it.name == SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME }) continue
// $completion should behave like ordinary parameter - span the whole function,
// unlike other parameters, it is safe to do so, since it always will have some value
// either completion (when there was no suspension) or continuation, when there was suspension.
// It is OK to have this discrepancy, since debugger walks through completion chain and to them
// there is no difference whether there is an additional link in the chain.
variable.start = method.getOrCreateStartingLabel()
variable.end = method.getOrCreateEndingLabel()
variable.index = getLastParameterIndex(method.desc, method.access)
method.localVariables.add(variable)
continue
}
// this acts like $continuation for lambdas. For example, it is used by debugger to create async stack trace. Keep it.
if (variable.name == "this" && !isForNamedFunction) {
method.localVariables.add(variable)
@@ -1342,6 +1358,22 @@ private fun updateLvtAccordingToLiveness(method: MethodNode, isForNamedFunction:
}
}
fun MethodNode.getOrCreateStartingLabel(): LabelNode {
val first = instructions.first
if (first is LabelNode) return first
val result = LabelNode()
instructions.insertBefore(first, result)
return result
}
fun MethodNode.getOrCreateEndingLabel(): LabelNode {
val last = instructions.last
if (last is LabelNode) return last
val result = LabelNode()
instructions.insert(last, result)
return result
}
/* We cannot extend a record if there is STORE instruction or a control-flow merge.
*
* STORE instructions can signify a unspilling operation, in which case, the variable will become visible before it unspilled.