From f4f8763f4d5596f1696d35a41c8afa32646b6b31 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Mon, 19 Oct 2020 21:10:18 +0300 Subject: [PATCH] Pass project instance while creating descriptor serializer (cherry picked from commit 42ff47ec3272af57edb028877f7eeff411c69dca) --- .../src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index ce2617733fd..be5ddb2abd2 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt @@ -164,7 +164,7 @@ internal val copyDefaultValuesToActualPhase = konanUnitPhase( internal val serializerPhase = konanUnitPhase( op = { - val expectActualLinker = config.configuration.get(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER)?:false + val expectActualLinker = config.configuration.get(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER) ?: false serializedIr = irModule?.let { ir -> KonanIrModuleSerializer( @@ -175,6 +175,7 @@ internal val serializerPhase = konanUnitPhase( val serializer = KlibMetadataMonolithicSerializer( this.config.configuration.languageVersionSettings, config.configuration.get(CommonConfigurationKeys.METADATA_VERSION)!!, + config.project, !expectActualLinker) serializedMetadata = serializer.serializeModule(moduleDescriptor) },