diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt index 1e867a50209..7ab47f5f753 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt @@ -553,7 +553,11 @@ class Fir2IrClassifierStorage( val result = declareIrEnumEntry(signature) { symbol -> val origin = enumEntry.computeIrOrigin(predefinedOrigin) irFactory.createEnumEntry( - startOffset, endOffset, origin, symbol, enumEntry.name + startOffset = startOffset, + endOffset = endOffset, + origin = origin, + name = enumEntry.name, + symbol = symbol, ).apply { declarationStorage.enterScope(this) if (irParent != null) { diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt index 476a3dc814f..ab45a8d58a3 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt @@ -107,7 +107,7 @@ internal class StandaloneDeclarationGenerator(private val context: GeneratorCont startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor, symbol: IrEnumEntrySymbol ): IrEnumEntry { // TODO: corresponging class? - val irEntry = irFactory.createEnumEntry(startOffset, endOffset, origin, symbol, descriptor.name) + val irEntry = irFactory.createEnumEntry(startOffset, endOffset, origin, descriptor.name, symbol) return irEntry } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt index af113e03ba3..aebf073f66a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt @@ -65,8 +65,8 @@ interface IrFactory { startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, - symbol: IrEnumEntrySymbol, name: Name, + symbol: IrEnumEntrySymbol, ): IrEnumEntry fun createErrorDeclaration( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt index a7a7f390240..8223ace4537 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt @@ -81,8 +81,8 @@ abstract class AbstractIrFactoryImpl : IrFactory { startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, - symbol: IrEnumEntrySymbol, name: Name, + symbol: IrEnumEntrySymbol, ): IrEnumEntry = IrEnumEntryImpl(startOffset, endOffset, origin, symbol, name, factory = this) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImplForJsIC.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImplForJsIC.kt index f7fdcb13467..2dddb43dd1f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImplForJsIC.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImplForJsIC.kt @@ -118,15 +118,15 @@ class IrFactoryImplForJsIC(override val stageController: StageController) : Abst startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, - symbol: IrEnumEntrySymbol, - name: Name + name: Name, + symbol: IrEnumEntrySymbol ): IrEnumEntry { return super.createEnumEntry( startOffset, endOffset, origin, - symbol, name, + symbol, ).register() } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/LazyIrFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/LazyIrFactory.kt index 5a41dca5369..edcec60917f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/LazyIrFactory.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/LazyIrFactory.kt @@ -70,12 +70,12 @@ class LazyIrFactory( startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, - symbol: IrEnumEntrySymbol, - name: Name + name: Name, + symbol: IrEnumEntrySymbol ): IrEnumEntry = if (symbol.isBound) symbol.owner else - delegate.createEnumEntry(startOffset, endOffset, origin, symbol, name) + delegate.createEnumEntry(startOffset, endOffset, origin, name, symbol) override fun createField( startOffset: Int, diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt index 8412250ea9a..2ee6831340f 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt @@ -295,10 +295,11 @@ open class DeepCopyIrTreeWithSymbols( override fun visitEnumEntry(declaration: IrEnumEntry): IrEnumEntry = declaration.factory.createEnumEntry( - declaration.startOffset, declaration.endOffset, - mapDeclarationOrigin(declaration.origin), - symbolRemapper.getDeclaredEnumEntry(declaration.symbol), - symbolRenamer.getEnumEntryName(declaration.symbol) + startOffset = declaration.startOffset, + endOffset = declaration.endOffset, + origin = mapDeclarationOrigin(declaration.origin), + name = symbolRenamer.getEnumEntryName(declaration.symbol), + symbol = symbolRemapper.getDeclaredEnumEntry(declaration.symbol), ).apply { transformAnnotations(declaration) correspondingClass = declaration.correspondingClass?.transform() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt index eae1cabe3fb..e14d2e5f9a8 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt @@ -654,7 +654,7 @@ open class SymbolTable( fun declareEnumEntry( startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor, factory: (IrEnumEntrySymbol) -> IrEnumEntry = { - irFactory.createEnumEntry(startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor)) + irFactory.createEnumEntry(startOffset, endOffset, origin, nameProvider.nameForDeclaration(descriptor), it) } ): IrEnumEntry = enumEntrySymbolTable.declare( diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt index f2df00ef6de..a65d584fd4d 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/MissingDeclarationStubGenerator.kt @@ -139,8 +139,8 @@ internal class MissingDeclarationStubGenerator(private val builtIns: IrBuiltIns) startOffset = UNDEFINED_OFFSET, endOffset = UNDEFINED_OFFSET, origin = PartiallyLinkedDeclarationOrigin.MISSING_DECLARATION, + name = symbol.guessName(), symbol = symbol, - name = symbol.guessName() ).setCommonParent() } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt index 5228cb4aba3..eed4e2748d0 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrDeclarationDeserializer.kt @@ -629,7 +629,7 @@ class IrDeclarationDeserializer( private fun deserializeIrEnumEntry(proto: ProtoEnumEntry, setParent: Boolean = true): IrEnumEntry = withDeserializedIrDeclarationBase(proto.base, setParent) { symbol, uniqId, startOffset, endOffset, origin, _ -> symbolTable.declareEnumEntry(uniqId, { symbol.checkSymbolType(ENUM_ENTRY_SYMBOL) }) { - irFactory.createEnumEntry(startOffset, endOffset, origin, it, deserializeName(proto.name)) + irFactory.createEnumEntry(startOffset, endOffset, origin, deserializeName(proto.name), it) }.apply { if (proto.hasCorrespondingClass()) correspondingClass = deserializeIrClass(proto.correspondingClass)