diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt index 5e7b93e9cc3..816f33c7f93 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt @@ -35,14 +35,7 @@ internal class LLFirLockProvider(private val checker: LLFirLazyResolveContractCh ): R { if (!globalLockEnabled) return action() - return globalLock.lockWithPCECheck(lockingIntervalMs) { - val session = key.llFirSession - if (!session.isValid) { - val description = session.ktModule.moduleDescription - throw InvalidSessionException("Session '$description' is invalid", description) - } - action() - } + return globalLock.lockWithPCECheck(lockingIntervalMs, action) } fun withGlobalPhaseLock( @@ -229,6 +222,4 @@ private val globalLockEnabled: Boolean by lazy(LazyThreadSafetyMode.PUBLICATION) Registry.`is`("kotlin.parallel.resolve.under.global.lock", false) } -private const val DEFAULT_LOCKING_INTERVAL = 50L - -internal class InvalidSessionException(message: String, val moduleDescription: String) : RuntimeException(message) +private const val DEFAULT_LOCKING_INTERVAL = 50L \ No newline at end of file diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt index 0e21c8890ff..9bca87d1029 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveT import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirSingleResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeClassResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeFileResolveTarget -import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.InvalidSessionException import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.llFirModuleData import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession @@ -209,10 +208,6 @@ private fun handleExceptionFromResolve( fromPhase: FirResolvePhase, toPhase: FirResolvePhase, ): Nothing { - if (exception is InvalidSessionException) { - throw exception - } - val session = firDeclarationToResolve.llFirSession val moduleData = firDeclarationToResolve.llFirModuleData val module = moduleData.ktModule @@ -242,10 +237,6 @@ private fun handleExceptionFromResolve( designation: LLFirResolveTarget, toPhase: FirResolvePhase, ): Nothing { - if (exception is InvalidSessionException) { - throw exception - } - val session = designation.firFile.llFirSession val moduleData = session.llFirModuleData val module = moduleData.ktModule