From 2229c82dc463fa3b139413b8ba1cfd0b45e1132e Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 4 Mar 2024 12:02:54 +0100 Subject: [PATCH] [LL FIR] additional checkCanceled after resolution We have explicit cancellation checks between phases and inside locks, so it is worth adding the check after `checkIsResolved` --- .../low/level/api/fir/transformers/LLFirLazyResolver.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyResolver.kt index f4cbc41edd0..30f3b79d488 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyResolver.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirPhaseUpdater +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkCanceled import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.declarations.* @@ -59,6 +60,7 @@ internal abstract class LLFirLazyResolver(val resolverPhase: FirResolvePhase) { fun checkIsResolved(designation: LLFirResolveTarget) { designation.forEachTarget(::checkIsResolved) + checkCanceled() } private fun checkNestedDeclarationsAreResolved(target: FirElementWithResolveState) {