From c3c8115163722c42d485a8b8eb08de304d0e5bb3 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 26 Aug 2020 16:15:41 +0300 Subject: [PATCH] FIR: Use explicit version of 'ensureResolved' --- .../src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index cce08986244..5394c861a1b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.fir.resolve.calls.ImplicitDispatchReceiverValue import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError import org.jetbrains.kotlin.fir.resolve.providers.* import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType +import org.jetbrains.kotlin.fir.resolve.transformers.ensureResolved +import org.jetbrains.kotlin.fir.scopes.impl.FirDeclaredMemberScopeProvider import org.jetbrains.kotlin.fir.scopes.impl.withReplacedConeType import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.fir.symbols.impl.* @@ -125,7 +127,8 @@ fun BodyResolveComponents.typeForQualifier(resolvedQualifier: FirResolvedQualifi val classSymbol = resolvedQualifier.symbol val resultType = resolvedQualifier.resultType if (classSymbol != null) { - val declaration = classSymbol.phasedFir + classSymbol.ensureResolved(FirResolvePhase.STATUS, session) + val declaration = classSymbol.fir if (declaration !is FirTypeAlias || resolvedQualifier.typeArguments.isEmpty()) { typeForQualifierByDeclaration(declaration, resultType, session)?.let { return it } }