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

[FIR] Change some phase requirements: STATUS -> DECLARATIONS

Browse Source 
NB: Also not quite sure this is better. IMO this shows more clearly that
we require results of declarations resolve and not some strange 'STATUS'
This commit is contained in:
Mikhail Glukhikh
2020-10-09 16:03:56 +03:00
committed by Dmitriy Novozhilov
parent 275260720d
commit 0b8116dff0
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt
+1 -1
View File
@@ -187,7 +187,7 @@ object FirExposedVisibilityDeclarationChecker : FirMemberDeclarationChecker() {
): FirMemberDeclaration? { ): FirMemberDeclaration? {
val type = this as? ConeClassLikeType ?: return null val type = this as? ConeClassLikeType ?: return null
val fir = type.fullyExpandedType(context.session).lookupTag.toSymbol(context.session)?.let { firSymbol -> 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 firSymbol.fir
} ?: return null } ?: return null
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
+1 -1
View File
@@ -125,7 +125,7 @@ fun BodyResolveComponents.typeForQualifier(resolvedQualifier: FirResolvedQualifi
val classSymbol = resolvedQualifier.symbol val classSymbol = resolvedQualifier.symbol
val resultType = resolvedQualifier.resultType val resultType = resolvedQualifier.resultType
if (classSymbol != null) { if (classSymbol != null) {
classSymbol.ensureResolved(FirResolvePhase.STATUS, session) classSymbol.ensureResolved(FirResolvePhase.DECLARATIONS, session)
val declaration = classSymbol.fir val declaration = classSymbol.fir
if (declaration !is FirTypeAlias || resolvedQualifier.typeArguments.isEmpty()) { if (declaration !is FirTypeAlias || resolvedQualifier.typeArguments.isEmpty()) {
typeForQualifierByDeclaration(declaration, resultType, session)?.let { return it } typeForQualifierByDeclaration(declaration, resultType, session)?.let { return it }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt
+1 -1
View File
@@ -29,7 +29,7 @@ fun ConeKotlinType.scope(
scopeSession: ScopeSession, scopeSession: ScopeSession,
fakeOverrideTypeCalculator: FakeOverrideTypeCalculator fakeOverrideTypeCalculator: FakeOverrideTypeCalculator
): FirTypeScope? { ): 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 if (fakeOverrideTypeCalculator == FakeOverrideTypeCalculator.DoNothing) return scope
return FirScopeWithFakeOverrideTypeCalculator(scope, fakeOverrideTypeCalculator) return FirScopeWithFakeOverrideTypeCalculator(scope, fakeOverrideTypeCalculator)
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
+2 -2
View File
@@ -59,8 +59,8 @@ fun ConeKotlinType.ensureResolvedTypeDeclaration(
) { ) {
if (this !is ConeClassLikeType) return if (this !is ConeClassLikeType) return
lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.STATUS, useSiteSession) lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.DECLARATIONS, useSiteSession)
fullyExpandedType(useSiteSession).lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.STATUS, useSiteSession) fullyExpandedType(useSiteSession).lookupTag.toSymbol(useSiteSession)?.ensureResolved(FirResolvePhase.DECLARATIONS, useSiteSession)
} }
fun FirTypeRef.ensureResolvedTypeDeclaration( fun FirTypeRef.ensureResolvedTypeDeclaration(