From 3154234107731047d6464f1ef3c69666234f7431 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 22 Mar 2021 12:22:24 +0100 Subject: [PATCH] FIR IDE: do not run STATUS phase under lock --- .../kotlin/idea/fir/low/level/api/FirPhaseRunner.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt index 31d66909665..e6fbcaba8fd 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt @@ -23,16 +23,12 @@ import kotlin.concurrent.withLock internal class FirPhaseRunner { private val superTypesBodyResolveLock = ReentrantLock() - private val statusResolveLock = ReentrantLock() private val implicitTypesResolveLock = ReentrantLock() fun runPhase(firFile: FirFile, phase: FirResolvePhase, scopeSession: ScopeSession) = when (phase) { FirResolvePhase.SUPER_TYPES -> superTypesBodyResolveLock.withLock { runPhaseWithoutLock(firFile, phase, scopeSession) } - FirResolvePhase.STATUS -> statusResolveLock.withLock { - runPhaseWithoutLock(firFile, phase, scopeSession) - } FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> implicitTypesResolveLock.withLock { runPhaseWithoutLock(firFile, phase, scopeSession) } @@ -45,9 +41,6 @@ internal class FirPhaseRunner { FirResolvePhase.SUPER_TYPES -> superTypesBodyResolveLock.withLock { runPhaseWithCustomResolveWithoutLock(resolve) } - FirResolvePhase.STATUS -> statusResolveLock.withLock { - runPhaseWithCustomResolveWithoutLock(resolve) - } FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> implicitTypesResolveLock.withLock { runPhaseWithCustomResolveWithoutLock(resolve) }