From 0af1c81d6235db32a61685373a20d2b9301ab3cb Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 21 Dec 2020 15:56:54 +0300
Subject: [PATCH] Revert "Probably fix issue with creating module descriptor
 for SDK twice"

This reverts commit 92adccde

Actually this commit didn't fix anything so it can be reverted
---
 .../kotlin/analyzer/AbstractResolverForProject.kt    |  4 ++--
 .../analyzer/ResolverForSingleModuleProject.kt       |  4 ++--
 .../compiler/MultiModuleJavaAnalysisCustomTest.kt    |  2 +-
 .../idea/caches/resolve/IdeaResolverForProject.kt    | 12 +++---------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
index 212e38791bb..1e07157dc1f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt
@@ -52,7 +52,7 @@ abstract class AbstractResolverForProject<M : ModuleInfo>(
         assert(moduleInfoToResolvableInfo.values.toSet() == modules.toSet())
     }
 
-    abstract fun sdkDependency(module: M, ownerModuleDescriptor: ModuleDescriptorImpl?): M?
+    abstract fun sdkDependency(module: M): M?
     abstract fun modulesContent(module: M): ModuleContent<M>
     abstract fun builtInsForModule(module: M): KotlinBuiltIns
     abstract fun createResolverForModule(descriptor: ModuleDescriptor, moduleInfo: M): ResolverForModule
@@ -68,7 +68,7 @@ abstract class AbstractResolverForProject<M : ModuleInfo>(
             LazyModuleDependencies(
                 projectContext.storageManager,
                 module,
-                sdkDependency(module, moduleDescriptor),
+                sdkDependency(module),
                 this
             )
         )
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt
index d0ca5e77b57..e2c36115eb4 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt
@@ -35,7 +35,7 @@ class ResolverForSingleModuleProject<M : ModuleInfo>(
     EmptyResolverForProject(),
     PackageOracleFactory.OptimisticFactory
 ) {
-    override fun sdkDependency(module: M, ownerModuleDescriptor: ModuleDescriptorImpl?): M? = sdkDependency
+    override fun sdkDependency(module: M): M? = sdkDependency
 
     init {
         knownDependencyModuleDescriptors.forEach { (module, descriptor) ->
@@ -61,4 +61,4 @@ class ResolverForSingleModuleProject<M : ModuleInfo>(
             this,
             languageVersionSettings
         )
-}
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
index 6040a0c17ce..1e449e6e4bc 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
@@ -96,7 +96,7 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
             projectContext,
             modules
         ) {
-            override fun sdkDependency(module: TestModule, ownerModuleDescriptor: ModuleDescriptorImpl?): TestModule? = null
+            override fun sdkDependency(module: TestModule): TestModule? = null
 
             override fun modulesContent(module: TestModule): ModuleContent<TestModule> =
                 ModuleContent(module, module.kotlinFiles, module.javaFilesScope)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
index 1aa494cd018..c18b9ab4272 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
@@ -58,16 +58,10 @@ class IdeaResolverForProject(
     private val builtInsCache: BuiltInsCache =
         (delegateResolver as? IdeaResolverForProject)?.builtInsCache ?: BuiltInsCache(projectContext, this)
 
-    override fun sdkDependency(module: IdeaModuleInfo, ownerModuleDescriptor: ModuleDescriptorImpl?): SdkInfo? {
+    override fun sdkDependency(module: IdeaModuleInfo): SdkInfo? {
         if (projectContext.project.useCompositeAnalysis) {
             require(constantSdkDependencyIfAny == null) { "Shouldn't pass SDK dependency manually for composite analysis mode" }
         }
-        // This is needed for case when we find sdk dependency for module descriptor of
-        //   that sdk itself. There was some situations when we create additional module
-        //   descriptor for one SdkInfo
-        if (module is SdkInfo && ownerModuleDescriptor?.getCapability(ModuleInfo.Capability) == module) {
-            return module
-        }
         return constantSdkDependencyIfAny ?: module.findSdkAcrossDependencies()
     }
 
@@ -138,7 +132,7 @@ class IdeaResolverForProject(
         private val cache = mutableMapOf<BuiltInsCacheKey, KotlinBuiltIns>()
 
         fun getOrCreateIfNeeded(module: IdeaModuleInfo): KotlinBuiltIns = projectContextFromSdkResolver.storageManager.compute {
-            val sdk = resolverForSdk.sdkDependency(module, null)
+            val sdk = resolverForSdk.sdkDependency(module)
 
             val key = module.platform.idePlatformKind.resolution.getKeyForBuiltIns(module, sdk)
             val cachedBuiltIns = cache[key]
@@ -186,4 +180,4 @@ class IdeaResolverForProject(
 
 interface BuiltInsCacheKey {
     object DefaultBuiltInsKey : BuiltInsCacheKey
-}
+}
\ No newline at end of file