azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass project instance while creating descriptor serializer

Browse Source 
(cherry picked from commit 42ff47ec3272af57edb028877f7eeff411c69dca)
This commit is contained in:
Leonid Startsev
2020-10-19 21:10:18 +03:00
committed by Vasily Levchenko
parent 025c4b3850
commit f4f8763f4d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+2 -1
View File
@@ -164,7 +164,7 @@ internal val copyDefaultValuesToActualPhase = konanUnitPhase(
internal val serializerPhase = konanUnitPhase( internal val serializerPhase = konanUnitPhase(
op = { 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 -> serializedIr = irModule?.let { ir ->
KonanIrModuleSerializer( KonanIrModuleSerializer(
@@ -175,6 +175,7 @@ internal val serializerPhase = konanUnitPhase(
val serializer = KlibMetadataMonolithicSerializer( val serializer = KlibMetadataMonolithicSerializer(
this.config.configuration.languageVersionSettings, this.config.configuration.languageVersionSettings,
config.configuration.get(CommonConfigurationKeys.METADATA_VERSION)!!, config.configuration.get(CommonConfigurationKeys.METADATA_VERSION)!!,
config.project,
!expectActualLinker) !expectActualLinker)
serializedMetadata = serializer.serializeModule(moduleDescriptor) serializedMetadata = serializer.serializeModule(moduleDescriptor)
}, },