[K/N] Move some utils to the serialization.native module

KT-64392

compiler/ir/serialization.native/build.gradle.kts

@@ -7,12 +7,16 @@ dependencies {
     api(project(":compiler:ir.tree"))
     api(project(":compiler:ir.serialization.common"))
 
+    implementation(project(":compiler:fir:fir2ir"))
+    implementation(project(":compiler:fir:tree"))
     implementation(project(":compiler:ir.objcinterop"))
     implementation(project(":core:compiler.common.native"))
 
     compileOnly(intellijCore())
 }
 
+optInToUnsafeDuringIrConstructionAPI()
+
 sourceSets {
     "main" { projectDefault() }
 }

compiler/ir/serialization.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrUtils.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.konan.serialization
+
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
+import org.jetbrains.kotlin.fir.declarations.utils.sourceElement
+import org.jetbrains.kotlin.fir.lazy.AbstractFir2IrLazyDeclaration
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.descriptors.IrBasedDeclarationDescriptor
+import org.jetbrains.kotlin.library.metadata.KlibDeserializedContainerSource
+import org.jetbrains.kotlin.library.metadata.isFromInteropLibrary
+import org.jetbrains.kotlin.resolve.descriptorUtil.module
+
+private fun IrDeclaration.findTopLevelDeclaration(): IrDeclaration = when (val parent = this.parent) {
+    is IrDeclaration -> parent.findTopLevelDeclaration()
+    else -> this
+}
+
+private fun IrDeclaration.propertyIfAccessor(): IrDeclaration =
+    (this as? IrSimpleFunction)?.correspondingPropertySymbol?.owner ?: this
+
+fun DeclarationDescriptor.isFromInteropLibrary(): Boolean =
+    this.isFromFirDeserializedInteropLibrary() || this.module.isFromInteropLibrary()
+
+private fun DeclarationDescriptor.isFromFirDeserializedInteropLibrary(): Boolean {
+    val declaration = (this as? IrBasedDeclarationDescriptor<*>)?.owner ?: return false
+
+    // We need to find top-level non-accessor declaration, because
+    //  - fir2ir lazy IR creates non-AbstractFir2IrLazyDeclaration declarations sometimes, e.g. for enum entries;
+    //  - K2 metadata deserializer doesn't set containerSource for property accessors.
+    val topLevelDeclaration = declaration.findTopLevelDeclaration().propertyIfAccessor()
+
+    val firDeclaration = (topLevelDeclaration as? AbstractFir2IrLazyDeclaration<*>)?.fir as? FirMemberDeclaration ?: return false
+    val containerSource = when (firDeclaration) {
+        is FirCallableDeclaration -> firDeclaration.containerSource
+        is FirClassLikeDeclaration -> firDeclaration.sourceElement
+    }
+
+    return containerSource is KlibDeserializedContainerSource && containerSource.isFromNativeInteropLibrary
+}
+
+/**
+ * This function should be equivalent to `IrDeclaration.isFromInteropLibrary` from `backend.native`, but in fact it is not for declarations
+ * from Fir modules.
+ *
+ * This should be fixed in the future.
+ */
+@ObsoleteDescriptorBasedAPI
+fun IrDeclaration.isFromInteropLibraryByDescriptor() = descriptor.isFromInteropLibrary()

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt

@@ -9,19 +9,8 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
-import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
-import org.jetbrains.kotlin.fir.declarations.utils.sourceElement
-import org.jetbrains.kotlin.fir.lazy.AbstractFir2IrLazyDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
-import org.jetbrains.kotlin.ir.descriptors.IrBasedDeclarationDescriptor
-import org.jetbrains.kotlin.library.metadata.KlibDeserializedContainerSource
 import org.jetbrains.kotlin.library.metadata.impl.KlibResolvedModuleDescriptorsFactoryImpl.Companion.FORWARD_DECLARATIONS_MODULE_NAME
