From b24afa017774deb7f69d5f2e34b4cef78084fa44 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Fri, 4 Aug 2023 10:37:23 +0200 Subject: [PATCH] [FIR] Regenerate FIR tree after FirExpression.coneTypeOrNull introduction #KT-59855 --- .../declarations/impl/FirErrorFunctionImpl.kt | 2 +- .../declarations/impl/FirErrorPropertyImpl.kt | 2 +- .../kotlin/fir/expressions/FirAnnotation.kt | 5 +++-- .../kotlin/fir/expressions/FirAnnotationCall.kt | 5 +++-- .../FirAnonymousFunctionExpression.kt | 6 +++--- .../expressions/FirAnonymousObjectExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirArrayLiteral.kt | 6 +++--- .../fir/expressions/FirBinaryLogicExpression.kt | 6 +++--- .../jetbrains/kotlin/fir/expressions/FirBlock.kt | 8 ++++---- .../kotlin/fir/expressions/FirBreakExpression.kt | 6 +++--- .../expressions/FirCallableReferenceAccess.kt | 6 +++--- .../fir/expressions/FirCheckNotNullCall.kt | 6 +++--- .../fir/expressions/FirCheckedSafeCallSubject.kt | 6 +++--- .../expressions/FirClassReferenceExpression.kt | 5 +++-- .../fir/expressions/FirComparisonExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirComponentCall.kt | 6 +++--- .../kotlin/fir/expressions/FirConstExpression.kt | 6 +++--- .../fir/expressions/FirContinueExpression.kt | 6 +++--- ...esugaredAssignmentValueReferenceExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirElvisExpression.kt | 6 +++--- .../FirEnumEntryDeserializedAccessExpression.kt | 6 +++--- .../fir/expressions/FirEqualityOperatorCall.kt | 6 +++--- .../fir/expressions/FirErrorAnnotationCall.kt | 5 +++-- .../kotlin/fir/expressions/FirErrorExpression.kt | 6 +++--- .../fir/expressions/FirErrorResolvedQualifier.kt | 9 ++++++--- .../kotlin/fir/expressions/FirExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirFunctionCall.kt | 6 +++--- .../kotlin/fir/expressions/FirGetClassCall.kt | 6 +++--- .../fir/expressions/FirImplicitInvokeCall.kt | 6 +++--- .../FirInaccessibleReceiverExpression.kt | 6 +++--- .../FirIncrementDecrementExpression.kt | 6 +++--- .../expressions/FirIntegerLiteralOperatorCall.kt | 6 +++--- .../jetbrains/kotlin/fir/expressions/FirJump.kt | 6 +++--- .../expressions/FirLambdaArgumentExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirLazyBlock.kt | 8 ++++---- .../kotlin/fir/expressions/FirLazyExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirLoopJump.kt | 6 +++--- .../expressions/FirNamedArgumentExpression.kt | 6 +++--- .../expressions/FirPropertyAccessExpression.kt | 6 +++--- .../expressions/FirQualifiedAccessExpression.kt | 6 +++--- .../FirQualifiedErrorAccessExpression.kt | 6 +++--- .../fir/expressions/FirResolvedQualifier.kt | 9 ++++++--- .../FirResolvedReifiedParameterReference.kt | 6 +++--- .../fir/expressions/FirReturnExpression.kt | 6 +++--- .../fir/expressions/FirSafeCallExpression.kt | 6 +++--- .../fir/expressions/FirSmartCastExpression.kt | 6 +++--- .../expressions/FirSpreadArgumentExpression.kt | 6 +++--- .../expressions/FirStringConcatenationCall.kt | 6 +++--- .../fir/expressions/FirThisReceiverExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirThrowExpression.kt | 6 +++--- .../kotlin/fir/expressions/FirTryExpression.kt | 6 +++--- .../fir/expressions/FirTypeOperatorCall.kt | 8 ++++++-- .../expressions/FirVarargArgumentsExpression.kt | 5 +++-- .../kotlin/fir/expressions/FirWhenExpression.kt | 6 +++--- .../fir/expressions/FirWhenSubjectExpression.kt | 6 +++--- .../expressions/FirWrappedArgumentExpression.kt | 6 +++--- .../expressions/FirWrappedDelegateExpression.kt | 6 +++--- .../fir/expressions/FirWrappedExpression.kt | 6 +++--- .../builder/FirAbstractFunctionCallBuilder.kt | 4 ++-- .../FirAbstractResolvedQualifierBuilder.kt | 5 +++-- .../expressions/builder/FirAnnotationBuilder.kt | 6 ++++-- .../builder/FirAnnotationCallBuilder.kt | 6 ++++-- .../builder/FirArrayLiteralBuilder.kt | 7 +++---- .../builder/FirBinaryLogicExpressionBuilder.kt | 12 +++--------- .../fir/expressions/builder/FirBlockBuilder.kt | 12 +++--------- .../builder/FirBreakExpressionBuilder.kt | 10 +++++----- .../builder/FirCallableReferenceAccessBuilder.kt | 7 +++---- .../builder/FirCheckNotNullCallBuilder.kt | 7 +++---- .../builder/FirCheckedSafeCallSubjectBuilder.kt | 7 +++---- .../FirClassReferenceExpressionBuilder.kt | 6 +++--- .../builder/FirComparisonExpressionBuilder.kt | 9 +++++---- .../builder/FirComponentCallBuilder.kt | 12 +++--------- .../builder/FirContinueExpressionBuilder.kt | 10 +++++----- ...dAssignmentValueReferenceExpressionBuilder.kt | 12 +++--------- .../builder/FirElseIfTrueConditionBuilder.kt | 6 +++--- .../builder/FirElvisExpressionBuilder.kt | 12 +++--------- .../builder/FirEmptyExpressionBlockBuilder.kt | 3 +-- ...umEntryDeserializedAccessExpressionBuilder.kt | 7 +++---- .../builder/FirEqualityOperatorCallBuilder.kt | 9 +++++---- .../builder/FirErrorAnnotationCallBuilder.kt | 6 ++++-- .../builder/FirErrorExpressionBuilder.kt | 8 ++++---- .../builder/FirErrorResolvedQualifierBuilder.kt | 14 +++++--------- .../expressions/builder/FirExpressionBuilder.kt | 4 ++-- .../builder/FirExpressionStubBuilder.kt | 7 +++---- .../builder/FirFunctionCallBuilder.kt | 7 +++---- .../builder/FirGetClassCallBuilder.kt | 7 +++---- .../builder/FirImplicitInvokeCallBuilder.kt | 12 +++--------- .../FirInaccessibleReceiverExpressionBuilder.kt | 6 +++--- .../FirIncrementDecrementExpressionBuilder.kt | 12 +++--------- .../FirIntegerLiteralOperatorCallBuilder.kt | 6 +++--- .../FirLambdaArgumentExpressionBuilder.kt | 6 +++--- .../expressions/builder/FirLazyBlockBuilder.kt | 2 +- .../builder/FirLazyExpressionBuilder.kt | 6 +++--- .../expressions/builder/FirLoopJumpBuilder.kt | 2 ++ .../builder/FirNamedArgumentExpressionBuilder.kt | 6 +++--- .../FirPropertyAccessExpressionBuilder.kt | 7 +++---- .../FirQualifiedAccessExpressionBuilder.kt | 4 ++-- .../FirQualifiedErrorAccessExpressionBuilder.kt | 8 ++++---- .../builder/FirResolvedQualifierBuilder.kt | 9 +++++---- ...irResolvedReifiedParameterReferenceBuilder.kt | 7 +++---- .../builder/FirReturnExpressionBuilder.kt | 10 +++++----- .../builder/FirSafeCallExpressionBuilder.kt | 7 +++---- .../builder/FirSmartCastExpressionBuilder.kt | 4 ++-- .../FirSpreadArgumentExpressionBuilder.kt | 6 +++--- .../builder/FirStringConcatenationCallBuilder.kt | 10 +++++----- .../builder/FirThisReceiverExpressionBuilder.kt | 9 ++++----- .../builder/FirThrowExpressionBuilder.kt | 10 +++++----- .../builder/FirTryExpressionBuilder.kt | 7 +++---- .../builder/FirTypeOperatorCallBuilder.kt | 11 +++-------- .../builder/FirUnitExpressionBuilder.kt | 6 +++--- .../FirVarargArgumentsExpressionBuilder.kt | 6 +++--- .../builder/FirWhenExpressionBuilder.kt | 7 +++---- .../builder/FirWhenSubjectExpressionBuilder.kt | 8 +++++--- .../FirWrappedDelegateExpressionBuilder.kt | 6 +++--- .../expressions/impl/FirAnnotationCallImpl.kt | 6 ++++-- .../fir/expressions/impl/FirAnnotationImpl.kt | 6 ++++-- .../fir/expressions/impl/FirArrayLiteralImpl.kt | 10 ++++------ .../impl/FirBinaryLogicExpressionImpl.kt | 12 ++++-------- .../kotlin/fir/expressions/impl/FirBlockImpl.kt | 16 ++++++---------- .../expressions/impl/FirBreakExpressionImpl.kt | 14 ++++++-------- .../impl/FirCallableReferenceAccessImpl.kt | 10 ++++------ .../expressions/impl/FirCheckNotNullCallImpl.kt | 10 ++++------ .../impl/FirCheckedSafeCallSubjectImpl.kt | 10 ++++------ .../impl/FirClassReferenceExpressionImpl.kt | 9 ++++----- .../impl/FirComparisonExpressionImpl.kt | 13 ++++++------- .../fir/expressions/impl/FirComponentCallImpl.kt | 11 ++++------- .../expressions/impl/FirConstExpressionImpl.kt | 12 ++++-------- .../impl/FirContinueExpressionImpl.kt | 14 ++++++-------- ...aredAssignmentValueReferenceExpressionImpl.kt | 12 ++++-------- .../expressions/impl/FirElseIfTrueCondition.kt | 14 ++++++-------- .../expressions/impl/FirElvisExpressionImpl.kt | 12 ++++-------- .../expressions/impl/FirEmptyExpressionBlock.kt | 15 ++++++--------- ...rEnumEntryDeserializedAccessExpressionImpl.kt | 11 ++++------- .../impl/FirEqualityOperatorCallImpl.kt | 13 ++++++------- .../impl/FirErrorAnnotationCallImpl.kt | 6 ++++-- .../expressions/impl/FirErrorExpressionImpl.kt | 12 +++++------- .../impl/FirErrorResolvedQualifierImpl.kt | 16 +++++++++------- .../fir/expressions/impl/FirExpressionStub.kt | 10 ++++------ .../fir/expressions/impl/FirFunctionCallImpl.kt | 10 ++++------ .../fir/expressions/impl/FirGetClassCallImpl.kt | 10 ++++------ .../impl/FirImplicitInvokeCallImpl.kt | 11 ++++------- .../FirInaccessibleReceiverExpressionImpl.kt | 10 ++++------ .../impl/FirIncrementDecrementExpressionImpl.kt | 12 ++++-------- .../impl/FirIntegerLiteralOperatorCallImpl.kt | 10 ++++------ .../impl/FirLambdaArgumentExpressionImpl.kt | 6 +++--- .../fir/expressions/impl/FirLazyBlockImpl.kt | 8 ++++---- .../expressions/impl/FirLazyExpressionImpl.kt | 6 +++--- .../impl/FirNamedArgumentExpressionImpl.kt | 6 +++--- .../impl/FirPropertyAccessExpressionImpl.kt | 10 ++++------ .../FirQualifiedErrorAccessExpressionImpl.kt | 12 +++++------- .../expressions/impl/FirResolvedQualifierImpl.kt | 15 +++++++++------ .../FirResolvedReifiedParameterReferenceImpl.kt | 10 ++++------ .../expressions/impl/FirReturnExpressionImpl.kt | 14 ++++++-------- .../impl/FirSafeCallExpressionImpl.kt | 10 ++++------ .../impl/FirSmartCastExpressionImpl.kt | 12 +++++------- .../impl/FirSpreadArgumentExpressionImpl.kt | 6 +++--- .../impl/FirStringConcatenationCallImpl.kt | 14 ++++++-------- .../impl/FirThisReceiverExpressionImpl.kt | 10 ++++------ .../expressions/impl/FirThrowExpressionImpl.kt | 14 ++++++-------- .../fir/expressions/impl/FirTryExpressionImpl.kt | 10 ++++------ .../expressions/impl/FirTypeOperatorCallImpl.kt | 15 +++++++++------ .../fir/expressions/impl/FirUnitExpression.kt | 14 ++++++-------- .../impl/FirVarargArgumentsExpressionImpl.kt | 9 ++++----- .../expressions/impl/FirWhenExpressionImpl.kt | 10 ++++------ .../impl/FirWhenSubjectExpressionImpl.kt | 8 +++++--- .../impl/FirWrappedDelegateExpressionImpl.kt | 6 +++--- .../kotlin/fir/references/FirThisReference.kt | 4 ++++ .../builder/FirExplicitThisReferenceBuilder.kt | 3 +++ .../builder/FirImplicitThisReferenceBuilder.kt | 3 +++ .../references/impl/FirExplicitThisReference.kt | 6 ++++++ .../references/impl/FirImplicitThisReference.kt | 6 ++++++ .../kotlin/fir/types/FirErrorTypeRef.kt | 1 - .../kotlin/fir/types/FirResolvedTypeRef.kt | 1 - .../types/builder/FirResolvedTypeRefBuilder.kt | 3 --- .../fir/types/impl/FirResolvedTypeRefImpl.kt | 1 - 175 files changed, 632 insertions(+), 727 deletions(-) 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 a5605a845cd..a864c9b5b49 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 @@ -58,7 +58,7 @@ internal class FirErrorFunctionImpl( ) : FirErrorFunction() { override val typeParameters: List get() = emptyList() override var status: FirDeclarationStatus = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS - override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic, false) + override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override val receiverParameter: FirReceiverParameter? get() = null override var controlFlowGraphReference: FirControlFlowGraphReference? = null override val body: FirBlock? get() = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index eb7a4fb8cb9..0a4b51a4c80 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -60,7 +60,7 @@ internal class FirErrorPropertyImpl( ) : FirErrorProperty() { override val typeParameters: List get() = emptyList() override var status: FirDeclarationStatus = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS - override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic, false) + override var returnTypeRef: FirTypeRef = FirErrorTypeRefImpl(null, null, diagnostic) override val receiverParameter: FirReceiverParameter? get() = null override val initializer: FirExpression? get() = null override val delegate: FirExpression? get() = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt index 86483b2cfd4..55158bdcfab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnnotation : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val useSiteTarget: AnnotationUseSiteTarget? abstract val annotationTypeRef: FirTypeRef @@ -32,7 +33,7 @@ abstract class FirAnnotation : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAnnotation(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt index 76520b6e7b0..014d50e275b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnnotationCall : FirAnnotation(), FirCall, FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val useSiteTarget: AnnotationUseSiteTarget? abstract override val annotationTypeRef: FirTypeRef @@ -36,7 +37,7 @@ abstract class FirAnnotationCall : FirAnnotation(), FirCall, FirResolvable { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAnnotationCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt index d2e3677dfec..58537c89d56 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousFunctionExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val anonymousFunction: FirAnonymousFunction @@ -28,7 +28,7 @@ abstract class FirAnonymousFunctionExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAnonymousFunctionExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt index 2acdd772c15..f0d85a8371b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousObjectExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val anonymousObject: FirAnonymousObject @@ -28,7 +28,7 @@ abstract class FirAnonymousObjectExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAnonymousObjectExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt index da4f2586ee0..5d10c1e08af 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirArrayLiteral : FirExpression(), FirCall { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val argumentList: FirArgumentList @@ -27,7 +27,7 @@ abstract class FirArrayLiteral : FirExpression(), FirCall { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformArrayLiteral(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index b679840898c..c90d15163e4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.LogicOperationKind import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBinaryLogicExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val leftOperand: FirExpression abstract val rightOperand: FirExpression @@ -30,7 +30,7 @@ abstract class FirBinaryLogicExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformBinaryLogicExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index cd8a65d523d..c55afff6bbc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBlock : FirExpression() { abstract override val source: KtSourceElement? + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val statements: List - abstract override val typeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitBlock(this, data) @@ -27,9 +27,9 @@ abstract class FirBlock : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformBlock(this, data) as E - abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index e5936634219..fd29fe72b34 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBreakExpression : FirLoopJump() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val target: FirTarget @@ -28,7 +28,7 @@ abstract class FirBreakExpression : FirLoopJump() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformBreakExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index 6f09bacf592..27e68b6d720 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -37,7 +37,7 @@ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformCallableReferenceAccess(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt index 74a7f0bf60c..8d35e32f1c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirCheckNotNullCall : FirExpression(), FirCall, FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract override val calleeReference: FirReference @@ -29,7 +29,7 @@ abstract class FirCheckNotNullCall : FirExpression(), FirCall, FirResolvable { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformCheckNotNullCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt index e5634ed85fd..56351e297cc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirCheckedSafeCallSubject : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val originalReceiverRef: FirExpressionRef @@ -28,7 +28,7 @@ abstract class FirCheckedSafeCallSubject : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformCheckedSafeCallSubject(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index 8c178cb4d7d..b074006b1da 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirClassReferenceExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val classTypeRef: FirTypeRef @@ -27,7 +28,7 @@ abstract class FirClassReferenceExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformClassReferenceExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt index 02db4135712..6df79251cee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirComparisonExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val operation: FirOperation abstract val compareToCall: FirFunctionCall @@ -28,7 +28,7 @@ abstract class FirComparisonExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformComparisonExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index 4e6e679e6be..f060ae43849 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirComponentCall : FirFunctionCall() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -39,7 +39,7 @@ abstract class FirComponentCall : FirFunctionCall() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformComponentCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index f10eac8bb2b..83221e173c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.types.ConstantValueKind import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirConstExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val kind: ConstantValueKind abstract val value: T @@ -29,7 +29,7 @@ abstract class FirConstExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformConstExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index 2915258dcce..bc75db026c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirContinueExpression : FirLoopJump() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val target: FirTarget @@ -28,7 +28,7 @@ abstract class FirContinueExpression : FirLoopJump() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformContinueExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt index 57892af1af7..a252847edcf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirDesugaredAssignmentValueReferenceExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val expressionRef: FirExpressionRef @@ -28,7 +28,7 @@ abstract class FirDesugaredAssignmentValueReferenceExpression : FirExpression() override fun transform(transformer: FirTransformer, data: D): E = transformer.transformDesugaredAssignmentValueReferenceExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt index 5622b6fddba..bc9c0a659b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirElvisExpression : FirExpression(), FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirReference abstract val lhs: FirExpression @@ -30,7 +30,7 @@ abstract class FirElvisExpression : FirExpression(), FirResolvable { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformElvisExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt index 8265aefa6fd..ecd05f1015c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirEnumEntryDeserializedAccessExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val enumClassId: ClassId abstract val enumEntryName: Name @@ -30,7 +30,7 @@ abstract class FirEnumEntryDeserializedAccessExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformEnumEntryDeserializedAccessExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt index dfa29ea828c..ad8dc97404c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirEqualityOperatorCall : FirExpression(), FirCall { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val operation: FirOperation @@ -28,7 +28,7 @@ abstract class FirEqualityOperatorCall : FirExpression(), FirCall { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformEqualityOperatorCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt index 51258732044..bccd276f6b1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -22,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorAnnotationCall : FirAnnotationCall(), FirDiagnosticHolder { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val useSiteTarget: AnnotationUseSiteTarget? abstract override val annotationTypeRef: FirTypeRef @@ -39,7 +40,7 @@ abstract class FirErrorAnnotationCall : FirAnnotationCall(), FirDiagnosticHolder override fun transform(transformer: FirTransformer, data: D): E = transformer.transformErrorAnnotationCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index 34e7529e6ba..2b58b5dd159 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorExpression : FirExpression(), FirDiagnosticHolder { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val diagnostic: ConeDiagnostic abstract val expression: FirExpression? @@ -31,7 +31,7 @@ abstract class FirErrorExpression : FirExpression(), FirDiagnosticHolder { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformErrorExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt index 3ae93d9b069..b50afa13e0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt @@ -10,8 +10,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnosticHolder { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val packageFqName: FqName abstract override val relativeClassFqName: FqName? @@ -31,6 +31,7 @@ abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnostic abstract override val symbol: FirClassLikeSymbol<*>? abstract override val isNullableLHSForCallableReference: Boolean abstract override val resolvedToCompanionObject: Boolean + abstract override val canBeValue: Boolean abstract override val isFullyQualified: Boolean abstract override val nonFatalDiagnostics: List abstract override val typeArguments: List @@ -42,7 +43,7 @@ abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnostic override fun transform(transformer: FirTransformer, data: D): E = transformer.transformErrorResolvedQualifier(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) @@ -50,6 +51,8 @@ abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnostic abstract override fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) + abstract override fun replaceCanBeValue(newCanBeValue: Boolean) + abstract override fun replaceTypeArguments(newTypeArguments: List) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorResolvedQualifier diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index e0312f5f612..1370cfb3f64 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirExpression : FirPureAbstractElement(), FirStatement { abstract override val source: KtSourceElement? - abstract val typeRef: FirTypeRef + abstract val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitExpression(this, data) @@ -27,7 +27,7 @@ abstract class FirExpression : FirPureAbstractElement(), FirStatement { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformExpression(this, data) as E - abstract fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index edb7e79dd2c..673970598f8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -38,7 +38,7 @@ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformFunctionCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index 1f60cb947a7..a0ed2424e6c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirGetClassCall : FirExpression(), FirCall { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val argument: FirExpression @@ -28,7 +28,7 @@ abstract class FirGetClassCall : FirExpression(), FirCall { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformGetClassCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index 15a37340e1d..adac373e1dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirImplicitInvokeCall : FirFunctionCall() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -38,7 +38,7 @@ abstract class FirImplicitInvokeCall : FirFunctionCall() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformImplicitInvokeCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt index 737c65b5585..0e8c9fe781f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirInaccessibleReceiverExpression : FirExpression(), FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirThisReference @@ -29,7 +29,7 @@ abstract class FirInaccessibleReceiverExpression : FirExpression(), FirResolvabl override fun transform(transformer: FirTransformer, data: D): E = transformer.transformInaccessibleReceiverExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt index 24270ba8990..4c94eacfce1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirIncrementDecrementExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val isPrefix: Boolean abstract val operationName: Name @@ -31,7 +31,7 @@ abstract class FirIncrementDecrementExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformIncrementDecrementExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt index eeab12024c6..66734d1577b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirIntegerLiteralOperatorCall : FirFunctionCall() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -38,7 +38,7 @@ abstract class FirIntegerLiteralOperatorCall : FirFunctionCall() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformIntegerLiteralOperatorCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt index 1ad2758f23b..2a2785bde79 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirJump : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val target: FirTarget @@ -29,7 +29,7 @@ sealed class FirJump : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformJump(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index c9997e7de5d..6b8429e4706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLambdaArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean @@ -28,7 +28,7 @@ abstract class FirLambdaArgumentExpression : FirWrappedArgumentExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformLambdaArgumentExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt index 18f062b74ab..cbffd14de7d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLazyBlock : FirBlock() { abstract override val source: KtSourceElement? + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val statements: List - abstract override val typeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLazyBlock(this, data) @@ -27,9 +27,9 @@ abstract class FirLazyBlock : FirBlock() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformLazyBlock(this, data) as E - abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirLazyBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt index 027c72e0da2..a5caae363ca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLazyExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLazyExpression(this, data) @@ -26,7 +26,7 @@ abstract class FirLazyExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformLazyExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index 3f6ec2201ac..59be7f3fdf8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLoopJump : FirJump() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val target: FirTarget @@ -28,7 +28,7 @@ abstract class FirLoopJump : FirJump() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformLoopJump(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index a0290c0f7c8..221a244db0e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean @@ -30,7 +30,7 @@ abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformNamedArgumentExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index bc562f648a8..86888690bf4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val contextReceiverArguments: List @@ -37,7 +37,7 @@ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformPropertyAccessExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 52f29a5507c..44880eb9e47 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirQualifiedAccessExpression : FirExpression(), FirResolvable, FirContextReceiverArgumentListOwner { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val contextReceiverArguments: List @@ -35,7 +35,7 @@ abstract class FirQualifiedAccessExpression : FirExpression(), FirResolvable, Fi override fun transform(transformer: FirTransformer, data: D): E = transformer.transformQualifiedAccessExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt index d43dcb0b3ed..4b6dc16a045 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirQualifiedErrorAccessExpression : FirExpression(), FirDiagnosticHolder { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val diagnostic: ConeDiagnostic abstract val selector: FirErrorExpression @@ -31,7 +31,7 @@ abstract class FirQualifiedErrorAccessExpression : FirExpression(), FirDiagnosti override fun transform(transformer: FirTransformer, data: D): E = transformer.transformQualifiedErrorAccessExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index 0dacfccd540..06d82421d80 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedQualifier : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val packageFqName: FqName abstract val relativeClassFqName: FqName? @@ -30,6 +30,7 @@ abstract class FirResolvedQualifier : FirExpression() { abstract val symbol: FirClassLikeSymbol<*>? abstract val isNullableLHSForCallableReference: Boolean abstract val resolvedToCompanionObject: Boolean + abstract val canBeValue: Boolean abstract val isFullyQualified: Boolean abstract val nonFatalDiagnostics: List abstract val typeArguments: List @@ -40,7 +41,7 @@ abstract class FirResolvedQualifier : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformResolvedQualifier(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) @@ -48,6 +49,8 @@ abstract class FirResolvedQualifier : FirExpression() { abstract fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) + abstract fun replaceCanBeValue(newCanBeValue: Boolean) + abstract fun replaceTypeArguments(newTypeArguments: List) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirResolvedQualifier diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt index f6cac1b4bb3..f9d49317f2e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedReifiedParameterReference : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val symbol: FirTypeParameterSymbol @@ -28,7 +28,7 @@ abstract class FirResolvedReifiedParameterReference : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformResolvedReifiedParameterReference(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index e400156daef..c166cd14fbb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirReturnExpression : FirJump() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val target: FirTarget abstract val result: FirExpression @@ -30,7 +30,7 @@ abstract class FirReturnExpression : FirJump() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformReturnExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt index 3577ddacfde..be8973236d1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSafeCallExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val receiver: FirExpression abstract val checkedSubjectRef: FirExpressionRef @@ -30,7 +30,7 @@ abstract class FirSafeCallExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformSafeCallExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt index df354e22298..7bfa647ec3c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSmartCastExpression : FirExpression() { abstract override val source: KtSourceElement? + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List - abstract override val typeRef: FirTypeRef abstract val originalExpression: FirExpression abstract val typesFromSmartCast: Collection abstract val smartcastType: FirTypeRef @@ -34,9 +34,9 @@ abstract class FirSmartCastExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformSmartCastExpression(this, data) as E - abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) abstract fun replaceOriginalExpression(newOriginalExpression: FirExpression) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index f6397e4d688..85e2a46d89f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSpreadArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean @@ -28,7 +28,7 @@ abstract class FirSpreadArgumentExpression : FirWrappedArgumentExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformSpreadArgumentExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index bb66cc324a8..aaf136559dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ abstract class FirStringConcatenationCall : FirCall, FirExpression() { abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val argumentList: FirArgumentList - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStringConcatenationCall(this, data) @@ -31,7 +31,7 @@ abstract class FirStringConcatenationCall : FirCall, FirExpression() { abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirStringConcatenationCall } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index dd56fadd22f..3150d86b766 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.FirImplementationDetail @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val contextReceiverArguments: List abstract override val typeArguments: List @@ -37,7 +37,7 @@ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformThisReceiverExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index 839c93d08b5..734fe146164 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirThrowExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val exception: FirExpression @@ -27,7 +27,7 @@ abstract class FirThrowExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformThrowExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index dca8b3bf906..d825e5a687b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTryExpression : FirExpression(), FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirReference abstract val tryBlock: FirBlock @@ -31,7 +31,7 @@ abstract class FirTryExpression : FirExpression(), FirResolvable { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformTryExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index d395b654836..1912066014d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,11 +18,12 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTypeOperatorCall : FirExpression(), FirCall { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val operation: FirOperation abstract val conversionTypeRef: FirTypeRef + abstract val argFromStubType: Boolean override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeOperatorCall(this, data) @@ -29,12 +31,14 @@ abstract class FirTypeOperatorCall : FirExpression(), FirCall { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformTypeOperatorCall(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) + abstract fun replaceArgFromStubType(newArgFromStubType: Boolean) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypeOperatorCall abstract fun transformConversionTypeRef(transformer: FirTransformer, data: D): FirTypeOperatorCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt index 5d666dd58ce..a711b56b28f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirVarargArgumentsExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val arguments: List abstract val varargElementType: FirTypeRef @@ -28,7 +29,7 @@ abstract class FirVarargArgumentsExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformVarargArgumentsExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index 88fad10b75d..6a6db92255f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWhenExpression : FirExpression(), FirResolvable { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val calleeReference: FirReference abstract val subject: FirExpression? @@ -34,7 +34,7 @@ abstract class FirWhenExpression : FirExpression(), FirResolvable { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWhenExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index 1246a16304d..0b59ebfebc4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWhenSubjectExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val whenRef: FirExpressionRef @@ -28,7 +28,7 @@ abstract class FirWhenSubjectExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWhenSubjectExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index 526a04bb760..903620ecbbc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedArgumentExpression : FirWrappedExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val expression: FirExpression abstract val isSpread: Boolean @@ -28,7 +28,7 @@ abstract class FirWrappedArgumentExpression : FirWrappedExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWrappedArgumentExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index 9dd22f69eab..b712184d2fd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedDelegateExpression : FirWrappedExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract override val expression: FirExpression abstract val delegateProvider: FirExpression @@ -28,7 +28,7 @@ abstract class FirWrappedDelegateExpression : FirWrappedExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWrappedDelegateExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index bbd81c98107..e8d631d9cba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedExpression : FirExpression() { abstract override val source: KtSourceElement? - abstract override val typeRef: FirTypeRef + abstract override val coneTypeOrNull: ConeKotlinType? abstract override val annotations: List abstract val expression: FirExpression @@ -27,7 +27,7 @@ abstract class FirWrappedExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWrappedExpression(this, data) as E - abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) abstract override fun replaceAnnotations(newAnnotations: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt index 7c39ef08e2e..e4e2a873cde 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpressionBuilder import org.jetbrains.kotlin.fir.references.FirNamedReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* /* @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAbstractFunctionCallBuilder : FirQualifiedAccessExpressionBuilder, FirCallBuilder { - abstract override var typeRef: FirTypeRef + abstract override var coneTypeOrNull: ConeKotlinType? abstract override val annotations: MutableList abstract override val contextReceiverArguments: MutableList abstract override val typeArguments: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt index 6f06b265ccc..e6c27819911 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl interface FirAbstractResolvedQualifierBuilder { abstract var source: KtSourceElement? - abstract var typeRef: FirTypeRef + abstract var coneTypeOrNull: ConeKotlinType? abstract val annotations: MutableList abstract var packageFqName: FqName abstract var relativeClassFqName: FqName? @@ -35,6 +35,7 @@ interface FirAbstractResolvedQualifierBuilder { abstract var symbol: FirClassLikeSymbol<*>? abstract var isNullableLHSForCallableReference: Boolean abstract var resolvedToCompanionObject: Boolean + abstract var canBeValue: Boolean abstract var isFullyQualified: Boolean abstract val nonFatalDiagnostics: MutableList abstract val typeArguments: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt index 7ba1ca5964b..dd30ccf2647 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt @@ -17,8 +17,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationImpl +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.visitors.* /* @@ -45,8 +47,8 @@ class FirAnnotationBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder } - @Deprecated("Modification of 'typeRef' has no impact for FirAnnotationBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirAnnotationBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt index 96eab9a609a..01e42824dd3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt @@ -24,8 +24,10 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationCallImpl import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* @@ -59,8 +61,8 @@ class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, } - @Deprecated("Modification of 'typeRef' has no impact for FirAnnotationCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirAnnotationCallBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt index af8260a36cc..a1ac979495a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirArrayLiteralImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -30,14 +29,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirArrayLiteralBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList override fun build(): FirArrayLiteral { return FirArrayLiteralImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), argumentList, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt index 004b680dfdc..7f4033eaa44 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBinaryLogicExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -30,6 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var leftOperand: FirExpression lateinit var rightOperand: FirExpression @@ -38,6 +38,7 @@ class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpres override fun build(): FirBinaryLogicExpression { return FirBinaryLogicExpressionImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), leftOperand, rightOperand, @@ -45,13 +46,6 @@ class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpres ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirBinaryLogicExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt index d96b3d0c1dc..ea6f85c6937 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt @@ -17,8 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBlockImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -29,24 +28,19 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() val statements: MutableList = mutableListOf() override fun build(): FirBlock { return FirBlockImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), statements, ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirBlockBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt index 4943e4c457e..060fb86347e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -21,9 +19,11 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBreakExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -45,8 +45,8 @@ class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuil } - @Deprecated("Modification of 'typeRef' has no impact for FirBreakExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirBreakExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt index ae92e42d205..2b3fd79836c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt @@ -22,9 +22,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirCallableReferenceAccessImpl import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -34,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCallableReferenceAccessBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -47,7 +46,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessExpressionBuilder, F override fun build(): FirCallableReferenceAccess { return FirCallableReferenceAccessImpl( - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt index 5cda1eaa3b5..eddaf2c6c3f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt @@ -19,8 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirCheckNotNullCallImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -31,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var argumentList: FirArgumentList var calleeReference: FirReference = FirStubReference @@ -39,7 +38,7 @@ class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionB override fun build(): FirCheckNotNullCall { return FirCheckNotNullCallImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), argumentList, calleeReference, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt index 52dc0b89b0c..0a97753963f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirCheckedSafeCallSubjectImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -30,14 +29,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var originalReceiverRef: FirExpressionRef override fun build(): FirCheckedSafeCallSubject { return FirCheckedSafeCallSubjectImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), originalReceiverRef, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt index 8c4cb05ef30..e3319775fdb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirClassReferenceExpressionImpl +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -28,14 +28,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var classTypeRef: FirTypeRef override fun build(): FirClassReferenceExpression { return FirClassReferenceExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), classTypeRef, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt index 7b0677a5f14..1920fe40132 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt @@ -18,9 +18,10 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirComparisonExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -44,8 +45,8 @@ class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpress } - @Deprecated("Modification of 'typeRef' has no impact for FirComparisonExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirComparisonExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt index 1cd0da5bec1..a1bf721727e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt @@ -26,9 +26,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -39,6 +38,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() val contextReceiverArguments: MutableList = mutableListOf() val typeArguments: MutableList = mutableListOf() @@ -51,6 +51,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F override fun build(): FirComponentCall { return FirComponentCallImpl( + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), @@ -63,13 +64,6 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirComponentCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt index 691c7db247a..4f3d7210eb5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -21,9 +19,11 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirContinueExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -45,8 +45,8 @@ class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerB } - @Deprecated("Modification of 'typeRef' has no impact for FirContinueExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirContinueExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt index 4e4e8d2e50e..7cd8d07c471 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReference import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirDesugaredAssignmentValueReferenceExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -30,24 +29,19 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDesugaredAssignmentValueReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var expressionRef: FirExpressionRef override fun build(): FirDesugaredAssignmentValueReferenceExpression { return FirDesugaredAssignmentValueReferenceExpressionImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), expressionRef, ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirDesugaredAssignmentValueReferenceExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt index da6b624edd6..4941e843463 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -18,9 +16,11 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt index 49afa26eb59..a3b740ab1c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt @@ -19,8 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirElvisExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -31,6 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference lateinit var lhs: FirExpression @@ -39,6 +39,7 @@ class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu override fun build(): FirElvisExpression { return FirElvisExpressionImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), calleeReference, lhs, @@ -46,13 +47,6 @@ class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirElvisExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt index 980fcce022b..6e716802b62 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt @@ -18,8 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt index 68698af96a0..a94c9e9535f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt @@ -16,8 +16,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEnumEntryDeserializedAccessExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassType import org.jetbrains.kotlin.fir.types.toLookupTag import org.jetbrains.kotlin.fir.visitors.* @@ -50,8 +49,8 @@ class FirEnumEntryDeserializedAccessExpressionBuilder : FirAnnotationContainerBu throw IllegalStateException() } - @Deprecated("Modification of 'typeRef' has no impact for FirEnumEntryDeserializedAccessExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirEnumEntryDeserializedAccessExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt index bb24f875d7e..a8a7ab73902 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt @@ -18,9 +18,10 @@ import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEqualityOperatorCallImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -44,8 +45,8 @@ class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpress } - @Deprecated("Modification of 'typeRef' has no impact for FirEqualityOperatorCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirEqualityOperatorCallBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt index 880b98a3161..f6cb69d7cff 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt @@ -25,8 +25,10 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.impl.FirErrorAnnotationCallImpl import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* @@ -60,8 +62,8 @@ class FirErrorAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuil } - @Deprecated("Modification of 'typeRef' has no impact for FirErrorAnnotationCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirErrorAnnotationCallBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt index 5ab79910f82..691a0ee0586 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirErrorExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.types.ConeErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -48,8 +48,8 @@ class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu } - @Deprecated("Modification of 'typeRef' has no impact for FirErrorExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirErrorExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt index 11d8bcadebd..e37f7310501 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt @@ -19,9 +19,8 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifier import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirErrorResolvedQualifierImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -34,11 +33,13 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName override var relativeClassFqName: FqName? = null override var symbol: FirClassLikeSymbol<*>? = null override var isNullableLHSForCallableReference: Boolean = false + override var canBeValue: Boolean = false override var isFullyQualified: Boolean = false override val nonFatalDiagnostics: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -47,11 +48,13 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi override fun build(): FirErrorResolvedQualifier { return FirErrorResolvedQualifierImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), packageFqName, relativeClassFqName, symbol, isNullableLHSForCallableReference, + canBeValue, isFullyQualified, nonFatalDiagnostics.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), @@ -60,13 +63,6 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi } - @Deprecated("Modification of 'typeRef' has no impact for FirErrorResolvedQualifierBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } - @Deprecated("Modification of 'classId' has no impact for FirErrorResolvedQualifierBuilder", level = DeprecationLevel.HIDDEN) override var classId: ClassId? get() = throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt index 2491fab52c9..169dfdee373 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirExpressionBuilder { abstract var source: KtSourceElement? - abstract var typeRef: FirTypeRef + abstract var coneTypeOrNull: ConeKotlinType? abstract val annotations: MutableList fun build(): FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt index 11aaf2b77ab..ed7851aa925 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt @@ -16,8 +16,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -28,14 +27,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExpressionStubBuilder : FirAnnotationContainerBuilder { override var source: KtSourceElement? = null - var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) override fun build(): FirExpression { return FirExpressionStub( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt index 4b9835a560a..d419b97e475 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt @@ -25,9 +25,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirFunctionCallImpl import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -37,7 +36,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -52,7 +51,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio @OptIn(FirImplementationDetail::class) override fun build(): FirFunctionCall { return FirFunctionCallImpl( - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt index 3905f736419..b5ea553834f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt @@ -19,8 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.FirGetClassCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirGetClassCallImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -31,14 +30,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList override fun build(): FirGetClassCall { return FirGetClassCallImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), argumentList, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt index 3fe2b1e72bb..6d46fb9cd8a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt @@ -25,9 +25,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirImplicitInvokeCallImpl import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -37,6 +36,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -49,6 +49,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn override fun build(): FirImplicitInvokeCall { return FirImplicitInvokeCallImpl( + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), @@ -62,13 +63,6 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn } - @Deprecated("Modification of 'typeRef' has no impact for FirImplicitInvokeCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } - @Deprecated("Modification of 'origin' has no impact for FirImplicitInvokeCallBuilder", level = DeprecationLevel.HIDDEN) override var origin: FirFunctionCallOrigin get() = throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt index 7f9e286f7b6..ac86bffff0c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirInaccessibleReceiverExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -29,14 +29,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirInaccessibleReceiverExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override lateinit var typeRef: FirTypeRef + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var calleeReference: FirThisReference override fun build(): FirInaccessibleReceiverExpression { return FirInaccessibleReceiverExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), calleeReference, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt index 26ce4a9083d..5a40acb0473 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt @@ -17,8 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirIncrementDecrementExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -30,6 +29,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirIncrementDecrementExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() var isPrefix: Boolean by kotlin.properties.Delegates.notNull() lateinit var operationName: Name @@ -39,6 +39,7 @@ class FirIncrementDecrementExpressionBuilder : FirAnnotationContainerBuilder, Fi override fun build(): FirIncrementDecrementExpression { return FirIncrementDecrementExpressionImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), isPrefix, operationName, @@ -47,13 +48,6 @@ class FirIncrementDecrementExpressionBuilder : FirAnnotationContainerBuilder, Fi ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirIncrementDecrementExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt index bc73a326fc4..4ec2f2d0d7f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirIntegerLiteralOperatorCallIm import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* /* @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override lateinit var typeRef: FirTypeRef + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -50,7 +50,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder override fun build(): FirIntegerLiteralOperatorCall { return FirIntegerLiteralOperatorCallImpl( - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt index 5cc840247d8..2b033e2ae0d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLambdaArgumentExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -40,8 +40,8 @@ class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp } - @Deprecated("Modification of 'typeRef' has no impact for FirLambdaArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirLambdaArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt index cdd49c081e3..fc3541fedb7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirLazyBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLazyBlockImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt index 4babba0bbb7..672df089ff6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -35,8 +35,8 @@ class FirLazyExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBui } - @Deprecated("Modification of 'typeRef' has no impact for FirLazyExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirLazyExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt index b1499520ec6..b9a900ed9b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.FirLoopJump +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -23,6 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopJumpBuilder { abstract var source: KtSourceElement? + abstract var coneTypeOrNull: ConeKotlinType? abstract val annotations: MutableList abstract var target: FirTarget fun build(): FirLoopJump diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt index aaa310701a1..da05279a9f4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirNamedArgumentExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -45,8 +45,8 @@ class FirNamedArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpr } - @Deprecated("Modification of 'typeRef' has no impact for FirNamedArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirNamedArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt index 8c7f28bc29c..eb92daf3030 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt @@ -22,9 +22,8 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirPropertyAccessExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -34,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirPropertyAccessExpressionBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var calleeReference: FirReference override val contextReceiverArguments: MutableList = mutableListOf() @@ -48,7 +47,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessExpressionBuilder, @OptIn(FirImplementationDetail::class) override fun build(): FirPropertyAccessExpression { return FirPropertyAccessExpressionImpl( - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), calleeReference, contextReceiverArguments.toMutableOrEmpty(), diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt index 975dfa140ef..200d67f9cd7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* /* @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirQualifiedAccessExpressionBuilder { - abstract var typeRef: FirTypeRef + abstract var coneTypeOrNull: ConeKotlinType? abstract val annotations: MutableList abstract val contextReceiverArguments: MutableList abstract val typeArguments: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt index 97bbb022f0e..0e6ddce3488 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirQualifiedErrorAccessExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.types.ConeErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -48,8 +48,8 @@ class FirQualifiedErrorAccessExpressionBuilder : FirAnnotationContainerBuilder, } - @Deprecated("Modification of 'typeRef' has no impact for FirQualifiedErrorAccessExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirQualifiedErrorAccessExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt index 8901eb83180..5040fdf7d8d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt @@ -20,9 +20,8 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifier import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedQualifierImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -35,12 +34,13 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName override var relativeClassFqName: FqName? = null override var symbol: FirClassLikeSymbol<*>? = null override var isNullableLHSForCallableReference: Boolean = false + override var canBeValue: Boolean = false override var isFullyQualified: Boolean = false override val nonFatalDiagnostics: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -48,12 +48,13 @@ class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnno override fun build(): FirResolvedQualifier { return FirResolvedQualifierImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), packageFqName, relativeClassFqName, symbol, isNullableLHSForCallableReference, + canBeValue, isFullyQualified, nonFatalDiagnostics.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt index 1fdc26aba72..0eb95404a7a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt @@ -17,8 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedReifiedParameterReferenceImpl import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -29,14 +28,14 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var symbol: FirTypeParameterSymbol override fun build(): FirResolvedReifiedParameterReference { return FirResolvedReifiedParameterReferenceImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), symbol, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt index 4e3c57459dd..6facbb9cdad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -21,9 +19,11 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirReturnExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -47,8 +47,8 @@ class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionB } - @Deprecated("Modification of 'typeRef' has no impact for FirReturnExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirReturnExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt index 617f1240e86..d17803ceeb0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt @@ -20,8 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirSafeCallExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -32,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() lateinit var receiver: FirExpression lateinit var checkedSubjectRef: FirExpressionRef @@ -41,7 +40,7 @@ class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressio override fun build(): FirSafeCallExpression { return FirSafeCallExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), receiver, checkedSubjectRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt index 0085bccbccd..382da3a75e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.types.SmartcastStability @FirBuilderDsl class FirSmartCastExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() - override lateinit var typeRef: FirTypeRef lateinit var originalExpression: FirExpression lateinit var typesFromSmartCast: Collection lateinit var smartcastType: FirTypeRef @@ -41,8 +41,8 @@ class FirSmartCastExpressionBuilder : FirAnnotationContainerBuilder, FirExpressi override fun build(): FirSmartCastExpression { return FirSmartCastExpressionImpl( + coneTypeOrNull, annotations.toMutableOrEmpty(), - typeRef, originalExpression, typesFromSmartCast, smartcastType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt index 0209bf224fa..b792802bfb1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirSpreadArgumentExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -40,8 +40,8 @@ class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp } - @Deprecated("Modification of 'typeRef' has no impact for FirSpreadArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirSpreadArgumentExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt index b4e89c9bde3..85a3bb57931 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -20,9 +18,11 @@ import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirStringConcatenationCallImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -44,8 +44,8 @@ class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainer } - @Deprecated("Modification of 'typeRef' has no impact for FirStringConcatenationCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirStringConcatenationCallBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt index 3a7aa9c49e2..bb7603a521a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt @@ -22,9 +22,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirThisReceiverExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -34,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirThisReceiverExpressionBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() @@ -44,7 +43,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessExpressionBuilder, Fi override fun build(): FirThisReceiverExpression { return FirThisReceiverExpressionImpl( - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), contextReceiverArguments.toMutableOrEmpty(), typeArguments.toMutableOrEmpty(), @@ -91,7 +90,7 @@ inline fun buildThisReceiverExpressionCopy(original: FirThisReceiverExpression, callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) } val copyBuilder = FirThisReceiverExpressionBuilder() - copyBuilder.typeRef = original.typeRef + copyBuilder.coneTypeOrNull = original.coneTypeOrNull copyBuilder.annotations.addAll(original.annotations) copyBuilder.contextReceiverArguments.addAll(original.contextReceiverArguments) copyBuilder.typeArguments.addAll(original.typeArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt index 5179c5e1989..110035e8a5d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -19,9 +17,11 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirThrowExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -43,8 +43,8 @@ class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu } - @Deprecated("Modification of 'typeRef' has no impact for FirThrowExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirThrowExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt index f7c43ceba0e..c11ac2ec807 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt @@ -20,8 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirTryExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -32,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference lateinit var tryBlock: FirBlock @@ -42,7 +41,7 @@ class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuil override fun build(): FirTryExpression { return FirTryExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), calleeReference, tryBlock, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt index 81dd0b1d7df..8a60e5efd09 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirTypeOperatorCallImpl +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var operation: FirOperation @@ -40,6 +41,7 @@ class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder override fun build(): FirTypeOperatorCall { return FirTypeOperatorCallImpl( source, + coneTypeOrNull, annotations.toMutableOrEmpty(), argumentList, operation, @@ -47,13 +49,6 @@ class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder ) } - - @Deprecated("Modification of 'typeRef' has no impact for FirTypeOperatorCallBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef - get() = throw IllegalStateException() - set(_) { - throw IllegalStateException() - } } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt index 08873aedfdd..fcc4070040c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -18,9 +16,11 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt index 59912ce3d8c..ad431ff6592 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirVarargArgumentsExpressionImpl +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* /* @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() val arguments: MutableList = mutableListOf() lateinit var varargElementType: FirTypeRef @@ -37,7 +37,7 @@ class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirEx override fun build(): FirVarargArgumentsExpression { return FirVarargArgumentsExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), arguments, varargElementType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt index e3b1c9b0448..0bc9b092ac2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt @@ -22,8 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWhenExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -34,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: KtSourceElement? = null - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference var subject: FirExpression? = null @@ -46,7 +45,7 @@ class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBui override fun build(): FirWhenExpression { return FirWhenExpressionImpl( source, - typeRef, + coneTypeOrNull, annotations.toMutableOrEmpty(), calleeReference, subject, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt index 9581a10cb05..605f9975c86 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt @@ -18,8 +18,10 @@ import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWhenSubjectExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.name.StandardClassIds /* * This file was generated automatically @@ -41,8 +43,8 @@ class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpres } - @Deprecated("Modification of 'typeRef' has no impact for FirWhenSubjectExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirWhenSubjectExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt index 0686b0c8a3d..204779eabbf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWrappedDelegateExpressionImpl -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* /* @@ -42,8 +42,8 @@ class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirEx } - @Deprecated("Modification of 'typeRef' has no impact for FirWrappedDelegateExpressionBuilder", level = DeprecationLevel.HIDDEN) - override var typeRef: FirTypeRef + @Deprecated("Modification of 'coneTypeOrNull' has no impact for FirWrappedDelegateExpressionBuilder", level = DeprecationLevel.HIDDEN) + override var coneTypeOrNull: ConeKotlinType? get() = throw IllegalStateException() set(_) { throw IllegalStateException() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index 9198795670f..214751699a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -15,8 +15,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -36,7 +38,7 @@ internal class FirAnnotationCallImpl( override var argumentMapping: FirAnnotationArgumentMapping, override var annotationResolvePhase: FirAnnotationResolvePhase, ) : FirAnnotationCall() { - override val typeRef: FirTypeRef get() = annotationTypeRef + override val coneTypeOrNull: ConeKotlinType? get() = annotationTypeRef.coneTypeOrNull override val annotations: List get() = emptyList() override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -73,7 +75,7 @@ internal class FirAnnotationCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt index 7949ed4ac19..c9915a44acb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt @@ -11,8 +11,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,7 +31,7 @@ internal class FirAnnotationImpl( override var argumentMapping: FirAnnotationArgumentMapping, override var typeArguments: MutableOrEmptyList, ) : FirAnnotation() { - override val typeRef: FirTypeRef get() = annotationTypeRef + override val coneTypeOrNull: ConeKotlinType? get() = annotationTypeRef.coneTypeOrNull override val annotations: List get() = emptyList() override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -59,7 +61,7 @@ internal class FirAnnotationImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt index 4e0f5f2a570..ca9d447cf71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -23,18 +23,16 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirArrayLiteralImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirArrayLiteral() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirArrayLiteralImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) return this @@ -45,8 +43,8 @@ internal class FirArrayLiteralImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index 39865491cc7..f164b81e0b9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.contracts.description.LogicOperationKind import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,15 +24,13 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirBinaryLogicExpressionImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var leftOperand: FirExpression, override var rightOperand: FirExpression, override val kind: LogicOperationKind, ) : FirBinaryLogicExpression() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } leftOperand.accept(visitor, data) rightOperand.accept(visitor, data) @@ -62,13 +59,12 @@ internal class FirBinaryLogicExpressionImpl( } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirBinaryLogicExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index 4f29ef9fd80..1f0390d3887 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -11,8 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -24,15 +23,13 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirBlockImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val statements: MutableList, ) : FirBlock() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } statements.forEach { it.accept(visitor, data) } - typeRef.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirBlockImpl { @@ -53,15 +50,14 @@ internal class FirBlockImpl( override fun transformOtherChildren(transformer: FirTransformer, data: D): FirBlockImpl { transformAnnotations(transformer, data) - typeRef = typeRef.transform(transformer, data) return this } + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull + } + override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() } - - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef - } } 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 85b7540e890..2f06f51ff3f 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 @@ -7,15 +7,15 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -30,15 +30,13 @@ internal class FirBreakExpressionImpl( override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirBreakExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirBreakExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -48,8 +46,8 @@ internal class FirBreakExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index 1a144aa6724..ed84014a017 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirCallableReferenceAccessImpl( - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -38,7 +38,6 @@ internal class FirCallableReferenceAccessImpl( override var hasQuestionMarkAtLHS: Boolean, ) : FirCallableReferenceAccess() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -53,7 +52,6 @@ internal class FirCallableReferenceAccessImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirCallableReferenceAccessImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -88,8 +86,8 @@ internal class FirCallableReferenceAccessImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt index ff17483e16f..52a59d718ac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -24,20 +24,18 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirCheckNotNullCallImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override var calleeReference: FirReference, ) : FirCheckNotNullCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) calleeReference.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirCheckNotNullCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) transformCalleeReference(transformer, data) @@ -54,8 +52,8 @@ internal class FirCheckNotNullCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt index 0f0db314317..d605f4a8635 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -24,17 +24,15 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirCheckedSafeCallSubjectImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val originalReceiverRef: FirExpressionRef, ) : FirCheckedSafeCallSubject() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirCheckedSafeCallSubjectImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -44,8 +42,8 @@ internal class FirCheckedSafeCallSubjectImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index 420fa964c46..ec845e0d599 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -10,6 +10,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -22,18 +23,16 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirClassReferenceExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var classTypeRef: FirTypeRef, ) : FirClassReferenceExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } classTypeRef.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirClassReferenceExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) classTypeRef = classTypeRef.transform(transformer, data) return this @@ -44,8 +43,8 @@ internal class FirClassReferenceExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt index efc30a95160..43a4db39b78 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt @@ -12,8 +12,9 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,16 +30,14 @@ internal class FirComparisonExpressionImpl( override val operation: FirOperation, override var compareToCall: FirFunctionCall, ) : FirComparisonExpression() { - override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(null) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Boolean.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } compareToCall.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirComparisonExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) compareToCall = compareToCall.transform(transformer, data) return this @@ -49,8 +48,8 @@ internal class FirComparisonExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index 3be2d952ee8..5e259ec0b5f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -17,9 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -32,6 +31,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @OptIn(FirImplementationDetail::class) internal class FirComponentCallImpl( + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -42,12 +42,10 @@ internal class FirComponentCallImpl( override var explicitReceiver: FirExpression, override val componentIndex: Int, ) : FirComponentCall() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource override var calleeReference: FirNamedReference = FirSimpleNamedReference(source, Name.identifier("component$componentIndex")) override val origin: FirFunctionCallOrigin = FirFunctionCallOrigin.Operator override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -63,7 +61,6 @@ internal class FirComponentCallImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirComponentCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -99,8 +96,8 @@ internal class FirComponentCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index 858fe8b7561..f358e91fbad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -10,8 +10,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.types.ConstantValueKind import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -24,19 +23,16 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirConstExpressionImpl ( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var kind: ConstantValueKind, override val value: T, ) : FirConstExpression() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirConstExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -46,8 +42,8 @@ internal class FirConstExpressionImpl ( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { 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 0fe7ab261bc..1b83a7d002b 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 @@ -7,15 +7,15 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -30,15 +30,13 @@ internal class FirContinueExpressionImpl( override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirContinueExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirContinueExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -48,8 +46,8 @@ internal class FirContinueExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt index 27a4da5a87e..de432185e8e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,18 +24,15 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirDesugaredAssignmentValueReferenceExpressionImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val expressionRef: FirExpressionRef, ) : FirDesugaredAssignmentValueReferenceExpression() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirDesugaredAssignmentValueReferenceExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -46,8 +42,8 @@ internal class FirDesugaredAssignmentValueReferenceExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { 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 84ed5a02067..3374a780ab2 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 @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -28,15 +28,13 @@ class FirElseIfTrueCondition @FirImplementationDetail constructor( override val source: KtSourceElement?, override var annotations: MutableOrEmptyList, ) : FirExpression() { - override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Boolean.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirElseIfTrueCondition { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -46,8 +44,8 @@ class FirElseIfTrueCondition @FirImplementationDetail constructor( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt index 0f004886788..9b59173c88e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,15 +24,13 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirElvisExpressionImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var lhs: FirExpression, override var rhs: FirExpression, ) : FirElvisExpression() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } calleeReference.accept(visitor, data) lhs.accept(visitor, data) @@ -41,7 +38,6 @@ internal class FirElvisExpressionImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirElvisExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformCalleeReference(transformer, data) transformLhs(transformer, data) @@ -69,8 +65,8 @@ internal class FirElvisExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index fa52dfa17c8..985b3944e20 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,12 +24,11 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty class FirEmptyExpressionBlock : FirBlock() { override val source: KtSourceElement? get() = null + override var coneTypeOrNull: ConeKotlinType? = null override val annotations: List get() = emptyList() override val statements: List get() = emptyList() - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirEmptyExpressionBlock { @@ -47,13 +45,12 @@ class FirEmptyExpressionBlock : FirBlock() { } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirEmptyExpressionBlock { - typeRef = typeRef.transform(transformer, data) return this } - override fun replaceAnnotations(newAnnotations: List) {} - - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } + + override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt index 8a5a475e812..ca1e05379d1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt @@ -10,8 +10,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassType import org.jetbrains.kotlin.fir.types.toLookupTag import org.jetbrains.kotlin.name.ClassId @@ -31,15 +30,13 @@ internal class FirEnumEntryDeserializedAccessExpressionImpl( override val enumEntryName: Name, ) : FirEnumEntryDeserializedAccessExpression() { override val source: KtSourceElement? get() = null - override var typeRef: FirTypeRef = buildResolvedTypeRef { type = enumClassId.toLookupTag().constructClassType(emptyArray(), false) } + override var coneTypeOrNull: ConeKotlinType? = enumClassId.toLookupTag().constructClassType(emptyArray(), false) override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirEnumEntryDeserializedAccessExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -49,8 +46,8 @@ internal class FirEnumEntryDeserializedAccessExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt index 0832c227551..065015258ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt @@ -12,8 +12,9 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,16 +30,14 @@ internal class FirEqualityOperatorCallImpl( override var argumentList: FirArgumentList, override val operation: FirOperation, ) : FirEqualityOperatorCall() { - override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(null) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Boolean.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirEqualityOperatorCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) return this @@ -49,8 +48,8 @@ internal class FirEqualityOperatorCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt index ffaa2fa4cac..526082a62b8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt @@ -16,8 +16,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -37,7 +39,7 @@ internal class FirErrorAnnotationCallImpl( override val diagnostic: ConeDiagnostic, override var argumentMapping: FirAnnotationArgumentMapping, ) : FirErrorAnnotationCall() { - override val typeRef: FirTypeRef get() = annotationTypeRef + override val coneTypeOrNull: ConeKotlinType? get() = annotationTypeRef.coneTypeOrNull override val annotations: List get() = emptyList() override var annotationResolvePhase: FirAnnotationResolvePhase = FirAnnotationResolvePhase.Types @@ -75,7 +77,7 @@ internal class FirErrorAnnotationCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index 9805bd391ce..66d37ae6aee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.types.ConeErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -32,17 +32,15 @@ internal class FirErrorExpressionImpl( override var expression: FirExpression?, override var nonExpressionElement: FirElement?, ) : FirErrorExpression() { - override var typeRef: FirTypeRef = FirErrorTypeRefImpl(source, null, ConeStubDiagnostic(diagnostic), false) + override var coneTypeOrNull: ConeKotlinType? = ConeErrorType(ConeStubDiagnostic(diagnostic)) override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } expression?.accept(visitor, data) nonExpressionElement?.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirErrorExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) expression = expression?.transform(transformer, data) nonExpressionElement = nonExpressionElement?.transform(transformer, data) @@ -54,8 +52,8 @@ internal class FirErrorExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt index c62a92f7211..e13a5cc26a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt @@ -12,9 +12,8 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -28,30 +27,29 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirErrorResolvedQualifierImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val packageFqName: FqName, override val relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, override var isNullableLHSForCallableReference: Boolean, + override var canBeValue: Boolean, override val isFullyQualified: Boolean, override var nonFatalDiagnostics: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, override val diagnostic: ConeDiagnostic, ) : FirErrorResolvedQualifier() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource override val classId: ClassId? get() = relativeClassFqName?.let { ClassId(packageFqName, it, false) } override val resolvedToCompanionObject: Boolean get() = false override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirErrorResolvedQualifierImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformTypeArguments(transformer, data) return this @@ -67,8 +65,8 @@ internal class FirErrorResolvedQualifierImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { @@ -81,6 +79,10 @@ internal class FirErrorResolvedQualifierImpl( override fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) {} + override fun replaceCanBeValue(newCanBeValue: Boolean) { + canBeValue = newCanBeValue + } + override fun replaceTypeArguments(newTypeArguments: List) { typeArguments = newTypeArguments.toMutableOrEmpty() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index e1faf4539e9..e3742066e96 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -23,16 +23,14 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty class FirExpressionStub @FirImplementationDetail constructor( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, ) : FirExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirExpressionStub { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -42,8 +40,8 @@ class FirExpressionStub @FirImplementationDetail constructor( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index 57e90da4eef..e0a3f19d2fb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty */ open class FirFunctionCallImpl @FirImplementationDetail constructor( - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -41,7 +41,6 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( override val origin: FirFunctionCallOrigin, ) : FirFunctionCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -57,7 +56,6 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( } override fun transformChildren(transformer: FirTransformer, data: D): FirFunctionCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -93,8 +91,8 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index 4c0fa44b293..bb481f3ee53 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -24,20 +24,18 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirGetClassCallImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirGetClassCall() { override val argument: FirExpression get() = argumentList.arguments.first() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirGetClassCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) return this @@ -48,8 +46,8 @@ internal class FirGetClassCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index dd26da8d3bf..f1241cbdeb9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -15,9 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,6 +28,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirImplicitInvokeCallImpl( + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -39,11 +39,9 @@ internal class FirImplicitInvokeCallImpl( override var argumentList: FirArgumentList, override var calleeReference: FirNamedReference, ) : FirImplicitInvokeCall() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource override val origin: FirFunctionCallOrigin = FirFunctionCallOrigin.Operator override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -59,7 +57,6 @@ internal class FirImplicitInvokeCallImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirImplicitInvokeCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -95,8 +92,8 @@ internal class FirImplicitInvokeCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt index 33759397a19..2e8fa05ab04 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -24,18 +24,16 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirInaccessibleReceiverExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var calleeReference: FirThisReference, ) : FirInaccessibleReceiverExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } calleeReference.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirInaccessibleReceiverExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformCalleeReference(transformer, data) return this @@ -51,8 +49,8 @@ internal class FirInaccessibleReceiverExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt index 413befad3fe..b6c7d735a47 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt @@ -11,8 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -25,22 +24,19 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirIncrementDecrementExpressionImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val isPrefix: Boolean, override val operationName: Name, override var expression: FirExpression, override val operationSource: KtSourceElement?, ) : FirIncrementDecrementExpression() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource - override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } expression.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirIncrementDecrementExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) expression = expression.transform(transformer, data) return this @@ -51,8 +47,8 @@ internal class FirIncrementDecrementExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt index 0b0a8be910a..45134386e00 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirIntegerLiteralOperatorCallImpl( - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -41,7 +41,6 @@ internal class FirIntegerLiteralOperatorCallImpl( override var extensionReceiver: FirExpression, ) : FirIntegerLiteralOperatorCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -57,7 +56,6 @@ internal class FirIntegerLiteralOperatorCallImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -103,8 +101,8 @@ internal class FirIntegerLiteralOperatorCallImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index 325aed4cec6..5e31ef00d95 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -26,7 +26,7 @@ internal class FirLambdaArgumentExpressionImpl( override var annotations: MutableOrEmptyList, override var expression: FirExpression, ) : FirLambdaArgumentExpression() { - override val typeRef: FirTypeRef get() = expression.typeRef + override val coneTypeOrNull: ConeKotlinType? get() = expression.coneTypeOrNull override val isSpread: Boolean get() = false override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -45,7 +45,7 @@ internal class FirLambdaArgumentExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + 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/FirLazyBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt index 1a96c088d21..e0366fd5610 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -23,9 +23,9 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirLazyBlockImpl : FirLazyBlock() { override val source: KtSourceElement? get() = error("FirLazyBlock should be calculated before accessing") + override val coneTypeOrNull: ConeKotlinType? get() = error("FirLazyBlock should be calculated before accessing") override val annotations: List get() = error("FirLazyBlock should be calculated before accessing") override val statements: List get() = error("FirLazyBlock should be calculated before accessing") - override val typeRef: FirTypeRef get() = error("FirLazyBlock should be calculated before accessing") override fun acceptChildren(visitor: FirVisitor, data: D) { } @@ -47,7 +47,7 @@ internal class FirLazyBlockImpl : FirLazyBlock() { return this } - override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt index d11e1e8d22a..d9f5405c37a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt @@ -10,7 +10,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirLazyExpressionImpl( override val source: KtSourceElement?, ) : FirLazyExpression() { - override val typeRef: FirTypeRef get() = error("FirLazyExpression should be calculated before accessing") + override val coneTypeOrNull: ConeKotlinType? get() = error("FirLazyExpression should be calculated before accessing") override val annotations: List get() = error("FirLazyExpression should be calculated before accessing") override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -37,7 +37,7 @@ internal class FirLazyExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 09a186ad7f3..113b937542b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -29,7 +29,7 @@ internal class FirNamedArgumentExpressionImpl( override val isSpread: Boolean, override val name: Name, ) : FirNamedArgumentExpression() { - override val typeRef: FirTypeRef get() = expression.typeRef + override val coneTypeOrNull: ConeKotlinType? get() = expression.coneTypeOrNull override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -47,7 +47,7 @@ internal class FirNamedArgumentExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + 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/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index 66b94f1b33d..924be211f82 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty */ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var contextReceiverArguments: MutableOrEmptyList, @@ -38,7 +38,6 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( override var nonFatalDiagnostics: MutableOrEmptyList, ) : FirPropertyAccessExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } calleeReference.accept(visitor, data) contextReceiverArguments.forEach { it.accept(visitor, data) } @@ -53,7 +52,6 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( } override fun transformChildren(transformer: FirTransformer, data: D): FirPropertyAccessExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformCalleeReference(transformer, data) contextReceiverArguments.transformInplace(transformer, data) @@ -88,8 +86,8 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt index c4b6ffbaf42..ca96e16dee2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.types.ConeErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -32,17 +32,15 @@ internal class FirQualifiedErrorAccessExpressionImpl( override var selector: FirErrorExpression, override var receiver: FirExpression, ) : FirQualifiedErrorAccessExpression() { - override var typeRef: FirTypeRef = FirErrorTypeRefImpl(source, null, ConeStubDiagnostic(diagnostic), false) + override var coneTypeOrNull: ConeKotlinType? = ConeErrorType(ConeStubDiagnostic(diagnostic)) override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } selector.accept(visitor, data) receiver.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirQualifiedErrorAccessExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) selector = selector.transform(transformer, data) receiver = receiver.transform(transformer, data) @@ -54,8 +52,8 @@ internal class FirQualifiedErrorAccessExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index b52578de9fa..93dec493ed6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -28,12 +28,13 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirResolvedQualifierImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var packageFqName: FqName, override var relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, override var isNullableLHSForCallableReference: Boolean, + override var canBeValue: Boolean, override val isFullyQualified: Boolean, override var nonFatalDiagnostics: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -44,13 +45,11 @@ internal class FirResolvedQualifierImpl( override var resolvedToCompanionObject: Boolean = (symbol?.fir as? FirRegularClass)?.companionObjectSymbol != null override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirResolvedQualifierImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformTypeArguments(transformer, data) return this @@ -66,8 +65,8 @@ internal class FirResolvedQualifierImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { @@ -82,6 +81,10 @@ internal class FirResolvedQualifierImpl( resolvedToCompanionObject = newResolvedToCompanionObject } + override fun replaceCanBeValue(newCanBeValue: Boolean) { + canBeValue = newCanBeValue + } + override fun replaceTypeArguments(newTypeArguments: List) { typeArguments = newTypeArguments.toMutableOrEmpty() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt index 92b25c6f92f..7667a64a584 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -23,17 +23,15 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirResolvedReifiedParameterReferenceImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val symbol: FirTypeParameterSymbol, ) : FirResolvedReifiedParameterReference() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirResolvedReifiedParameterReferenceImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -43,8 +41,8 @@ internal class FirResolvedReifiedParameterReferenceImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { 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 7595d0801f1..5de087f3ae3 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 @@ -7,16 +7,16 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -32,10 +32,9 @@ internal class FirReturnExpressionImpl( override val target: FirTarget, override var result: FirExpression, ) : FirReturnExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } result.accept(visitor, data) } @@ -57,13 +56,12 @@ internal class FirReturnExpressionImpl( } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirReturnExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt index 60701d9bef3..b9cede56d8e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -26,21 +26,19 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirSafeCallExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var receiver: FirExpression, override val checkedSubjectRef: FirExpressionRef, override var selector: FirStatement, ) : FirSafeCallExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } receiver.accept(visitor, data) selector.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirSafeCallExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformReceiver(transformer, data) transformSelector(transformer, data) @@ -62,8 +60,8 @@ internal class FirSafeCallExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt index 82a50790720..8c1131ce8fb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty */ internal class FirSmartCastExpressionImpl( + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, - override var typeRef: FirTypeRef, override var originalExpression: FirExpression, override val typesFromSmartCast: Collection, override var smartcastType: FirTypeRef, @@ -39,7 +39,6 @@ internal class FirSmartCastExpressionImpl( override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } - typeRef.accept(visitor, data) originalExpression.accept(visitor, data) smartcastType.accept(visitor, data) smartcastTypeWithoutNullableNothing?.accept(visitor, data) @@ -47,7 +46,6 @@ internal class FirSmartCastExpressionImpl( override fun transformChildren(transformer: FirTransformer, data: D): FirSmartCastExpressionImpl { transformAnnotations(transformer, data) - typeRef = typeRef.transform(transformer, data) transformOriginalExpression(transformer, data) smartcastType = smartcastType.transform(transformer, data) smartcastTypeWithoutNullableNothing = smartcastTypeWithoutNullableNothing?.transform(transformer, data) @@ -64,12 +62,12 @@ internal class FirSmartCastExpressionImpl( return this } - override fun replaceAnnotations(newAnnotations: List) { - annotations = newAnnotations.toMutableOrEmpty() + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() } override fun replaceOriginalExpression(newOriginalExpression: FirExpression) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index d684c3125f2..ea0b3cd65e3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -26,7 +26,7 @@ internal class FirSpreadArgumentExpressionImpl( override var annotations: MutableOrEmptyList, override var expression: FirExpression, ) : FirSpreadArgumentExpression() { - override val typeRef: FirTypeRef get() = expression.typeRef + override val coneTypeOrNull: ConeKotlinType? get() = expression.coneTypeOrNull override val isSpread: Boolean get() = true override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -45,7 +45,7 @@ internal class FirSpreadArgumentExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + 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 5dc077f8bcc..1e75ad6bdc4 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 @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,18 +29,16 @@ internal class FirStringConcatenationCallImpl( override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirStringConcatenationCall() { - override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.String.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) - typeRef.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirStringConcatenationCallImpl { transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) - typeRef = typeRef.transform(transformer, data) return this } @@ -57,7 +55,7 @@ internal class FirStringConcatenationCallImpl( argumentList = newArgumentList } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index 4e34f45ca15..a6e344abfb0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirThisReceiverExpressionImpl( - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var contextReceiverArguments: MutableOrEmptyList, override var typeArguments: MutableOrEmptyList, @@ -40,7 +40,6 @@ internal class FirThisReceiverExpressionImpl( override var extensionReceiver: FirExpression = FirNoReceiverExpression override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } contextReceiverArguments.forEach { it.accept(visitor, data) } typeArguments.forEach { it.accept(visitor, data) } @@ -55,7 +54,6 @@ internal class FirThisReceiverExpressionImpl( } override fun transformChildren(transformer: FirTransformer, data: D): FirThisReceiverExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) contextReceiverArguments.transformInplace(transformer, data) transformTypeArguments(transformer, data) @@ -90,8 +88,8 @@ internal class FirThisReceiverExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { 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 7b92ef5ef5a..31216df42b4 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 @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -29,16 +29,14 @@ internal class FirThrowExpressionImpl( override var annotations: MutableOrEmptyList, override var exception: FirExpression, ) : FirThrowExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Nothing.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } exception.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirThrowExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) transformException(transformer, data) return this @@ -54,8 +52,8 @@ internal class FirThrowExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index 06b55a48f44..42727396039 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch import org.jetbrains.kotlin.fir.expressions.FirTryExpression import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirTryExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var tryBlock: FirBlock, @@ -33,7 +33,6 @@ internal class FirTryExpressionImpl( override var finallyBlock: FirBlock?, ) : FirTryExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } calleeReference.accept(visitor, data) tryBlock.accept(visitor, data) @@ -76,13 +75,12 @@ internal class FirTryExpressionImpl( } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirTryExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index b5e1c34a3cc..ea8c60ef028 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -25,15 +25,15 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirTypeOperatorCallImpl( override val source: KtSourceElement?, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override val operation: FirOperation, override var conversionTypeRef: FirTypeRef, ) : FirTypeOperatorCall() { - override var typeRef: FirTypeRef = FirImplicitTypeRefImplWithoutSource + override var argFromStubType: Boolean = false override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } argumentList.accept(visitor, data) conversionTypeRef.accept(visitor, data) @@ -56,14 +56,13 @@ internal class FirTypeOperatorCallImpl( } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirTypeOperatorCallImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { @@ -73,4 +72,8 @@ internal class FirTypeOperatorCallImpl( override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } + + override fun replaceArgFromStubType(newArgFromStubType: Boolean) { + argFromStubType = newArgFromStubType + } } 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 bfaf3b0af50..feb953a7c88 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 @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -28,15 +28,13 @@ class FirUnitExpression @FirImplementationDetail constructor( override val source: KtSourceElement?, override var annotations: MutableOrEmptyList, ) : FirExpression() { - override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) + override var coneTypeOrNull: ConeKotlinType? = StandardClassIds.Unit.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } } override fun transformChildren(transformer: FirTransformer, data: D): FirUnitExpression { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } @@ -46,8 +44,8 @@ class FirUnitExpression @FirImplementationDetail constructor( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt index 79785295c79..67e7d3e4f4c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList @@ -23,20 +24,18 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirVarargArgumentsExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override val arguments: MutableList, override var varargElementType: FirTypeRef, ) : FirVarargArgumentsExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } arguments.forEach { it.accept(visitor, data) } varargElementType.accept(visitor, data) } override fun transformChildren(transformer: FirTransformer, data: D): FirVarargArgumentsExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) arguments.transformInplace(transformer, data) varargElementType = varargElementType.transform(transformer, data) @@ -48,8 +47,8 @@ internal class FirVarargArgumentsExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index 25b5362c17d..38a8e3cbafd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirWhenExpressionImpl( override val source: KtSourceElement?, - override var typeRef: FirTypeRef, + override var coneTypeOrNull: ConeKotlinType?, override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var subject: FirExpression?, @@ -37,7 +37,6 @@ internal class FirWhenExpressionImpl( override val usedAsExpression: Boolean, ) : FirWhenExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { - typeRef.accept(visitor, data) annotations.forEach { it.accept(visitor, data) } calleeReference.accept(visitor, data) val subjectVariable_ = subjectVariable @@ -83,13 +82,12 @@ internal class FirWhenExpressionImpl( } override fun transformOtherChildren(transformer: FirTransformer, data: D): FirWhenExpressionImpl { - typeRef = typeRef.transform(transformer, data) transformAnnotations(transformer, data) return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) { - typeRef = newTypeRef + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) { + coneTypeOrNull = newConeTypeOrNull } override fun replaceAnnotations(newAnnotations: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index dde448bf10f..8bde7ff7805 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -12,7 +12,9 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -27,7 +29,7 @@ internal class FirWhenSubjectExpressionImpl( override var annotations: MutableOrEmptyList, override val whenRef: FirExpressionRef, ) : FirWhenSubjectExpression() { - override val typeRef: FirTypeRef get() = whenRef.value.subject?.typeRef ?: org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef(source) + override val coneTypeOrNull: ConeKotlinType? get() = whenRef.value.subject?.coneTypeOrNull ?: StandardClassIds.Unit.constructClassLikeType() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -43,7 +45,7 @@ internal class FirWhenSubjectExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + 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/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index 6d2b4b10ade..f070f197084 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -27,7 +27,7 @@ internal class FirWrappedDelegateExpressionImpl( override var expression: FirExpression, override var delegateProvider: FirExpression, ) : FirWrappedDelegateExpression() { - override val typeRef: FirTypeRef get() = expression.typeRef + override val coneTypeOrNull: ConeKotlinType? get() = expression.coneTypeOrNull override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -47,7 +47,7 @@ internal class FirWrappedDelegateExpressionImpl( return this } - override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceConeTypeOrNull(newConeTypeOrNull: ConeKotlinType?) {} override fun replaceAnnotations(newAnnotations: List) { annotations = newAnnotations.toMutableOrEmpty() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt index cb98eba149e..37ad60dd6ca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -21,6 +22,7 @@ abstract class FirThisReference : FirReference() { abstract val boundSymbol: FirBasedSymbol<*>? abstract val contextReceiverNumber: Int abstract val isImplicit: Boolean + abstract val diagnostic: ConeDiagnostic? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitThisReference(this, data) @@ -31,4 +33,6 @@ abstract class FirThisReference : FirReference() { abstract fun replaceBoundSymbol(newBoundSymbol: FirBasedSymbol<*>?) abstract fun replaceContextReceiverNumber(newContextReceiverNumber: Int) + + abstract fun replaceDiagnostic(newDiagnostic: ConeDiagnostic?) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt index 17756da49f7..0a3793e3392 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt @@ -10,6 +10,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -25,12 +26,14 @@ class FirExplicitThisReferenceBuilder { var source: KtSourceElement? = null var labelName: String? = null var contextReceiverNumber: Int = -1 + var diagnostic: ConeDiagnostic? = null fun build(): FirThisReference { return FirExplicitThisReference( source, labelName, contextReceiverNumber, + diagnostic, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt index 34db162f757..24ae84371d3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt @@ -10,6 +10,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirImplicitThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -24,11 +25,13 @@ import org.jetbrains.kotlin.fir.visitors.* class FirImplicitThisReferenceBuilder { var boundSymbol: FirBasedSymbol<*>? = null var contextReceiverNumber: Int = -1 + var diagnostic: ConeDiagnostic? = null fun build(): FirThisReference { return FirImplicitThisReference( boundSymbol, contextReceiverNumber, + diagnostic, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt index 533425f9f2f..7c3200912bd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -21,6 +22,7 @@ internal class FirExplicitThisReference( override val source: KtSourceElement?, override val labelName: String?, override var contextReceiverNumber: Int, + override var diagnostic: ConeDiagnostic?, ) : FirThisReference() { override var boundSymbol: FirBasedSymbol<*>? = null override val isImplicit: Boolean = false @@ -38,4 +40,8 @@ internal class FirExplicitThisReference( override fun replaceContextReceiverNumber(newContextReceiverNumber: Int) { contextReceiverNumber = newContextReceiverNumber } + + override fun replaceDiagnostic(newDiagnostic: ConeDiagnostic?) { + diagnostic = newDiagnostic + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt index a4a27272487..0153fd2f0b6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -20,6 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirImplicitThisReference( override val boundSymbol: FirBasedSymbol<*>?, override var contextReceiverNumber: Int, + override var diagnostic: ConeDiagnostic?, ) : FirThisReference() { override val source: KtSourceElement? get() = null override val labelName: String? get() = null @@ -36,4 +38,8 @@ internal class FirImplicitThisReference( override fun replaceContextReceiverNumber(newContextReceiverNumber: Int) { contextReceiverNumber = newContextReceiverNumber } + + override fun replaceDiagnostic(newDiagnostic: ConeDiagnostic?) { + diagnostic = newDiagnostic + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index 015843a6523..9d138ed35b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -22,7 +22,6 @@ abstract class FirErrorTypeRef : FirResolvedTypeRef(), FirDiagnosticHolder { abstract override val annotations: List abstract override val type: ConeKotlinType abstract override val delegatedTypeRef: FirTypeRef? - abstract override val isFromStubType: Boolean abstract override val diagnostic: ConeDiagnostic abstract val partiallyResolvedTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index 0ba7d5ab812..b2246e08948 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -20,7 +20,6 @@ abstract class FirResolvedTypeRef : FirTypeRef() { abstract override val annotations: List abstract val type: ConeKotlinType abstract val delegatedTypeRef: FirTypeRef? - abstract val isFromStubType: Boolean override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvedTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt index 0315261e3ef..e5d82711b20 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt @@ -31,7 +31,6 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { override val annotations: MutableList = mutableListOf() lateinit var type: ConeKotlinType var delegatedTypeRef: FirTypeRef? = null - var isFromStubType: Boolean = false @OptIn(FirImplementationDetail::class) override fun build(): FirResolvedTypeRef { @@ -40,7 +39,6 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { annotations.toMutableOrEmpty(), type, delegatedTypeRef, - isFromStubType, ) } @@ -64,6 +62,5 @@ inline fun buildResolvedTypeRefCopy(original: FirResolvedTypeRef, init: FirResol copyBuilder.annotations.addAll(original.annotations) copyBuilder.type = original.type copyBuilder.delegatedTypeRef = original.delegatedTypeRef - copyBuilder.isFromStubType = original.isFromStubType return copyBuilder.apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 96940aed8d4..d654fb0292b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -27,7 +27,6 @@ class FirResolvedTypeRefImpl @FirImplementationDetail constructor( override var annotations: MutableOrEmptyList, override val type: ConeKotlinType, override var delegatedTypeRef: FirTypeRef?, - override val isFromStubType: Boolean, ) : FirResolvedTypeRef() { override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) }