From d842ac5d3e59412838af625781d174f25cac7757 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 3 Dec 2021 16:44:39 +0300 Subject: [PATCH] FIR: change dispatch receiver type to ConeSimpleKotlinType --- .../fir/java/declarations/FirJavaConstructor.kt | 4 ++-- .../kotlin/fir/java/declarations/FirJavaField.kt | 4 ++-- .../kotlin/fir/java/declarations/FirJavaMethod.kt | 6 +++--- .../fir/java/declarations/FirJavaValueParameter.kt | 4 ++-- .../org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt | 2 +- .../fir/scopes/impl/FirClassSubstitutionScope.kt | 13 +++++++------ .../fir/scopes/impl/FirFakeOverrideGenerator.kt | 14 +++++++------- .../fir/scopes/impl/FirTypeIntersectionScope.kt | 4 ++-- .../fir/declarations/FirAnonymousFunction.kt | 4 ++-- .../kotlin/fir/declarations/FirBackingField.kt | 4 ++-- .../fir/declarations/FirCallableDeclaration.kt | 4 ++-- .../kotlin/fir/declarations/FirConstructor.kt | 4 ++-- .../kotlin/fir/declarations/FirEnumEntry.kt | 4 ++-- .../kotlin/fir/declarations/FirErrorFunction.kt | 4 ++-- .../kotlin/fir/declarations/FirErrorProperty.kt | 4 ++-- .../jetbrains/kotlin/fir/declarations/FirField.kt | 4 ++-- .../kotlin/fir/declarations/FirFunction.kt | 4 ++-- .../kotlin/fir/declarations/FirProperty.kt | 4 ++-- .../kotlin/fir/declarations/FirPropertyAccessor.kt | 4 ++-- .../kotlin/fir/declarations/FirSimpleFunction.kt | 4 ++-- .../kotlin/fir/declarations/FirValueParameter.kt | 4 ++-- .../kotlin/fir/declarations/FirVariable.kt | 4 ++-- .../builder/FirAbstractConstructorBuilder.kt | 4 ++-- .../builder/FirAnonymousFunctionBuilder.kt | 4 ++-- .../declarations/builder/FirBackingFieldBuilder.kt | 4 ++-- .../declarations/builder/FirConstructorBuilder.kt | 4 ++-- .../FirDefaultSetterValueParameterBuilder.kt | 4 ++-- .../declarations/builder/FirEnumEntryBuilder.kt | 4 ++-- .../builder/FirErrorFunctionBuilder.kt | 4 ++-- .../builder/FirErrorPropertyBuilder.kt | 4 ++-- .../fir/declarations/builder/FirFieldBuilder.kt | 4 ++-- .../fir/declarations/builder/FirFunctionBuilder.kt | 4 ++-- .../builder/FirPrimaryConstructorBuilder.kt | 4 ++-- .../builder/FirPropertyAccessorBuilder.kt | 4 ++-- .../fir/declarations/builder/FirPropertyBuilder.kt | 4 ++-- .../builder/FirSimpleFunctionBuilder.kt | 4 ++-- .../builder/FirValueParameterBuilder.kt | 4 ++-- .../declarations/impl/FirAnonymousFunctionImpl.kt | 4 ++-- .../fir/declarations/impl/FirBackingFieldImpl.kt | 4 ++-- .../fir/declarations/impl/FirConstructorImpl.kt | 4 ++-- .../impl/FirDefaultSetterValueParameter.kt | 4 ++-- .../fir/declarations/impl/FirEnumEntryImpl.kt | 4 ++-- .../fir/declarations/impl/FirErrorFunctionImpl.kt | 4 ++-- .../fir/declarations/impl/FirErrorPropertyImpl.kt | 4 ++-- .../kotlin/fir/declarations/impl/FirFieldImpl.kt | 4 ++-- .../fir/declarations/impl/FirPrimaryConstructor.kt | 4 ++-- .../declarations/impl/FirPropertyAccessorImpl.kt | 4 ++-- .../fir/declarations/impl/FirPropertyImpl.kt | 4 ++-- .../fir/declarations/impl/FirSimpleFunctionImpl.kt | 4 ++-- .../fir/declarations/impl/FirValueParameterImpl.kt | 4 ++-- .../impl/FirDefaultPropertyAccessor.kt | 4 ++-- .../declarations/synthetic/FirSyntheticProperty.kt | 4 ++-- .../synthetic/FirSyntheticPropertyAccessor.kt | 4 ++-- .../kotlin/fir/symbols/impl/FirCallableSymbol.kt | 2 +- .../kotlin/fir/tree/generator/NodeConfigurator.kt | 2 +- .../jetbrains/kotlin/fir/tree/generator/Types.kt | 2 ++ 56 files changed, 120 insertions(+), 117 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index 596ac5a59dc..ae2c8d528c5 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -39,7 +39,7 @@ class FirJavaConstructor @FirImplementationDetail constructor( override var status: FirDeclarationStatus, @Volatile override var resolvePhase: FirResolvePhase, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, ) : FirConstructor() { override val receiverTypeRef: FirTypeRef? get() = null override var deprecation: DeprecationsPerUseSite? = null diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index abbb3ce0402..d79aeedd94a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -45,7 +45,7 @@ class FirJavaField @FirImplementationDetail constructor( annotationBuilder: () -> List, override val typeParameters: MutableList, override var initializer: FirExpression?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val attributes: FirDeclarationAttributes, ) : FirField() { init { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 97efea997eb..dbe5046f593 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -60,7 +60,7 @@ class FirJavaMethod @FirImplementationDetail constructor( override var status: FirDeclarationStatus, override val symbol: FirNamedFunctionSymbol, annotationBuilder: () -> List, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, ) : FirSimpleFunction() { init { symbol.bind(this) @@ -193,7 +193,7 @@ class FirJavaMethodBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, override val valueParameters: MutableList = mutableListOf() override var body: FirBlock? = null override lateinit var status: FirDeclarationStatus - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null lateinit var name: Name lateinit var symbol: FirNamedFunctionSymbol override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index 2afb46fa48b..b1523cbd69d 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -94,7 +94,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( override val containerSource: DeserializedContainerSource? get() = null - override val dispatchReceiverType: ConeKotlinType? + override val dispatchReceiverType: ConeSimpleKotlinType? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt index dfb81f5cc6a..4532209ad9a 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt @@ -87,7 +87,7 @@ private fun ConeKotlinType.scope(useSiteSession: FirSession, scopeSession: Scope intersectedTypes.mapNotNullTo(mutableListOf()) { it.scope(useSiteSession, scopeSession, requiredPhase) }, - type + this ) is ConeDefinitelyNotNullType -> original.scope(useSiteSession, scopeSession, requiredPhase) is ConeIntegerLiteralType -> error("ILT should not be in receiver position") diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt index 2be4f08625e..83dc4f79b25 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt @@ -22,10 +22,7 @@ import org.jetbrains.kotlin.fir.scopes.FirTypeScope import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.symbols.impl.* -import org.jetbrains.kotlin.fir.types.ConeClassLikeType -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.coneType -import org.jetbrains.kotlin.fir.types.coneTypeSafe +import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.addToStdlib.runIf @@ -119,6 +116,10 @@ class FirClassSubstitutionScope( return substitutor.substituteOrNull(this) } + private fun ConeSimpleKotlinType.substitute(substitutor: ConeSubstitutor): ConeSimpleKotlinType? { + return substitutor.substituteOrNull(this) as ConeSimpleKotlinType? + } + fun createSubstitutionOverrideFunction(original: FirNamedFunctionSymbol): FirNamedFunctionSymbol { if (substitutor == ConeSubstitutor.Empty) return original val member = original.fir @@ -247,7 +248,7 @@ class FirClassSubstitutionScope( private data class SubstitutedData( val typeParameters: List, - val dispatchReceiverType: ConeKotlinType?, + val dispatchReceiverType: ConeSimpleKotlinType?, val receiverType: ConeKotlinType?, val returnType: ConeKotlinType?, val substitutor: ConeSubstitutor, @@ -324,7 +325,7 @@ class FirClassSubstitutionScope( session, member, original, - substitutor.substituteOrSelf(dispatchReceiverTypeForSubstitutedMembers), + substitutor.substituteOrSelf(dispatchReceiverTypeForSubstitutedMembers) as ConeSimpleKotlinType?, newReturnType, newGetterParameterTypes, newSetterParameterTypes, diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt index d444e51dcc2..98c9e129579 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt @@ -33,7 +33,7 @@ object FirFakeOverrideGenerator { session: FirSession, baseFunction: FirSimpleFunction, baseSymbol: FirNamedFunctionSymbol, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newReceiverType: ConeKotlinType? = null, newReturnType: ConeKotlinType? = null, newParameterTypes: List? = null, @@ -58,7 +58,7 @@ object FirFakeOverrideGenerator { fakeOverrideSymbol: FirNamedFunctionSymbol, session: FirSession, baseFunction: FirSimpleFunction, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newReceiverType: ConeKotlinType?, newReturnType: ConeKotlinType?, newParameterTypes: List?, @@ -91,7 +91,7 @@ object FirFakeOverrideGenerator { session: FirSession, origin: FirDeclarationOrigin, isExpect: Boolean = baseFunction.isExpect, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newParameterTypes: List? = null, newTypeParameters: List? = null, newReceiverType: ConeKotlinType? = null, @@ -123,7 +123,7 @@ object FirFakeOverrideGenerator { session: FirSession, baseConstructor: FirConstructor, origin: FirDeclarationOrigin, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newReturnType: ConeKotlinType?, newParameterTypes: List?, newTypeParameters: List?, @@ -256,7 +256,7 @@ object FirFakeOverrideGenerator { session: FirSession, baseProperty: FirProperty, baseSymbol: FirPropertySymbol, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newReceiverType: ConeKotlinType? = null, newReturnType: ConeKotlinType? = null, newTypeParameters: List? = null, @@ -285,7 +285,7 @@ object FirFakeOverrideGenerator { session: FirSession, origin: FirDeclarationOrigin, isExpect: Boolean = baseProperty.isExpect, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newTypeParameters: List? = null, newReceiverType: ConeKotlinType? = null, newReturnType: ConeKotlinType? = null, @@ -429,7 +429,7 @@ object FirFakeOverrideGenerator { session: FirSession, baseProperty: FirSyntheticProperty, baseSymbol: FirSyntheticPropertySymbol, - newDispatchReceiverType: ConeKotlinType?, + newDispatchReceiverType: ConeSimpleKotlinType?, newReturnType: ConeKotlinType?, newGetterParameterTypes: List?, newSetterParameterTypes: List?, diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt index dd298475036..789b6cd7fe0 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt @@ -26,7 +26,7 @@ class FirTypeIntersectionScope private constructor( session: FirSession, overrideChecker: FirOverrideChecker, private val scopes: List, - private val dispatchReceiverType: ConeKotlinType, + private val dispatchReceiverType: ConeSimpleKotlinType, ) : AbstractFirOverrideScope(session, overrideChecker) { private val absentFunctions: MutableSet = mutableSetOf() private val absentProperties: MutableSet = mutableSetOf() @@ -567,7 +567,7 @@ class FirTypeIntersectionScope private constructor( session: FirSession, overrideChecker: FirOverrideChecker, scopes: List, - dispatchReceiverType: ConeKotlinType, + dispatchReceiverType: ConeSimpleKotlinType, ): FirTypeScope { scopes.singleOrNull()?.let { return it } if (scopes.isEmpty()) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index a7d8d923227..0c4f7bdbbd9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -36,7 +36,7 @@ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List abstract override val body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index b1d4500bff9..526c93e9f58 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -34,7 +34,7 @@ abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirState abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val delegate: FirExpression? abstract override val isVar: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 190b3ce3f71..71c2f62642a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -34,7 +34,7 @@ sealed class FirCallableDeclaration : FirTypedDeclaration() { abstract val deprecation: DeprecationsPerUseSite? abstract override val symbol: FirCallableSymbol abstract val containerSource: DeserializedContainerSource? - abstract val dispatchReceiverType: ConeKotlinType? + abstract val dispatchReceiverType: ConeSimpleKotlinType? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitCallableDeclaration(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index e22ba78d041..64eadad6bed 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -35,7 +35,7 @@ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List abstract override val annotations: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index a93909fad1e..a6d3ec65bf9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -34,7 +34,7 @@ abstract class FirEnumEntry : FirVariable() { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val initializer: FirExpression? abstract override val delegate: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index c7db0df86eb..01d4d02d8a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -36,7 +36,7 @@ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List abstract override val body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index 11a83ff48bc..5761bc507bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -36,7 +36,7 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val initializer: FirExpression? abstract override val delegate: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index 5b9b0f7f5d6..6752c0f3ee9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -35,7 +35,7 @@ abstract class FirField : FirVariable(), FirControlFlowGraphOwner { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val initializer: FirExpression? abstract override val delegate: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index 37ebed3e06a..09cc896fc0f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -37,7 +37,7 @@ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirContro abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val symbol: FirFunctionSymbol abstract val valueParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index 1b43f3f2518..ce961409857 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -35,7 +35,7 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val initializer: FirExpression? abstract override val delegate: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 62a7da3cb76..aaf01d08e66 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -35,7 +35,7 @@ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List abstract override val body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index 38ef4c15161..43678a665aa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -35,7 +35,7 @@ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, F abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List abstract override val body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index 66699657ad8..88ba8317273 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -35,7 +35,7 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract override val name: Name abstract override val initializer: FirExpression? abstract override val delegate: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index bc3e198e67c..5cc86ea4105 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -35,7 +35,7 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract override val receiverTypeRef: FirTypeRef? abstract override val deprecation: DeprecationsPerUseSite? abstract override val containerSource: DeserializedContainerSource? - abstract override val dispatchReceiverType: ConeKotlinType? + abstract override val dispatchReceiverType: ConeSimpleKotlinType? abstract val name: Name abstract override val symbol: FirVariableSymbol abstract val initializer: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index b9520203516..4496efd1609 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -44,7 +44,7 @@ interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var returnTypeRef: FirTypeRef abstract override var deprecation: DeprecationsPerUseSite? abstract override var containerSource: DeserializedContainerSource? - abstract override var dispatchReceiverType: ConeKotlinType? + abstract override var dispatchReceiverType: ConeSimpleKotlinType? abstract override val valueParameters: MutableList abstract override var body: FirBlock? abstract val typeParameters: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index c0ae3a401da..e790f364d93 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* @@ -50,7 +50,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null var controlFlowGraphReference: FirControlFlowGraphReference? = null override val valueParameters: MutableList = mutableListOf() override var body: FirBlock? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index f2ecf9fa5de..9cd191b33ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -46,7 +46,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder { var receiverTypeRef: FirTypeRef? = null var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null lateinit var name: Name var delegate: FirExpression? = null var isVar: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index f611c8218af..73ffd22f81c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -48,7 +48,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null override val valueParameters: MutableList = mutableListOf() override val annotations: MutableList = mutableListOf() override lateinit var symbol: FirConstructorSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index 24e1ef5f80e..08b7297aab1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -47,7 +47,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { var receiverTypeRef: FirTypeRef? = null var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null var initializer: FirExpression? = null var delegate: FirExpression? = null var isVar: Boolean = false diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index 4f748192b2f..60498648483 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirEnumEntryImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -46,7 +46,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { lateinit var returnTypeRef: FirTypeRef var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null lateinit var name: Name var initializer: FirExpression? = null var backingField: FirBackingField? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index e1dc5cb3c51..5ad8a1f116b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* @@ -46,7 +46,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { var attributes: FirDeclarationAttributes = FirDeclarationAttributes() var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null val valueParameters: MutableList = mutableListOf() lateinit var diagnostic: ConeDiagnostic lateinit var symbol: FirErrorFunctionSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index c6bf32a4b6f..e68e2c3dfb7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* @@ -46,7 +46,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { var attributes: FirDeclarationAttributes = FirDeclarationAttributes() var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null lateinit var name: Name var backingField: FirBackingField? = null override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index 1202324bbb2..6053974be91 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -49,7 +49,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde open lateinit var returnTypeRef: FirTypeRef open var deprecation: DeprecationsPerUseSite? = null open var containerSource: DeserializedContainerSource? = null - open var dispatchReceiverType: ConeKotlinType? = null + open var dispatchReceiverType: ConeSimpleKotlinType? = null open lateinit var name: Name open var initializer: FirExpression? = null open var isVar: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index 6f4c4714e51..2b429419c9a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -41,7 +41,7 @@ interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuil abstract var returnTypeRef: FirTypeRef abstract var deprecation: DeprecationsPerUseSite? abstract var containerSource: DeserializedContainerSource? - abstract var dispatchReceiverType: ConeKotlinType? + abstract var dispatchReceiverType: ConeSimpleKotlinType? abstract val valueParameters: MutableList abstract var body: FirBlock? override fun build(): FirFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index c47f89bb64d..55f03afb290 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -49,7 +49,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null override val valueParameters: MutableList = mutableListOf() override val annotations: MutableList = mutableListOf() override lateinit var symbol: FirConstructorSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index b4b31b2133e..2aea2599ced 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -50,7 +50,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui override lateinit var returnTypeRef: FirTypeRef override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null override val valueParameters: MutableList = mutableListOf() override var body: FirBlock? = null var contractDescription: FirContractDescription = FirEmptyContractDescription diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index 0bf4a6dd6dd..bfa2a179c88 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -52,7 +52,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, var receiverTypeRef: FirTypeRef? = null var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null - var dispatchReceiverType: ConeKotlinType? = null + var dispatchReceiverType: ConeSimpleKotlinType? = null lateinit var name: Name var initializer: FirExpression? = null var delegate: FirExpression? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index ff0cebc0553..e6f3ab267cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -50,7 +50,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner open var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null override var containerSource: DeserializedContainerSource? = null - override var dispatchReceiverType: ConeKotlinType? = null + override var dispatchReceiverType: ConeSimpleKotlinType? = null override val valueParameters: MutableList = mutableListOf() override var body: FirBlock? = null open var contractDescription: FirContractDescription = FirEmptyContractDescription diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index 2f2c8d6ace8..d8d1e3f4519 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -46,7 +46,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { open lateinit var returnTypeRef: FirTypeRef open var deprecation: DeprecationsPerUseSite? = null open var containerSource: DeserializedContainerSource? = null - open var dispatchReceiverType: ConeKotlinType? = null + open var dispatchReceiverType: ConeSimpleKotlinType? = null open lateinit var name: Name open var backingField: FirBackingField? = null override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index b9936d5c1d0..35cf9e6cc63 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -43,7 +43,7 @@ internal class FirAnonymousFunctionImpl( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override var controlFlowGraphReference: FirControlFlowGraphReference?, override val valueParameters: MutableList, override var body: FirBlock?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index 8cfa2fede12..56fac29c9e9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -42,7 +42,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var delegate: FirExpression?, override val isVar: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 0151e9176c6..27b6fbd2d93 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -43,7 +43,7 @@ internal class FirConstructorImpl( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val valueParameters: MutableList, override val annotations: MutableList, override val symbol: FirConstructorSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index b27e976aa91..4a4f280919c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -43,7 +43,7 @@ internal class FirDefaultSetterValueParameter( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override var initializer: FirExpression?, override var delegate: FirExpression?, override val isVar: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index d5a819acb5d..47c742fd5cc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -42,7 +42,7 @@ internal class FirEnumEntryImpl( override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var initializer: FirExpression?, override var backingField: FirBackingField?, 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 720b01ac4d8..44b6bf7c0f5 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -42,7 +42,7 @@ internal class FirErrorFunctionImpl( override val attributes: FirDeclarationAttributes, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val valueParameters: MutableList, override val diagnostic: ConeDiagnostic, override val symbol: FirErrorFunctionSymbol, 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 f9818cff72b..c6f540c3198 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.name.Name @@ -42,7 +42,7 @@ internal class FirErrorPropertyImpl( override val attributes: FirDeclarationAttributes, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var backingField: FirBackingField?, override val annotations: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index 23cfa8cca65..5d99e9565ee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -44,7 +44,7 @@ class FirFieldImpl @FirImplementationDetail constructor( override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var initializer: FirExpression?, override val isVar: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index bedce7605ba..a91cb186d43 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -44,7 +44,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val valueParameters: MutableList, override val annotations: MutableList, override val symbol: FirConstructorSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index 55517717301..b555d0b085e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* @@ -44,7 +44,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val valueParameters: MutableList, override var body: FirBlock?, override var contractDescription: FirContractDescription, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index 586081422da..3621f1a4b29 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -46,7 +46,7 @@ internal class FirPropertyImpl( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var initializer: FirExpression?, override var delegate: FirExpression?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index 1f1515e7248..31969f508db 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -43,7 +43,7 @@ internal class FirSimpleFunctionImpl( override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val valueParameters: MutableList, override var body: FirBlock?, override var contractDescription: FirContractDescription, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index 30763993c23..86730ea57e9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -42,7 +42,7 @@ internal class FirValueParameterImpl( override var returnTypeRef: FirTypeRef, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, - override val dispatchReceiverType: ConeKotlinType?, + override val dispatchReceiverType: ConeSimpleKotlinType?, override val name: Name, override var backingField: FirBackingField?, override val annotations: MutableList, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 0a623ed865e..94e1351b01e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.name.Name @@ -66,7 +66,7 @@ abstract class FirDefaultPropertyAccessor( get() = if (status is FirResolvedDeclarationStatus) FirResolvePhase.BODY_RESOLVE else FirResolvePhase.TYPES set(_) {} - override val dispatchReceiverType: ConeKotlinType? + override val dispatchReceiverType: ConeSimpleKotlinType? get() = propertySymbol?.dispatchReceiverType final override var body: FirBlock? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index e6e7af33210..1e06bc3252c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirSyntheticPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -39,7 +39,7 @@ class FirSyntheticProperty( override val returnTypeRef: FirTypeRef get() = getter.returnTypeRef - override val dispatchReceiverType: ConeKotlinType? + override val dispatchReceiverType: ConeSimpleKotlinType? get() = getter.dispatchReceiverType override val source: KtSourceElement? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt index 6ab9e33e18e..9f618728e4d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -44,7 +44,7 @@ class FirSyntheticPropertyAccessor( override val status: FirDeclarationStatus get() = delegate.status - override val dispatchReceiverType: ConeKotlinType? + override val dispatchReceiverType: ConeSimpleKotlinType? get() = delegate.dispatchReceiverType override val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt index d8ea272aeb3..215f1070d45 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt @@ -38,7 +38,7 @@ abstract class FirCallableSymbol : FirBasedSymbol return fir.typeParameters.map { it.symbol } } - val dispatchReceiverType: ConeKotlinType? + val dispatchReceiverType: ConeSimpleKotlinType? get() = fir.dispatchReceiverType val name: Name diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 04baf885cad..399961dd3a2 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -89,7 +89,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild +symbol("FirCallableSymbol", "out FirCallableDeclaration") +field("containerSource", type(DeserializedContainerSource::class), nullable = true) - +field("dispatchReceiverType", coneKotlinTypeType, nullable = true) + +field("dispatchReceiverType", coneSimpleKotlinTypeType, nullable = true) } function.configure { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt index 068a22f706b..a16daf0c636 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.tree.generator.context.generatedType import org.jetbrains.kotlin.fir.tree.generator.context.type import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -39,6 +40,7 @@ val classIdType = type(ClassId::class) val annotationUseSiteTargetType = type(AnnotationUseSiteTarget::class) val operationKindType = type("fir.expressions", "LogicOperationKind") val coneKotlinTypeType = type(ConeKotlinType::class) +val coneSimpleKotlinTypeType = type(ConeSimpleKotlinType::class) val whenExpressionType = generatedType("expressions", "FirWhenExpression") val expressionType = generatedType("expressions", "FirExpression")