Callable descriptors store expected this object

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -12,6 +12,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.types.*;
 
 import java.util.*;
@@ -327,6 +328,7 @@ public class JavaDescriptorResolver {
                 resolveVisibilityFromPsiModifiers(semanticServices.getTrace(), field),
                 !isFinal,
                 null,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(containingDeclaration),
                 field.getName(),
                 isFinal ? null : type,
                 type);
@@ -401,6 +403,7 @@ public class JavaDescriptorResolver {
         methodDescriptorCache.put(method, functionDescriptorImpl);
         functionDescriptorImpl.initialize(
                 null,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(owner),
                 resolveTypeParameters(functionDescriptorImpl, method.getTypeParameters()),
                 semanticServices.getDescriptorResolver().resolveParameterDescriptors(functionDescriptorImpl, parameters),
                 semanticServices.getTypeTransformer().transformToType(returnType),

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java

@@ -15,6 +15,9 @@ public interface CallableDescriptor extends DeclarationDescriptor {
     @NotNull
     ReceiverDescriptor getReceiverParameter();
 
+    @NotNull
+    ReceiverDescriptor getExpectedThisObject();
+
     @NotNull
     List<TypeParameterDescriptor> getTypeParameters();
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java

@@ -3,6 +3,8 @@ package org.jetbrains.jet.lang.descriptors;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
 
 import java.util.Collections;
@@ -28,16 +30,27 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
 
     @Override
     @Deprecated
-    public FunctionDescriptorImpl initialize(@Nullable JetType receiverType, @NotNull List<TypeParameterDescriptor> typeParameters, @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters, @Nullable JetType unsubstitutedReturnType, Modality modality, @NotNull Visibility visibility) {
+    public FunctionDescriptorImpl initialize(@Nullable JetType receiverType, @NotNull ReceiverDescriptor expectedThisObject, @NotNull List<TypeParameterDescriptor> typeParameters, @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters, @Nullable JetType unsubstitutedReturnType, Modality modality, @NotNull Visibility visibility) {
         assert receiverType == null;
-        return super.initialize(null, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility);
+        return super.initialize(null, expectedThisObject, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility);
     }
 
     public ConstructorDescriptorImpl initialize(@NotNull List<TypeParameterDescriptor> typeParameters, @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters, Modality modality, Visibility visibility) {
-        super.initialize(null, typeParameters, unsubstitutedValueParameters, null, modality, visibility);
+        super.initialize(null, getExpectedThisObject(getContainingDeclaration()), typeParameters, unsubstitutedValueParameters, null, modality, visibility);
         return this;
     }
 
+    @NotNull
+    private static ReceiverDescriptor getExpectedThisObject(@NotNull DeclarationDescriptor descriptor) {
+        if (descriptor instanceof ConstructorDescriptor) {
+            ConstructorDescriptor constructorDescriptor = (ConstructorDescriptor) descriptor;
+            ClassDescriptor classDescriptor = constructorDescriptor.getContainingDeclaration();
+            return getExpectedThisObject(classDescriptor);
+        }
+        DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
+        return DescriptorUtils.getExpectedThisObjectIfNeeded(containingDeclaration);
+    }
+
     @NotNull
     @Override
     public ClassDescriptor getContainingDeclaration() {

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java

@@ -8,6 +8,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver;
 import org.jetbrains.jet.lang.types.DescriptorSubstitutor;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
@@ -27,6 +28,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
     private List<ValueParameterDescriptor> unsubstitutedValueParameters;
     private JetType unsubstitutedReturnType;
     private ReceiverDescriptor receiver;
+    private ReceiverDescriptor expectedThisObject;
 
     private Modality modality;
     private Visibility visibility;
@@ -51,6 +53,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
 
     public FunctionDescriptorImpl initialize(
             @Nullable JetType receiverType,
+            @NotNull ReceiverDescriptor expectedThisObject,
             @NotNull List<TypeParameterDescriptor> typeParameters,
             @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters,
             @Nullable JetType unsubstitutedReturnType,
@@ -62,6 +65,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
         this.modality = modality;
         this.visibility = visibility;
         this.receiver = receiverType == null ? NO_RECEIVER : new ExtensionReceiver(this, receiverType);
+        this.expectedThisObject = expectedThisObject;
         return this;
     }
 
@@ -75,6 +79,12 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
         return receiver;
     }
 
+    @NotNull
+    @Override
+    public ReceiverDescriptor getExpectedThisObject() {
+        return expectedThisObject;
+    }
+
     @NotNull
     @Override
     public Set<? extends FunctionDescriptor> getOverriddenDescriptors() {
@@ -138,6 +148,15 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
                 return null;
             }
         }
+        
+        ReceiverDescriptor substitutedExpectedThis = NO_RECEIVER;
+        if (expectedThisObject.exists()) {
+            JetType substitutedType = substitutor.substitute(expectedThisObject.getType(), Variance.IN_VARIANCE);
+            if (substitutedType == null) {
+                return null;
+            }
+            substitutedExpectedThis = new TransientReceiver(substitutedType);
+        }
 
         List<ValueParameterDescriptor> substitutedValueParameters = FunctionDescriptorUtil.getSubstitutedValueParameters(substitutedDescriptor, this, substitutor);
         if (substitutedValueParameters == null) {
@@ -151,6 +170,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
 
         substitutedDescriptor.initialize(
                 substitutedReceiverType,
+                substitutedExpectedThis,
                 substitutedTypeParameters,
                 substitutedValueParameters,
                 substitutedReturnType,
@@ -182,6 +202,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
         FunctionDescriptorImpl copy = new FunctionDescriptorImpl(newOwner, Lists.newArrayList(getAnnotations()), getName());
         copy.initialize(
                 getReceiverParameter().exists() ? getReceiverParameter().getType() : null,
+                expectedThisObject,
                 DescriptorUtils.copyTypeParameters(copy, typeParameters),
                 DescriptorUtils.copyValueParameters(copy, unsubstitutedValueParameters),
                 unsubstitutedReturnType,

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java

@@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.descriptors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
 
 import java.util.Collections;
@@ -77,6 +78,18 @@ public abstract class PropertyAccessorDescriptor extends DeclarationDescriptorIm
         return correspondingProperty;
     }
 
+    @NotNull
+    @Override
+    public ReceiverDescriptor getReceiverParameter() {
+        return getCorrespondingProperty().getReceiverParameter();
+    }
+
+    @NotNull
+    @Override
+    public ReceiverDescriptor getExpectedThisObject() {
+        return getCorrespondingProperty().getExpectedThisObject();
+    }
+
     @NotNull
     @Override
     public PropertyAccessorDescriptor copy(DeclarationDescriptor newOwner, boolean makeNonAbstract) {

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java

@@ -8,6 +8,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
 import org.jetbrains.jet.lang.types.Variance;
@@ -24,6 +25,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
     private final Visibility visibility;
     private final boolean isVar;
     private final ReceiverDescriptor receiver;
+    private final ReceiverDescriptor expectedThisObject;
     private final Set<PropertyDescriptor> overriddenProperties = Sets.newLinkedHashSet();
     private final List<TypeParameterDescriptor> typeParemeters = Lists.newArrayListWithCapacity(0);
     private final PropertyDescriptor original;
@@ -38,6 +40,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
             @NotNull Visibility visibility,
             boolean isVar,
             @Nullable JetType receiverType,
+            @NotNull ReceiverDescriptor expectedThisObject,
             @NotNull String name,
             @Nullable JetType inType,
             @NotNull JetType outType) {
@@ -48,6 +51,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
         this.modality = modality;
         this.visibility = visibility;
         this.receiver = receiverType == null ? ReceiverDescriptor.NO_RECEIVER : new ExtensionReceiver(this, receiverType);
+        this.expectedThisObject = expectedThisObject;
         this.original = original == null ? this : original.getOriginal();
     }
 
@@ -58,15 +62,17 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
             @NotNull Visibility visibility,
             boolean isVar,
             @Nullable JetType receiverType,
+            @NotNull ReceiverDescriptor expectedThisObject,
             @NotNull String name,
             @Nullable JetType inType,
             @NotNull JetType outType) {
-        this(null, containingDeclaration, annotations, modality, visibility, isVar, receiverType, name, inType, outType);
+        this(null, containingDeclaration, annotations, modality, visibility, isVar, receiverType, expectedThisObject, name, inType, outType);
     }
 
     private PropertyDescriptor(
             @NotNull PropertyDescriptor original,
             @Nullable JetType receiverType,
+            @NotNull ReceiverDescriptor expectedThisObject,
             @Nullable JetType inType,
             @NotNull JetType outType) {
         this(
@@ -77,6 +83,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
                 original.getVisibility(),
                 original.isVar,
                 receiverType,
+                expectedThisObject,
                 original.getName(),
                 inType,
                 outType);
@@ -99,6 +106,12 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
         return receiver;
     }
 
+    @NotNull
+    @Override
+    public ReceiverDescriptor getExpectedThisObject() {
+        return expectedThisObject;
+    }
+
     @NotNull
     @Override
     public JetType getReturnType() {
@@ -132,7 +145,6 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
         return setter;
     }
 
-    @NotNull
     @Override
     public PropertyDescriptor substitute(TypeSubstitutor substitutor) {
         JetType originalInType = getInType();
@@ -142,9 +154,18 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
         if (inType == null && outType == null) {
             return null; // TODO : tell the user that the property was projected out
         }
+        JetType substitutedReceiverType;
+        if (receiver.exists()) {
+            substitutedReceiverType = substitutor.substitute(receiver.getType(), Variance.IN_VARIANCE);
+            if (substitutedReceiverType == null) return null;
+        }
+        else {
+            substitutedReceiverType = null;
+        }
         return new PropertyDescriptor(
                 this,
-                receiver.exists() ? substitutor.substitute(receiver.getType(), Variance.IN_VARIANCE) : null,
+                substitutedReceiverType,
+                expectedThisObject.exists() ? new TransientReceiver(substitutor.substitute(expectedThisObject.getType(), Variance.IN_VARIANCE)) : expectedThisObject,
                 inType,
                 outType
         );
@@ -171,6 +192,7 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
         return overriddenProperties;
 
     }
+
     @NotNull
     @Override
     public PropertyDescriptor copy(DeclarationDescriptor newOwner, boolean makeNonAbstract) {
@@ -178,7 +200,9 @@ public class PropertyDescriptor extends VariableDescriptorImpl implements Callab
                 newOwner,
                 Lists.newArrayList(getAnnotations()),
                 DescriptorUtils.convertModality(modality, makeNonAbstract), visibility, isVar,
-                receiver.exists() ? receiver.getType() : null, getName(), getInType(), getOutType());
+                receiver.exists() ? receiver.getType() : null,
+                expectedThisObject,
+                getName(), getInType(), getOutType());
         PropertyGetterDescriptor newGetter = getter == null ? null : new PropertyGetterDescriptor(
                 propertyDescriptor, Lists.newArrayList(getter.getAnnotations()),
                 DescriptorUtils.convertModality(getter.getModality(), makeNonAbstract), getter.getVisibility(),

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java

@@ -33,12 +33,6 @@ public class PropertyGetterDescriptor extends PropertyAccessorDescriptor {
         overriddenGetters.add(overriddenGetter);
     }
 
-    @NotNull
-    @Override
-    public ReceiverDescriptor getReceiverParameter() {
-        return getCorrespondingProperty().getReceiverParameter();
-    }
-
     @NotNull
     @Override
     public List<ValueParameterDescriptor> getValueParameters() {

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java

@@ -3,7 +3,6 @@ package org.jetbrains.jet.lang.descriptors;
 import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetStandardClasses;
 import org.jetbrains.jet.lang.types.JetType;
 
@@ -42,12 +41,6 @@ public class PropertySetterDescriptor extends PropertyAccessorDescriptor {
         overriddenSetters.add(overriddenSetter);
     }
 
-    @NotNull
-    @Override
-    public ReceiverDescriptor getReceiverParameter() {
-        return getCorrespondingProperty().getReceiverParameter();
-    }
-
     @NotNull
     @Override
     public List<ValueParameterDescriptor> getValueParameters() {

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableAsFunctionDescriptor.java

@@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.descriptors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetStandardClasses;
 import org.jetbrains.jet.lang.types.JetType;
 
@@ -16,7 +17,7 @@ public class VariableAsFunctionDescriptor extends FunctionDescriptorImpl {
         assert outType != null;
         assert JetStandardClasses.isFunctionType(outType);
         VariableAsFunctionDescriptor result = new VariableAsFunctionDescriptor(variableDescriptor);
-        result.initialize(JetStandardClasses.getReceiverType(outType), Collections.<TypeParameterDescriptor>emptyList(), JetStandardClasses.getValueParameters(result, outType), JetStandardClasses.getReturnType(outType), Modality.FINAL, Visibility.LOCAL);
+        result.initialize(JetStandardClasses.getReceiverType(outType), ReceiverDescriptor.NO_RECEIVER, Collections.<TypeParameterDescriptor>emptyList(), JetStandardClasses.getValueParameters(result, outType), JetStandardClasses.getReturnType(outType), Modality.FINAL, Visibility.LOCAL);
         return result;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java

@@ -26,7 +26,6 @@ public interface VariableDescriptor extends CallableDescriptor {
     @NotNull
     DeclarationDescriptor getContainingDeclaration();
 
-    @NotNull
     @Override
     VariableDescriptor substitute(TypeSubstitutor substitutor);
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorImpl.java

@@ -78,6 +78,12 @@ public abstract class VariableDescriptorImpl extends DeclarationDescriptorImpl i
         return ReceiverDescriptor.NO_RECEIVER;
     }
 
+    @NotNull
+    @Override
+    public ReceiverDescriptor getExpectedThisObject() {
+        return ReceiverDescriptor.NO_RECEIVER;
+    }
+
     @NotNull
     @Override
     public JetType getReturnType() {

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java

@@ -195,6 +195,7 @@ public class ClassDescriptorResolver {
         Visibility visibility = resolveVisibilityFromModifiers(function.getModifierList());
         functionDescriptor.initialize(
                 receiverType,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(containingDescriptor),
                 typeParameterDescriptors,
                 valueParameterDescriptors,
                 returnType,
@@ -438,6 +439,7 @@ public class ClassDescriptorResolver {
                 resolveVisibilityFromModifiers(objectDeclaration.getModifierList()),
                 false,
                 null,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(containingDeclaration),
                 JetPsiUtil.safeName(objectDeclaration.getName()),
                 null,
                 classDescriptor.getDefaultType());
@@ -490,6 +492,7 @@ public class ClassDescriptorResolver {
                 resolveVisibilityFromModifiers(property.getModifierList()),
                 isVar,
                 receiverType,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(containingDeclaration),
                 JetPsiUtil.safeName(property.getName()),
                 isVar ? type : null,
                 type);
@@ -761,6 +764,7 @@ public class ClassDescriptorResolver {
                 resolveVisibilityFromModifiers(parameter.getModifierList()),
                 isMutable,
                 null,
+                DescriptorUtils.getExpectedThisObjectIfNeeded(classDescriptor),
                 name == null ? "<no name>" : name,
                 isMutable ? type : null,
                 type);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

@@ -116,13 +116,7 @@ public class DescriptorUtils {
     }
 
     @NotNull
-    public static ReceiverDescriptor getExpectedThisObject(@NotNull DeclarationDescriptor descriptor) {
-        if (descriptor instanceof ConstructorDescriptor) {
-            ConstructorDescriptor constructorDescriptor = (ConstructorDescriptor) descriptor;
-            ClassDescriptor classDescriptor = constructorDescriptor.getContainingDeclaration();
-            return getExpectedThisObject(classDescriptor);
-        }
-        DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
+    public static ReceiverDescriptor getExpectedThisObjectIfNeeded(@NotNull DeclarationDescriptor containingDeclaration) {
         if (containingDeclaration instanceof ClassDescriptor) {
             ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
             return classDescriptor.getImplicitReceiver();

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java

@@ -557,7 +557,7 @@ public class CallResolver {
         boolean result = checkValueArgumentTypes(scope, candidateCall);
 
         result &= checkReceiver(tracing, candidateCall, candidateCall.getResultingDescriptor().getReceiverParameter(), candidateCall.getReceiverArgument(), task);
-        result &= checkReceiver(tracing, candidateCall, DescriptorUtils.getExpectedThisObject(candidateCall.getResultingDescriptor()), candidateCall.getThisObject(), task);
+        result &= checkReceiver(tracing, candidateCall, candidateCall.getResultingDescriptor().getExpectedThisObject(), candidateCall.getThisObject(), task);
         return result;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolvedCall.java

@@ -4,8 +4,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
@@ -132,9 +133,4 @@ public class ResolvedCall<D extends CallableDescriptor> {
     public boolean isDirty() {
         return someArgumentHasNoType;
     }
-
-    @NotNull
-    public ReceiverDescriptor getExpectedThisObject() {
-        return DescriptorUtils.getExpectedThisObject(getResultingDescriptor());
-    }
 }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TaskPrioritizer.java

@@ -2,10 +2,12 @@ package org.jetbrains.jet.lang.resolve.calls;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.Call;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.DataFlowInfo;
@@ -89,7 +91,6 @@ import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
         DataFlowInfo dataFlowInfo = autoCastService.getDataFlowInfo();
         List<ReceiverDescriptor> implicitReceivers = Lists.newArrayList();
         scope.getImplicitReceiversHierarchy(implicitReceivers);
-        // AutoCastUtils.getAutoCastVariants(bindingContext, dataFlowInfo, receiverToCast)
         if (receiver.exists()) {
             List<ReceiverDescriptor> variantsForExplicitReceiver = autoCastService.getVariantsForReceiver(receiver);
 
@@ -170,7 +171,7 @@ import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
     }
 
     private static <D extends CallableDescriptor> boolean setImpliedThis(@NotNull JetScope scope, ResolvedCall<D> resolvedCall) {
-        ReceiverDescriptor expectedThisObject = DescriptorUtils.getExpectedThisObject(resolvedCall.getCandidateDescriptor());
+        ReceiverDescriptor expectedThisObject = resolvedCall.getCandidateDescriptor().getExpectedThisObject();
         if (!expectedThisObject.exists()) return true;
         List<ReceiverDescriptor> receivers = Lists.newArrayList();
         scope.getImplicitReceiversHierarchy(receivers);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java

@@ -177,7 +177,7 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
             error = true;
         }
 
-        assert candidateCall.getThisObject().exists() == candidateCall.getExpectedThisObject().exists() : "Shouldn't happen because of TaskPrioritizer: " + candidateCall.getCandidateDescriptor();
+        assert candidateCall.getThisObject().exists() == candidateCall.getResultingDescriptor().getExpectedThisObject().exists() : "Shouldn't happen because of TaskPrioritizer: " + candidateCall.getCandidateDescriptor();
 
         return error;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java

@@ -2,14 +2,28 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.types.JetType;
 
 /**
  * @author abreslav
  */
-public class ClassReceiver extends ImplicitReceiverDescriptor {
+public class ClassReceiver implements ReceiverDescriptor {
 
-    public ClassReceiver(ClassDescriptor classDescriptor) {
-        super(classDescriptor, classDescriptor.getDefaultType());
+    private final ClassDescriptor classDescriptor;
+
+    public ClassReceiver(@NotNull ClassDescriptor classDescriptor) {
+        this.classDescriptor = classDescriptor;
+    }
+
+    @Override
+    public boolean exists() {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public JetType getType() {
+        return classDescriptor.getDefaultType();
     }
 
     @Override

compiler/frontend/src/org/jetbrains/jet/lang/types/DataFlowInfo.java

@@ -185,6 +185,10 @@ public class DataFlowInfo {
 
         return new DataFlowInfo(ImmutableMap.copyOf(builder), newTypeInfo);
     }
+    
+    public DataFlowInfo nullabilityOnly() {
+        return new DataFlowInfo(nullabilityInfo, EMPTY.copyTypeInfo());
+    }
 
     private static class NullabilityFlags {
         private final boolean canBeNull;

compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java

@@ -105,6 +105,7 @@ public class ErrorUtils {
             Visibility.INTERNAL,
             true,
             null,
+            ReceiverDescriptor.NO_RECEIVER,
             "<ERROR PROPERTY>",
             ERROR_PROPERTY_TYPE, ERROR_PROPERTY_TYPE);
 
@@ -112,6 +113,7 @@ public class ErrorUtils {
         FunctionDescriptorImpl functionDescriptor = new FunctionDescriptorImpl(ERROR_CLASS, Collections.<AnnotationDescriptor>emptyList(), "<ERROR FUNCTION>");
         return functionDescriptor.initialize(
                 null,
+                ReceiverDescriptor.NO_RECEIVER,
                 typeParameters,
                 getValueParameters(functionDescriptor, positionedValueArgumentTypes),
                 createErrorType("<ERROR FUNCTION RETURN>"),
@@ -123,6 +125,7 @@ public class ErrorUtils {
     public static FunctionDescriptor createErrorFunction(int typeParameterCount, List<JetType> positionedValueParameterTypes) {
         return new FunctionDescriptorImpl(ERROR_CLASS, Collections.<AnnotationDescriptor>emptyList(), "<ERROR FUNCTION>").initialize(
                 null,
+                ReceiverDescriptor.NO_RECEIVER,
                 Collections.<TypeParameterDescriptor>emptyList(), // TODO
                 Collections.<ValueParameterDescriptor>emptyList(), // TODO
                 createErrorType("<ERROR FUNCTION RETURN TYPE>"),

compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -1014,7 +1014,7 @@ public class JetTypeInferrer {
             else {
                 effectiveReceiverType = receiverType;
             }
-            functionDescriptor.initialize(effectiveReceiverType, Collections.<TypeParameterDescriptor>emptyList(), valueParameterDescriptors, null, Modality.FINAL, Visibility.LOCAL);
+            functionDescriptor.initialize(effectiveReceiverType, NO_RECEIVER, Collections.<TypeParameterDescriptor>emptyList(), valueParameterDescriptors, null, Modality.FINAL, Visibility.LOCAL);
             context.trace.record(BindingContext.FUNCTION, expression, functionDescriptor);
 
             JetType returnType = NO_EXPECTED_TYPE;