diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt index 6b93b1d7e03..0962c47492f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt @@ -187,7 +187,7 @@ object FirExposedVisibilityDeclarationChecker : FirMemberDeclarationChecker() { ): FirMemberDeclaration? { val type = this as? ConeClassLikeType ?: return null val fir = type.fullyExpandedType(context.session).lookupTag.toSymbol(context.session)?.let { firSymbol -> - firSymbol.ensureResolved(FirResolvePhase.STATUS, context.session) + firSymbol.ensureResolved(FirResolvePhase.DECLARATIONS, context.session) firSymbol.fir } ?: return null 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 f50a286b549..a199374273d 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 @@ -125,7 +125,7 @@ fun BodyResolveComponents.typeForQualifier(resolvedQualifier: FirResolvedQualifi val classSymbol = resolvedQualifier.symbol val resultType = resolvedQualifier.resultType if (classSymbol != null) { - classSymbol.ensureResolved(FirResolvePhase.STATUS, session) + classSymbol.ensureResolved(FirResolvePhase.DECLARATIONS, session) val declaration = classSymbol.fir if (declaration !is FirTypeAlias || resolvedQualifier.typeArguments.isEmpty()) { typeForQualifierByDeclaration(declaration, resultType, session)?.let { return it } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt index a8903cdf370..08c565eb236 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt @@ -29,7 +29,7 @@ fun ConeKotlinType.scope( scopeSession: ScopeSession, fakeOverrideTypeCalculator: FakeOverrideTypeCalculator ): FirTypeScope? { - val scope = scope(useSiteSession, scopeSession, FirResolvePhase.STATUS) ?: return null + val scope = scope(useSiteSession, scopeSession, FirResolvePhase.DECLARATIONS) ?: return null if (fakeOverrideTypeCalculator == FakeOverrideTypeCalculator.DoNothing) return scope return FirScopeWithFakeOverrideTypeCalculator(scope, fakeOverrideTypeCalculator) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt index 44797b9c827..397a973122a 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt @@ -59,8 +59,8 @@ fun ConeKotlinType.ensureResolvedTypeDeclaration( ) { if (this !is ConeClassLikeType) return - lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.STATUS, useSiteSession) - fullyExpandedType(useSiteSession).lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.STATUS, useSiteSession) + lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.DECLARATIONS, useSiteSession) + fullyExpandedType(useSiteSession).lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.DECLARATIONS, useSiteSession) } fun FirTypeRef.ensureResolvedTypeDeclaration(