azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed obsolete use of resolution results cache

Browse Source 
the other usage is still relevant
This commit is contained in:
Svetlana Isakova
2015-06-11 23:49:39 +03:00
parent 89e16ecbcc
commit 690a46bbb4
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+9 -20
View File
@@ -440,28 +440,17 @@ public class CallResolver {
Call call = context.call; Call call = context.call;
tracing.bindCall(context.trace, call); tracing.bindCall(context.trace, call);
OverloadResolutionResultsImpl<F> results = null;
TemporaryBindingTrace traceToResolveCall = TemporaryBindingTrace.create(context.trace, "trace to resolve call", call); TemporaryBindingTrace traceToResolveCall = TemporaryBindingTrace.create(context.trace, "trace to resolve call", call);
if (!CallResolverUtil.isInvokeCallOnVariable(call)) { BasicCallResolutionContext newContext = context.replaceBindingTrace(traceToResolveCall);
ResolutionResultsCache.CachedData data = context.resolutionResultsCache.get(call);
if (data != null) { recordScopeAndDataFlowInfo(newContext, newContext.call.getCalleeExpression());
DelegatingBindingTrace deltasTraceForResolve = data.getResolutionTrace(); OverloadResolutionResultsImpl<F> results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing);
deltasTraceForResolve.addOwnDataTo(traceToResolveCall); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
//noinspection unchecked if (deltasTraceForTypeInference != null) {
results = (OverloadResolutionResultsImpl<F>) data.getResolutionResults(); deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
}
}
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);
} }
completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing);
cacheResults(context, results, traceToResolveCall, tracing);
traceToResolveCall.commit(); traceToResolveCall.commit();
if (context.contextDependency == ContextDependency.INDEPENDENT) { if (context.contextDependency == ContextDependency.INDEPENDENT) {