diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt index 3948884748b..f8f30fae9f0 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConflictsHelpers.kt @@ -33,12 +33,11 @@ import org.jetbrains.kotlin.fir.util.ListMultimap import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.utils.SmartSet internal class FirDefaultDeclarationPresenter : FirDeclarationPresenter -private val NO_NAME_PROVIDED = Name.special("") - private val MAIN_FUNCTION_SHAPES = setOf( "<>[]():kotlin/Unit", "<>[](kotlin/Array,):kotlin/Unit", @@ -74,9 +73,9 @@ private val FirSimpleFunction.representsMainFunctionAllowingConflictingOverloads // - see tests with `fun () {}`. // you can't redeclare something that has no name. private fun FirDeclaration.isCollectable() = when (this) { - is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED + is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != SpecialNames.NO_NAME_PROVIDED is FirProperty -> source?.kind !is KtFakeSourceElementKind.EnumGeneratedDeclaration - is FirRegularClass -> name != NO_NAME_PROVIDED + is FirRegularClass -> name != SpecialNames.NO_NAME_PROVIDED else -> true } diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index 6139b895410..a005b33d5a0 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -527,7 +527,7 @@ class FirElementSerializer private constructor( function.name } is FirAnonymousFunction -> { - if (function.isLambda) SpecialNames.ANONYMOUS else Name.special("") + if (function.isLambda) SpecialNames.ANONYMOUS else SpecialNames.NO_NAME_PROVIDED } else -> throw AssertionError("Unsupported function: ${function.render()}") } 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 ec59c4d6081..7f73ea8675d 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 @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.runUnless @@ -382,7 +383,7 @@ class Fir2IrClassifierStorage( fun registerIrAnonymousObject( anonymousObject: FirAnonymousObject, visibility: Visibility = Visibilities.Local, - name: Name = Name.special(""), + name: Name = SpecialNames.NO_NAME_PROVIDED, irParent: IrDeclarationParent? = null ): IrClass { val origin = IrDeclarationOrigin.DEFINED 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 0a0baee9161..3fe0dcce027 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 @@ -580,7 +580,7 @@ class Fir2IrDeclarationStorage( return createIrLazyFunction(function as FirSimpleFunction, signature, irParent, updatedOrigin) } val name = simpleFunction?.name - ?: if (isLambda) SpecialNames.ANONYMOUS else Name.special("") + ?: if (isLambda) SpecialNames.ANONYMOUS else SpecialNames.NO_NAME_PROVIDED val visibility = simpleFunction?.visibility ?: Visibilities.Local val isSuspend = if (isLambda) ((function as FirAnonymousFunction).typeRef as? FirResolvedTypeRef)?.type?.isSuspendOrKSuspendFunctionType(session) == true