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

no @Nullable tracing in parameters

Browse Source
This commit is contained in:
Svetlana Isakova
2012-07-18 22:46:07 +04:00
parent 4ca18b2fb6
commit 3f37fe49a8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+8 -2
View File
@@ -277,6 +277,11 @@ public class CallResolver {
delegatingBindingTrace.addAllMyDataTo(cloneDelta); delegatingBindingTrace.addAllMyDataTo(cloneDelta);
cacheResults(resolutionResultsSlice, context, results, cloneDelta); cacheResults(resolutionResultsSlice, context, results, cloneDelta);
if (prioritizedTasks.isEmpty()) {
delegatingBindingTrace.commit();
return results;
}
TemporaryBindingTrace temporaryBindingTrace = null; TemporaryBindingTrace temporaryBindingTrace = null;
if (results instanceof OverloadResolutionResultsImpl) { if (results instanceof OverloadResolutionResultsImpl) {
temporaryBindingTrace = ((OverloadResolutionResultsImpl) results).getTrace(); temporaryBindingTrace = ((OverloadResolutionResultsImpl) results).getTrace();
@@ -284,7 +289,7 @@ public class CallResolver {
newContext = newContext.replaceTrace(temporaryBindingTrace); newContext = newContext.replaceTrace(temporaryBindingTrace);
} }
} }
TracingStrategy tracing = !prioritizedTasks.isEmpty() ? prioritizedTasks.iterator().next().tracing : null; TracingStrategy tracing = prioritizedTasks.iterator().next().tracing;
OverloadResolutionResults<F> completeResults = completeTypeInferenceDependentOnExpectedType(newContext, results, tracing); OverloadResolutionResults<F> completeResults = completeTypeInferenceDependentOnExpectedType(newContext, results, tracing);
if (temporaryBindingTrace != null) { if (temporaryBindingTrace != null) {
temporaryBindingTrace.commit(); temporaryBindingTrace.commit();
@@ -296,7 +301,8 @@ public class CallResolver {
private <D extends CallableDescriptor> OverloadResolutionResults<D> completeTypeInferenceDependentOnExpectedType( private <D extends CallableDescriptor> OverloadResolutionResults<D> completeTypeInferenceDependentOnExpectedType(
@NotNull BasicResolutionContext context, @NotNull BasicResolutionContext context,
@NotNull OverloadResolutionResults<D> results, @NotNull OverloadResolutionResults<D> results,
@Nullable TracingStrategy tracing) { @NotNull TracingStrategy tracing
) {
if (results.getResultCode() != OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE) return results; if (results.getResultCode() != OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE) return results;
Set<ResolvedCallWithTrace<D>> successful = Sets.newLinkedHashSet(); Set<ResolvedCallWithTrace<D>> successful = Sets.newLinkedHashSet();
Set<ResolvedCallWithTrace<D>> failed = Sets.newLinkedHashSet(); Set<ResolvedCallWithTrace<D>> failed = Sets.newLinkedHashSet();