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

Return proper type after coercion

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-11-29 12:01:10 +01:00
parent 77b93ab7ad
commit 724f3bf714
1 changed files with 13 additions and 14 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
+13 -14
View File
@@ -172,8 +172,7 @@ class ExpressionCodegen(
//coerceNotToUnit(r.type, Type.VOID_TYPE) //coerceNotToUnit(r.type, Type.VOID_TYPE)
exp.accept(this, data) exp.accept(this, data)
} }
coerceNotToUnit(result.type, expression.asmType) return coerceNotToUnit(result.type, expression.asmType)
return expression.onStack
} }
override fun visitMemberAccess(expression: IrMemberAccessExpression, data: BlockInfo): StackValue { override fun visitMemberAccess(expression: IrMemberAccessExpression, data: BlockInfo): StackValue {
@@ -283,7 +282,7 @@ class ExpressionCodegen(
mv.athrow() mv.athrow()
} else if (expression.descriptor !is ConstructorDescriptor) { } else if (expression.descriptor !is ConstructorDescriptor) {
val expectedTypeOnStack = returnType?.let { typeMapper.mapType(it) } ?: callable.returnType val expectedTypeOnStack = returnType?.let { typeMapper.mapType(it) } ?: callable.returnType
StackValue.coerce(callable.returnType, expectedTypeOnStack, mv) return coerceNotToUnit(callable.returnType, expectedTypeOnStack)
} }
return expression.onStack return expression.onStack
@@ -521,14 +520,11 @@ class ExpressionCodegen(
} }
override fun visitWhen(expression: IrWhen, data: BlockInfo): StackValue { override fun visitWhen(expression: IrWhen, data: BlockInfo): StackValue =
val resultType = expression.asmType genIfWithBranches(expression.branches[0], data, expression.asmType, expression.branches.drop(1))
genIfWithBranches(expression.branches[0], data, resultType, expression.branches.drop(1))
return expression.onStack
}
fun genIfWithBranches(branch: IrBranch, data: BlockInfo, type: Type, otherBranches: List<IrBranch>) { private fun genIfWithBranches(branch: IrBranch, data: BlockInfo, type: Type, otherBranches: List<IrBranch>): StackValue {
val elseLabel = Label() val elseLabel = Label()
val condition = branch.condition val condition = branch.condition
val thenBranch = branch.result val thenBranch = branch.result
@@ -541,9 +537,9 @@ class ExpressionCodegen(
val end = Label() val end = Label()
thenBranch.apply { val result = thenBranch.run {
gen(this, type, data) val stackValue = gen(this, data)
//coerceNotToUnit(this.asmType, type) coerceNotToUnit(stackValue.type, type)
} }
mv.goTo(end) mv.goTo(end)
@@ -555,6 +551,7 @@ class ExpressionCodegen(
} }
mv.mark(end) mv.mark(end)
return result
} }
@@ -878,7 +875,7 @@ class ExpressionCodegen(
override fun visitThrow(expression: IrThrow, data: BlockInfo): StackValue { override fun visitThrow(expression: IrThrow, data: BlockInfo): StackValue {
gen(expression.value, JAVA_THROWABLE_TYPE, data) gen(expression.value, JAVA_THROWABLE_TYPE, data)
mv.athrow() mv.athrow()
return expression.onStack return none()
} }
override fun visitGetClass(expression: IrGetClass, data: BlockInfo): StackValue { override fun visitGetClass(expression: IrGetClass, data: BlockInfo): StackValue {
@@ -916,10 +913,12 @@ class ExpressionCodegen(
} }
private fun coerceNotToUnit(fromType: Type, toType: Type) { private fun coerceNotToUnit(fromType: Type, toType: Type): StackValue {
if (toType != AsmTypes.UNIT_TYPE) { if (toType != AsmTypes.UNIT_TYPE) {
coerce(fromType, toType, mv) coerce(fromType, toType, mv)
return onStack(toType)
} }
return onStack(fromType)
} }
val IrExpression.asmType: Type val IrExpression.asmType: Type