[FIR] Drop dependency on ir.serialization from fir-serialization

compiler/fir/fir-serialization/build.gradle.kts

@@ -8,7 +8,10 @@ dependencies {
     implementation(project(":core:compiler.common.jvm"))
     implementation(project(":core:deserialization.common.jvm"))
     implementation(project(":compiler:fir:fir-deserialization"))
-    implementation(project(":compiler:ir.serialization.common"))
+
+    implementation(project(":compiler:serialization"))
+    implementation(project(":kotlin-util-klib"))
+    implementation(project(":kotlin-util-klib-metadata"))
 
     api(project(":compiler:fir:cones"))
     api(project(":compiler:fir:tree"))

compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/firKlibSerialization.kt

@@ -5,15 +5,14 @@
 
 package org.jetbrains.kotlin.fir.serialization
 
-import org.jetbrains.kotlin.backend.common.serialization.metadata.buildKlibPackageFragment
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.utils.classId
 import org.jetbrains.kotlin.fir.packageFqName
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
+import org.jetbrains.kotlin.library.metadata.buildKlibPackageFragment
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.SerializableStringTable

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.library.metadata.KlibMetadataHeaderFlags
 import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
+import org.jetbrains.kotlin.library.metadata.buildKlibPackageFragment
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
 import org.jetbrains.kotlin.name.ClassId
@@ -21,7 +22,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.serialization.ApproximatingStringTable
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
-import org.jetbrains.kotlin.serialization.SerializableStringTable
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
@@ -291,29 +291,3 @@ fun DeclarationDescriptor.extractFileId(): Int? = when (this) {
 internal val ModuleDescriptor.packageFragmentProviderForModuleContentWithoutDependencies: PackageFragmentProvider
     get() = (this as? ModuleDescriptorImpl)?.packageFragmentProviderForModuleContentWithoutDependencies
         ?: error("Can't get a module content package fragments, it's not a ${ModuleDescriptorImpl::class.simpleName}.")
-
-fun buildKlibPackageFragment(
-    packageProto: ProtoBuf.Package,
-    classesProto: List<Pair<ProtoBuf.Class, Int>>,
-    fqName: FqName,
-    isEmpty: Boolean,
-    stringTable: SerializableStringTable,
-): ProtoBuf.PackageFragment {
-
-    val (stringTableProto, nameTableProto) = stringTable.buildProto()
-
-    return ProtoBuf.PackageFragment.newBuilder()
-        .setPackage(packageProto)
-        .addAllClass_(classesProto.map { it.first })
-        .setStrings(stringTableProto)
-        .setQualifiedNames(nameTableProto)
-        .also { packageFragment ->
-            classesProto.forEach {
-                packageFragment.addExtension(KlibMetadataProtoBuf.className, it.second )
-            }
-            packageFragment.setExtension(KlibMetadataProtoBuf.isEmpty, isEmpty)
-            packageFragment.setExtension(KlibMetadataProtoBuf.fqName, fqName.asString())
-        }
-        .build()
-}
-

compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataSerializationUtils.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2018 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.library.metadata
+
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.serialization.SerializableStringTable
+
+fun buildKlibPackageFragment(
+    packageProto: ProtoBuf.Package,
+    classesProto: List<Pair<ProtoBuf.Class, Int>>,
+    fqName: FqName,
+    isEmpty: Boolean,
+    stringTable: SerializableStringTable,
+): ProtoBuf.PackageFragment {
+
+    val (stringTableProto, nameTableProto) = stringTable.buildProto()
+
+    return ProtoBuf.PackageFragment.newBuilder()
+        .setPackage(packageProto)
+        .addAllClass_(classesProto.map { it.first })
+        .setStrings(stringTableProto)
+        .setQualifiedNames(nameTableProto)
+        .also { packageFragment ->
+            classesProto.forEach {
+                packageFragment.addExtension(KlibMetadataProtoBuf.className, it.second )
+            }
+            packageFragment.setExtension(KlibMetadataProtoBuf.isEmpty, isEmpty)
+            packageFragment.setExtension(KlibMetadataProtoBuf.fqName, fqName.asString())
+        }
+        .build()
+}