From 690a46bbb478840fb43c5dc1ce1fdbc132558ab2 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 11 Jun 2015 23:49:39 +0300
Subject: [PATCH] Removed obsolete use of resolution results cache   the other
 usage is still relevant

---
 .../kotlin/resolve/calls/CallResolver.java    | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
index 80c19ad9380..c012a961f52 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
@@ -440,28 +440,17 @@ public class CallResolver {
         Call call = context.call;
         tracing.bindCall(context.trace, call);
 
-        OverloadResolutionResultsImpl<F> results = null;
         TemporaryBindingTrace traceToResolveCall = TemporaryBindingTrace.create(context.trace, "trace to resolve call", call);
-        if (!CallResolverUtil.isInvokeCallOnVariable(call)) {
-            ResolutionResultsCache.CachedData data = context.resolutionResultsCache.get(call);
-            if (data != null) {
-                DelegatingBindingTrace deltasTraceForResolve = data.getResolutionTrace();
-                deltasTraceForResolve.addOwnDataTo(traceToResolveCall);
-                //noinspection unchecked
-                results = (OverloadResolutionResultsImpl<F>) data.getResolutionResults();
-            }
-        }
-        if (results == null) {
-            BasicCallResolutionContext newContext = context.replaceBindingTrace(traceToResolveCall);
-            recordScopeAndDataFlowInfo(newContext, newContext.call.getCalleeExpression());
-            results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing);
-            DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
-            if (deltasTraceForTypeInference != null) {
-                deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
-            }
-            completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing);
-            cacheResults(context, results, traceToResolveCall, tracing);
+        BasicCallResolutionContext newContext = context.replaceBindingTrace(traceToResolveCall);
+
+        recordScopeAndDataFlowInfo(newContext, newContext.call.getCalleeExpression());
+        OverloadResolutionResultsImpl<F> results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing);
+        DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
+        if (deltasTraceForTypeInference != null) {
+            deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
         }
+        completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing);
+        cacheResults(context, results, traceToResolveCall, tracing);
         traceToResolveCall.commit();
 
         if (context.contextDependency == ContextDependency.INDEPENDENT) {