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

backend: fix type operator result type in autoboxing

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-03-09 12:36:39 +07:00
committed by SvyatoslavScherbina
parent 11f2ea7e38
commit d4fc79da43
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
+6 -2
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.util.isNullConst
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.typeUtil.makeNullable
/** /**
* Boxes and unboxes values of value types when necessary. * Boxes and unboxes values of value types when necessary.
@@ -75,8 +76,11 @@ private class AutoboxingTransformer(val context: Context) : AbstractValueUsageTr
IrTypeOperator.CAST, IrTypeOperator.IMPLICIT_CAST, IrTypeOperator.CAST, IrTypeOperator.IMPLICIT_CAST,
IrTypeOperator.IMPLICIT_NOTNULL, IrTypeOperator.SAFE_CAST -> { IrTypeOperator.IMPLICIT_NOTNULL, IrTypeOperator.SAFE_CAST -> {
// Codegen produces the object reference: val newExpressionType = if (expression.operator == IrTypeOperator.SAFE_CAST) {
val newExpressionType = builtIns.nullableAnyType newTypeOperand.makeNullable()
} else {
newTypeOperand
}
IrTypeOperatorCallImpl(expression.startOffset, expression.endOffset, IrTypeOperatorCallImpl(expression.startOffset, expression.endOffset,
newExpressionType, expression.operator, newTypeOperand, newExpressionType, expression.operator, newTypeOperand,