Revert "[LL FIR] return non-cancellable section back for resolve until cache invalidation problems (^KTIJ-24594) are fixed"

This reverts commit d03f523a71.
This commit is contained in:
Yan Zhulanow
2023-02-20 17:36:58 +09:00
committed by Space Team
parent 471ecf62c8
commit 4a27034ed5
2 changed files with 1 additions and 10 deletions
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers
import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDesignationWithFile
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.executeWithoutPCE
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector
@@ -31,9 +30,7 @@ internal class LLFirLazyTransformerExecutor {
lockProvider,
towerDataContextCollector
)
executeWithoutPCE {
lazyTransformer.transformDeclaration(phaseRunner)
}
lazyTransformer.transformDeclaration(phaseRunner)
}
}
}
@@ -18,12 +18,6 @@ import org.jetbrains.kotlin.psi.psiUtil.isObjectLiteral
import java.util.concurrent.TimeUnit
import java.util.concurrent.locks.Lock
internal inline fun <T> executeWithoutPCE(crossinline action: () -> T): T {
var result: T? = null
ProgressManager.getInstance().executeNonCancelableSection { result = action() }
@Suppress("UNCHECKED_CAST")
return result as T
}
internal inline fun <T> Lock.lockWithPCECheck(lockingIntervalMs: Long, action: () -> T): T {
while (true) {