From ff400059734df6362761c6b726c49f7740797d0f Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 29 Nov 2013 16:23:16 +0400
Subject: [PATCH] Record resolved call for this expression

---
 .../BasicExpressionTypingVisitor.java         | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
index fd262ce2064..0f1d1bb377b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
@@ -35,14 +35,16 @@ import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValue;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValueFactory;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.Nullability;
+import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext;
 import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode;
 import org.jetbrains.jet.lang.resolve.calls.context.TemporaryTraceAndCache;
-import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
-import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace;
-import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall;
+import org.jetbrains.jet.lang.resolve.calls.model.*;
 import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults;
 import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl;
 import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsUtil;
+import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind;
+import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate;
+import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy;
 import org.jetbrains.jet.lang.resolve.calls.util.CallMaker;
 import org.jetbrains.jet.lang.resolve.constants.*;
 import org.jetbrains.jet.lang.resolve.constants.StringValue;
@@ -427,11 +429,41 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             }
             if (result != NO_RECEIVER_PARAMETER) {
                 context.trace.record(REFERENCE_TARGET, expression.getInstanceReference(), result.getContainingDeclaration());
+                recordThisOrSuperCallInTraceAndCallExtension(context, result, expression);
+
             }
             return LabelResolver.LabeledReceiverResolutionResult.labelResolutionSuccess(result);
         }
     }
 
+    private static void recordThisOrSuperCallInTraceAndCallExtension(
+            ExpressionTypingContext context,
+            ReceiverParameterDescriptor descriptor,
+            JetExpression expression
+    ) {
+        BindingTrace trace = context.trace;
+        ResolutionCandidate<ReceiverParameterDescriptor> resolutionCandidate =
+                ResolutionCandidate.create(descriptor,
+                                           NO_RECEIVER,
+                                           NO_RECEIVER,
+                                           ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
+                                           false);
+
+        Call call = CallMaker.makeCall(expression, NO_RECEIVER, null, expression, Collections.<ValueArgument>emptyList());
+        ResolvedCallImpl<ReceiverParameterDescriptor> resolvedCall =
+                ResolvedCallImpl.create(resolutionCandidate,
+                                        TemporaryBindingTrace.create(trace, "Fake trace for fake 'this' or 'super' resolved call"),
+                                        TracingStrategy.EMPTY,
+                                        new DataFlowInfoForArgumentsImpl(call));
+        resolvedCall.markCallAsCompleted();
+
+        trace.record(RESOLVED_CALL, expression, resolvedCall);
+        trace.record(CALL, expression, call);
+
+        context.callResolverExtension.run(resolvedCall,
+                                          BasicCallResolutionContext.create(context, call, CheckValueArgumentsMode.DISABLED));
+    }
+
     private static boolean isDeclaredInClass(ReceiverParameterDescriptor receiver) {
         return receiver.getContainingDeclaration() instanceof ClassDescriptor;
     }