From 08e3da67690489d35c218defab362077b198cebf Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 22 Aug 2012 16:48:30 +0400 Subject: [PATCH] Rename --- .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 7c364043c5c..83e55b5cf06 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1249,7 +1249,7 @@ public class ExpressionCodegen extends JetVisitor { return myFrameMap.getIndex(descriptor); } - public void invokeFunctionNoParams(FunctionDescriptor functionDescriptor, Type type, InstructionAdapter v) { + public void invokeFunctionNoParams(FunctionDescriptor functionDescriptor, Type expectedType, InstructionAdapter v) { DeclarationDescriptor containingDeclaration = functionDescriptor.getOriginal().getContainingDeclaration(); boolean isStatic = containingDeclaration instanceof NamespaceDescriptor; functionDescriptor = functionDescriptor.getOriginal(); @@ -1257,7 +1257,7 @@ public class ExpressionCodegen extends JetVisitor { IntrinsicMethod intrinsic = state.getInjector().getIntrinsics().getIntrinsic(functionDescriptor); if (intrinsic != null) { - intrinsic.generate(this, v, type, null, null, StackValue.onStack(TYPE_OBJECT), state); + intrinsic.generate(this, v, expectedType, null, null, StackValue.onStack(TYPE_OBJECT), state); return; } @@ -1277,7 +1277,7 @@ public class ExpressionCodegen extends JetVisitor { typeMapper.mapSignature(functionDescriptor.getName(), functionDescriptor).getAsmMethod().getDescriptor()); JetType returnType = functionDescriptor.getReturnType(); assert returnType != null; - StackValue.onStack(asmType(returnType)).coerce(type, v); + StackValue.onStack(asmType(returnType)).coerce(expectedType, v); } public StackValue.Property intermediateValueForProperty(