Reconciled -Xklib-mpp with commonizer

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

@@ -24,10 +24,9 @@ import org.jetbrains.kotlin.serialization.DescriptorSerializer
 class KlibMetadataIncrementalSerializer(
     languageVersionSettings: LanguageVersionSettings,
     metadataVersion: BinaryVersion,
-    moduleDescriptor: ModuleDescriptor,
     descriptorTable: DescriptorTable,
     skipExpects: Boolean
-) : KlibMetadataSerializer(languageVersionSettings, metadataVersion, moduleDescriptor, descriptorTable, skipExpects) {
+) : KlibMetadataSerializer(languageVersionSettings, metadataVersion, descriptorTable, skipExpects) {
 
     fun serializePackageFragment(
         module: ModuleDescriptor,

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

@@ -19,10 +19,9 @@ import org.jetbrains.kotlin.serialization.DescriptorSerializer
 class KlibMetadataMonolithicSerializer(
     languageVersionSettings: LanguageVersionSettings,
     metadataVersion: BinaryVersion,
-    moduleDescriptor: ModuleDescriptor,
     descriptorTable: DescriptorTable,
     skipExpects: Boolean
-) : KlibMetadataSerializer(languageVersionSettings, metadataVersion, moduleDescriptor, descriptorTable, skipExpects) {
+) : KlibMetadataSerializer(languageVersionSettings, metadataVersion, descriptorTable, skipExpects) {
 
     private fun serializePackageFragment(fqName: FqName, module: ModuleDescriptor): List<ProtoBuf.PackageFragment> {
 

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

@@ -33,7 +33,6 @@ internal fun <T, R> Iterable<T>.maybeChunked(size: Int?, transform: (List<T>) ->
 abstract class KlibMetadataSerializer(
     val languageVersionSettings: LanguageVersionSettings,
     val metadataVersion: BinaryVersion,
-    val moduleDescriptor: ModuleDescriptor,
     val descriptorTable: DescriptorTable,
     val skipExpects: Boolean = false
 ) {

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt

@@ -390,7 +390,6 @@ fun serializeModuleIntoKlib(
     val metadataSerializer = KlibMetadataIncrementalSerializer(
         languageVersionSettings,
         metadataVersion,
-        moduleDescriptor,
         descriptorTable,
         skipExpects = !configuration.klibMpp
     )

konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli.kt

@@ -230,7 +230,8 @@ private fun saveModules(
     val serializer = KlibMetadataMonolithicSerializer(
         languageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
         metadataVersion = KlibMetadataVersion.INSTANCE,
-        descriptorTable = EmptyDescriptorTable
+        descriptorTable = EmptyDescriptorTable,
+        skipExpects = false
     )
 
     val stdlibName = Name.special("<$KONAN_STDLIB_NAME>")