From d6b5e48b2a0a85229a0e1205b5640c5bcab053d9 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 5 Oct 2016 12:35:03 +0300 Subject: [PATCH] Wrap Nothing type into return expression --- .../jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt index 400f48ea10c..b6c7a741f08 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt @@ -105,12 +105,7 @@ class BodyGenerator(val scopeOwner: DeclarationDescriptor, override val context: } } - private fun IrExpression.wrapWithReturn() = - if (KotlinBuiltIns.isNothing(type)) - this - else { - generateReturnExpression(startOffset, endOffset, this) - } + private fun IrExpression.wrapWithReturn() = generateReturnExpression(startOffset, endOffset, this) private fun generateReturnExpression(startOffset: Int, endOffset: Int, returnValue: IrExpression): IrReturnImpl { val returnTarget = (scopeOwner as? CallableDescriptor) ?: