IR: drop IrFile.fileAnnotations (it already has annotations anyway)

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DumpIrTreeWithDescriptorsVisitor.kt

@@ -186,9 +186,6 @@ class RenderIrElementWithDescriptorsVisitor : IrElementVisitor<String, Nothing?>
         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)
                 "<receiver: ${containingDeclaration.ref()}>"
@@ -198,8 +195,6 @@ class RenderIrElementWithDescriptorsVisitor : IrElementVisitor<String, Nothing?>
         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<Unit,
 
     override fun visitFile(declaration: IrFile, data: String) {
         declaration.dumpLabeledElementWith(data) {
-            if (declaration.fileAnnotations.isNotEmpty()) {
+            if (declaration.annotations.isNotEmpty()) {
-                printer.println("fileAnnotations:")
+                printer.println("annotations:")
                 indented {
-                    declaration.fileAnnotations.forEach {
+                    declaration.annotations.forEach {
-                        printer.println(ANNOTATIONS_RENDERER.renderAnnotation(it))
+                        it.accept(this, "")
                     }
                 }
             }

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ModuleGenerator.kt

@@ -62,7 +62,6 @@ class ModuleGenerator(override val context: GeneratorContext) : Generator {
 
         for (ktAnnotationEntry in ktFile.annotationEntries) {
             val annotationDescriptor = getOrFail(BindingContext.ANNOTATION, ktAnnotationEntry)
-            irFile.fileAnnotations.add(annotationDescriptor)
             irFile.annotations.add(constantValueGenerator.generateAnnotationConstructorCall(annotationDescriptor))
         }
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFile.kt

@@ -17,9 +17,9 @@
 package org.jetbrains.kotlin.ir.declarations
 
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.SourceManager
+import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.symbols.IrExternalPackageFragmentSymbol
 import org.jetbrains.kotlin.ir.symbols.IrFileSymbol
 import org.jetbrains.kotlin.ir.symbols.IrPackageFragmentSymbol
@@ -42,7 +42,6 @@ interface IrFile : IrPackageFragment, IrAnnotationContainer, IrMetadataSourceOwn
     override val symbol: IrFileSymbol
 
     val fileEntry: SourceManager.FileEntry
-    val fileAnnotations: MutableList<AnnotationDescriptor>
 
     override val metadata: MetadataSource.File?
 

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<AnnotationDescriptor> = SmartList()
-
     override val declarations: MutableList<IrDeclaration> = ArrayList()
 
     override val annotations: MutableList<IrCall> = ArrayList()

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)
         }
 

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()
         }

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"

compiler/testData/ir/irText/declarations/fileWithAnnotations.txt

@@ -1,6 +1,4 @@
 FILE fqName:<root> 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"