azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL FIR] remove InvalidSessionException

Browse Source 
it was thrown only in a case when global lock is enabled, which is not true in production and only used for some QA testing
This commit is contained in:
Ilya Kirillov
2023-08-16 16:08:26 +02:00
committed by Space Team
parent 2e9cae4810
commit 72957b9978
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt
+2 -11
View File
@@ -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
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt
-9
View File
@@ -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