-import org.jetbrains.kotlin.library.metadata.isFromInteropLibrary
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.descriptorUtil.module
 
 fun DeclarationDescriptor.deepPrint() {
     this.accept(DeepPrintVisitor(PrintVisitor()), 0)
@@ -37,33 +26,5 @@ internal val CallableMemberDescriptor.propertyIfAccessor
                 this.correspondingProperty
                 else this
 
-private fun IrDeclaration.findTopLevelDeclaration(): IrDeclaration = when (val parent = this.parent) {
-    is IrDeclaration -> parent.findTopLevelDeclaration()
-    else -> this
-}
-
-private fun IrDeclaration.propertyIfAccessor(): IrDeclaration =
-        (this as? IrSimpleFunction)?.correspondingPropertySymbol?.owner ?: this
-
 val ModuleDescriptor.isForwardDeclarationModule: Boolean
     get() = name == FORWARD_DECLARATIONS_MODULE_NAME
-
-fun DeclarationDescriptor.isFromInteropLibrary(): Boolean =
-        this.isFromFirDeserializedInteropLibrary() || this.module.isFromInteropLibrary()
-
-private fun DeclarationDescriptor.isFromFirDeserializedInteropLibrary(): Boolean {
-    val declaration = (this as? IrBasedDeclarationDescriptor<*>)?.owner ?: return false
-
-    // We need to find top-level non-accessor declaration, because
-    //  - fir2ir lazy IR creates non-AbstractFir2IrLazyDeclaration declarations sometimes, e.g. for enum entries;
-    //  - K2 metadata deserializer doesn't set containerSource for property accessors.
-    val topLevelDeclaration = declaration.findTopLevelDeclaration().propertyIfAccessor()
-
-    val firDeclaration = (topLevelDeclaration as? AbstractFir2IrLazyDeclaration<*>)?.fir as? FirMemberDeclaration ?: return false
-    val containerSource = when (firDeclaration) {
-        is FirCallableDeclaration -> firDeclaration.containerSource
-        is FirClassLikeDeclaration -> firDeclaration.sourceElement
-    }
-
-    return containerSource is KlibDeserializedContainerSource && containerSource.isFromNativeInteropLibrary
-}

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt

@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.backend.konan.ir
 
 import org.jetbrains.kotlin.backend.konan.DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION
 import org.jetbrains.kotlin.backend.konan.descriptors.allOverriddenFunctions
-import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary
 import org.jetbrains.kotlin.backend.konan.llvm.KonanMetadata
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.ir.IrBuiltIns
@@ -109,10 +108,3 @@ val IrDeclaration.konanLibrary: KotlinLibrary?
 
 fun IrDeclaration.isFromInteropLibrary() = konanLibrary?.isInteropLibrary() == true
 fun IrPackageFragment.isFromInteropLibrary() = konanLibrary?.isInteropLibrary() == true
-
-/**
- * This function should be equivalent to [IrDeclaration.isFromInteropLibrary], but in fact it is not for declarations
- * from Fir modules. This should be fixed in the future.
- */
-@ObsoleteDescriptorBasedAPI
-fun IrDeclaration.isFromInteropLibraryByDescriptor() = descriptor.isFromInteropLibrary()

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDeclarationTable.kt

@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.backend.konan.serialization
 import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable
 import org.jetbrains.kotlin.backend.common.serialization.GlobalDeclarationTable
 import org.jetbrains.kotlin.backend.common.serialization.signature.DescToIrIdSignatureComputer
-import org.jetbrains.kotlin.backend.konan.ir.isFromInteropLibraryByDescriptor
 import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIdSignaturer.kt

@@ -2,7 +2,6 @@ package org.jetbrains.kotlin.backend.konan.serialization
 
 import org.jetbrains.kotlin.backend.common.serialization.mangle.SpecialDeclarationType
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor
-import org.jetbrains.kotlin.backend.konan.descriptors.isFromInteropLibrary
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.KotlinMangler

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrLinker.kt

@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.backend.konan.CachedLibraries
 import org.jetbrains.kotlin.backend.konan.InlineFunctionOriginInfo
 import org.jetbrains.kotlin.backend.konan.PartialCacheInfo
 import org.jetbrains.kotlin.backend.konan.ir.interop.IrProviderForCEnumAndCStructStubs
-import org.jetbrains.kotlin.backend.konan.ir.isFromInteropLibraryByDescriptor
 import org.jetbrains.kotlin.backend.konan.ir.konanLibrary
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib