From 4dacbbf7ee27210b3deb5e04005fa49f2d0008f8 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Wed, 8 Apr 2020 00:57:28 +0300
Subject: [PATCH] Add dependency on the current module descriptor to the
 dependency module descriptors

(cherry picked from commit 2400433b63172e4f909d557ae61605403baca879)
---
 .../backend/konan/TopDownAnalyzerFacadeForKonan.kt       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt
index f26b8f66ec3..46027d9fbde 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt
@@ -49,7 +49,9 @@ internal object TopDownAnalyzerFacadeForKonan {
                 projectContext.storageManager,
                 module.builtIns,
                 config.languageVersionSettings,
-                config.friendModuleFiles)
+                config.friendModuleFiles,
+                module
+        )
 
         val additionalPackages = mutableListOf<PackageFragmentProvider>()
         if (!module.isNativeStdlib()) {
@@ -106,7 +108,8 @@ private class ResolvedDependencies(
     storageManager: StorageManager,
     builtIns: KotlinBuiltIns,
     specifics: LanguageVersionSettings,
-    friendModuleFiles: Set<File>
+    friendModuleFiles: Set<File>,
+    currentModuleDescriptor: ModuleDescriptorImpl
 ) {
 
     val moduleDescriptors: KotlinResolvedModuleDescriptors
@@ -123,7 +126,7 @@ private class ResolvedDependencies(
         }
 
         this.moduleDescriptors = NativeFactories.DefaultResolvedDescriptorsFactory.createResolved(
-                resolvedLibraries, storageManager, builtIns, specifics, customAction)
+                resolvedLibraries, storageManager, builtIns, specifics, customAction, listOf(currentModuleDescriptor))
 
         this.friends = collectedFriends.toSet()
     }