From c8e5b2f2f879e3e292316f889ad6ea932f4a81ff Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Wed, 13 Nov 2019 20:32:04 +0300
Subject: [PATCH] [KLIB] Add error message when failed to resolve library

---
 .../kotlin/library/SearchPathResolver.kt        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
index da06b1f77c2..78a1c2d6bd4 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
@@ -98,13 +98,18 @@ abstract class KotlinLibrarySearchPathResolver<L: KotlinLibrary>(
 
     override fun resolve(unresolved: UnresolvedLibrary, isDefaultLink: Boolean): L {
         val givenPath = unresolved.path
-        val fileSequence = resolutionSequence(givenPath)
-        val matching = fileSequence.map { libraryBuilder(it, isDefaultLink) }
-            .map { it.takeIf { libraryMatch(it, unresolved) } }
-            .filterNotNull()
+        try {
+            val fileSequence = resolutionSequence(givenPath)
+            val matching = fileSequence.map { libraryBuilder(it, isDefaultLink) }
+                .map { it.takeIf { libraryMatch(it, unresolved) } }
+                .filterNotNull()
 
-        return matching.firstOrNull() ?: run {
-            logger.fatal("Could not find \"$givenPath\" in ${searchRoots.map { it.absolutePath }}.")
+            return matching.firstOrNull() ?: run {
+                logger.fatal("Could not find \"$givenPath\" in ${searchRoots.map { it.absolutePath }}.")
+            }
+        } catch (e: Throwable) {
+            logger.error("Failed to resolve Kotlin library: $givenPath")
+            throw e
         }
     }