From 426191ea4a5db337e3300282baf63f76330dfaad Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 11 Jun 2020 21:59:04 +0200 Subject: [PATCH] IR: use String instead of FqName in IdSignature.PublicSignature See https://github.com/JetBrains/kotlin/commit/3154eca218d (cherry picked from commit de54f9897c589d8111b55a8d5069277a94dd8c39) --- .../kotlin/backend/konan/serialization/KonanIrlinker.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt index aab2311da9b..ca21665c611 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt @@ -180,7 +180,7 @@ internal class KonanIrLinker( private fun resolveDescriptor(idSig: IdSignature): ClassDescriptor = with(idSig as IdSignature.PublicSignature) { - val classId = ClassId(packageFqn, declarationFqn, false) + val classId = ClassId(packageFqName(), FqName(declarationFqName), false) moduleDescriptor.findClassAcrossModuleDependencies(classId) ?: error("No declaration found with $idSig") } @@ -231,4 +231,4 @@ internal class KonanIrLinker( .filter { !it.key.isForwardDeclarationModule && it.value.moduleDescriptor !== currentModule } .forEach { this.put(it.key.konanLibrary!!.libraryName, it.value.moduleFragment) } } -} \ No newline at end of file +}