diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataIncrementalSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataIncrementalSerializer.kt index 9a4f526e7c4..99f8920e2aa 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataIncrementalSerializer.kt +++ b/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, diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataMonolithicSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataMonolithicSerializer.kt index 9148f710f04..6fc15af1178 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataMonolithicSerializer.kt +++ b/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 { diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt index c7aa24016da..b2832d8a27a 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/metadata/KlibMetadataSerializer.kt @@ -33,7 +33,6 @@ internal fun Iterable.maybeChunked(size: Int?, transform: (List) -> abstract class KlibMetadataSerializer( val languageVersionSettings: LanguageVersionSettings, val metadataVersion: BinaryVersion, - val moduleDescriptor: ModuleDescriptor, val descriptorTable: DescriptorTable, val skipExpects: Boolean = false ) { diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index 694c26835a9..efd8f8e9fea 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/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 ) diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli.kt b/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli.kt index 866d4ad26c6..04c60858cea 100644 --- a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli.kt +++ b/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>")