diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 2373e7a13cf..6733106c569 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -31,8 +31,8 @@ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List - abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -77,10 +77,10 @@ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnonymousFunction - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirAnonymousFunction - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirAnonymousFunction + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirAnonymousFunction + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirAnonymousFunction abstract override fun transformValueParameters(transformer: FirTransformer, data: D): FirAnonymousFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index 2065d72e864..884fd11904c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -27,8 +27,9 @@ abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val deprecation: DeprecationsPerUseSite? abstract override val typeParameters: List + abstract override val status: FirDeclarationStatus + abstract override val deprecation: DeprecationsPerUseSite? abstract override val classKind: ClassKind abstract override val superTypeRefs: List abstract override val declarations: List @@ -53,6 +54,8 @@ abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirAnonymousObject + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirAnonymousObject + abstract override fun transformSuperTypeRefs(transformer: FirTransformer, data: D): FirAnonymousObject abstract override fun transformDeclarations(transformer: FirTransformer, data: D): FirAnonymousObject diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 248d74cb50e..a524f800664 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -20,16 +20,16 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -sealed class FirCallableDeclaration : FirTypedDeclaration(), FirMemberDeclaration { +sealed class FirCallableDeclaration : FirTypedDeclaration() { abstract override val source: FirSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract val receiverTypeRef: FirTypeRef? abstract val deprecation: DeprecationsPerUseSite? abstract override val symbol: FirCallableSymbol @@ -52,11 +52,11 @@ sealed class FirCallableDeclaration : FirTypedDeclaration(), FirMemberDeclaratio abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirCallableDeclaration - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirCallableDeclaration - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirCallableDeclaration abstract override fun transformStatus(transformer: FirTransformer, data: D): FirCallableDeclaration + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirCallableDeclaration + abstract fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirCallableDeclaration } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 044003a7d2f..865c6549888 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -27,8 +27,9 @@ sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParamete abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val deprecation: DeprecationsPerUseSite? abstract override val typeParameters: List + abstract override val status: FirDeclarationStatus + abstract override val deprecation: DeprecationsPerUseSite? abstract override val symbol: FirClassSymbol abstract val classKind: ClassKind abstract val superTypeRefs: List @@ -50,6 +51,8 @@ sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParamete abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirClass + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirClass + abstract fun transformSuperTypeRefs(transformer: FirTransformer, data: D): FirClass abstract fun transformDeclarations(transformer: FirTransformer, data: D): FirClass diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index bfa7ea99153..9a9165fb973 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -18,13 +18,15 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -sealed class FirClassLikeDeclaration : FirAnnotatedDeclaration(), FirStatement { +sealed class FirClassLikeDeclaration : FirMemberDeclaration(), FirStatement { abstract override val source: FirSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List + abstract override val typeParameters: List + abstract override val status: FirDeclarationStatus abstract override val symbol: FirClassLikeSymbol abstract val deprecation: DeprecationsPerUseSite? @@ -39,4 +41,8 @@ sealed class FirClassLikeDeclaration : FirAnnotatedDeclaration(), FirStatement { abstract fun replaceDeprecation(newDeprecation: DeprecationsPerUseSite?) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirClassLikeDeclaration + + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirClassLikeDeclaration + + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirClassLikeDeclaration } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index ce52a379d5b..9235c49fcd4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -29,9 +29,9 @@ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -64,12 +64,12 @@ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override fun replaceBody(newBody: FirBlock?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirConstructor - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirConstructor abstract override fun transformStatus(transformer: FirTransformer, data: D): FirConstructor + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirConstructor + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirConstructor abstract override fun transformValueParameters(transformer: FirTransformer, data: D): FirConstructor diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index d976e488ec9..52214658462 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -28,9 +28,9 @@ abstract class FirEnumEntry : FirVariable() { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -66,12 +66,12 @@ abstract class FirEnumEntry : FirVariable() { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirEnumEntry - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirEnumEntry abstract override fun transformStatus(transformer: FirTransformer, data: D): FirEnumEntry + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirEnumEntry + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirEnumEntry abstract override fun transformInitializer(transformer: FirTransformer, data: D): FirEnumEntry diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index 7cb8f478956..764e76598c0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -31,8 +31,8 @@ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List - abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -66,10 +66,10 @@ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorFunction - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorFunction - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirErrorFunction + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorFunction + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirErrorFunction abstract override fun transformValueParameters(transformer: FirTransformer, data: D): FirErrorFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index 5432e2e04b6..8458a829878 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -30,9 +30,9 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -69,12 +69,12 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorProperty - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirErrorProperty abstract override fun transformStatus(transformer: FirTransformer, data: D): FirErrorProperty + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorProperty + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirErrorProperty abstract override fun transformInitializer(transformer: FirTransformer, data: D): FirErrorProperty diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index 6129bc576c9..98b7292aa8c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -28,9 +28,9 @@ abstract class FirField : FirVariable() { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -66,12 +66,12 @@ abstract class FirField : FirVariable() { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirField - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirField abstract override fun transformStatus(transformer: FirTransformer, data: D): FirField + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirField + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirField abstract override fun transformInitializer(transformer: FirTransformer, data: D): FirField diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index 89077dc458a..46a2d9a99c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -31,9 +31,9 @@ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirContro abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -65,12 +65,12 @@ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirContro abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirFunction - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirFunction - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirFunction abstract override fun transformStatus(transformer: FirTransformer, data: D): FirFunction + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirFunction + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirFunction abstract fun transformValueParameters(transformer: FirTransformer, data: D): FirFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index a8ea8095280..c0156234d8c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -6,7 +6,10 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,10 +17,16 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -sealed interface FirMemberDeclaration : FirTypeParameterRefsOwner { - override val source: FirSourceElement? - override val typeParameters: List - val status: FirDeclarationStatus +sealed class FirMemberDeclaration : FirAnnotatedDeclaration(), FirTypeParameterRefsOwner { + abstract override val source: FirSourceElement? + abstract override val symbol: FirBasedSymbol + abstract override val moduleData: FirModuleData + abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin + abstract override val attributes: FirDeclarationAttributes + abstract override val annotations: List + abstract override val typeParameters: List + abstract val status: FirDeclarationStatus override fun accept(visitor: FirVisitor, data: D): R = visitor.visitMemberDeclaration(this, data) @@ -25,7 +34,11 @@ sealed interface FirMemberDeclaration : FirTypeParameterRefsOwner { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformMemberDeclaration(this, data) as E - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirMemberDeclaration + abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) - fun transformStatus(transformer: FirTransformer, data: D): FirMemberDeclaration + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirMemberDeclaration + + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirMemberDeclaration + + abstract fun transformStatus(transformer: FirTransformer, data: D): FirMemberDeclaration } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index c83b8c804af..da54a7f2322 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -30,8 +30,8 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -76,10 +76,10 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl abstract fun replaceBodyResolveState(newBodyResolveState: FirPropertyBodyResolveState) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirProperty - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirProperty + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirProperty + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirProperty abstract override fun transformInitializer(transformer: FirTransformer, data: D): FirProperty diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 25b9df4c60f..e620370b450 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -30,8 +30,8 @@ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -69,10 +69,10 @@ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, abstract override fun replaceContractDescription(newContractDescription: FirContractDescription) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessor - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyAccessor + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessor + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessor abstract override fun transformValueParameters(transformer: FirTransformer, data: D): FirPropertyAccessor diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index 703f0f21d98..0b1ad9dc383 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -22,19 +22,19 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -abstract class FirRegularClass : FirClass(), FirMemberDeclaration, FirControlFlowGraphOwner { +abstract class FirRegularClass : FirClass(), FirControlFlowGraphOwner { abstract override val source: FirSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val deprecation: DeprecationsPerUseSite? abstract override val typeParameters: List + abstract override val status: FirDeclarationStatus + abstract override val deprecation: DeprecationsPerUseSite? abstract override val classKind: ClassKind abstract override val declarations: List abstract override val annotations: List abstract override val scopeProvider: FirScopeProvider - abstract override val status: FirDeclarationStatus abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract val name: Name abstract override val symbol: FirRegularClassSymbol @@ -58,12 +58,12 @@ abstract class FirRegularClass : FirClass(), FirMemberDeclaration, FirControlFlo abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirRegularClass + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirRegularClass + abstract override fun transformDeclarations(transformer: FirTransformer, data: D): FirRegularClass abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirRegularClass - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirRegularClass - abstract fun transformCompanionObject(transformer: FirTransformer, data: D): FirRegularClass abstract override fun transformSuperTypeRefs(transformer: FirTransformer, data: D): FirRegularClass diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index ebbafcabe99..b1f88a1a028 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -30,8 +30,8 @@ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, F abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -67,10 +67,10 @@ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, F abstract override fun replaceContractDescription(newContractDescription: FirContractDescription) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirSimpleFunction - abstract override fun transformStatus(transformer: FirTransformer, data: D): FirSimpleFunction + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirSimpleFunction + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirSimpleFunction abstract override fun transformValueParameters(transformer: FirTransformer, data: D): FirSimpleFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index affce9f6a87..c7ce719284a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -19,14 +19,14 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -abstract class FirTypeAlias : FirClassLikeDeclaration(), FirMemberDeclaration, FirTypeParametersOwner { +abstract class FirTypeAlias : FirClassLikeDeclaration(), FirTypeParametersOwner { abstract override val source: FirSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val deprecation: DeprecationsPerUseSite? abstract override val status: FirDeclarationStatus + abstract override val deprecation: DeprecationsPerUseSite? abstract override val typeParameters: List abstract val name: Name abstract override val symbol: FirTypeAliasSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt index b4e277f8f71..3a8b3347dcd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -sealed class FirTypedDeclaration : FirAnnotatedDeclaration() { +sealed class FirTypedDeclaration : FirMemberDeclaration() { abstract override val source: FirSourceElement? abstract override val symbol: FirBasedSymbol abstract override val moduleData: FirModuleData @@ -26,6 +26,8 @@ sealed class FirTypedDeclaration : FirAnnotatedDeclaration() { abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val annotations: List + abstract override val typeParameters: List + abstract override val status: FirDeclarationStatus abstract val returnTypeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypedDeclaration(this, data) @@ -40,5 +42,9 @@ sealed class FirTypedDeclaration : FirAnnotatedDeclaration() { abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypedDeclaration + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirTypedDeclaration + + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirTypedDeclaration + abstract fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirTypedDeclaration } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index e6b6cdb5681..0b06aa10ad7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -29,9 +29,9 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -74,12 +74,12 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirValueParameter - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirValueParameter abstract override fun transformStatus(transformer: FirTransformer, data: D): FirValueParameter + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirValueParameter + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirValueParameter abstract override fun transformInitializer(transformer: FirTransformer, data: D): FirValueParameter diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index 1117fa8e080..4b8c515d040 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -29,9 +29,9 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus + abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? @@ -67,12 +67,12 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract fun replaceSetter(newSetter: FirPropertyAccessor?) - abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirVariable - abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirVariable abstract override fun transformStatus(transformer: FirTransformer, data: D): FirVariable + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirVariable + abstract override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirVariable abstract fun transformInitializer(transformer: FirTransformer, data: D): FirVariable diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index 10097c8adaa..aa80a464c7a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -40,8 +40,8 @@ interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract override val annotations: MutableList - abstract override var returnTypeRef: FirTypeRef abstract override var status: FirDeclarationStatus + abstract override var returnTypeRef: FirTypeRef abstract override var deprecation: DeprecationsPerUseSite? abstract override var containerSource: DeserializedContainerSource? abstract override var dispatchReceiverType: ConeKotlinType? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt index 617c2043238..36b1bc7969e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin +import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder @@ -40,8 +41,9 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override var deprecation: DeprecationsPerUseSite? = null override val typeParameters: MutableList = mutableListOf() + override lateinit var status: FirDeclarationStatus + override var deprecation: DeprecationsPerUseSite? = null override lateinit var classKind: ClassKind override val superTypeRefs: MutableList = mutableListOf() override val declarations: MutableList = mutableListOf() @@ -56,8 +58,9 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn resolvePhase, origin, attributes, - deprecation, typeParameters, + status, + deprecation, classKind, superTypeRefs, declarations, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt index 87a73a0dcef..cddcfa55648 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin +import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder @@ -36,8 +37,9 @@ interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract override val annotations: MutableList - abstract var deprecation: DeprecationsPerUseSite? abstract val typeParameters: MutableList + abstract var status: FirDeclarationStatus + abstract var deprecation: DeprecationsPerUseSite? abstract var classKind: ClassKind abstract val superTypeRefs: MutableList abstract val declarations: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index 42de25449b4..a1af7e45d83 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -42,9 +42,9 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override lateinit var returnTypeRef: FirTypeRef override val typeParameters: MutableList = mutableListOf() override lateinit var status: FirDeclarationStatus + override lateinit var returnTypeRef: FirTypeRef override var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null @@ -62,9 +62,9 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC resolvePhase, origin, attributes, - returnTypeRef, typeParameters, status, + returnTypeRef, receiverTypeRef, deprecation, containerSource, @@ -105,9 +105,9 @@ inline fun buildConstructorCopy(original: FirConstructor, init: FirConstructorBu copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.typeParameters.addAll(original.typeParameters) copyBuilder.status = original.status + copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.receiverTypeRef = original.receiverTypeRef copyBuilder.deprecation = original.deprecation copyBuilder.containerSource = original.containerSource diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index d86f6c51ea1..0f717058dbe 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -41,9 +41,9 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - lateinit var returnTypeRef: FirTypeRef val typeParameters: MutableList = mutableListOf() lateinit var status: FirDeclarationStatus + lateinit var returnTypeRef: FirTypeRef var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null var dispatchReceiverType: ConeKotlinType? = null @@ -60,9 +60,9 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { resolvePhase, origin, attributes, - returnTypeRef, typeParameters, status, + returnTypeRef, deprecation, containerSource, dispatchReceiverType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index 89bb97440e5..fe1ca45d077 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -43,9 +43,9 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - open lateinit var returnTypeRef: FirTypeRef open val typeParameters: MutableList = mutableListOf() open lateinit var status: FirDeclarationStatus + open lateinit var returnTypeRef: FirTypeRef open var deprecation: DeprecationsPerUseSite? = null open var containerSource: DeserializedContainerSource? = null open var dispatchReceiverType: ConeKotlinType? = null @@ -64,9 +64,9 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde resolvePhase, origin, attributes, - returnTypeRef, typeParameters, status, + returnTypeRef, deprecation, containerSource, dispatchReceiverType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index 64017d5442a..eb478fb4fbc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -37,8 +37,8 @@ interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuil abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract override val annotations: MutableList - abstract var returnTypeRef: FirTypeRef abstract var status: FirDeclarationStatus + abstract var returnTypeRef: FirTypeRef abstract var deprecation: DeprecationsPerUseSite? abstract var containerSource: DeserializedContainerSource? abstract var dispatchReceiverType: ConeKotlinType? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index a407cb74627..aaf0a134c26 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -43,9 +43,9 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override lateinit var returnTypeRef: FirTypeRef override val typeParameters: MutableList = mutableListOf() override lateinit var status: FirDeclarationStatus + override lateinit var returnTypeRef: FirTypeRef override var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null @@ -64,9 +64,9 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio resolvePhase, origin, attributes, - returnTypeRef, typeParameters, status, + returnTypeRef, receiverTypeRef, deprecation, containerSource, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index 6a4280ff1f9..282815f5ad9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -46,8 +46,8 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override lateinit var returnTypeRef: FirTypeRef override lateinit var status: FirDeclarationStatus + override lateinit var returnTypeRef: FirTypeRef override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null override var dispatchReceiverType: ConeKotlinType? = null @@ -68,8 +68,8 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui resolvePhase, origin, attributes, - returnTypeRef, status, + returnTypeRef, deprecation, containerSource, dispatchReceiverType, @@ -105,8 +105,8 @@ inline fun buildPropertyAccessorCopy(original: FirPropertyAccessor, init: FirPro copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.status = original.status + copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.deprecation = original.deprecation copyBuilder.containerSource = original.containerSource copyBuilder.dispatchReceiverType = original.dispatchReceiverType diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index 26ac98cd75c..28e982319a8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -47,8 +47,8 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - lateinit var returnTypeRef: FirTypeRef lateinit var status: FirDeclarationStatus + lateinit var returnTypeRef: FirTypeRef var receiverTypeRef: FirTypeRef? = null var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null @@ -74,8 +74,8 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, resolvePhase, origin, attributes, - returnTypeRef, status, + returnTypeRef, receiverTypeRef, deprecation, containerSource, @@ -117,8 +117,8 @@ inline fun buildPropertyCopy(original: FirProperty, init: FirPropertyBuilder.() copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.status = original.status + copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.receiverTypeRef = original.receiverTypeRef copyBuilder.deprecation = original.deprecation copyBuilder.containerSource = original.containerSource diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt index 7bfd01a84ae..0bb26b44126 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt @@ -42,13 +42,13 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override var deprecation: DeprecationsPerUseSite? = null override val typeParameters: MutableList = mutableListOf() + override lateinit var status: FirDeclarationStatus + override var deprecation: DeprecationsPerUseSite? = null override lateinit var classKind: ClassKind override val declarations: MutableList = mutableListOf() override val annotations: MutableList = mutableListOf() override lateinit var scopeProvider: FirScopeProvider - open lateinit var status: FirDeclarationStatus open lateinit var name: Name open lateinit var symbol: FirRegularClassSymbol open var companionObject: FirRegularClass? = null @@ -61,13 +61,13 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu resolvePhase, origin, attributes, - deprecation, typeParameters, + status, + deprecation, classKind, declarations, annotations, scopeProvider, - status, name, symbol, companionObject, @@ -96,13 +96,13 @@ inline fun buildRegularClassCopy(original: FirRegularClass, init: FirRegularClas copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.deprecation = original.deprecation copyBuilder.typeParameters.addAll(original.typeParameters) + copyBuilder.status = original.status + copyBuilder.deprecation = original.deprecation copyBuilder.classKind = original.classKind copyBuilder.declarations.addAll(original.declarations) copyBuilder.annotations.addAll(original.annotations) copyBuilder.scopeProvider = original.scopeProvider - copyBuilder.status = original.status copyBuilder.name = original.name copyBuilder.symbol = original.symbol copyBuilder.companionObject = original.companionObject diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index c528e8511eb..e1d82cc80a9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -45,8 +45,8 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override lateinit var returnTypeRef: FirTypeRef override lateinit var status: FirDeclarationStatus + override lateinit var returnTypeRef: FirTypeRef open var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null @@ -66,8 +66,8 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner resolvePhase, origin, attributes, - returnTypeRef, status, + returnTypeRef, receiverTypeRef, deprecation, containerSource, @@ -103,8 +103,8 @@ inline fun buildSimpleFunctionCopy(original: FirSimpleFunction, init: FirSimpleF copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.status = original.status + copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.receiverTypeRef = original.receiverTypeRef copyBuilder.deprecation = original.deprecation copyBuilder.containerSource = original.containerSource diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt index 4f8939b3618..19267c8d0f3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt @@ -38,8 +38,8 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - var deprecation: DeprecationsPerUseSite? = null lateinit var status: FirDeclarationStatus + var deprecation: DeprecationsPerUseSite? = null override val typeParameters: MutableList = mutableListOf() lateinit var name: Name lateinit var symbol: FirTypeAliasSymbol @@ -53,8 +53,8 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder resolvePhase, origin, attributes, - deprecation, status, + deprecation, typeParameters, name, symbol, @@ -84,8 +84,8 @@ inline fun buildTypeAliasCopy(original: FirTypeAlias, init: FirTypeAliasBuilder. copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() - copyBuilder.deprecation = original.deprecation copyBuilder.status = original.status + copyBuilder.deprecation = original.deprecation copyBuilder.typeParameters.addAll(original.typeParameters) copyBuilder.name = original.name copyBuilder.symbol = original.symbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index 63298a24331..cdf3e3db5c2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -66,8 +66,8 @@ internal class FirAnonymousFunctionImpl( override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } @@ -79,8 +79,8 @@ internal class FirAnonymousFunctionImpl( override fun transformChildren(transformer: FirTransformer, data: D): FirAnonymousFunctionImpl { transformAnnotations(transformer, data) - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) @@ -96,13 +96,13 @@ internal class FirAnonymousFunctionImpl( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirAnonymousFunctionImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) + override fun transformStatus(transformer: FirTransformer, data: D): FirAnonymousFunctionImpl { + status = status.transform(transformer, data) return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirAnonymousFunctionImpl { - status = status.transform(transformer, data) + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirAnonymousFunctionImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 139d6e613be..7a7aa0f013d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin +import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -34,8 +35,9 @@ internal class FirAnonymousObjectImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var deprecation: DeprecationsPerUseSite?, override val typeParameters: MutableList, + override var status: FirDeclarationStatus, + override var deprecation: DeprecationsPerUseSite?, override val classKind: ClassKind, override val superTypeRefs: MutableList, override val declarations: MutableList, @@ -51,6 +53,7 @@ internal class FirAnonymousObjectImpl( override fun acceptChildren(visitor: FirVisitor, data: D) { typeParameters.forEach { it.accept(visitor, data) } + status.accept(visitor, data) superTypeRefs.forEach { it.accept(visitor, data) } declarations.forEach { it.accept(visitor, data) } annotations.forEach { it.accept(visitor, data) } @@ -59,6 +62,7 @@ internal class FirAnonymousObjectImpl( override fun transformChildren(transformer: FirTransformer, data: D): FirAnonymousObjectImpl { transformTypeParameters(transformer, data) + transformStatus(transformer, data) transformSuperTypeRefs(transformer, data) transformDeclarations(transformer, data) transformAnnotations(transformer, data) @@ -71,6 +75,11 @@ internal class FirAnonymousObjectImpl( return this } + override fun transformStatus(transformer: FirTransformer, data: D): FirAnonymousObjectImpl { + status = status.transform(transformer, data) + return this + } + override fun transformSuperTypeRefs(transformer: FirTransformer, data: D): FirAnonymousObjectImpl { superTypeRefs.transformInplace(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 5ee772cc9f2..dd7b7e6357e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -37,9 +37,9 @@ internal class FirConstructorImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override val typeParameters: MutableList, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, @@ -58,9 +58,9 @@ internal class FirConstructorImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) typeParameters.forEach { it.accept(visitor, data) } status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } @@ -70,9 +70,9 @@ internal class FirConstructorImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirConstructorImpl { - transformReturnTypeRef(transformer, data) transformTypeParameters(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) @@ -82,11 +82,6 @@ internal class FirConstructorImpl( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirConstructorImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirConstructorImpl { typeParameters.transformInplace(transformer, data) return this @@ -97,6 +92,11 @@ internal class FirConstructorImpl( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirConstructorImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirConstructorImpl { receiverTypeRef = receiverTypeRef?.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index ec50cb4bf4d..0256ff3a3c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -68,8 +68,8 @@ internal class FirDefaultSetterValueParameter( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) initializer?.accept(visitor, data) delegate?.accept(visitor, data) @@ -82,8 +82,8 @@ internal class FirDefaultSetterValueParameter( } override fun transformChildren(transformer: FirTransformer, data: D): FirDefaultSetterValueParameter { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) transformInitializer(transformer, data) transformDelegate(transformer, data) @@ -94,11 +94,6 @@ internal class FirDefaultSetterValueParameter( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirDefaultSetterValueParameter { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirDefaultSetterValueParameter { return this } @@ -108,6 +103,11 @@ internal class FirDefaultSetterValueParameter( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirDefaultSetterValueParameter { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirDefaultSetterValueParameter { receiverTypeRef = receiverTypeRef?.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index 1350af0a8f9..34321375464 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -37,9 +37,9 @@ internal class FirEnumEntryImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override val typeParameters: MutableList, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, @@ -61,29 +61,24 @@ internal class FirEnumEntryImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) typeParameters.forEach { it.accept(visitor, data) } status.accept(visitor, data) + returnTypeRef.accept(visitor, data) initializer?.accept(visitor, data) backingField?.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirEnumEntryImpl { - transformReturnTypeRef(transformer, data) transformTypeParameters(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformInitializer(transformer, data) transformBackingField(transformer, data) transformOtherChildren(transformer, data) return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirEnumEntryImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirEnumEntryImpl { typeParameters.transformInplace(transformer, data) return this @@ -94,6 +89,11 @@ internal class FirEnumEntryImpl( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirEnumEntryImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirEnumEntryImpl { return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index 6fe677bab23..d50233cf025 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -47,8 +47,8 @@ internal class FirErrorFunctionImpl( override val diagnostic: ConeDiagnostic, override val symbol: FirErrorFunctionSymbol, ) : FirErrorFunction() { - override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override var status: FirDeclarationStatus = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS + override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override val receiverTypeRef: FirTypeRef? get() = null override var controlFlowGraphReference: FirControlFlowGraphReference? = null override val body: FirBlock? get() = null @@ -60,16 +60,16 @@ internal class FirErrorFunctionImpl( override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirErrorFunctionImpl { transformAnnotations(transformer, data) - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) return this @@ -80,13 +80,13 @@ internal class FirErrorFunctionImpl( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorFunctionImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) + override fun transformStatus(transformer: FirTransformer, data: D): FirErrorFunctionImpl { + status = status.transform(transformer, data) return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirErrorFunctionImpl { - status = status.transform(transformer, data) + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorFunctionImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index 351c1c9a70d..ec01f39f3e9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -49,9 +49,9 @@ internal class FirErrorPropertyImpl( override val diagnostic: ConeDiagnostic, override val symbol: FirErrorPropertySymbol, ) : FirErrorProperty() { - override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override val typeParameters: List get() = emptyList() override var status: FirDeclarationStatus = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS + override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override val receiverTypeRef: FirTypeRef? get() = null override val initializer: FirExpression? get() = null override val delegate: FirExpression? get() = null @@ -65,25 +65,20 @@ internal class FirErrorPropertyImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) backingField?.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirErrorPropertyImpl { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformBackingField(transformer, data) transformOtherChildren(transformer, data) return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorPropertyImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirErrorPropertyImpl { return this } @@ -93,6 +88,11 @@ internal class FirErrorPropertyImpl( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirErrorPropertyImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirErrorPropertyImpl { return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index 5182e6b9bd0..c076f67ae1f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -38,9 +38,9 @@ class FirFieldImpl @FirImplementationDetail constructor( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override val typeParameters: MutableList, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, @@ -62,29 +62,24 @@ class FirFieldImpl @FirImplementationDetail constructor( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) typeParameters.forEach { it.accept(visitor, data) } status.accept(visitor, data) + returnTypeRef.accept(visitor, data) initializer?.accept(visitor, data) backingField?.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirFieldImpl { - transformReturnTypeRef(transformer, data) transformTypeParameters(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformInitializer(transformer, data) transformBackingField(transformer, data) transformOtherChildren(transformer, data) return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirFieldImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirFieldImpl { typeParameters.transformInplace(transformer, data) return this @@ -95,6 +90,11 @@ class FirFieldImpl @FirImplementationDetail constructor( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirFieldImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirFieldImpl { return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index b3db4e49558..1553d10735b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -38,9 +38,9 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override val typeParameters: MutableList, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, @@ -59,9 +59,9 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) typeParameters.forEach { it.accept(visitor, data) } status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } @@ -71,9 +71,9 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( } override fun transformChildren(transformer: FirTransformer, data: D): FirPrimaryConstructor { - transformReturnTypeRef(transformer, data) transformTypeParameters(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) @@ -83,11 +83,6 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPrimaryConstructor { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirPrimaryConstructor { typeParameters.transformInplace(transformer, data) return this @@ -98,6 +93,11 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPrimaryConstructor { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirPrimaryConstructor { receiverTypeRef = receiverTypeRef?.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index 3d040b2bd25..48f9b37c5fd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -40,8 +40,8 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, @@ -63,8 +63,8 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } body?.accept(visitor, data) @@ -74,8 +74,8 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( } override fun transformChildren(transformer: FirTransformer, data: D): FirPropertyAccessorImpl { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) transformBody(transformer, data) @@ -85,13 +85,13 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessorImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) + override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyAccessorImpl { + status = status.transform(transformer, data) return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyAccessorImpl { - status = status.transform(transformer, data) + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessorImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index fb75d986ea6..0da6ca14500 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -41,8 +41,8 @@ internal class FirPropertyImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, @@ -70,8 +70,8 @@ internal class FirPropertyImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) initializer?.accept(visitor, data) delegate?.accept(visitor, data) @@ -84,8 +84,8 @@ internal class FirPropertyImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirPropertyImpl { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) transformInitializer(transformer, data) transformDelegate(transformer, data) @@ -97,13 +97,13 @@ internal class FirPropertyImpl( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) + override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyImpl { + status = status.transform(transformer, data) return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyImpl { - status = status.transform(transformer, data) + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt index 04c9cefde46..3b4e72b6eaf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt @@ -36,13 +36,13 @@ internal class FirRegularClassImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var deprecation: DeprecationsPerUseSite?, override val typeParameters: MutableList, + override var status: FirDeclarationStatus, + override var deprecation: DeprecationsPerUseSite?, override val classKind: ClassKind, override val declarations: MutableList, override val annotations: MutableList, override val scopeProvider: FirScopeProvider, - override var status: FirDeclarationStatus, override val name: Name, override val symbol: FirRegularClassSymbol, override var companionObject: FirRegularClass?, @@ -57,18 +57,18 @@ internal class FirRegularClassImpl( override fun acceptChildren(visitor: FirVisitor, data: D) { typeParameters.forEach { it.accept(visitor, data) } + status.accept(visitor, data) declarations.forEach { it.accept(visitor, data) } annotations.forEach { it.accept(visitor, data) } - status.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) superTypeRefs.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirRegularClassImpl { transformTypeParameters(transformer, data) + transformStatus(transformer, data) transformDeclarations(transformer, data) transformAnnotations(transformer, data) - transformStatus(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) companionObject = declarations.asSequence().filterIsInstance().firstOrNull { it.status.isCompanion } transformSuperTypeRefs(transformer, data) @@ -80,6 +80,11 @@ internal class FirRegularClassImpl( return this } + override fun transformStatus(transformer: FirTransformer, data: D): FirRegularClassImpl { + status = status.transform(transformer, data) + return this + } + override fun transformDeclarations(transformer: FirTransformer, data: D): FirRegularClassImpl { declarations.transformInplace(transformer, data) return this @@ -90,11 +95,6 @@ internal class FirRegularClassImpl( return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirRegularClassImpl { - status = status.transform(transformer, data) - return this - } - override fun transformCompanionObject(transformer: FirTransformer, data: D): FirRegularClassImpl { companionObject = companionObject?.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index caca6557bcd..2cd3f6e4d37 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -38,8 +38,8 @@ internal class FirSimpleFunctionImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var returnTypeRef: FirTypeRef, override var status: FirDeclarationStatus, + override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, @@ -59,8 +59,8 @@ internal class FirSimpleFunctionImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) receiverTypeRef?.accept(visitor, data) controlFlowGraphReference?.accept(visitor, data) valueParameters.forEach { it.accept(visitor, data) } @@ -71,8 +71,8 @@ internal class FirSimpleFunctionImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirSimpleFunctionImpl { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformReceiverTypeRef(transformer, data) controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data) transformValueParameters(transformer, data) @@ -83,13 +83,13 @@ internal class FirSimpleFunctionImpl( return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirSimpleFunctionImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) + override fun transformStatus(transformer: FirTransformer, data: D): FirSimpleFunctionImpl { + status = status.transform(transformer, data) return this } - override fun transformStatus(transformer: FirTransformer, data: D): FirSimpleFunctionImpl { - status = status.transform(transformer, data) + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirSimpleFunctionImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index f550cda4edf..0335064e9ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -32,8 +32,8 @@ internal class FirTypeAliasImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override var deprecation: DeprecationsPerUseSite?, override var status: FirDeclarationStatus, + override var deprecation: DeprecationsPerUseSite?, override val typeParameters: MutableList, override val name: Name, override val symbol: FirTypeAliasSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index 473b4989996..1cec2f6c33b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -68,8 +68,8 @@ internal class FirValueParameterImpl( } override fun acceptChildren(visitor: FirVisitor, data: D) { - returnTypeRef.accept(visitor, data) status.accept(visitor, data) + returnTypeRef.accept(visitor, data) backingField?.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } controlFlowGraphReference?.accept(visitor, data) @@ -77,18 +77,13 @@ internal class FirValueParameterImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirValueParameterImpl { - transformReturnTypeRef(transformer, data) transformStatus(transformer, data) + transformReturnTypeRef(transformer, data) transformBackingField(transformer, data) transformOtherChildren(transformer, data) return this } - override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirValueParameterImpl { - returnTypeRef = returnTypeRef.transform(transformer, data) - return this - } - override fun transformTypeParameters(transformer: FirTransformer, data: D): FirValueParameterImpl { return this } @@ -98,6 +93,11 @@ internal class FirValueParameterImpl( return this } + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirValueParameterImpl { + returnTypeRef = returnTypeRef.transform(transformer, data) + return this + } + override fun transformReceiverTypeRef(transformer: FirTransformer, data: D): FirValueParameterImpl { return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt index 90c8327a225..b646d0c851b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -152,11 +152,11 @@ abstract class FirDefaultVisitor : FirVisitor() { override fun visitExpression(expression: FirExpression, data: D): R = visitStatement(expression, data) - override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): R = visitAnnotatedDeclaration(typedDeclaration, data) - override fun visitTypeParametersOwner(typeParametersOwner: FirTypeParametersOwner, data: D): R = visitTypeParameterRefsOwner(typeParametersOwner, data) - override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration, data: D): R = visitTypeParameterRefsOwner(memberDeclaration, data) + override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): R = visitMemberDeclaration(typedDeclaration, data) + + override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: D): R = visitTypedDeclaration(callableDeclaration, data) override fun visitField(field: FirField, data: D): R = visitVariable(field, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt index 419a1396757..75c7c4768b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -152,11 +152,11 @@ abstract class FirDefaultVisitorVoid : FirVisitorVoid() { override fun visitExpression(expression: FirExpression) = visitStatement(expression) - override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration) = visitAnnotatedDeclaration(typedDeclaration) - override fun visitTypeParametersOwner(typeParametersOwner: FirTypeParametersOwner) = visitTypeParameterRefsOwner(typeParametersOwner) - override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) = visitTypeParameterRefsOwner(memberDeclaration) + override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration) = visitMemberDeclaration(typedDeclaration) + + override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration) = visitTypedDeclaration(callableDeclaration) override fun visitField(field: FirField) = visitVariable(field) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt index 992d0e7956c..72ebcc5dca7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -195,18 +195,6 @@ abstract class FirTransformer : FirVisitor() { return transformElement(declaration, data) } - open fun transformAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): FirAnnotatedDeclaration { - return transformElement(annotatedDeclaration, data) - } - - open fun transformAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): FirAnonymousInitializer { - return transformElement(anonymousInitializer, data) - } - - open fun transformTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): FirTypedDeclaration { - return transformElement(typedDeclaration, data) - } - open fun transformTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner, data: D): FirTypeParameterRefsOwner { return transformElement(typeParameterRefsOwner, data) } @@ -215,10 +203,22 @@ abstract class FirTransformer : FirVisitor() { return transformElement(typeParametersOwner, data) } + open fun transformAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): FirAnnotatedDeclaration { + return transformElement(annotatedDeclaration, data) + } + open fun transformMemberDeclaration(memberDeclaration: FirMemberDeclaration, data: D): FirMemberDeclaration { return transformElement(memberDeclaration, data) } + open fun transformAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): FirAnonymousInitializer { + return transformElement(anonymousInitializer, data) + } + + open fun transformTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): FirTypedDeclaration { + return transformElement(typedDeclaration, data) + } + open fun transformCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: D): FirCallableDeclaration { return transformElement(callableDeclaration, data) } @@ -723,18 +723,6 @@ abstract class FirTransformer : FirVisitor() { return transformDeclaration(declaration, data) } - final override fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): FirAnnotatedDeclaration { - return transformAnnotatedDeclaration(annotatedDeclaration, data) - } - - final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): FirAnonymousInitializer { - return transformAnonymousInitializer(anonymousInitializer, data) - } - - final override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): FirTypedDeclaration { - return transformTypedDeclaration(typedDeclaration, data) - } - final override fun visitTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner, data: D): FirTypeParameterRefsOwner { return transformTypeParameterRefsOwner(typeParameterRefsOwner, data) } @@ -743,10 +731,22 @@ abstract class FirTransformer : FirVisitor() { return transformTypeParametersOwner(typeParametersOwner, data) } + final override fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): FirAnnotatedDeclaration { + return transformAnnotatedDeclaration(annotatedDeclaration, data) + } + final override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration, data: D): FirMemberDeclaration { return transformMemberDeclaration(memberDeclaration, data) } + final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): FirAnonymousInitializer { + return transformAnonymousInitializer(anonymousInitializer, data) + } + + final override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): FirTypedDeclaration { + return transformTypedDeclaration(typedDeclaration, data) + } + final override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: D): FirCallableDeclaration { return transformCallableDeclaration(callableDeclaration, data) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt index 486071c1761..98ab9b99d26 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -170,18 +170,18 @@ abstract class FirVisitor { open fun visitDeclaration(declaration: FirDeclaration, data: D): R = visitElement(declaration, data) - open fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): R = visitElement(annotatedDeclaration, data) - - open fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): R = visitElement(anonymousInitializer, data) - - open fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): R = visitElement(typedDeclaration, data) - open fun visitTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner, data: D): R = visitElement(typeParameterRefsOwner, data) open fun visitTypeParametersOwner(typeParametersOwner: FirTypeParametersOwner, data: D): R = visitElement(typeParametersOwner, data) + open fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: D): R = visitElement(annotatedDeclaration, data) + open fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration, data: D): R = visitElement(memberDeclaration, data) + open fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: D): R = visitElement(anonymousInitializer, data) + + open fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: D): R = visitElement(typedDeclaration, data) + open fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: D): R = visitElement(callableDeclaration, data) open fun visitTypeParameterRef(typeParameterRef: FirTypeParameterRef, data: D): R = visitElement(typeParameterRef, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt index ec03263ccba..51a9dcd919d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -194,18 +194,6 @@ abstract class FirVisitorVoid : FirVisitor() { visitElement(declaration) } - open fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration) { - visitElement(annotatedDeclaration) - } - - open fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) { - visitElement(anonymousInitializer) - } - - open fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration) { - visitElement(typedDeclaration) - } - open fun visitTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner) { visitElement(typeParameterRefsOwner) } @@ -214,10 +202,22 @@ abstract class FirVisitorVoid : FirVisitor() { visitElement(typeParametersOwner) } + open fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration) { + visitElement(annotatedDeclaration) + } + open fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) { visitElement(memberDeclaration) } + open fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) { + visitElement(anonymousInitializer) + } + + open fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration) { + visitElement(typedDeclaration) + } + open fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration) { visitElement(callableDeclaration) } @@ -722,18 +722,6 @@ abstract class FirVisitorVoid : FirVisitor() { visitDeclaration(declaration) } - final override fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: Nothing?) { - visitAnnotatedDeclaration(annotatedDeclaration) - } - - final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: Nothing?) { - visitAnonymousInitializer(anonymousInitializer) - } - - final override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: Nothing?) { - visitTypedDeclaration(typedDeclaration) - } - final override fun visitTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner, data: Nothing?) { visitTypeParameterRefsOwner(typeParameterRefsOwner) } @@ -742,10 +730,22 @@ abstract class FirVisitorVoid : FirVisitor() { visitTypeParametersOwner(typeParametersOwner) } + final override fun visitAnnotatedDeclaration(annotatedDeclaration: FirAnnotatedDeclaration, data: Nothing?) { + visitAnnotatedDeclaration(annotatedDeclaration) + } + final override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration, data: Nothing?) { visitMemberDeclaration(memberDeclaration) } + final override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer, data: Nothing?) { + visitAnonymousInitializer(anonymousInitializer) + } + + final override fun visitTypedDeclaration(typedDeclaration: FirTypedDeclaration, data: Nothing?) { + visitTypedDeclaration(typedDeclaration) + } + final override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: Nothing?) { visitCallableDeclaration(callableDeclaration) } 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 c370970ded4..fe4e4f167a7 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 @@ -40,11 +40,11 @@ abstract class FirDefaultPropertyAccessor( resolvePhase = if (effectiveVisibility != null) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES, origin, FirDeclarationAttributes(), - propertyTypeRef, status = if (effectiveVisibility == null) FirDeclarationStatusImpl(visibility, modality) else FirResolvedDeclarationStatusImpl(visibility, modality, effectiveVisibility), + propertyTypeRef, deprecation = null, containerSource = null, dispatchReceiverType = null,