Revert "[LL FIR] return non-cancellable section back for resolve until cache invalidation problems (^KTIJ-24594) are fixed" This reverts commit d03f523a71d50a741ac4faf8cb7e2cbcf9dc15bd.
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformerExecutor.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformerExecutor.kt index 5b08b35..1a11022 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformerExecutor.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformerExecutor.kt
@@ -8,7 +8,6 @@ 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 @@ lockProvider, towerDataContextCollector ) - executeWithoutPCE { - lazyTransformer.transformDeclaration(phaseRunner) - } + lazyTransformer.transformDeclaration(phaseRunner) } } } \ No newline at end of file
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt index 282704e..a85e218 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt
@@ -18,12 +18,6 @@ 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) {