From b07f89864e567b9f8e617e7e6aec1c4f8964fe02 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 23 Apr 2020 13:33:37 +0300 Subject: [PATCH] Allow dependencies to see internals from main module as well ^KT-38338 Fixed --- .../impl/KlibResolvedModuleDescriptorsFactoryImpl.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt index 165365e67cd..0c9fbfd913c 100644 --- a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt @@ -65,7 +65,10 @@ class KlibResolvedModuleDescriptorsFactoryImpl( // Set inter-dependencies between module descriptors, add forwarding declarations module. for (module in moduleDescriptors) { // Yes, just to all of them. - module.setDependencies(moduleDescriptors + additionalDependencyModules + forwardDeclarationsModule) + module.setDependencies( + moduleDescriptors + additionalDependencyModules + forwardDeclarationsModule, + additionalDependencyModules.toSet() + ) } return KotlinResolvedModuleDescriptors(moduleDescriptors, forwardDeclarationsModule)