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

[KLIB] Provide KotlinLibrary for Konan Interop Deserializer

Browse Source
This commit is contained in:
Roman Artemev
2021-06-30 16:47:29 +03:00
committed by teamcityserver
parent 0a49b24320
commit eadf252de9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
+2 -3
View File
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib
import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin 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.builders.TranslationPluginContext
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
@@ -120,11 +119,11 @@ internal class KonanIrLinker(
private inner class KonanInteropModuleDeserializer( private inner class KonanInteropModuleDeserializer(
moduleDescriptor: ModuleDescriptor, moduleDescriptor: ModuleDescriptor,
klib: KotlinLibrary, override val klib: KotlinLibrary,
private val isLibraryCached: Boolean private val isLibraryCached: Boolean
) : IrModuleDeserializer(moduleDescriptor, klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT) { ) : IrModuleDeserializer(moduleDescriptor, klib.versions.abiVersion ?: KotlinAbiVersion.CURRENT) {
init { init {
assert(moduleDescriptor.kotlinLibrary.isInteropLibrary()) assert(klib.isInteropLibrary())
} }
private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinder( private val descriptorByIdSignatureFinder = DescriptorByIdSignatureFinder(