From e73049dfb0ab31429c12eb3f3414f1b7e8311a67 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 25 Oct 2022 17:13:49 +0300 Subject: [PATCH] [Native] Add workaround for KT-54668 --- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 b3bcfdfd427..897663ca370 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 @@ -642,8 +642,8 @@ internal class KonanIrLinker( override fun deserializedSymbolNotFound(idSig: IdSignature): Nothing = error("No descriptor found for $idSig") private val inlineFunctionReferences by lazy { - (cachedLibraries.getLibraryCache(klib) - ?: error("No cache for ${klib.libraryName}")).serializedInlineFunctionBodies.associateBy { + val cache = cachedLibraries.getLibraryCache(klib)!! // ?: error("No cache for ${klib.libraryName}") // KT-54668 + cache.serializedInlineFunctionBodies.associateBy { fileDeserializationStates[it.file].declarationDeserializer.symbolDeserializer.deserializeIdSignature(it.functionSignature) } } @@ -740,8 +740,8 @@ internal class KonanIrLinker( } private val classesFields by lazy { - (cachedLibraries.getLibraryCache(klib) - ?: error("No cache for ${klib.libraryName}")).serializedClassFields.associateBy { + val cache = cachedLibraries.getLibraryCache(klib)!! // ?: error("No cache for ${klib.libraryName}") // KT-54668 + cache.serializedClassFields.associateBy { fileDeserializationStates[it.file].declarationDeserializer.symbolDeserializer.deserializeIdSignature(it.classSignature) } }