From e12a800b2d047458f4f6fc06afa6e9823448f8e2 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 9 Aug 2022 10:30:26 +0200 Subject: [PATCH] [LL FIR] fix lazy resolve of FirDefaultPropertyAccessor FirDefaultPropertyAccessor was hardcoded and thus lazy resolution was not able to update it after resolution --- .../fir/declarations/impl/FirDefaultPropertyAccessor.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 73a19294c8a..7b0f41500e4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -43,7 +43,7 @@ abstract class FirDefaultPropertyAccessor( ) : FirPropertyAccessorImpl( source, moduleData, - resolvePhase = if (effectiveVisibility != null) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES, + resolvePhase = FirResolvePhase.RAW_FIR, origin, FirDeclarationAttributes(), status = if (effectiveVisibility == null) @@ -64,10 +64,6 @@ abstract class FirDefaultPropertyAccessor( annotations = mutableListOf(), typeParameters = mutableListOf(), ) { - override var resolvePhase - get() = if (status is FirResolvedDeclarationStatus) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES - set(_) {} - override val dispatchReceiverType: ConeSimpleKotlinType? get() = propertySymbol?.dispatchReceiverType