From de2bef910baca2318eda55c13e9fb917a93b390a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 28 Sep 2016 15:52:35 +0300 Subject: [PATCH] Assertion error on singleton values in ExpressionCodegen. --- .../kotlin/backend/jvm/codegen/ExpressionCodegen.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt index 27267798a90..8c3783fa099 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt @@ -196,7 +196,7 @@ class ExpressionCodegen( override fun visitInstanceInitializerCall(expression: IrInstanceInitializerCall, data: BlockInfo): StackValue { - throw AssertionError("IrInstanceInitializerCall should've been lowered before code generation: ${expression.render()}") + throw AssertionError("Instruction should've been lowered before code generation: ${expression.render()}") } override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall, data: BlockInfo): StackValue { @@ -267,8 +267,11 @@ class ExpressionCodegen( } override fun visitGetObjectValue(expression: IrGetObjectValue, data: BlockInfo): StackValue { - StackValue.singleton(expression.descriptor, typeMapper).put(expression.asmType, mv) - return expression.onStack + throw AssertionError("Instruction should've been lowered before code generation: ${expression.render()}") + } + + override fun visitGetEnumValue(expression: IrGetEnumValue, data: BlockInfo): StackValue { + throw AssertionError("Instruction should've been lowered before code generation: ${expression.render()}") } override fun visitSetVariable(expression: IrSetVariable, data: BlockInfo): StackValue {