From df9d039c03638b809a53a6d118fbb4336ec03df1 Mon Sep 17 00:00:00 2001
From: Roman Artemev <roman.artemev@jetbrains.com>
Date: Mon, 15 Nov 2021 17:14:37 +0300
Subject: [PATCH] [KLIB] Don't use module descriptor to compute library in
 error reporter

---
 .../linkerissues/UserVisibleIrModulesSupport.kt              | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/linkerissues/UserVisibleIrModulesSupport.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/linkerissues/UserVisibleIrModulesSupport.kt
index c28b2da4c69..96e771526ad 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/linkerissues/UserVisibleIrModulesSupport.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/linkerissues/UserVisibleIrModulesSupport.kt
@@ -6,8 +6,6 @@
 package org.jetbrains.kotlin.backend.common.serialization.linkerissues
 
 import org.jetbrains.kotlin.backend.common.serialization.IrModuleDeserializer
-import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
 import org.jetbrains.kotlin.konan.file.File
 import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.library.uniqueName
@@ -200,9 +198,8 @@ open class UserVisibleIrModulesSupport(externalDependenciesLoader: ExternalDepen
         }
     }
 
-    // TODO: find a way to access KotlinLibrary without descriptors
     protected val IrModuleDeserializer.kotlinLibrary: KotlinLibrary?
-        get() = (moduleDescriptor.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
+        get() = klib as? KotlinLibrary
 
     val moduleIdComparator: Comparator<ResolvedDependencyId> = Comparator { a, b ->
         when {