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

Return proper type after cast

Browse Source
This commit is contained in:
Michael Bogdanov
2016-10-05 14:23:07 +03:00
committed by Dmitry Petrov
parent 171e607250
commit 12235faa39
1 changed files with 6 additions and 3 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
+6 -3
View File
@@ -506,6 +506,7 @@ class ExpressionCodegen(
override fun visitTypeOperator(expression: IrTypeOperatorCall, data: BlockInfo): StackValue { override fun visitTypeOperator(expression: IrTypeOperatorCall, data: BlockInfo): StackValue {
val asmType = expression.typeOperand.asmType
when (expression.operator) { when (expression.operator) {
IrTypeOperator.IMPLICIT_COERCION_TO_UNIT -> { IrTypeOperator.IMPLICIT_COERCION_TO_UNIT -> {
expression.argument.accept(this, data) expression.argument.accept(this, data)
@@ -513,7 +514,7 @@ class ExpressionCodegen(
return none() return none()
} }
IrTypeOperator.IMPLICIT_CAST -> { IrTypeOperator.IMPLICIT_CAST -> {
gen(expression.argument, expression.typeOperand.asmType, data) gen(expression.argument, asmType, data)
} }
IrTypeOperator.CAST, IrTypeOperator.SAFE_CAST -> { IrTypeOperator.CAST, IrTypeOperator.SAFE_CAST -> {
@@ -522,12 +523,14 @@ class ExpressionCodegen(
if (value.type === Type.VOID_TYPE) { if (value.type === Type.VOID_TYPE) {
StackValue.putUnitInstance(mv) StackValue.putUnitInstance(mv)
} }
generateAsCast(mv, expression.typeOperand, boxType(expression.typeOperand.asmType), expression.operator == IrTypeOperator.SAFE_CAST) val boxedType = boxType(asmType)
generateAsCast(mv, expression.typeOperand, boxedType, expression.operator == IrTypeOperator.SAFE_CAST)
return onStack(boxedType)
} }
IrTypeOperator.INSTANCEOF -> { IrTypeOperator.INSTANCEOF -> {
gen(expression.argument, OBJECT_TYPE, data) gen(expression.argument, OBJECT_TYPE, data)
val type = boxType(expression.typeOperand.asmType) val type = boxType(asmType)
generateIsCheck(mv, expression.typeOperand, type) generateIsCheck(mv, expression.typeOperand, type)
} }