From 5dbc0f12d1d2da09ab009e010b93171815d3cdaf Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 13 Sep 2023 15:05:20 +0300 Subject: [PATCH] [FIR2IR] Rename `getIrEnumEntry` to `getOrCreateIrEnumEntry` This is needed for sake of naming consistency. --- .../org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt | 2 +- .../src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt | 2 +- .../jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt | 2 +- .../src/org/jetbrains/kotlin/fir/backend/FirIrProvider.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 c365224d74b..857d4a919a0 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 @@ -341,7 +341,7 @@ class Fir2IrClassifierStorage( return enumEntryCache[enumEntry] } - fun getIrEnumEntry( + fun getOrCreateIrEnumEntry( enumEntry: FirEnumEntry, irParent: IrClass, predefinedOrigin: IrDeclarationOrigin? = null, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt index af454049b35..08d4d92e4c8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt @@ -487,7 +487,7 @@ class Fir2IrConverter( null } is FirEnumEntry -> { - classifierStorage.getIrEnumEntry(declaration, parent as IrClass) + classifierStorage.getOrCreateIrEnumEntry(declaration, parent as IrClass) } is FirAnonymousInitializer -> { declarationStorage.getOrCreateIrAnonymousInitializer(declaration, parent as IrClass) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 91d9c4416a3..418a2615342 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -841,7 +841,7 @@ class Fir2IrDeclarationStorage( val firProviderForSymbol = firVariableSymbol.moduleData.session.firProvider val containingFile = firProviderForSymbol.getFirCallableContainerFile(firVariableSymbol) - classifierStorage.getIrEnumEntry( + classifierStorage.getOrCreateIrEnumEntry( firDeclaration, irParent = irParentClass, predefinedOrigin = if (containingFile != null) IrDeclarationOrigin.DEFINED else irParentClass.origin diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirIrProvider.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirIrProvider.kt index b193998e3e3..db69208e790 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirIrProvider.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirIrProvider.kt @@ -166,7 +166,7 @@ class FirIrProvider(val components: Fir2IrComponents) : IrProvider { SymbolKind.CLASS_SYMBOL -> { classifierStorage.getOrCreateIrClass((firDeclaration as FirRegularClass).symbol) } - SymbolKind.ENUM_ENTRY_SYMBOL -> classifierStorage.getIrEnumEntry( + SymbolKind.ENUM_ENTRY_SYMBOL -> classifierStorage.getOrCreateIrEnumEntry( firDeclaration as FirEnumEntry, parent as IrClass ) SymbolKind.CONSTRUCTOR_SYMBOL -> {