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

[IR] Throw NPE instead of KCE on attempt to cast from null

Browse Source
This commit is contained in:
Igor Chevdar
2020-01-30 15:45:19 +03:00
parent d6df4f8b21
commit b15875cc15
1 changed files with 2 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/TypeOperatorLowering.kt
+2 -2
View File
@@ -47,7 +47,7 @@ private class TypeOperatorTransformer(val context: CommonBackendContext, val fun
private val builder = context.createIrBuilder(function) private val builder = context.createIrBuilder(function)
val throwTypeCastException = context.ir.symbols.ThrowTypeCastException val throwNullPointerException = context.ir.symbols.ThrowNullPointerException
override fun visitFunction(declaration: IrFunction): IrStatement { override fun visitFunction(declaration: IrFunction): IrStatement {
// ignore inner functions during this pass // ignore inner functions during this pass
@@ -96,7 +96,7 @@ private class TypeOperatorTransformer(val context: CommonBackendContext, val fun
thenPart = if (typeOperand.isSimpleTypeWithQuestionMark) thenPart = if (typeOperand.isSimpleTypeWithQuestionMark)
irNull() irNull()
else else
irCall(throwTypeCastException.owner), irCall(throwNullPointerException.owner),
elsePart = irAs(irGet(argument.owner), typeOperand.makeNotNull()) elsePart = irAs(irGet(argument.owner), typeOperand.makeNotNull())
) )