From 7f95d7f414a82841abab260f5b4fac3083336d56 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 14 Feb 2022 15:48:34 +0300 Subject: [PATCH] IR make 'name' a var --- .../src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt | 5 ++++- .../org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt | 5 ++++- .../src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt | 5 ++++- .../jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt | 5 ++++- .../jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt | 5 ++++- .../org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt | 2 +- .../kotlin/ir/declarations/impl/IrConstructorImpl.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt | 2 +- .../ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt | 2 +- .../kotlin/ir/declarations/impl/IrTypeParameterImpl.kt | 2 +- .../kotlin/ir/declarations/impl/IrValueParameterImpl.kt | 2 +- .../kotlin/ir/declarations/IrDeclarationWithName.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt | 2 +- .../jetbrains/kotlin/ir/declarations/impl/IrVariableImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt | 2 +- .../kotlin/ir/declarations/lazy/IrLazyConstructor.kt | 2 +- .../kotlin/ir/declarations/lazy/IrLazyEnumEntryImpl.kt | 2 +- .../org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt | 2 +- .../jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt | 2 +- .../jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt | 2 +- .../jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt | 2 +- .../kotlin/ir/declarations/lazy/IrLazyTypeParameter.kt | 2 +- .../kotlin/ir/declarations/lazy/IrLazyValueParameter.kt | 2 +- 27 files changed, 42 insertions(+), 27 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt index ceaa42fa993..4d3292f30b7 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt @@ -57,8 +57,11 @@ class Fir2IrLazyClass( override val descriptor: ClassDescriptor get() = symbol.descriptor - override val name: Name + override var name: Name get() = fir.name + set(_) { + throw UnsupportedOperationException() + } @Suppress("SetterBackingFieldAssignment") override var visibility: DescriptorVisibility = components.visibilityConverter.convertToDescriptorVisibility(fir.visibility) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt index e7a825098c7..f8a3152776f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyConstructor.kt @@ -63,8 +63,11 @@ class Fir2IrLazyConstructor( override var body: IrBody? = null - override val name: Name + override var name: Name get() = SpecialNames.INIT + set(_) { + throw UnsupportedOperationException() + } @Suppress("SetterBackingFieldAssignment") override var visibility: DescriptorVisibility = components.visibilityConverter.convertToDescriptorVisibility(fir.visibility) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt index abce1eac35b..ea167a5ea6f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt @@ -74,8 +74,11 @@ class Fir2IrLazyProperty( override val isExpect: Boolean get() = fir.isExpect - override val name: Name + override var name: Name get() = fir.name + set(_) { + throw UnsupportedOperationException() + } @Suppress("SetterBackingFieldAssignment") override var visibility: DescriptorVisibility = components.visibilityConverter.convertToDescriptorVisibility(fir.visibility) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt index 5c5a9247ace..bfce4c69990 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt @@ -52,8 +52,11 @@ class Fir2IrLazyPropertyAccessor( override var annotations: List by createLazyAnnotations() - override val name: Name + override var name: Name get() = Name.special("<${if (isSetter) "set" else "get"}-${firParentProperty.name}>") + set(_) { + throw UnsupportedOperationException() + } override var returnType: IrType by lazyVar(lock) { if (isSetter) irBuiltIns.unitType else firParentProperty.returnTypeRef.toIrType(typeConverter, conversionTypeContext) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt index 14784f3d739..20b9bff265e 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt @@ -41,8 +41,11 @@ class Fir2IrLazySimpleFunction( override var annotations: List by createLazyAnnotations() - override val name: Name + override var name: Name get() = fir.name + set(_) { + throw UnsupportedOperationException() + } override var returnType: IrType by lazyVar(lock) { fir.returnTypeRef.toIrType(typeConverter) diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt index e9fb81b65cf..970d4ae9b5f 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt @@ -30,7 +30,7 @@ open class IrClassImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, final override val symbol: IrClassSymbol, - override val name: Name, + override var name: Name, override val kind: ClassKind, override var visibility: DescriptorVisibility, override var modality: Modality, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt index fdbc14f486a..3739a8aec14 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt @@ -34,7 +34,7 @@ class IrConstructorImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrConstructorSymbol, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, returnType: IrType, override val isInline: Boolean, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt index 72e315bf6ba..143aa1a3826 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt @@ -29,7 +29,7 @@ class IrEnumEntryImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrEnumEntrySymbol, - override val name: Name, + override var name: Name, override val factory: IrFactory = IrFactoryImpl, ) : IrEnumEntry() { init { diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index 231b9c0c940..a8142230a9a 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -32,7 +32,7 @@ class IrFieldImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrFieldSymbol, - override val name: Name, + override var name: Name, override var type: IrType, override var visibility: DescriptorVisibility, override val isFinal: Boolean, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt index 87b6af962b3..46993589f13 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt @@ -25,7 +25,7 @@ abstract class IrFunctionCommonImpl( override val startOffset: Int, override val endOffset: Int, override var origin: IrDeclarationOrigin, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, returnType: IrType, override val isInline: Boolean, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt index d0dddc24f03..4fa8c0be6d2 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrLocalDelegatedPropertyImpl.kt @@ -18,7 +18,7 @@ class IrLocalDelegatedPropertyImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrLocalDelegatedPropertySymbol, - override val name: Name, + override var name: Name, override var type: IrType, override val isVar: Boolean, override val factory: IrFactory = IrFactoryImpl, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index 2f4cb80fe5f..3c0f5ee863f 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -32,7 +32,7 @@ abstract class IrPropertyCommonImpl( override val startOffset: Int, override val endOffset: Int, override var origin: IrDeclarationOrigin, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val isVar: Boolean, override val isConst: Boolean, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt index 8281f3e18b8..ab33ef3788e 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeAliasImpl.kt @@ -18,7 +18,7 @@ class IrTypeAliasImpl( override val startOffset: Int, override val endOffset: Int, override val symbol: IrTypeAliasSymbol, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override var expandedType: IrType, override val isActual: Boolean, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt index 1dd5d7c4775..f730b60ae14 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrTypeParameterImpl.kt @@ -33,7 +33,7 @@ class IrTypeParameterImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrTypeParameterSymbol, - override val name: Name, + override var name: Name, override val index: Int, override val isReified: Boolean, override val variance: Variance, diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt index c8a6a606f4f..646b8faf7ee 100644 --- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt +++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt @@ -33,7 +33,7 @@ class IrValueParameterImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrValueParameterSymbol, - override val name: Name, + override var name: Name, override val index: Int, override var type: IrType, override var varargElementType: IrType?, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationWithName.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationWithName.kt index 2b6a2156414..0f24f150938 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationWithName.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclarationWithName.kt @@ -8,5 +8,5 @@ package org.jetbrains.kotlin.ir.declarations import org.jetbrains.kotlin.name.Name interface IrDeclarationWithName : IrDeclaration { - val name: Name + var name: Name } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt index 3394cfa8075..22ad20008d7 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrScriptImpl.kt @@ -22,7 +22,7 @@ private val SCRIPT_ORIGIN = object : IrDeclarationOriginImpl("SCRIPT") {} class IrScriptImpl( override val symbol: IrScriptSymbol, - override val name: Name, + override var name: Name, override val factory: IrFactory, ) : IrScript() { override val startOffset: Int get() = UNDEFINED_OFFSET diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrVariableImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrVariableImpl.kt index f2e7c8ce0c7..19028a3e33f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrVariableImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrVariableImpl.kt @@ -33,7 +33,7 @@ class IrVariableImpl( override val endOffset: Int, override var origin: IrDeclarationOrigin, override val symbol: IrVariableSymbol, - override val name: Name, + override var name: Name, override var type: IrType, override val isVar: Boolean, override val isConst: Boolean, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt index e0422f35149..c1678a9da38 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyClass.kt @@ -25,7 +25,7 @@ class IrLazyClass( override val symbol: IrClassSymbol, @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: ClassDescriptor, - override val name: Name, + override var name: Name, override val kind: ClassKind, override var visibility: DescriptorVisibility, override var modality: Modality, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt index c5ca5a07cfe..a41647ba400 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt @@ -27,7 +27,7 @@ class IrLazyConstructor( override var origin: IrDeclarationOrigin, override val symbol: IrConstructorSymbol, override val descriptor: ClassConstructorDescriptor, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val isInline: Boolean, override val isExternal: Boolean, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyEnumEntryImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyEnumEntryImpl.kt index 278e0bc1911..801b7e0890c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyEnumEntryImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyEnumEntryImpl.kt @@ -47,7 +47,7 @@ class IrLazyEnumEntryImpl( override var annotations: List by createLazyAnnotations() - override val name: Name = descriptor.name + override var name: Name = descriptor.name override var correspondingClass: IrClass? = null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt index 3b5f6085863..44f93c55e35 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt @@ -29,7 +29,7 @@ class IrLazyField( override val symbol: IrFieldSymbol, @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: PropertyDescriptor, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val isFinal: Boolean, override val isExternal: Boolean, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt index fb61a7bd829..b47d4a3dd6b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt @@ -31,7 +31,7 @@ class IrLazyFunction( override var origin: IrDeclarationOrigin, override val symbol: IrSimpleFunctionSymbol, override val descriptor: FunctionDescriptor, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val modality: Modality, override val isInline: Boolean, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt index fb4d739295d..663396aef3c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyProperty.kt @@ -25,7 +25,7 @@ class IrLazyProperty( override val symbol: IrPropertySymbol, @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: PropertyDescriptor, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val modality: Modality, override val isVar: Boolean, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt index 60c23b81ea9..709e75b830f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeAlias.kt @@ -23,7 +23,7 @@ class IrLazyTypeAlias( override val symbol: IrTypeAliasSymbol, @OptIn(ObsoleteDescriptorBasedAPI::class) override val descriptor: TypeAliasDescriptor, - override val name: Name, + override var name: Name, override var visibility: DescriptorVisibility, override val isActual: Boolean, override val stubGenerator: DeclarationStubGenerator, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeParameter.kt index fb13fc8f448..f7cd065048a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeParameter.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyTypeParameter.kt @@ -23,7 +23,7 @@ class IrLazyTypeParameter( override var origin: IrDeclarationOrigin, override val symbol: IrTypeParameterSymbol, override val descriptor: TypeParameterDescriptor, - override val name: Name, + override var name: Name, override val index: Int, override val isReified: Boolean, override val variance: Variance, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyValueParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyValueParameter.kt index 540fe49dc78..ce8cb39eead 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyValueParameter.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyValueParameter.kt @@ -26,7 +26,7 @@ class IrLazyValueParameter( override var origin: IrDeclarationOrigin, override val symbol: IrValueParameterSymbol, override val descriptor: ValueParameterDescriptor, - override val name: Name, + override var name: Name, override val index: Int, kotlinType: KotlinType, varargElementKotlinType: KotlinType?,