diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index 2f06f51ff3f..732de97904e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -30,7 +30,7 @@ internal class FirBreakExpressionImpl( override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirBreakExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -46,9 +46,7 @@ internal class FirBreakExpressionImpl( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index 1b83a7d002b..c2a9803507b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -30,7 +30,7 @@ internal class FirContinueExpressionImpl( override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirContinueExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -46,9 +46,7 @@ internal class FirContinueExpressionImpl( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index 3374a780ab2..b7c54623eb3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -28,7 +28,7 @@ class FirElseIfTrueCondition @FirImplementationDetail constructor( override val source: KtSourceElement?, override var annotations: MutableOrEmptyList, ) : FirExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Boolean.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Boolean.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -44,9 +44,7 @@ class FirElseIfTrueCondition @FirImplementationDetail constructor( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index 5de087f3ae3..44f60a78ec2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -32,7 +32,7 @@ internal class FirReturnExpressionImpl( override val target: FirTarget, override var result: FirExpression, ) : FirReturnExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -60,9 +60,7 @@ internal class FirReturnExpressionImpl( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index 1e75ad6bdc4..b8459a53b09 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -29,7 +29,7 @@ internal class FirStringConcatenationCallImpl( override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirStringConcatenationCall() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.String.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.String.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -55,7 +55,5 @@ internal class FirStringConcatenationCallImpl( argumentList = newArgumentList } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index 31216df42b4..15770b5050f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -29,7 +29,7 @@ internal class FirThrowExpressionImpl( override var annotations: MutableOrEmptyList, override var exception: FirExpression, ) : FirThrowExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -52,9 +52,7 @@ internal class FirThrowExpressionImpl( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index feb953a7c88..bd55a7f02d6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -28,7 +28,7 @@ class FirUnitExpression @FirImplementationDetail constructor( override val source: KtSourceElement?, override var annotations: MutableOrEmptyList, ) : FirExpression() { - override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Unit.constructClassLikeType() + override val coneTypeOrNull: ConeKotlinType? = StandardClassIds.Unit.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -44,9 +44,7 @@ class FirUnitExpression @FirImplementationDetail constructor( return this } - override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { - coneTypeOrNull = newConeTypeOrNull - } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt index 9ff94b70844..da43161154d 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt @@ -122,7 +122,10 @@ abstract class AbstractFirTreeImplementationConfigurator { } fun defaultBuiltInType(type: String) { - default("coneTypeOrNull", "StandardClassIds.$type.constructClassLikeType()") + default("coneTypeOrNull") { + value = "StandardClassIds.$type.constructClassLikeType()" + isMutable = false + } useTypes(standardClassIdsType, constructClassLikeTypeImport) }