diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java index 5af208b16d8..4e0d6bc6f8e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java @@ -156,16 +156,16 @@ public class DelegatingBindingTrace implements BindingTrace { record(BindingContext.EXPRESSION_TYPE_INFO, expression, typeInfo); } - public void addAllMyDataTo(@NotNull BindingTrace trace) { - addAllMyDataTo(trace, null, true); + public void addOwnDataTo(@NotNull BindingTrace trace) { + addOwnDataTo(trace, null, true); } public void moveAllMyDataTo(@NotNull BindingTrace trace) { - addAllMyDataTo(trace, null, true); + addOwnDataTo(trace, null, true); clear(); } - public void addAllMyDataTo(@NotNull BindingTrace trace, @Nullable TraceEntryFilter filter, boolean commitDiagnostics) { + public void addOwnDataTo(@NotNull BindingTrace trace, @Nullable TraceEntryFilter filter, boolean commitDiagnostics) { BindingContextUtils.addOwnDataTo(trace, filter, commitDiagnostics, map, mutableDiagnostics); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java index 380022a9e8d..a24291fdb7e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java @@ -39,12 +39,12 @@ public class TemporaryBindingTrace extends DelegatingBindingTrace { } public void commit() { - addAllMyDataTo(trace); + addOwnDataTo(trace); clear(); } public void commit(@NotNull TraceEntryFilter filter, boolean commitDiagnostics) { - addAllMyDataTo(trace, filter, commitDiagnostics); + addOwnDataTo(trace, filter, commitDiagnostics); clear(); } } 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 5668b1c629a..15b715e0814 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java @@ -439,7 +439,7 @@ public class CallResolver { ResolutionResultsCache.CachedData data = context.resolutionResultsCache.get(call); if (data != null) { DelegatingBindingTrace deltasTraceForResolve = data.getResolutionTrace(); - deltasTraceForResolve.addAllMyDataTo(traceToResolveCall); + deltasTraceForResolve.addOwnDataTo(traceToResolveCall); //noinspection unchecked results = (OverloadResolutionResultsImpl) data.getResolutionResults(); } @@ -450,7 +450,7 @@ public class CallResolver { results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace(); if (deltasTraceForTypeInference != null) { - deltasTraceForTypeInference.addAllMyDataTo(traceToResolveCall); + deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall); } completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing); cacheResults(context, results, traceToResolveCall, tracing); @@ -493,7 +493,7 @@ public class CallResolver { DelegatingBindingTrace deltasTraceToCacheResolve = new DelegatingBindingTrace( BindingContext.EMPTY, "delta trace for caching resolve of", context.call); - traceToResolveCall.addAllMyDataTo(deltasTraceToCacheResolve); + traceToResolveCall.addOwnDataTo(deltasTraceToCacheResolve); context.resolutionResultsCache.record(call, results, context, tracing, deltasTraceToCacheResolve); }