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

Move generation of coroutines 'invoke' after 'doResume'

Browse Source 
It's necessary because in next commits 'invoke' will depend on captured variables
that are being calculated during 'doResume' calculation
This commit is contained in:
Denis Zharkov
2016-06-14 12:43:49 +03:00
parent d3461d1519
commit 84964a76f9
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt
+30 -26
View File
@@ -75,32 +75,6 @@ class CoroutineCodegen(
val classDescriptor = closureContext.contextDescriptor
functionCodegen.generateMethod(JvmDeclarationOrigin.NO_ORIGIN, funDescriptor,
object : FunctionGenerationStrategy.CodegenBased(state) {
override fun doGenerateBody(codegen: ExpressionCodegen, signature: JvmMethodSignature) {
AsmUtil.genAssignInstanceFieldFromParam(
FieldInfo.createForHiddenField(
typeMapper.mapClass(classDescriptor),
typeMapper.mapType(controllerType), COROUTINE_CONTROLLER_FIELD_NAME),
1, codegen.v)
with(codegen.v) {
setLabelValue(LABEL_VALUE_BEFORE_FIRST_SUSPENSION)
for (parameter in funDescriptor.valueParameters) {
// 0 - this
// 1 - controller
val parametersIndexShift = 2
AsmUtil.genAssignInstanceFieldFromParam(
parameter.getFieldInfoForCoroutineLambdaParameter(), parametersIndexShift + parameter.index, this)
}
load(0, AsmTypes.OBJECT_TYPE)
areturn(AsmTypes.OBJECT_TYPE)
}
}
})
val resumeFunctionDescriptor =
createSynthesizedImplementationByName(
"resume",
@@ -142,6 +116,36 @@ class CoroutineCodegen(
generateExceptionHandlingBlock(codegen)
}
})
functionCodegen.generateMethod(JvmDeclarationOrigin.NO_ORIGIN, funDescriptor,
object : FunctionGenerationStrategy.CodegenBased(state) {
override fun doGenerateBody(codegen: ExpressionCodegen, signature: JvmMethodSignature) {
generateInvokeMethod(codegen, signature)
}
})
}
private fun generateInvokeMethod(codegen: ExpressionCodegen, signature: JvmMethodSignature) {
AsmUtil.genAssignInstanceFieldFromParam(
FieldInfo.createForHiddenField(
typeMapper.mapClass(classDescriptor),
typeMapper.mapType(controllerType), COROUTINE_CONTROLLER_FIELD_NAME),
1, codegen.v)
with(codegen.v) {
setLabelValue(LABEL_VALUE_BEFORE_FIRST_SUSPENSION)
for (parameter in funDescriptor.valueParameters) {
// 0 - this
// 1 - controller
val parametersIndexShift = 2
AsmUtil.genAssignInstanceFieldFromParam(
parameter.getFieldInfoForCoroutineLambdaParameter(), parametersIndexShift + parameter.index, this)
}
load(0, AsmTypes.OBJECT_TYPE)
areturn(AsmTypes.OBJECT_TYPE)
}
}
private fun ExpressionCodegen.initializeCoroutineParameters() {