From a57869993d2d63ab4d610db4abb838ab1a166604 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 15 May 2018 10:23:27 +0300 Subject: [PATCH] Fix asserted cast in IrBuilderWithScope.irReturn --- .../org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt index 29ce9e6461f..3661cf6d406 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt @@ -22,10 +22,7 @@ import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrVariable import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.* -import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol -import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol -import org.jetbrains.kotlin.ir.symbols.IrValueSymbol -import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol +import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.addToStdlib.assertedCast @@ -90,7 +87,7 @@ fun IrBuilderWithScope.irExprBody(value: IrExpression) = fun IrBuilderWithScope.irReturn(value: IrExpression) = IrReturnImpl( startOffset, endOffset, context.builtIns.nothingType, - scope.scopeOwnerSymbol.assertedCast { + scope.scopeOwnerSymbol.assertedCast { "Function scope expected: ${scope.scopeOwner}" }, value