Skip to content

Commit

Permalink
Fix StorageManager deadlock (#2480)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6046abc)
  • Loading branch information
vmishenev authored and IgnatBeresnev committed Apr 29, 2022
1 parent b69a7d4 commit aa25a2a
Showing 1 changed file with 2 additions and 1 deletion.
Expand Up @@ -76,6 +76,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
import org.jetbrains.kotlin.resolve.konan.platform.NativePlatformAnalyzerServices
import org.jetbrains.kotlin.storage.LockBasedStorageManager
import java.io.File
import org.jetbrains.kotlin.konan.file.File as KFile

Expand Down Expand Up @@ -191,7 +192,7 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
val commonDependencyContainer = if (analysisPlatform == Platform.common) DokkaKlibMetadataCommonDependencyContainer(
kotlinLibraries.values.toList(),
environment.configuration,
projectContext.storageManager
LockBasedStorageManager("DokkaKlibMetadata")
) else null

val extraModuleDependencies = kotlinLibraries.values.registerLibraries() + commonDependencyContainer?.moduleInfos.orEmpty()
Expand Down

0 comments on commit aa25a2a

Please sign in to comment.