Add dependency on the current module descriptor to the dependency module descriptors

(cherry picked from commit 2400433b63172e4f909d557ae61605403baca879)
This commit is contained in:
Sergey Igushkin
2020-04-08 00:57:28 +03:00
committed by Vasily Levchenko
parent 0dc855619f
commit 4dacbbf7ee
@@ -49,7 +49,9 @@ internal object TopDownAnalyzerFacadeForKonan {
projectContext.storageManager, projectContext.storageManager,
module.builtIns, module.builtIns,
config.languageVersionSettings, config.languageVersionSettings,
config.friendModuleFiles) config.friendModuleFiles,
module
)
val additionalPackages = mutableListOf<PackageFragmentProvider>() val additionalPackages = mutableListOf<PackageFragmentProvider>()
if (!module.isNativeStdlib()) { if (!module.isNativeStdlib()) {
@@ -106,7 +108,8 @@ private class ResolvedDependencies(
storageManager: StorageManager, storageManager: StorageManager,
builtIns: KotlinBuiltIns, builtIns: KotlinBuiltIns,
specifics: LanguageVersionSettings, specifics: LanguageVersionSettings,
friendModuleFiles: Set<File> friendModuleFiles: Set<File>,
currentModuleDescriptor: ModuleDescriptorImpl
) { ) {
val moduleDescriptors: KotlinResolvedModuleDescriptors val moduleDescriptors: KotlinResolvedModuleDescriptors
@@ -123,7 +126,7 @@ private class ResolvedDependencies(
} }
this.moduleDescriptors = NativeFactories.DefaultResolvedDescriptorsFactory.createResolved( this.moduleDescriptors = NativeFactories.DefaultResolvedDescriptorsFactory.createResolved(
resolvedLibraries, storageManager, builtIns, specifics, customAction) resolvedLibraries, storageManager, builtIns, specifics, customAction, listOf(currentModuleDescriptor))
this.friends = collectedFriends.toSet() this.friends = collectedFriends.toSet()
} }