diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index f23c5a012e1..c32ffd30ab0 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -54,6 +54,8 @@ class FirJavaClass @FirImplementationDetail internal constructor( symbol.bind(this) } + override val origin: FirDeclarationOrigin + get() = FirDeclarationOrigin.Java override val companionObject: FirRegularClass? get() = null @@ -179,6 +181,13 @@ internal class FirJavaClassBuilder : AbstractFirRegularClassBuilder, FirAnnotati set(value) { throw IllegalStateException() } + + @Deprecated("Modification of 'origin' has no impact for FirJavaClassBuilder", level = DeprecationLevel.HIDDEN) + override var origin: FirDeclarationOrigin + get() = throw IllegalStateException() + set(value) { + throw IllegalStateException() + } } internal inline fun buildJavaClass(init: FirJavaClassBuilder.() -> Unit): FirJavaClass { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index 9ca37ad4395..875e69037ea 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -51,6 +51,9 @@ class FirJavaConstructor @FirImplementationDetail constructor( override val body: FirBlock? get() = null + override val origin: FirDeclarationOrigin + get() = FirDeclarationOrigin.Java + override val controlFlowGraphReference: FirControlFlowGraphReference get() = FirEmptyControlFlowGraphReference override fun transformValueParameters(transformer: FirTransformer, data: D): FirJavaConstructor { @@ -185,6 +188,13 @@ class FirJavaConstructorBuilder : FirConstructorBuilder() { set(value) { throw IllegalStateException() } + + @Deprecated("Modification of 'origin' has no impact for FirJavaConstructorBuilder", level = DeprecationLevel.HIDDEN) + override var origin: FirDeclarationOrigin + get() = throw IllegalStateException() + set(value) { + throw IllegalStateException() + } } inline fun buildJavaConstructor(init: FirJavaConstructorBuilder.() -> Unit): FirJavaConstructor { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 74587a5e6fa..15b9b95722c 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -53,6 +53,9 @@ class FirJavaField @FirImplementationDetail constructor( override val getter: FirPropertyAccessor? get() = null override val setter: FirPropertyAccessor? get() = null + override val origin: FirDeclarationOrigin + get() = FirDeclarationOrigin.Java + override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirField { returnTypeRef = returnTypeRef.transformSingle(transformer, data) return this @@ -160,6 +163,13 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() { isEnumEntry ) } + + @Deprecated("Modification of 'origin' has no impact for FirJavaFieldBuilder", level = DeprecationLevel.HIDDEN) + override var origin: FirDeclarationOrigin + get() = throw IllegalStateException() + set(value) { + throw IllegalStateException() + } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 65ae9f5e356..541a842d3f6 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -58,6 +58,7 @@ class FirJavaMethod @FirImplementationDetail constructor( source, session, resolvePhase, + FirDeclarationOrigin.Java, returnTypeRef, receiverTypeRef, valueParameters, @@ -82,6 +83,13 @@ class FirJavaMethodBuilder : FirSimpleFunctionBuilder() { var isStatic: Boolean by Delegates.notNull() override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES + @Deprecated("Modification of 'origin' has no impact for FirJavaFunctionBuilder", level = DeprecationLevel.HIDDEN) + override var origin: FirDeclarationOrigin + get() = throw IllegalStateException() + set(value) { + throw IllegalStateException() + } + @OptIn(FirImplementationDetail::class) override fun build(): FirJavaMethod { val status = FirDeclarationStatusImpl(visibility, modality).apply { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index bd8e55db706..8b678bfd4de 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirValueParameterBuilder @@ -36,6 +37,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( source, session, resolvePhase, + FirDeclarationOrigin.Java, returnTypeRef, name, symbol, @@ -100,6 +102,12 @@ class FirJavaValueParameterBuilder : FirValueParameterBuilder() { throw IllegalStateException() } + @Deprecated("Modification of 'origin' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN) + override var origin: FirDeclarationOrigin + get() = throw IllegalStateException() + set(value) { + throw IllegalStateException() + } } inline fun buildJavaValueParameter(init: FirJavaValueParameterBuilder.() -> Unit): FirJavaValueParameter { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt index 8742c287d3d..a2e5e915178 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt @@ -10,10 +10,7 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl @@ -52,6 +49,7 @@ class FirIntegerLiteralTypeScope(private val session: FirSession, val isUnsigned val valueParameterName = Name.identifier("arg") valueParameters += buildValueParameter { source = null + origin = FirDeclarationOrigin.Synthetic session = this@FirIntegerLiteralTypeScope.session returnTypeRef = FirILTTypeRefPlaceHolder(isUnsigned) this.name = valueParameterName @@ -107,6 +105,7 @@ class FirIntegerOperator @FirImplementationDetail constructor( source, session, resolvePhase = FirResolvePhase.BODY_RESOLVE, + FirDeclarationOrigin.Synthetic, returnTypeRef, receiverTypeRef, typeParameters = mutableListOf(), 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 4f844b824fa..ac51c37aede 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,6 +26,7 @@ abstract class FirAnonymousFunction : FirFunction, FirExpr abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val annotations: List abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? 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 c24dbc6e02c..5c1db1cab88 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 @@ -23,6 +23,7 @@ abstract class FirAnonymousInitializer : FirPureAbstractElement(), FirDeclaratio abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract val body: FirBlock? abstract override val symbol: FirAnonymousInitializerSymbol abstract 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 066846359f2..60aef0869c2 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 @@ -25,6 +25,7 @@ abstract class FirAnonymousObject : FirClass, FirExpression( abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val typeParameters: List abstract override val classKind: ClassKind abstract override val superTypeRefs: List 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 d4bc41e80ff..e2c5c65a938 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,6 +22,7 @@ interface FirCallableDeclaration> : FirTypedDeclar override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List override val returnTypeRef: FirTypeRef val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt index 8c85944dc3f..1d9da77171a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt @@ -22,6 +22,7 @@ interface FirCallableMemberDeclaration> : Fi override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List override val returnTypeRef: FirTypeRef override val receiverTypeRef: FirTypeRef? 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 f0c308be74e..1b45cde1add 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 @@ -25,6 +25,7 @@ interface FirClass> : FirClassLikeDeclaration, FirStatement, override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val typeParameters: List override val symbol: FirClassSymbol val classKind: ClassKind 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 d0ecdd3c2b5..41dea5cb750 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 @@ -22,6 +22,7 @@ interface FirClassLikeDeclaration> : FirDeclarati override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List override val symbol: FirClassLikeSymbol 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 f60960b7f76..321847caf70 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 @@ -26,6 +26,7 @@ abstract class FirConstructor : FirPureAbstractElement(), FirFunction 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 4add9f36ee8..23f2368532e 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 @@ -19,6 +19,7 @@ interface FirDeclaration : FirElement { override val source: FirSourceElement? val session: FirSession val resolvePhase: FirResolvePhase + val origin: FirDeclarationOrigin override fun accept(visitor: FirVisitor, data: D): R = visitor.visitDeclaration(this, data) 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 fabd81ae1cd..3942d40117e 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 @@ -25,6 +25,7 @@ abstract class FirEnumEntry : FirVariable(), FirCallableMemberDecl abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val name: Name 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 f401ac55858..9e9859a489f 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,6 +26,7 @@ abstract class FirErrorFunction : FirPureAbstractElement(), FirFunction abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? 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 f3dae780923..b463105d328 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,6 +25,7 @@ abstract class FirField : FirVariable(), FirTypeParametersOwner, FirCa abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val name: Name 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 e88046bfa25..a2934a9ae83 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 @@ -23,6 +23,7 @@ abstract class FirFile : FirPureAbstractElement(), FirAnnotationContainer, FirDe abstract override val annotations: List abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract val imports: List abstract val declarations: List abstract val name: String 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 647bd1fa20b..28d2412b173 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,6 +26,7 @@ interface FirFunction> : FirCallableDeclaration, FirTarget override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List override val returnTypeRef: FirTypeRef override val receiverTypeRef: FirTypeRef? 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 9bedbb1c542..4cfe2040a49 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 @@ -20,6 +20,7 @@ interface FirMemberDeclaration : FirDeclaration, FirAnnotationContainer { override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List val typeParameters: List val status: FirDeclarationStatus 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 60786b211ac..7875477906f 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 @@ -27,6 +27,7 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val name: Name 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 b5ca070c8c9..c484185cce8 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 @@ -25,6 +25,7 @@ abstract class FirPropertyAccessor : FirPureAbstractElement(), FirFunction abstract override val typeParameters: List abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt index eadc90618e1..dc2bdcda704 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt @@ -26,6 +26,7 @@ abstract class FirSealedClass : FirRegularClass() { abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val annotations: List abstract override val typeParameters: List abstract override val status: FirDeclarationStatus 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 0bad0b9d51b..b9d86724bd2 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 @@ -27,6 +27,7 @@ abstract class FirSimpleFunction : FirPureAbstractElement(), FirFunction abstract val name: Name 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 64e91921b5f..6e4225876ce 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 @@ -26,6 +26,7 @@ abstract class FirTypeParameter : FirPureAbstractElement(), FirTypeParameterRef, abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract val name: Name abstract override val symbol: FirTypeParameterSymbol abstract val variance: Variance 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 e364ee53e36..c0dd5daccc2 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 @@ -21,6 +21,7 @@ interface FirTypedDeclaration : FirDeclaration, FirAnnotationContainer { override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase + override val origin: FirDeclarationOrigin override val annotations: List val returnTypeRef: FirTypeRef 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 dc7ae49b9af..4983736a87e 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 @@ -24,6 +24,7 @@ abstract class FirValueParameter : FirVariable() { abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract override val name: Name 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 b21dd481a4a..e32cb2c2ab5 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 @@ -26,6 +26,7 @@ abstract class FirVariable> : FirPureAbstractElement(), FirCa abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase + abstract override val origin: FirDeclarationOrigin abstract override val returnTypeRef: FirTypeRef abstract override val receiverTypeRef: FirTypeRef? abstract val name: Name diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/AbstractFirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/AbstractFirRegularClassBuilder.kt index 687c59691e6..d5df0fca20b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/AbstractFirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/AbstractFirRegularClassBuilder.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -34,6 +35,7 @@ interface AbstractFirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefs abstract override var source: FirSourceElement? abstract override val annotations: MutableList abstract override var session: FirSession + abstract override var origin: FirDeclarationOrigin abstract override val typeParameters: MutableList abstract override var classKind: ClassKind abstract override val superTypeRefs: MutableList 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 44c49eebda9..452859e5474 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 @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirConstructor +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 @@ -33,6 +34,7 @@ interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var source: FirSourceElement? abstract override val annotations: MutableList abstract override var session: FirSession + abstract override var origin: FirDeclarationOrigin abstract override var returnTypeRef: FirTypeRef abstract override val valueParameters: MutableList abstract override var body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index cd0a63842a1..5c6854a64f5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -37,6 +38,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override lateinit var session: FirSession + override lateinit var origin: FirDeclarationOrigin override val annotations: MutableList = mutableListOf() override lateinit var returnTypeRef: FirTypeRef var receiverTypeRef: FirTypeRef? = null @@ -54,6 +56,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu return FirAnonymousFunctionImpl( source, session, + origin, annotations, returnTypeRef, receiverTypeRef, 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 7f9640a015a..f940fa82d8e 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousInitializerImpl import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -28,6 +29,7 @@ class FirAnonymousInitializerBuilder { var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin var body: FirBlock? = null var symbol: FirAnonymousInitializerSymbol = FirAnonymousInitializerSymbol() @@ -36,6 +38,7 @@ class FirAnonymousInitializerBuilder { source, session, resolvePhase, + origin, body, symbol, ) 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 cd811324568..07adead6ec9 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 @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder @@ -37,6 +38,7 @@ class FirAnonymousObjectBuilder : FirClassBuilder, FirAnnotationContainerBuilder override var source: FirSourceElement? = null override lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override val typeParameters: MutableList = mutableListOf() override lateinit var classKind: ClassKind override val superTypeRefs: MutableList = mutableListOf() @@ -51,6 +53,7 @@ class FirAnonymousObjectBuilder : FirClassBuilder, FirAnnotationContainerBuilder source, session, resolvePhase, + origin, typeParameters, classKind, superTypeRefs, 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 0053c07ffd2..202dcd45ae0 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -28,6 +29,7 @@ interface FirClassBuilder : FirAnnotationContainerBuilder { abstract override var source: FirSourceElement? abstract override val annotations: MutableList abstract var session: FirSession + abstract var origin: FirDeclarationOrigin abstract val typeParameters: MutableList abstract var classKind: ClassKind abstract val superTypeRefs: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassImplBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassImplBuilder.kt index ac5d06689e5..dae93cba866 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassImplBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassImplBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -37,6 +38,7 @@ open class FirClassImplBuilder : AbstractFirRegularClassBuilder, FirAnnotationCo override var source: FirSourceElement? = null override lateinit var session: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() override lateinit var status: FirDeclarationStatus @@ -53,6 +55,7 @@ open class FirClassImplBuilder : AbstractFirRegularClassBuilder, FirAnnotationCo source, session, resolvePhase, + origin, annotations, typeParameters, status, 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 9d275ba73e5..cb64572a6f0 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 @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirConstructor +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 @@ -37,6 +38,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override var source: FirSourceElement? = null override lateinit var session: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override lateinit var returnTypeRef: FirTypeRef override var receiverTypeRef: FirTypeRef? = null override val typeParameters: MutableList = mutableListOf() @@ -53,6 +55,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC source, session, resolvePhase, + origin, returnTypeRef, receiverTypeRef, typeParameters, 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 4dc0e834f47..2c65299f7aa 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -32,6 +33,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin lateinit var returnTypeRef: FirTypeRef var receiverTypeRef: FirTypeRef? = null lateinit var symbol: FirVariableSymbol @@ -53,6 +55,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, returnTypeRef, receiverTypeRef, symbol, 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 cd4034447ac..02d85104f77 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirEnumEntry import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -35,6 +36,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin lateinit var returnTypeRef: FirTypeRef lateinit var name: Name lateinit var symbol: FirVariableSymbol @@ -49,6 +51,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, returnTypeRef, name, symbol, 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 796b1a4ea6e..aa1cdb2cb03 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirErrorFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -35,6 +36,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin override val annotations: MutableList = mutableListOf() val valueParameters: MutableList = mutableListOf() lateinit var diagnostic: ConeDiagnostic @@ -46,6 +48,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, annotations, valueParameters, diagnostic, 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 f44481f1760..d1d2719feb0 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -35,6 +36,7 @@ open class FirFieldBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null open lateinit var session: FirSession open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + open lateinit var origin: FirDeclarationOrigin open lateinit var returnTypeRef: FirTypeRef open lateinit var name: Name open lateinit var symbol: FirVariableSymbol @@ -49,6 +51,7 @@ open class FirFieldBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, returnTypeRef, name, symbol, 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 d871b238f18..f5ecb907b44 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 @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -30,6 +31,7 @@ class FirFileBuilder : FirAnnotationContainerBuilder { override val annotations: MutableList = mutableListOf() lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin val imports: MutableList = mutableListOf() val declarations: MutableList = mutableListOf() lateinit var name: String @@ -41,6 +43,7 @@ class FirFileBuilder : FirAnnotationContainerBuilder { annotations, session, resolvePhase, + origin, imports, declarations, name, 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 eb85c5c761c..62c538d9690 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 @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -26,6 +27,7 @@ interface FirFunctionBuilder : FirAnnotationContainerBuilder { abstract override var source: FirSourceElement? abstract override val annotations: MutableList abstract var session: FirSession + abstract var origin: FirDeclarationOrigin abstract var returnTypeRef: FirTypeRef abstract val valueParameters: MutableList abstract var body: FirBlock? 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 3ccaf024db3..1150ac9eacc 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 @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirConstructor +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 @@ -37,6 +38,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override var source: FirSourceElement? = null override lateinit var session: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override lateinit var returnTypeRef: FirTypeRef override var receiverTypeRef: FirTypeRef? = null override val typeParameters: MutableList = mutableListOf() @@ -53,6 +55,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio source, session, resolvePhase, + origin, returnTypeRef, receiverTypeRef, 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 d19648dea0c..d7261dd7648 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 @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -39,6 +40,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui override var source: FirSourceElement? = null override lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override lateinit var returnTypeRef: FirTypeRef override val valueParameters: MutableList = mutableListOf() override var body: FirBlock? = null @@ -55,6 +57,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui source, session, resolvePhase, + origin, returnTypeRef, valueParameters, body, 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 a7c1de9603e..0cf55881586 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -39,6 +40,7 @@ class FirPropertyBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContainer override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin lateinit var returnTypeRef: FirTypeRef var receiverTypeRef: FirTypeRef? = null lateinit var name: Name @@ -60,6 +62,7 @@ class FirPropertyBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContainer source, session, resolvePhase, + origin, returnTypeRef, receiverTypeRef, name, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSealedClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSealedClassBuilder.kt index 2e1d910e8d2..563bdb7cc09 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSealedClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSealedClassBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -39,6 +40,7 @@ class FirSealedClassBuilder : AbstractFirRegularClassBuilder, FirAnnotationConta override var source: FirSourceElement? = null override lateinit var session: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() override lateinit var status: FirDeclarationStatus @@ -56,6 +58,7 @@ class FirSealedClassBuilder : AbstractFirRegularClassBuilder, FirAnnotationConta source, session, resolvePhase, + origin, annotations, typeParameters, status, 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 e16a8185447..a970e397350 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 @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription +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.FirSimpleFunction @@ -41,6 +42,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner override var source: FirSourceElement? = null override lateinit var session: FirSession open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + override lateinit var origin: FirDeclarationOrigin override lateinit var returnTypeRef: FirTypeRef open var receiverTypeRef: FirTypeRef? = null override val valueParameters: MutableList = mutableListOf() @@ -59,6 +61,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner source, session, resolvePhase, + origin, returnTypeRef, receiverTypeRef, valueParameters, 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 6623af3eed1..c48bdf14f15 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +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.FirTypeAlias @@ -32,6 +33,7 @@ class FirTypeAliasBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContaine override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin lateinit var status: FirDeclarationStatus override val typeParameters: MutableList = mutableListOf() lateinit var name: Name @@ -44,6 +46,7 @@ class FirTypeAliasBuilder : FirTypeParametersOwnerBuilder, FirAnnotationContaine source, session, resolvePhase, + origin, status, typeParameters, name, 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 355afe81f25..ebf3e88b36a 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl @@ -30,6 +31,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null lateinit var session: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + lateinit var origin: FirDeclarationOrigin lateinit var name: Name lateinit var symbol: FirTypeParameterSymbol lateinit var variance: Variance @@ -42,6 +44,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, name, symbol, variance, 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 87ceddaf8fb..fae00b5f648 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 @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -33,6 +34,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null open lateinit var session: FirSession open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR + open lateinit var origin: FirDeclarationOrigin open lateinit var returnTypeRef: FirTypeRef open lateinit var name: Name open lateinit var symbol: FirVariableSymbol @@ -48,6 +50,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { source, session, resolvePhase, + origin, returnTypeRef, name, 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 c767c2167b4..d37cd9f7345 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -28,6 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAnonymousFunctionImpl( override val source: FirSourceElement?, override val session: FirSession, + override val origin: FirDeclarationOrigin, override val annotations: MutableList, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, 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 70e70d85ab8..b9512fe5948 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -24,6 +25,7 @@ internal class FirAnonymousInitializerImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var body: FirBlock?, override val symbol: FirAnonymousInitializerSymbol, ) : FirAnonymousInitializer() { 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 f5774aa397c..34ac7d521c0 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -29,6 +30,7 @@ internal class FirAnonymousObjectImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val typeParameters: MutableList, override val classKind: ClassKind, override val superTypeRefs: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt index bdab3457cdc..79d003883cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -31,6 +32,7 @@ internal class FirClassImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val annotations: MutableList, override val typeParameters: MutableList, override var status: FirDeclarationStatus, 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 d152eabb997..de6bce4d51f 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirConstructor +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 @@ -31,6 +32,7 @@ internal class FirConstructorImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, 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 4b9d141e574..bf5e2fd9f83 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -27,6 +28,7 @@ internal class FirDefaultSetterValueParameter( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override val symbol: FirVariableSymbol, 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 c4fd933edbb..f56602e6ad8 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirEnumEntry import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -30,6 +31,7 @@ internal class FirEnumEntryImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override val name: Name, override val symbol: FirVariableSymbol, 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 1c202bb5df1..6f017b6fe51 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirErrorFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -30,6 +31,7 @@ internal class FirErrorFunctionImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val annotations: MutableList, override val valueParameters: MutableList, override val diagnostic: ConeDiagnostic, 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 4d3bb235fd8..c8235009d23 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -30,6 +31,7 @@ internal class FirFieldImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override val name: Name, override val symbol: FirVariableSymbol, 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 934de376178..d25ad2c749f 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -25,6 +26,7 @@ internal class FirFileImpl( override val annotations: MutableList, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val imports: MutableList, override val declarations: MutableList, override val name: String, 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 8059754c1c3..ed34b95be1e 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirConstructor +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 @@ -31,6 +32,7 @@ internal class FirPrimaryConstructor( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, 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 e405a0db136..3d69e1449f0 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 @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -32,6 +33,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override val valueParameters: MutableList, override var body: FirBlock?, 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 f540ff7d25f..3febb3f5aaa 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -33,6 +34,7 @@ internal class FirPropertyImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override val name: Name, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt index 671b13f1aa6..8b6da02f8af 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -33,6 +34,7 @@ internal class FirSealedClassImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val annotations: MutableList, override val typeParameters: MutableList, override var status: FirDeclarationStatus, 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 c0a355ce09a..6fa42a9224b 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 @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription +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.FirSimpleFunction @@ -33,6 +34,7 @@ open class FirSimpleFunctionImpl @FirImplementationDetail constructor( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override val valueParameters: MutableList, 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 9266b1590b0..7d40f4c7fcb 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +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.FirTypeAlias @@ -26,6 +27,7 @@ internal class FirTypeAliasImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var status: FirDeclarationStatus, override val typeParameters: MutableList, override val name: Name, 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 6a506de2a53..7c346189e10 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -25,6 +26,7 @@ internal class FirTypeParameterImpl( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override val name: Name, override val symbol: FirTypeParameterSymbol, override val variance: Variance, 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 2e361756a62..7405912e7b2 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 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -28,6 +29,7 @@ open class FirValueParameterImpl @FirImplementationDetail constructor( override val source: FirSourceElement?, override val session: FirSession, override var resolvePhase: FirResolvePhase, + override val origin: FirDeclarationOrigin, override var returnTypeRef: FirTypeRef, override val name: Name, override val symbol: FirVariableSymbol, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationOrigin.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationOrigin.kt new file mode 100644 index 00000000000..e4c0667b680 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationOrigin.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2010-2020 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.declarations + +sealed class FirDeclarationOrigin { + object Source : FirDeclarationOrigin() + object Library : FirDeclarationOrigin() + object Java : FirDeclarationOrigin() + object Synthetic : FirDeclarationOrigin() + object SamConstructor : FirDeclarationOrigin() + object FakeOverride : FirDeclarationOrigin() + object Enhancement : FirDeclarationOrigin() + + class Plugin(val marker: FirPluginMarker) : FirDeclarationOrigin() +} + +abstract class FirPluginMarker \ No newline at end of file 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 95933f2b14e..6c86903180f 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 @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription +import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.buildDefaultSetterValueParameter @@ -27,6 +28,7 @@ import org.jetbrains.kotlin.name.Name abstract class FirDefaultPropertyAccessor( source: FirSourceElement?, session: FirSession, + origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, valueParameters: MutableList, isGetter: Boolean, @@ -36,6 +38,7 @@ abstract class FirDefaultPropertyAccessor( source, session, resolvePhase = FirResolvePhase.RAW_FIR, + origin, propertyTypeRef, valueParameters, body = null, @@ -56,14 +59,15 @@ abstract class FirDefaultPropertyAccessor( fun createGetterOrSetter( source: FirSourceElement?, session: FirSession, + origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, visibility: Visibility, isGetter: Boolean ): FirDefaultPropertyAccessor { return if (isGetter) { - FirDefaultPropertyGetter(source, session, propertyTypeRef, visibility) + FirDefaultPropertyGetter(source, session, origin, propertyTypeRef, visibility) } else { - FirDefaultPropertySetter(source, session, propertyTypeRef, visibility) + FirDefaultPropertySetter(source, session, origin, propertyTypeRef, visibility) } } } @@ -72,12 +76,14 @@ abstract class FirDefaultPropertyAccessor( class FirDefaultPropertyGetter( source: FirSourceElement?, session: FirSession, + origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, visibility: Visibility, symbol: FirPropertyAccessorSymbol = FirPropertyAccessorSymbol() ) : FirDefaultPropertyAccessor( source, session, + origin, propertyTypeRef, valueParameters = mutableListOf(), isGetter = true, @@ -88,12 +94,14 @@ class FirDefaultPropertyGetter( class FirDefaultPropertySetter( source: FirSourceElement?, session: FirSession, + origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, visibility: Visibility, symbol: FirPropertyAccessorSymbol = FirPropertyAccessorSymbol() ) : FirDefaultPropertyAccessor( source, session, + origin, FirImplicitUnitTypeRef(source), valueParameters = mutableListOf( buildDefaultSetterValueParameter builder@{ diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index 0f5b03c1796..adad18dc17b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -39,6 +39,9 @@ class FirSyntheticProperty( override val source: FirSourceElement? get() = null + override val origin: FirDeclarationOrigin + get() = FirDeclarationOrigin.Synthetic + override val initializer: FirExpression? get() = null diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt index e927d34342c..7ff75428a77 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt @@ -30,6 +30,9 @@ class FirSyntheticPropertyAccessor( override val session: FirSession get() = delegate.session + override val origin: FirDeclarationOrigin + get() = FirDeclarationOrigin.Synthetic + override val returnTypeRef: FirTypeRef get() = delegate.returnTypeRef 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 5295992b78f..c4dcff338c8 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 @@ -73,6 +73,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild declaration.configure { +field("session", firSessionType) +field("resolvePhase", resolvePhaseType, withReplace = true).apply { isMutable = true } + +field("origin", declarationOriginType) } typedDeclaration.configure { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt index a2613155a13..9899869a656 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt @@ -69,4 +69,5 @@ val coneDiagnosticType = generatedType("diagnostics", "ConeDiagnostic") val coneStubDiagnosticType = generatedType("diagnostics", "ConeStubDiagnostic") val dslBuilderAnnotationType = generatedType("builder", "FirBuilderDsl") -val firImplementationDetailType = generatedType("FirImplementationDetail") \ No newline at end of file +val firImplementationDetailType = generatedType("FirImplementationDetail") +val declarationOriginType = generatedType("declarations", "FirDeclarationOrigin") \ No newline at end of file