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

Cast return expression to function return type

Browse Source
This commit is contained in:
Michael Bogdanov
2016-09-27 12:59:49 +03:00
committed by Dmitry Petrov
parent f30027b4de
commit 1cda60fcd1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+4 -2
View File
@@ -55,6 +55,8 @@ class ExpressionCodegen(
val typeMapper = classCodegen.typeMapper val typeMapper = classCodegen.typeMapper
val returnType = typeMapper.mapReturnType(irFunction.descriptor)
fun generate() { fun generate() {
mv.visitCode() mv.visitCode()
val info = BlockInfo() val info = BlockInfo()
@@ -329,9 +331,9 @@ class ExpressionCodegen(
override fun visitReturn(expression: IrReturn, data: BlockInfo): StackValue { override fun visitReturn(expression: IrReturn, data: BlockInfo): StackValue {
val value = expression.value?.apply { val value = expression.value?.apply {
gen(this, this.asmType, data) gen(this, returnType, data)
} }
mv.areturn((expression.value ?: expression).asmType) mv.areturn(returnType)
return expression.onStack return expression.onStack
} }