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

Revert "[FE 1.0] Resolve equal calls through the new type inference infra"

Browse Source 
This reverts commit a74c221729.
This commit is contained in:
Mikhail Glukhikh
2022-09-12 11:28:35 +02:00
committed by Space
parent a9b8f6715b
commit 707bfbed19
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+5 -15
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStat
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.*;
import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt;
import org.jetbrains.kotlin.resolve.calls.tower.NewResolutionOldInferenceKt;
import org.jetbrains.kotlin.resolve.calls.util.CallResolverUtilKt;
import org.jetbrains.kotlin.resolve.calls.util.ResolveArgumentsMode;
import org.jetbrains.kotlin.resolve.calls.util.CallUtilKt;
@@ -288,21 +287,12 @@ public class CallResolver {
@NotNull Collection<FunctionDescriptor> functionDescriptors
) {
BasicCallResolutionContext callResolutionContext = BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS);
List<OldResolutionCandidate<FunctionDescriptor>> resolutionCandidates = CollectionsKt.map(functionDescriptors, descriptor ->
OldResolutionCandidate.create(
call, descriptor, receiver, ExplicitReceiverKind.DISPATCH_RECEIVER, null));
OverloadResolutionResults<FunctionDescriptor> resolutionResults = PSICallResolver.runResolutionAndInferenceForGivenDescriptors(
callResolutionContext,
functionDescriptors,
TracingStrategyImpl.create(expression, call),
null,
NewResolutionOldInferenceKt.transformToReceiverWithSmartCastInfo(context, receiver)
);
if (resolutionResults.isSingleResult()) {
context.trace.record(BindingContext.RESOLVED_CALL, call, resolutionResults.getResultingCall());
context.trace.record(BindingContext.CALL, call.getCalleeExpression(), call);
}
return resolutionResults;
return computeTasksFromCandidatesAndResolvedCall(
callResolutionContext, resolutionCandidates, TracingStrategyImpl.create(expression, call));
}
@NotNull