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
This commit is contained in:
Dmitriy Novozhilov
2020-12-21 15:56:54 +03:00
parent 6230a7861a
commit 0af1c81d62
4 changed files with 8 additions and 14 deletions
@@ -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
}
}