From 66b9c2f2609e15d2e0a6d3df677592b901dbf16a Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Tue, 15 Aug 2023 12:53:24 +0200
Subject: [PATCH] [Native] Move `FORWARD_DECLARATION_ORIGIN` into
 `KonanForwardDeclarationModuleDeserializer`

---
 .../KonanForwardDeclarationModuleDeserializer.kt           | 7 ++++++-
 .../kotlin/backend/konan/serialization/KonanIrLinker.kt    | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanForwardDeclarationModuleDeserializer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanForwardDeclarationModuleDeserializer.kt
index 8bfa72d0ac4..d99e960603c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanForwardDeclarationModuleDeserializer.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanForwardDeclarationModuleDeserializer.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
 import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrDeclarationOriginImpl
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
@@ -34,6 +35,10 @@ internal class KonanForwardDeclarationModuleDeserializer(
         require(moduleDescriptor.isForwardDeclarationModule)
     }
 
+    companion object {
+        private val FORWARD_DECLARATION_ORIGIN = object : IrDeclarationOriginImpl("FORWARD_DECLARATION_ORIGIN") {}
+    }
+
     private val declaredDeclaration = mutableMapOf<IdSignature, IrClass>()
 
     private fun IdSignature.isForwardDeclarationSignature(): Boolean {
@@ -54,7 +59,7 @@ internal class KonanForwardDeclarationModuleDeserializer(
 
     private fun buildForwardDeclarationStub(descriptor: ClassDescriptor): IrClass {
         return stubGenerator.generateClassStub(descriptor).also {
-            it.origin = KonanIrLinker.FORWARD_DECLARATION_ORIGIN
+            it.origin = FORWARD_DECLARATION_ORIGIN
         }
     }
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
index 6f935b59095..532e70ebd29 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt
@@ -452,11 +452,6 @@ internal class KonanIrLinker(
         private val libraryBeingCached: PartialCacheInfo?,
         override val userVisibleIrModulesSupport: UserVisibleIrModulesSupport
 ) : KotlinIrLinker(currentModule, messageLogger, builtIns, symbolTable, exportedDependencies) {
-
-    companion object {
-        val FORWARD_DECLARATION_ORIGIN = object : IrDeclarationOriginImpl("FORWARD_DECLARATION_ORIGIN") {}
-    }
-
     override fun isBuiltInModule(moduleDescriptor: ModuleDescriptor): Boolean = moduleDescriptor.isNativeStdlib()
 
     private val forwardDeclarationDeserializer = forwardModuleDescriptor?.let {