From eadf252de9fb5863b1505cd6627efd4e296ff709 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Wed, 30 Jun 2021 16:47:29 +0300 Subject: [PATCH] [KLIB] Provide KotlinLibrary for Konan Interop Deserializer --- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 adbc30a3a74..1440029e0ad 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 @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin -import org.jetbrains.kotlin.descriptors.konan.kotlinLibrary import org.jetbrains.kotlin.ir.builders.TranslationPluginContext import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl @@ -120,11 +119,11 @@ internal class KonanIrLinker( private inner class KonanInteropModuleDeserializer( moduleDescriptor: ModuleDescriptor, - klib: KotlinLibrary, + override val klib: KotlinLibrary, private val isLibraryCached: Boolean ) : IrModuleDeserializer(moduleDescriptor, klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT) { init { - assert(moduleDescriptor.kotlinLibrary.isInteropLibrary()) + assert(klib.isInteropLibrary()) } private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinder(