From 47d6bdfd35a021b6486c06c4d881f638abdc7a4b Mon Sep 17 00:00:00 2001
From: Georgy Bronnikov <georgy.bronnikov@jetbrains.com>
Date: Thu, 28 Nov 2019 16:54:29 +0300
Subject: [PATCH] IR: add isProvidedByDefault() to SearchPathResolver

---
 .../library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt  | 1 +
 .../src/org/jetbrains/kotlin/library/SearchPathResolver.kt       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt
index 5c399c9f79a..c62969d54de 100644
--- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt
+++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/resolver/impl/KotlinLibraryResolverImpl.kt
@@ -117,6 +117,7 @@ class KotlinLibraryResolverImpl<L: KotlinLibrary>(
             newDependencies = newDependencies.map { library: KotlinResolvedLibraryImpl ->
                 library.library.unresolvedDependencies.asSequence()
 
+                        .filterNot { searchPathResolver.isProvidedByDefault(it) }
                         .map { KotlinResolvedLibraryImpl(searchPathResolver.resolve(it)) }
                         .map { resolved ->
                             val absoluteFile = resolved.library.libraryFile.absoluteFile
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 a1f29b59e85..87628f755d0 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/SearchPathResolver.kt
@@ -15,6 +15,7 @@ interface SearchPathResolver<L: KotlinLibrary> : WithLogger {
     fun resolve(givenPath: String): L
     fun defaultLinks(noStdLib: Boolean, noDefaultLibs: Boolean, noEndorsedLibs: Boolean): List<L>
     fun libraryMatch(candidate: L, unresolved: UnresolvedLibrary): Boolean
+    fun isProvidedByDefault(unresolved: UnresolvedLibrary): Boolean = false
 }
 
 interface SearchPathResolverWithAttributes<L: KotlinLibrary>: SearchPathResolver<L> {