diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index ca59ba1016a..fec19e6c37b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -399,7 +399,7 @@ public class CallResolver { if (callKey == null) return; DelegatingBindingTrace deltasTraceToCacheResolve = new DelegatingBindingTrace( - new BindingTraceContext().getBindingContext(), "delta trace for caching resolve of", context.call); + BindingContext.EMPTY, "delta trace for caching resolve of", context.call); traceToResolveCall.addAllMyDataTo(deltasTraceToCacheResolve); context.resolutionResultsCache.recordResolutionResults(callKey, memberType, results); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCacheImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCacheImpl.java index 4519671cf3c..ae058662a83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCacheImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionResultsCacheImpl.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.psi.CallKey; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; @@ -48,7 +48,7 @@ public class ResolutionResultsCacheImpl implements ResolutionResultsCache { } private final DelegatingBindingTrace trace = new DelegatingBindingTrace( - new BindingTraceContext().getBindingContext(), "Internal binding context in resolution results cache"); + BindingContext.EMPTY, "Internal binding context in resolution results cache"); @NotNull private static WritableSlice> getSliceByMemberType(@NotNull MemberType memberType) {