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

do not repeat initialization of candidate call if the context is copied

Browse Source
This commit is contained in:
Svetlana Isakova
2013-01-28 18:36:14 +04:00
parent e8e07ecec1
commit 9f28764811
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
+11 -5
View File
@@ -41,18 +41,22 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor,
@NotNull Call call, @NotNull Call call,
@NotNull JetType expectedType, @NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
boolean namespacesAllowed boolean namespacesAllowed,
boolean initialize
) { ) {
super(trace, scope, call, expectedType, dataFlowInfo, namespacesAllowed); super(trace, scope, call, expectedType, dataFlowInfo, namespacesAllowed);
this.candidateCall = candidateCall; this.candidateCall = candidateCall;
this.tracing = tracing; this.tracing = tracing;
this.candidateCall.setInitialDataFlowInfo(dataFlowInfo); if (initialize) {
this.candidateCall.setInitialDataFlowInfo(dataFlowInfo);
}
} }
public static <D extends CallableDescriptor, F extends D> CallCandidateResolutionContext<D, F> create( public static <D extends CallableDescriptor, F extends D> CallCandidateResolutionContext<D, F> create(
@NotNull ResolvedCallImpl<D> candidateCall, @NotNull ResolutionTask<D, F> task, @NotNull BindingTrace trace, @NotNull ResolvedCallImpl<D> candidateCall, @NotNull ResolutionTask<D, F> task, @NotNull BindingTrace trace,
@NotNull TracingStrategy tracing, @NotNull Call call) { @NotNull TracingStrategy tracing, @NotNull Call call) {
return new CallCandidateResolutionContext<D, F>(candidateCall, tracing, trace, task.scope, call, task.expectedType, task.dataFlowInfo, task.namespacesAllowed); return new CallCandidateResolutionContext<D, F>(candidateCall, tracing, trace, task.scope, call, task.expectedType,
task.dataFlowInfo, task.namespacesAllowed, true);
} }
public static <D extends CallableDescriptor, F extends D> CallCandidateResolutionContext<D, F> create( public static <D extends CallableDescriptor, F extends D> CallCandidateResolutionContext<D, F> create(
@@ -64,7 +68,8 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor,
public static <D extends CallableDescriptor> CallCandidateResolutionContext<D, D> create( public static <D extends CallableDescriptor> CallCandidateResolutionContext<D, D> create(
@NotNull BasicCallResolutionContext context, @NotNull TracingStrategy tracing, @NotNull BasicCallResolutionContext context, @NotNull TracingStrategy tracing,
@NotNull ResolvedCallImpl<D> candidateCall) { @NotNull ResolvedCallImpl<D> candidateCall) {
return new CallCandidateResolutionContext<D, D>(candidateCall, tracing, context.trace, context.scope, context.call, context.expectedType, context.dataFlowInfo, context.namespacesAllowed); return new CallCandidateResolutionContext<D, D>(candidateCall, tracing, context.trace, context.scope, context.call,
context.expectedType, context.dataFlowInfo, context.namespacesAllowed, true);
} }
@Override @Override
@@ -75,7 +80,8 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor,
@NotNull JetType expectedType, @NotNull JetType expectedType,
boolean namespacesAllowed boolean namespacesAllowed
) { ) {
return new CallCandidateResolutionContext<D, F>(candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo, namespacesAllowed); return new CallCandidateResolutionContext<D, F>(candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo,
namespacesAllowed, false);
} }
@Override @Override