From 189080e6249922b6351e92a954d738c8f08f087d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 9 Jul 2014 17:22:57 +0400 Subject: [PATCH] JVM backend: fixed the getting Unit instance -- Unit.VALUE -> Unit.instance$. --- compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java index 7923ef58712..66c4d107c41 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java @@ -25,6 +25,7 @@ import org.jetbrains.jet.codegen.state.JetTypeMapper; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.org.objectweb.asm.Label; @@ -282,7 +283,7 @@ public abstract class StackValue { } public static void putUnitInstance(InstructionAdapter v) { - v.visitFieldInsn(GETSTATIC, UNIT_TYPE.getInternalName(), "VALUE", UNIT_TYPE.getDescriptor()); + v.visitFieldInsn(GETSTATIC, UNIT_TYPE.getInternalName(), JvmAbi.INSTANCE_FIELD, UNIT_TYPE.getDescriptor()); } protected void putAsBoolean(InstructionAdapter v) {