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

FE: properly clear the deferred generator stack

Browse Source 
Before this commit the stack wasn't cleared for read variable case.
#KT-47168 Fixed
This commit is contained in:
pyos
2021-06-09 11:36:25 +02:00
committed by teamcityserver
parent 2f632ada42
commit 1f9db7cf25
9 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.kt
+6 -7
View File
@@ -1574,19 +1574,18 @@ class ControlFlowProcessor(
}
}
if (resolvedCall.resultingDescriptor is VariableDescriptor) {
val callInstruction = if (resolvedCall.resultingDescriptor is VariableDescriptor) {
// If a callee of the call is just a variable (without 'invoke'), 'read variable' is generated.
// todo : process arguments for such a case (KT-5387)
val callExpression =
callElement as? KtExpression ?: error("Variable-based call without callee expression: " + callElement.text)
assert(parameterValues.isEmpty()) { "Variable-based call with non-empty argument list: " + callElement.text }
return builder.readVariable(callExpression, resolvedCall, receivers)
builder.readVariable(callExpression, resolvedCall, receivers)
} else {
mark(resolvedCall.call.callElement)
builder.call(callElement, resolvedCall, receivers, parameterValues)
}
mark(resolvedCall.call.callElement)
val callInstruction = builder.call(callElement, resolvedCall, receivers, parameterValues)
val deferredGeneratorsForCall = deferredGeneratorsStack.pop()
deferredGeneratorsForCall.forEach { it.invoke(builder) }
deferredGeneratorsStack.pop().forEach { it.invoke(builder) }
return callInstruction
}