From 49619cda48464557e0f6756d54c763ad7ba2e6c0 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Fri, 14 May 2021 18:04:12 +0300 Subject: [PATCH] Restore Native compilation --- .../src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt | 2 +- .../org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt | 1 + .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt index 2bafa4f5140..d3250db1a41 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt @@ -58,7 +58,7 @@ internal fun Context.psiToIr( generatorContext.irBuiltIns.functionFactory = functionIrClassFactory val stubGenerator = DeclarationStubGeneratorImpl( moduleDescriptor, symbolTable, - config.configuration.languageVersionSettings + generatorContext.irBuiltIns ) val symbols = KonanSymbols(this, generatorContext.irBuiltIns, symbolTable, symbolTable.lazyWrapper, functionIrClassFactory) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt index 4c734a01ce9..ec22e6b40f1 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt @@ -393,6 +393,7 @@ internal class CodegenClassMetadata(irClass: IrClass) : KonanMetadata(irClass.metadata?.name, irClass.konanLibrary), MetadataSource.Class { var layoutBuilder: ClassLayoutBuilder? = null var llvm: ClassLlvmDeclarations? = null + override var serializedIr: ByteArray? = null } private class CodegenFunctionMetadata( diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt index f7fdffe54f8..ccf7508898a 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt @@ -260,4 +260,5 @@ fun IrModuleFragment.toKonanModule() = KonanIrModuleFragmentImpl(descriptor, irB class KonanFileMetadataSource(val module: KonanIrModuleFragmentImpl) : MetadataSource.File { override val name: Name? = null + override var serializedIr: ByteArray? = null }