From 77efe8b857f1588ac7510cc9c9859b493e0bc358 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 17 Apr 2019 15:36:01 +0300 Subject: [PATCH] FIR resolve: reorder call resolution sequence --- .../kotlin/fir/resolve/calls/ResolverParts.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolverParts.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolverParts.kt index e4ae6e16fd2..bbcb4b6714f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolverParts.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolverParts.kt @@ -140,12 +140,15 @@ internal object DiscriminateSynthetics : CheckerStage() { internal fun functionCallResolutionSequence() = listOf( - CheckExplicitReceiverConsistency, CheckReceivers.Dispatch, CheckReceivers.Extension, - MapArguments, CreateFreshTypeVariableSubstitutorStage, CheckArguments + MapArguments, CheckExplicitReceiverConsistency, CreateFreshTypeVariableSubstitutorStage, + CheckReceivers.Dispatch, CheckReceivers.Extension, CheckArguments ) internal fun qualifiedAccessResolutionSequence() = listOf( - DiscriminateSynthetics, CheckExplicitReceiverConsistency, CheckReceivers.Dispatch, CheckReceivers.Extension, - CreateFreshTypeVariableSubstitutorStage + DiscriminateSynthetics, + CheckExplicitReceiverConsistency, + CreateFreshTypeVariableSubstitutorStage, + CheckReceivers.Dispatch, + CheckReceivers.Extension ) \ No newline at end of file