From 1c093a843c9fbe4afe21c36759c68c8667bb7d3e Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Thu, 13 Oct 2011 18:08:53 +0400
Subject: [PATCH] Method renamed

---
 .../src/org/jetbrains/jet/codegen/JetTypeMapper.java        | 6 +++---
 .../src/org/jetbrains/jet/lang/types/JetTypeInferrer.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
index 59ff7f9bf75..b8e221c52a9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
@@ -466,8 +466,8 @@ public class JetTypeMapper {
 
 
     private Method mapSignature(FunctionDescriptor f, List<Type> valueParameterTypes, OwnerKind kind) {
-        final ReceiverDescriptor receiverTypeRef = f.getReceiver();
-        final JetType receiverType = receiverTypeRef == ReceiverDescriptor.NO_RECEIVER ? null : receiverTypeRef.getType();
+        final ReceiverDescriptor receiverTypeRef = f.getReceiverParameter();
+        final JetType receiverType = !receiverTypeRef.exists() ? null : receiverTypeRef.getType();
         final List<ValueParameterDescriptor> parameters = f.getValueParameters();
         List<Type> parameterTypes = new ArrayList<Type>();
         if (receiverType != null) {
@@ -520,7 +520,7 @@ public class JetTypeMapper {
         if (functionParent instanceof NamespaceDescriptor) {
             owner = NamespaceCodegen.getJVMClassName(DescriptorRenderer.getFQName(functionParent));
             invokeOpcode = Opcodes.INVOKESTATIC;
-            needsReceiver = functionDescriptor.getReceiver() != ReceiverDescriptor.NO_RECEIVER;
+            needsReceiver = functionDescriptor.getReceiverParameter().exists();
         }
         else if (functionParent instanceof ClassDescriptor) {
             ClassDescriptor containingClass = (ClassDescriptor) functionParent;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
index 65a43fdde38..e8b0a6f6bee 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
@@ -2956,7 +2956,7 @@ public class JetTypeInferrer {
                 }
                 else if (declarationDescriptor instanceof FunctionDescriptor) {
                     FunctionDescriptor functionDescriptor = (FunctionDescriptor) declarationDescriptor;
-                    thisReceiver = functionDescriptor.getReceiver();
+                    thisReceiver = functionDescriptor.getReceiverParameter();
                 }
                 else {
                     throw new UnsupportedOperationException(); // TODO
@@ -2971,7 +2971,7 @@ public class JetTypeInferrer {
                 if (element instanceof JetFunctionLiteralExpression) {
                     DeclarationDescriptor declarationDescriptor = context.trace.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
                     if (declarationDescriptor instanceof FunctionDescriptor) {
-                        thisReceiver = ((FunctionDescriptor) declarationDescriptor).getReceiver();
+                        thisReceiver = ((FunctionDescriptor) declarationDescriptor).getReceiverParameter();
                         if (thisReceiver.exists()) {
                             context.trace.record(LABEL_TARGET, targetLabel, element);
                             context.trace.record(REFERENCE_TARGET, expression.getThisReference(), declarationDescriptor);