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 f498a35e4e4..8f3d08bab65 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 @@ -515,8 +515,8 @@ class Fir2IrDeclarationStorage( ): IrSimpleFunction { if (signature == null) { val descriptor = - if (isGetter) WrappedPropertyGetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE) - else WrappedPropertySetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE) + if (isGetter) WrappedPropertyGetterDescriptor() + else WrappedPropertySetterDescriptor() return symbolTable.declareSimpleFunction(descriptor, factory).apply { descriptor.bind(this) } } return symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt index ba608c95d3e..b6bbf3969ae 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt @@ -47,9 +47,9 @@ abstract class Fir2IrBindableSymbol WrappedFunctionDescriptorWithContainerSource() owner.name.isSpecial && owner.name.asString().startsWith(GETTER_PREFIX) -> - WrappedPropertyGetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE) + WrappedPropertyGetterDescriptor() owner.name.isSpecial && owner.name.asString().startsWith(SETTER_PREFIX) -> - WrappedPropertySetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE) + WrappedPropertySetterDescriptor() else -> WrappedSimpleFunctionDescriptor() }.apply { bind(owner) } diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DescriptorsToIrRemapper.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DescriptorsToIrRemapper.kt index 59c9ec786e1..412a023ac50 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DescriptorsToIrRemapper.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DescriptorsToIrRemapper.kt @@ -17,38 +17,38 @@ import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid object DescriptorsToIrRemapper : DescriptorsRemapper { override fun remapDeclaredClass(descriptor: ClassDescriptor) = - WrappedClassDescriptor(descriptor.annotations, descriptor.source) + WrappedClassDescriptor() override fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor) = - WrappedClassConstructorDescriptor(descriptor.annotations, descriptor.source) + WrappedClassConstructorDescriptor() override fun remapDeclaredEnumEntry(descriptor: ClassDescriptor) = - WrappedClassDescriptor(descriptor.annotations, descriptor.source) + WrappedClassDescriptor() override fun remapDeclaredField(descriptor: PropertyDescriptor) = - WrappedFieldDescriptor(descriptor.annotations, descriptor.source) + WrappedFieldDescriptor() override fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor) = when (descriptor) { - is PropertyGetterDescriptor -> WrappedPropertyGetterDescriptor(descriptor.annotations, descriptor.source) - is PropertySetterDescriptor -> WrappedPropertySetterDescriptor(descriptor.annotations, descriptor.source) - else -> WrappedSimpleFunctionDescriptor(descriptor.annotations, descriptor.source) + is PropertyGetterDescriptor -> WrappedPropertyGetterDescriptor() + is PropertySetterDescriptor -> WrappedPropertySetterDescriptor() + else -> WrappedSimpleFunctionDescriptor() } override fun remapDeclaredProperty(descriptor: PropertyDescriptor) = - WrappedPropertyDescriptor(descriptor.annotations, descriptor.source) + WrappedPropertyDescriptor() override fun remapDeclaredTypeParameter(descriptor: TypeParameterDescriptor) = - WrappedTypeParameterDescriptor(descriptor.annotations, descriptor.source) + WrappedTypeParameterDescriptor() override fun remapDeclaredVariable(descriptor: VariableDescriptor) = - WrappedVariableDescriptor(descriptor.annotations, descriptor.source) + WrappedVariableDescriptor() override fun remapDeclaredValueParameter(descriptor: ParameterDescriptor): ParameterDescriptor = if (descriptor is ReceiverParameterDescriptor) - WrappedReceiverParameterDescriptor(descriptor.annotations, descriptor.source) + WrappedReceiverParameterDescriptor() else - WrappedValueParameterDescriptor(descriptor.annotations, descriptor.source) + WrappedValueParameterDescriptor() } @OptIn(ObsoleteDescriptorBasedAPI::class) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt index b75390e1de6..79da23c31e9 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt @@ -512,7 +512,7 @@ fun IrFactory.createStaticFunctionWithReceivers( ): IrSimpleFunction { val descriptor = (oldFunction.descriptor as? DescriptorWithContainerSource)?.let { WrappedFunctionDescriptorWithContainerSource() - } ?: WrappedSimpleFunctionDescriptor(Annotations.EMPTY, oldFunction.descriptor.source) + } ?: WrappedSimpleFunctionDescriptor() return createFunction( oldFunction.startOffset, oldFunction.endOffset, origin, diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt index b9a0d40678f..83d9d6b6831 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt @@ -223,7 +223,7 @@ fun buildReceiverParameter( @PublishedApi internal fun IrFactory.buildValueParameter(builder: IrValueParameterBuilder, parent: IrDeclarationParent): IrValueParameter = with(builder) { - val wrappedDescriptor = WrappedValueParameterDescriptor(wrappedDescriptorAnnotations) + val wrappedDescriptor = WrappedValueParameterDescriptor() return createValueParameter( startOffset, endOffset, origin, IrValueParameterSymbolImpl(wrappedDescriptor), diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt index 0408760ca4b..14da148d1cd 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CollectionStubMethodLowering.kt @@ -98,7 +98,6 @@ internal class CollectionStubMethodLowering(val context: JvmBackendContext) : Cl ): IrValueParameter { val parameter = this return buildValueParameter(target) { - wrappedDescriptorAnnotations = descriptor.annotations origin = IrDeclarationOrigin.IR_BUILTINS_STUB name = parameter.name index = parameter.index diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt index 7f7cc5cfe73..bdd445ea247 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt @@ -85,7 +85,7 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa val ktFile = context.psiSourceManager.getKtFile(fileEntry) ?: throw AssertionError("Unexpected file entry: $fileEntry") fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(ktFile) - descriptor = WrappedClassDescriptor(sourceElement = KotlinSourceElement(ktFile)) + descriptor = WrappedClassDescriptor() } is NaiveSourceBasedFileEntryImpl -> { fileClassInfo = JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(irFile.fqName, fileEntry.name), false) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt index 9e3c591a20c..02f61e836e6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrDeclarationBuilder.kt @@ -18,7 +18,6 @@ abstract class IrDeclarationBuilder : IrElementBuilder() { var origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFINED var visibility: Visibility = Visibilities.PUBLIC - var wrappedDescriptorAnnotations: Annotations = Annotations.EMPTY lateinit var name: Name fun updateFrom(from: IrDeclaration) {