diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt index a8a7315f698..5d00958703e 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt @@ -186,9 +186,6 @@ class RenderIrElementWithDescriptorsVisitor : IrElementVisitor internal fun IrDeclaration.name(): String = descriptor.let { it.name.toString() } - internal fun IrDeclaration.renderDeclared(): String = - DECLARATION_RENDERER.render(this.descriptor) - internal fun DeclarationDescriptor.ref(): String = if (this is ReceiverParameterDescriptor) "" @@ -198,8 +195,6 @@ class RenderIrElementWithDescriptorsVisitor : IrElementVisitor internal fun KotlinType.render(): String = DECLARATION_RENDERER.renderType(this) - internal fun IrDeclaration.renderOrigin(): String = - if (origin != IrDeclarationOrigin.DEFINED) origin.toString() + " " else "" } } @@ -220,11 +215,11 @@ class DumpIrTreeWithDescriptorsVisitor(out: Appendable) : IrElementVisitor override val metadata: MetadataSource.File? diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt index 395f51ce900..b4ba215c136 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.ir.IrElementBase import org.jetbrains.kotlin.ir.SourceManager import org.jetbrains.kotlin.ir.declarations.IrDeclaration @@ -29,7 +28,6 @@ import org.jetbrains.kotlin.ir.symbols.impl.IrFileSymbolImpl import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.utils.SmartList class IrFileImpl( override val fileEntry: SourceManager.FileEntry, @@ -42,14 +40,12 @@ class IrFileImpl( constructor( fileEntry: SourceManager.FileEntry, symbol: IrFileSymbol - ) : - this(fileEntry, symbol, symbol.descriptor.fqName) + ) : this(fileEntry, symbol, symbol.descriptor.fqName) constructor( fileEntry: SourceManager.FileEntry, packageFragmentDescriptor: PackageFragmentDescriptor - ) : - this(fileEntry, IrFileSymbolImpl(packageFragmentDescriptor), packageFragmentDescriptor.fqName) + ) : this(fileEntry, IrFileSymbolImpl(packageFragmentDescriptor), packageFragmentDescriptor.fqName) init { symbol.bind(this) @@ -57,8 +53,6 @@ class IrFileImpl( override val packageFragmentDescriptor: PackageFragmentDescriptor get() = symbol.descriptor - override val fileAnnotations: MutableList = SmartList() - override val declarations: MutableList = ArrayList() override val annotations: MutableList = ArrayList() 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 9ad5f16373f..5420a55a356 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 @@ -110,7 +110,6 @@ open class DeepCopyIrTreeWithSymbols( symbolRenamer.getFileName(declaration.symbol) ).apply { transformAnnotations(declaration) - fileAnnotations.addAll(declaration.fileAnnotations) declaration.transformDeclarationsTo(this) } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt index 3c7b4102f5b..2b7856ea331 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt @@ -80,9 +80,6 @@ class DumpIrTreeVisitor( override fun visitFile(declaration: IrFile, data: String) { declaration.dumpLabeledElementWith(data) { - declaration.fileAnnotations.dumpItemsWith("fileAnnotations") { - ANNOTATIONS_RENDERER.renderAnnotation(it) - } dumpAnnotations(declaration) declaration.declarations.dumpElements() } diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt index ac72dd47db6..5f8cf4b951e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt @@ -1,6 +1,4 @@ FILE fqName:test fileName:/fileAnnotations.kt - fileAnnotations: - @test.A(x = "File annotation") annotations: CALL 'CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:test.A flags:[primary]' type=test.A origin=null x: CONST String type=kotlin.String value="File annotation" diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt index e36a60df4a8..9014a69460d 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt @@ -1,6 +1,4 @@ FILE fqName: fileName:/fileWithAnnotations.kt - fileAnnotations: - @kotlin.jvm.JvmName(name = "FileWithAnnotations") annotations: CALL 'CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> (name:kotlin.String) returnType:kotlin.jvm.JvmName flags:[primary]' type=kotlin.jvm.JvmName origin=null name: CONST String type=kotlin.String value="FileWithAnnotations"