From 8fd892176a76f1da79d9837222f93abd6149666e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 8 Dec 2022 15:22:47 +0100 Subject: [PATCH] [FIR] introduce FirElementWithResolvePhase class and make it a base class for FirDeclaration --- .../kotlin/fir/FirElementWithResolvePhase.kt | 29 +++++++++++++++++++ .../fir/declarations/FirAnonymousFunction.kt | 2 +- .../declarations/FirAnonymousInitializer.kt | 2 +- .../fir/declarations/FirAnonymousObject.kt | 2 +- .../fir/declarations/FirBackingField.kt | 2 +- .../declarations/FirCallableDeclaration.kt | 2 +- .../kotlin/fir/declarations/FirClass.kt | 2 +- .../declarations/FirClassLikeDeclaration.kt | 2 +- .../kotlin/fir/declarations/FirConstructor.kt | 2 +- .../kotlin/fir/declarations/FirDeclaration.kt | 10 +++---- .../kotlin/fir/declarations/FirEnumEntry.kt | 2 +- .../fir/declarations/FirErrorFunction.kt | 2 +- .../fir/declarations/FirErrorProperty.kt | 2 +- .../kotlin/fir/declarations/FirField.kt | 2 +- .../kotlin/fir/declarations/FirFile.kt | 2 +- .../kotlin/fir/declarations/FirFunction.kt | 2 +- .../fir/declarations/FirMemberDeclaration.kt | 2 +- .../kotlin/fir/declarations/FirProperty.kt | 2 +- .../fir/declarations/FirPropertyAccessor.kt | 2 +- .../fir/declarations/FirRegularClass.kt | 2 +- .../kotlin/fir/declarations/FirScript.kt | 2 +- .../fir/declarations/FirSimpleFunction.kt | 2 +- .../kotlin/fir/declarations/FirTypeAlias.kt | 2 +- .../fir/declarations/FirTypeParameter.kt | 2 +- .../fir/declarations/FirValueParameter.kt | 2 +- .../kotlin/fir/declarations/FirVariable.kt | 2 +- .../builder/FirAbstractConstructorBuilder.kt | 2 +- .../builder/FirAnonymousInitializerBuilder.kt | 4 +-- .../builder/FirAnonymousObjectBuilder.kt | 4 +-- .../builder/FirBackingFieldBuilder.kt | 4 +-- .../declarations/builder/FirClassBuilder.kt | 2 +- .../builder/FirConstructorBuilder.kt | 6 ++-- .../builder/FirDeclarationBuilder.kt | 2 +- .../FirDefaultSetterValueParameterBuilder.kt | 4 +-- .../builder/FirEnumEntryBuilder.kt | 4 +-- .../builder/FirErrorFunctionBuilder.kt | 4 +-- .../builder/FirErrorPropertyBuilder.kt | 4 +-- .../declarations/builder/FirFieldBuilder.kt | 4 +-- .../declarations/builder/FirFileBuilder.kt | 4 +-- .../builder/FirFunctionBuilder.kt | 2 +- .../builder/FirPrimaryConstructorBuilder.kt | 4 +-- .../builder/FirPropertyAccessorBuilder.kt | 6 ++-- .../builder/FirPropertyBuilder.kt | 6 ++-- .../builder/FirRegularClassBuilder.kt | 6 ++-- .../declarations/builder/FirScriptBuilder.kt | 4 +-- .../builder/FirSimpleFunctionBuilder.kt | 6 ++-- .../builder/FirTypeAliasBuilder.kt | 6 ++-- .../builder/FirTypeParameterBuilder.kt | 6 ++-- .../builder/FirValueParameterBuilder.kt | 6 ++-- .../impl/FirAnonymousInitializerImpl.kt | 2 +- .../impl/FirAnonymousObjectImpl.kt | 2 +- .../declarations/impl/FirBackingFieldImpl.kt | 2 +- .../declarations/impl/FirConstructorImpl.kt | 2 +- .../impl/FirDefaultSetterValueParameter.kt | 2 +- .../fir/declarations/impl/FirEnumEntryImpl.kt | 2 +- .../declarations/impl/FirErrorFunctionImpl.kt | 4 +-- .../declarations/impl/FirErrorPropertyImpl.kt | 2 +- .../fir/declarations/impl/FirFieldImpl.kt | 2 +- .../fir/declarations/impl/FirFileImpl.kt | 4 +-- .../impl/FirPrimaryConstructor.kt | 2 +- .../impl/FirPropertyAccessorImpl.kt | 2 +- .../fir/declarations/impl/FirPropertyImpl.kt | 2 +- .../declarations/impl/FirRegularClassImpl.kt | 2 +- .../fir/declarations/impl/FirScriptImpl.kt | 4 +-- .../impl/FirSimpleFunctionImpl.kt | 2 +- .../fir/declarations/impl/FirTypeAliasImpl.kt | 2 +- .../declarations/impl/FirTypeParameterImpl.kt | 2 +- .../impl/FirValueParameterImpl.kt | 2 +- .../kotlin/fir/visitors/FirDefaultVisitor.kt | 3 +- .../fir/visitors/FirDefaultVisitorVoid.kt | 3 +- .../kotlin/fir/visitors/FirTransformer.kt | 9 ++++++ .../kotlin/fir/visitors/FirVisitor.kt | 3 ++ .../kotlin/fir/visitors/FirVisitorVoid.kt | 9 ++++++ .../impl/FirDefaultPropertyAccessor.kt | 2 +- .../fir/tree/generator/FirTreeBuilder.kt | 3 +- .../fir/tree/generator/NodeConfigurator.kt | 8 ++++- 76 files changed, 163 insertions(+), 108 deletions(-) create mode 100644 compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolvePhase.kt diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolvePhase.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolvePhase.kt new file mode 100644 index 00000000000..91855f5dc70 --- /dev/null +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolvePhase.kt @@ -0,0 +1,29 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir + +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.visitors.* + +/* + * This file was generated automatically + * DO NOT MODIFY IT MANUALLY + */ + +abstract class FirElementWithResolvePhase : FirPureAbstractElement(), FirElement { + abstract override val source: KtSourceElement? + abstract val resolvePhase: FirResolvePhase + abstract val moduleData: FirModuleData + + override fun accept(visitor: FirVisitor, data: D): R = visitor.visitElementWithResolvePhase(this, data) + + @Suppress("UNCHECKED_CAST") + override fun transform(transformer: FirTransformer, data: D): E = + transformer.transformElementWithResolvePhase(this, data) as E + + abstract fun replaceResolvePhase(newResolvePhase: FirResolvePhase) +} 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 51681515a6b..e1d9d9a3a3e 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 @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt index af31199ed5b..696be542708 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousInitializer : FirDeclaration(), FirControlFlowGraphOwner { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val controlFlowGraphReference: FirControlFlowGraphReference? 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 9a28e098d6e..30dbcea95e6 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 @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index e78d59ea86c..92efe0a6823 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirStatement { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val returnTypeRef: FirTypeRef 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 44bb70c7e76..1a7774fbf5b 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 @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirCallableDeclaration : FirMemberDeclaration() { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 7f995706b2c..03aa00a702d 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 @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParameterRefsOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 07a510e9a82..8a64e34a776 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 @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirClassLikeDeclaration : FirMemberDeclaration(), FirStatement { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 9e3bda3915b..25d2410577a 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 @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt index 509950186a3..b45b9e13119 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -19,12 +19,12 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -sealed class FirDeclaration : FirPureAbstractElement(), FirAnnotationContainer { +sealed class FirDeclaration : FirElementWithResolvePhase(), FirAnnotationContainer { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract val symbol: FirBasedSymbol - abstract val moduleData: FirModuleData - abstract val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract val origin: FirDeclarationOrigin abstract val attributes: FirDeclarationAttributes @@ -34,7 +34,7 @@ sealed class FirDeclaration : FirPureAbstractElement(), FirAnnotationContainer { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformDeclaration(this, data) as E - abstract fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirDeclaration } 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 a8f01acc2ed..0e567a7f622 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 @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirEnumEntry : FirVariable() { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 f31f91ed7a3..c78091e95a6 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 @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus 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 ed5d2382ce7..1818d69d548 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 d1ffaf2c068..f63c23eac97 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 @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirField : FirVariable(), FirControlFlowGraphOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt index e93565c03ab..7ffda90869f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirFile : FirDeclaration() { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract val packageDirective: FirPackageDirective 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 ec1f587ea63..7bf633c0243 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 @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirControlFlowGraphOwner, FirStatement { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 72b57bd9bcc..490c9a13edf 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 @@ -19,10 +19,10 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirMemberDeclaration : FirDeclaration(), FirTypeParameterRefsOwner { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List 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 typeParameters: List 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 a65801c0001..c8ffb8cc21b 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFlowGraphOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus 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 0fb7948b047..e30fbc2181f 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, FirTypeParametersOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus 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 2aa4fd5d3a1..65b4478cb08 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 @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirRegularClass : FirClass(), FirControlFlowGraphOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt index ef4c33f4bfd..84273fc9bd9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirScript : FirDeclaration() { abstract override val source: KtSourceElement? + abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List abstract override val moduleData: FirModuleData - abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract val name: Name 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 db3e623e6e3..cbc2a91ab31 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, FirTypeParametersOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus 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 5fef60793ef..1dafbe14193 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 @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTypeAlias : FirClassLikeDeclaration(), FirTypeParametersOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index fb2356feddc..85ba6e6126f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTypeParameter : FirTypeParameterRef, FirDeclaration() { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract val name: Name 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 2acf77ed170..eb1fc472c36 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 71ec6167015..3a12d3d6134 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 @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract override val source: KtSourceElement? - abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase + abstract override val moduleData: FirModuleData abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes abstract override val typeParameters: List 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 291f96d8583..7b225cd4055 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var source: KtSourceElement? + abstract override var resolvePhase: FirResolvePhase abstract override val annotations: MutableList abstract override var moduleData: FirModuleData - abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract override var status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt index e72db1f9c4a..c6783136542 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() var body: FirBlock? = null @@ -42,8 +42,8 @@ class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationConta override fun build(): FirAnonymousInitializer { return FirAnonymousInitializerImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, body, 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 ec1f95fe731..df9f839b807 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 @@ -40,8 +40,8 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override val typeParameters: MutableList = mutableListOf() @@ -57,8 +57,8 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn override fun build(): FirAnonymousObject { return FirAnonymousObjectImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index 5654e2b15e5..f264928710a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -43,8 +43,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirBackingFieldBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var moduleData: FirModuleData lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var returnTypeRef: FirTypeRef @@ -71,8 +71,8 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder { override fun build(): FirBackingField { return FirBackingFieldImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, returnTypeRef, 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 4ae1e27b362..1c63287a0e7 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 @@ -34,9 +34,9 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { abstract override var source: KtSourceElement? + abstract override var resolvePhase: FirResolvePhase abstract override val annotations: MutableList abstract override var moduleData: FirModuleData - abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract val typeParameters: 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 65a36e887a5..17c754a0753 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 @@ -43,8 +43,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override val typeParameters: MutableList = mutableListOf() @@ -64,8 +64,8 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override fun build(): FirConstructor { return FirConstructorImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, @@ -108,8 +108,8 @@ inline fun buildConstructorCopy(original: FirConstructor, init: FirConstructorBu } val copyBuilder = FirConstructorBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.typeParameters.addAll(original.typeParameters) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt index 5da8aae0b85..38c686177ed 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt @@ -25,9 +25,9 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirDeclarationBuilder { abstract var source: KtSourceElement? + abstract var resolvePhase: FirResolvePhase abstract val annotations: MutableList abstract var moduleData: FirModuleData - abstract var resolvePhase: FirResolvePhase abstract var origin: FirDeclarationOrigin abstract var attributes: FirDeclarationAttributes fun build(): FirDeclaration diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index 8e926cba24a..c449df298b8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var moduleData: FirModuleData lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var returnTypeRef: FirTypeRef @@ -73,8 +73,8 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirValueParameter { return FirDefaultSetterValueParameter( source, - moduleData, resolvePhase, + moduleData, origin, attributes, returnTypeRef, 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 c623fe55b14..6376aaced45 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 @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirEnumEntryBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var moduleData: FirModuleData lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() val typeParameters: MutableList = mutableListOf() @@ -62,8 +62,8 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { override fun build(): FirEnumEntry { return FirEnumEntryImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index 40ff0ac135f..e91d296fb3c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -44,9 +44,9 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null + var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override val annotations: MutableList = mutableListOf() lateinit var moduleData: FirModuleData - var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() var deprecationsProvider: DeprecationsProvider = UnresolvedDeprecationProvider @@ -60,9 +60,9 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { override fun build(): FirErrorFunction { return FirErrorFunctionImpl( source, + resolvePhase, annotations, moduleData, - resolvePhase, origin, attributes, deprecationsProvider, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index 2d6082a67d7..57a7796434f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var moduleData: FirModuleData lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() var deprecationsProvider: DeprecationsProvider = UnresolvedDeprecationProvider @@ -62,8 +62,8 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { override fun build(): FirErrorProperty { return FirErrorPropertyImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, deprecationsProvider, 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 71febf8e340..4e1c82524b1 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 @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() open val typeParameters: MutableList = mutableListOf() @@ -67,8 +67,8 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde override fun build(): FirField { return FirFieldImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt index 704f2043495..b0c9578c946 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt @@ -34,9 +34,9 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFileBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null + var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override val annotations: MutableList = mutableListOf() lateinit var moduleData: FirModuleData - var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var packageDirective: FirPackageDirective @@ -49,9 +49,9 @@ class FirFileBuilder : FirAnnotationContainerBuilder { override fun build(): FirFile { return FirFileImpl( source, + resolvePhase, annotations, moduleData, - resolvePhase, origin, attributes, packageDirective, 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 34dad01dea2..7a0b9a44463 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 @@ -35,9 +35,9 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { abstract override var source: KtSourceElement? + abstract override var resolvePhase: FirResolvePhase abstract override val annotations: MutableList abstract override var moduleData: FirModuleData - abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes abstract var status: FirDeclarationStatus 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 05647765ce6..b4df74b9759 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 @@ -44,8 +44,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override val typeParameters: MutableList = mutableListOf() @@ -66,8 +66,8 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override fun build(): FirConstructor { return FirPrimaryConstructor( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, 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 1bac34a6af1..43b7c8b5a5b 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 @@ -47,8 +47,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override lateinit var status: FirDeclarationStatus @@ -70,8 +70,8 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui override fun build(): FirPropertyAccessor { return FirPropertyAccessorImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, status, @@ -108,8 +108,8 @@ inline fun buildPropertyAccessorCopy(original: FirPropertyAccessor, init: FirPro } val copyBuilder = FirPropertyAccessorBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.status = original.status 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 ae185e6ec90..f74ef5bc415 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 @@ -48,8 +48,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var status: FirDeclarationStatus @@ -76,8 +76,8 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, override fun build(): FirProperty { return FirPropertyImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, status, @@ -120,8 +120,8 @@ inline fun buildPropertyCopy(original: FirProperty, init: FirPropertyBuilder.() } val copyBuilder = FirPropertyBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.status = original.status 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 02f63d2d9ef..e0edbb9b1ea 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,8 +42,8 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override val typeParameters: MutableList = mutableListOf() @@ -62,8 +62,8 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu override fun build(): FirRegularClass { return FirRegularClassImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, typeParameters, @@ -98,8 +98,8 @@ inline fun buildRegularClassCopy(original: FirRegularClass, init: FirRegularClas } val copyBuilder = FirRegularClassBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.typeParameters.addAll(original.typeParameters) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt index dbd3e0ad2cc..c2f443e58ab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt @@ -32,9 +32,9 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirScriptBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null + var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override val annotations: MutableList = mutableListOf() lateinit var moduleData: FirModuleData - var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var name: Name @@ -45,9 +45,9 @@ class FirScriptBuilder : FirAnnotationContainerBuilder { override fun build(): FirScript { return FirScriptImpl( source, + resolvePhase, annotations, moduleData, - resolvePhase, origin, attributes, name, 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 7169cef58b7..7586ba448d8 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 @@ -46,8 +46,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override lateinit var status: FirDeclarationStatus @@ -68,8 +68,8 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner override fun build(): FirSimpleFunction { return FirSimpleFunctionImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, status, @@ -106,8 +106,8 @@ inline fun buildSimpleFunctionCopy(original: FirSimpleFunction, init: FirSimpleF } val copyBuilder = FirSimpleFunctionBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.status = original.status 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 c9c2f2057a4..d3510bb1e04 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 @@ -37,8 +37,8 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var status: FirDeclarationStatus @@ -52,8 +52,8 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder override fun build(): FirTypeAlias { return FirTypeAliasImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, status, @@ -83,8 +83,8 @@ inline fun buildTypeAliasCopy(original: FirTypeAlias, init: FirTypeAliasBuilder. } val copyBuilder = FirTypeAliasBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.status = original.status diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt index 8da732e778f..285aaaee01e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt @@ -33,8 +33,8 @@ import org.jetbrains.kotlin.types.Variance @FirBuilderDsl class FirTypeParameterBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var moduleData: FirModuleData lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var name: Name @@ -48,8 +48,8 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirTypeParameter { return FirTypeParameterImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, name, @@ -79,8 +79,8 @@ inline fun buildTypeParameterCopy(original: FirTypeParameter, init: FirTypeParam } val copyBuilder = FirTypeParameterBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.name = original.name diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index e84cf5eb2ea..3c98c0f3540 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirValueParameterBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - open lateinit var moduleData: FirModuleData open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + open lateinit var moduleData: FirModuleData open lateinit var origin: FirDeclarationOrigin open var attributes: FirDeclarationAttributes = FirDeclarationAttributes() open lateinit var returnTypeRef: FirTypeRef @@ -67,8 +67,8 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirValueParameter { return FirValueParameterImpl( source, - moduleData, resolvePhase, + moduleData, origin, attributes, returnTypeRef, @@ -105,8 +105,8 @@ inline fun buildValueParameterCopy(original: FirValueParameter, init: FirValuePa } val copyBuilder = FirValueParameterBuilder() copyBuilder.source = original.source - copyBuilder.moduleData = original.moduleData copyBuilder.resolvePhase = original.resolvePhase + copyBuilder.moduleData = original.moduleData copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() copyBuilder.returnTypeRef = original.returnTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt index e3df161d581..6d3f6a1340a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAnonymousInitializerImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var body: FirBlock?, 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 5888cb9393d..6c15784c3e0 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 @@ -32,9 +32,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAnonymousObjectImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index bdf84e1b2db..a86d132e2ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirBackingFieldImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var returnTypeRef: FirTypeRef, 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 0a06e8ebf74..38f39663f0b 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 @@ -36,9 +36,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirConstructorImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, 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 b1bfb9cca74..4067576821c 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDefaultSetterValueParameter( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var returnTypeRef: FirTypeRef, 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 8bf4193ed89..a1cfaf0592f 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 @@ -36,9 +36,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirEnumEntryImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, 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 47c75d7e1e7..1ff2c8ed13d 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 @@ -38,10 +38,10 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorFunctionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val annotations: MutableList, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var deprecationsProvider: DeprecationsProvider, 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 19b66209b97..fa1749ee4d8 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorPropertyImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var deprecationsProvider: DeprecationsProvider, 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 545fb7890d1..99398bb2275 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 @@ import org.jetbrains.kotlin.fir.visitors.* class FirFieldImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index a54bc978549..930ac3728f1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -29,10 +29,10 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirFileImpl( override val source: KtSourceElement?, - override val annotations: MutableList, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val annotations: MutableList, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var packageDirective: FirPackageDirective, 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 eae6815e6d4..b92202eadeb 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 @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.fir.visitors.* class FirPrimaryConstructor @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, 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 d162b95bd63..effd22ba76f 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var status: FirDeclarationStatus, 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 0c0dfba0db8..2b699527334 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 @@ -40,9 +40,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirPropertyImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var status: FirDeclarationStatus, 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 a100f8e4a99..4881be81954 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 @@ -34,9 +34,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirRegularClassImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val typeParameters: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt index 14c7563c727..cdf7f67ec68 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirScriptImpl( override val source: KtSourceElement?, - override val annotations: MutableList, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val annotations: MutableList, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val name: Name, 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 4aceb8c5d80..a9d96f938e1 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 @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSimpleFunctionImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var status: FirDeclarationStatus, 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 769515d800b..2112812c025 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 @@ -29,9 +29,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTypeAliasImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var status: FirDeclarationStatus, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index 15dd22c48bc..0a39d9670d4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTypeParameterImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override val name: Name, 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 6298e44c2e5..b3329f51be1 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirValueParameterImpl( override val source: KtSourceElement?, - override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, + override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, override var returnTypeRef: FirTypeRef, 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 e27a82aee1d..2290707787b 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,6 +18,7 @@ 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.FirContextReceiver +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -159,8 +160,6 @@ abstract class FirDefaultVisitor : FirVisitor() { override fun visitExpression(expression: FirExpression, data: D): R = visitStatement(expression, data) - override fun visitDeclaration(declaration: FirDeclaration, data: D): R = visitAnnotationContainer(declaration, data) - override fun visitTypeParametersOwner(typeParametersOwner: FirTypeParametersOwner, data: D): R = visitTypeParameterRefsOwner(typeParametersOwner, data) override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration, data: D): R = visitMemberDeclaration(callableDeclaration, 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 e70c76247ea..e0cebad9680 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,6 +18,7 @@ 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.FirContextReceiver +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -159,8 +160,6 @@ abstract class FirDefaultVisitorVoid : FirVisitorVoid() { override fun visitExpression(expression: FirExpression) = visitStatement(expression) - override fun visitDeclaration(declaration: FirDeclaration) = visitAnnotationContainer(declaration) - override fun visitTypeParametersOwner(typeParametersOwner: FirTypeParametersOwner) = visitTypeParameterRefsOwner(typeParametersOwner) override fun visitCallableDeclaration(callableDeclaration: FirCallableDeclaration) = visitMemberDeclaration(callableDeclaration) 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 70e4d586226..dc49fa3412e 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,6 +18,7 @@ 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.FirContextReceiver +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -202,6 +203,10 @@ abstract class FirTransformer : FirVisitor() { return transformElement(contextReceiver, data) } + open fun transformElementWithResolvePhase(elementWithResolvePhase: FirElementWithResolvePhase, data: D): FirElementWithResolvePhase { + return transformElement(elementWithResolvePhase, data) + } + open fun transformDeclaration(declaration: FirDeclaration, data: D): FirDeclaration { return transformElement(declaration, data) } @@ -758,6 +763,10 @@ abstract class FirTransformer : FirVisitor() { return transformContextReceiver(contextReceiver, data) } + final override fun visitElementWithResolvePhase(elementWithResolvePhase: FirElementWithResolvePhase, data: D): FirElementWithResolvePhase { + return transformElementWithResolvePhase(elementWithResolvePhase, data) + } + final override fun visitDeclaration(declaration: FirDeclaration, data: D): FirDeclaration { return transformDeclaration(declaration, 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 8fcdf0361fc..d02db23aaf7 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,6 +18,7 @@ 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.FirContextReceiver +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -177,6 +178,8 @@ abstract class FirVisitor { open fun visitContextReceiver(contextReceiver: FirContextReceiver, data: D): R = visitElement(contextReceiver, data) + open fun visitElementWithResolvePhase(elementWithResolvePhase: FirElementWithResolvePhase, data: D): R = visitElement(elementWithResolvePhase, data) + open fun visitDeclaration(declaration: FirDeclaration, data: D): R = visitElement(declaration, data) open fun visitTypeParameterRefsOwner(typeParameterRefsOwner: FirTypeParameterRefsOwner, data: D): R = visitElement(typeParameterRefsOwner, 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 24193c839b9..2b41f057454 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,6 +18,7 @@ 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.FirContextReceiver +import org.jetbrains.kotlin.fir.FirElementWithResolvePhase import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -201,6 +202,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitElement(contextReceiver) } + open fun visitElementWithResolvePhase(elementWithResolvePhase: FirElementWithResolvePhase) { + visitElement(elementWithResolvePhase) + } + open fun visitDeclaration(declaration: FirDeclaration) { visitElement(declaration) } @@ -757,6 +762,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitContextReceiver(contextReceiver) } + final override fun visitElementWithResolvePhase(elementWithResolvePhase: FirElementWithResolvePhase, data: Nothing?) { + visitElementWithResolvePhase(elementWithResolvePhase) + } + final override fun visitDeclaration(declaration: FirDeclaration, data: Nothing?) { visitDeclaration(declaration) } 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 b7f8f0497e3..8a3331884c2 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 @@ -41,8 +41,8 @@ abstract class FirDefaultPropertyAccessor( symbol: FirPropertyAccessorSymbol ) : FirPropertyAccessorImpl( source, - moduleData, resolvePhase = FirResolvePhase.RAW_FIR, + moduleData, origin, FirDeclarationAttributes(), status = if (effectiveVisibility == null) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt index 2d7fcd9c824..7e797ad7b1a 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt @@ -29,7 +29,8 @@ object FirTreeBuilder : AbstractFirTreeBuilder() { val contextReceiver by element(Declaration) - val declaration by sealedElement(Declaration, annotationContainer) + val elementWithResolvePhase by element(Other) + val declaration by sealedElement(Declaration, elementWithResolvePhase, annotationContainer) val typeParameterRefsOwner by sealedElement(Declaration) val typeParametersOwner by sealedElement(Declaration, typeParameterRefsOwner) val memberDeclaration by sealedElement(Declaration, declaration, typeParameterRefsOwner) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 35cc006e24c..cb273dca924 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -76,10 +76,16 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild +field("labelNameFromTypeRef", nameType, nullable = true) } + + elementWithResolvePhase.configure { + +field("resolvePhase", resolvePhaseType, withReplace = true).apply { isMutable = true; isVolatile = true } + +field("moduleData", firModuleDataType) + shouldBeAbstractClass() + } + declaration.configure { +symbolWithPackage("fir.symbols", "FirBasedSymbol", "out FirDeclaration") +field("moduleData", firModuleDataType) - +field("resolvePhase", resolvePhaseType, withReplace = true).apply { isMutable = true; isVolatile = true } +field("origin", declarationOriginType) +field("attributes", declarationAttributesType) shouldBeAbstractClass()