From 2657adc6dca9b6b710a9b7a866105ab2b599ec06 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Wed, 16 Aug 2023 11:15:43 +0200
Subject: [PATCH] [Native] Move `addFile` from `IrUtils2`

This function is actually used only in `BackendPhases` and it is
too specific to be included into utils.
---
 .../backend/konan/driver/phases/BackendPhases.kt  | 15 +++++++++++++--
 .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt  |  9 ---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/BackendPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/BackendPhases.kt
index 44bab12f156..70b3e1c59d4 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/BackendPhases.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/BackendPhases.kt
@@ -19,12 +19,15 @@ import org.jetbrains.kotlin.backend.konan.makeEntryPoint
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.backend.konan.objcexport.createTestBundle
+import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
+import org.jetbrains.kotlin.ir.IrFileEntry
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
+import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.util.NaiveSourceBasedFileEntryImpl
 import org.jetbrains.kotlin.ir.util.addChild
-import org.jetbrains.kotlin.ir.util.addFile
 import org.jetbrains.kotlin.ir.util.file
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
 
 internal data class SpecialBackendChecksInput(
         val irModule: IrModuleFragment,
@@ -98,4 +101,12 @@ internal val CreateTestBundlePhase = createSimpleNamedCompilerPhase<PhaseContext
     val config = context.config
     val output = OutputFiles(config.outputPath, config.target, config.produce).mainFile
     createTestBundle(config, input.moduleDescriptor, output)
-}
\ No newline at end of file
+}
+
+private fun IrModuleFragment.addFile(fileEntry: IrFileEntry, packageFqName: FqName): IrFile {
+    val packageFragmentDescriptor = object : PackageFragmentDescriptorImpl(this.descriptor, packageFqName) {
+        override fun getMemberScope(): MemberScope = MemberScope.Empty
+    }
+
+    return IrFileImpl(fileEntry, packageFragmentDescriptor).also { this.files += it }
+}
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
index ee7accd4221..873ea3941dd 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
@@ -59,15 +59,6 @@ internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: Ko
     addChild(irField)
 }
 
-fun IrModuleFragment.addFile(fileEntry: IrFileEntry, packageFqName: FqName): IrFile {
-    val packageFragmentDescriptor = object : PackageFragmentDescriptorImpl(this.descriptor, packageFqName) {
-        override fun getMemberScope(): MemberScope = MemberScope.Empty
-    }
-
-    return IrFileImpl(fileEntry, packageFragmentDescriptor)
-            .also { this.files += it }
-}
-
 fun IrBuilderWithScope.irCatch() =
         IrCatchImpl(
                 startOffset, endOffset,