From d67dde8395b1147f57150fd8f60dd15ff4c45d1e Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 13 Mar 2024 17:13:04 +0100 Subject: [PATCH] [LL FIR] LLFirTargetResolver: rename `isJumpingPhase` into `requiresJumpingLock` to avoid conflicting terms with jumping phases from `FirResolvePhase` KDoc --- .../fir/transformers/LLFirAbstractBodyTargetResolver.kt | 4 ++-- .../transformers/LLFirCompilerAnnotationsLazyResolver.kt | 2 +- .../fir/transformers/LLFirImplicitTypesLazyResolver.kt | 2 +- .../level/api/fir/transformers/LLFirStatusLazyResolver.kt | 2 +- .../api/fir/transformers/LLFirSupertypeLazyResolver.kt | 2 +- .../low/level/api/fir/transformers/LLFirTargetResolver.kt | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAbstractBodyTargetResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAbstractBodyTargetResolver.kt index 75c2ec769c1..8712af684a4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAbstractBodyTargetResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAbstractBodyTargetResolver.kt @@ -19,8 +19,8 @@ internal sealed class LLFirAbstractBodyTargetResolver( resolveTarget: LLFirResolveTarget, resolvePhase: FirResolvePhase, protected val llImplicitBodyResolveComputationSession: LLImplicitBodyResolveComputationSession = LLImplicitBodyResolveComputationSession(), - isJumpingPhase: Boolean = false, -) : LLFirTargetResolver(resolveTarget, resolvePhase, isJumpingPhase) { + requiresJumpingLock: Boolean = false, +) : LLFirTargetResolver(resolveTarget, resolvePhase, requiresJumpingLock) { protected fun createReturnTypeCalculator(): LLFirReturnTypeCalculatorWithJump = LLFirReturnTypeCalculatorWithJump( resolveTargetScopeSession, llImplicitBodyResolveComputationSession, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt index f65ebc1478b..8aa78fad4eb 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt @@ -55,7 +55,7 @@ internal object LLFirCompilerAnnotationsLazyResolver : LLFirLazyResolver(FirReso private class LLFirCompilerRequiredAnnotationsTargetResolver( target: LLFirResolveTarget, computationSession: LLFirCompilerRequiredAnnotationsComputationSession? = null, -) : LLFirTargetResolver(target, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS, isJumpingPhase = false) { +) : LLFirTargetResolver(target, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { inner class LLFirCompilerRequiredAnnotationsComputationSession : CompilerRequiredAnnotationsComputationSession() { override fun resolveAnnotationSymbol(symbol: FirRegularClassSymbol, scopeSession: ScopeSession) { val regularClass = symbol.fir diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirImplicitTypesLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirImplicitTypesLazyResolver.kt index da551873415..d3eff23f4dc 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirImplicitTypesLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirImplicitTypesLazyResolver.kt @@ -143,7 +143,7 @@ internal class LLFirImplicitBodyTargetResolver( target, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, llImplicitBodyResolveComputationSession = llImplicitBodyResolveComputationSessionParameter ?: LLImplicitBodyResolveComputationSession(), - isJumpingPhase = true, + requiresJumpingLock = true, ) { override val transformer = object : FirImplicitAwareBodyResolveTransformer( resolveTargetSession, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt index fb6a01a39f3..9f01193995b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt @@ -97,7 +97,7 @@ private class LLFirStatusTargetResolver( target: LLFirResolveTarget, private val statusComputationSession: LLStatusComputationSession = LLStatusComputationSession(target.session), private val resolveMode: StatusResolveMode, -) : LLFirTargetResolver(target, FirResolvePhase.STATUS, isJumpingPhase = false) { +) : LLFirTargetResolver(target, FirResolvePhase.STATUS) { private val transformer = Transformer(resolveTargetSession, resolveTargetScopeSession) @Deprecated("Should never be called directly, only for override purposes, please use withRegularClass", level = DeprecationLevel.ERROR) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt index 4dd132f11cb..89b02c2bdd8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt @@ -69,7 +69,7 @@ private class LLFirSuperTypeTargetResolver( target: LLFirResolveTarget, private val supertypeComputationSession: LLFirSupertypeComputationSession = LLFirSupertypeComputationSession(target.session), private val visitedElements: MutableSet = hashSetOf(), -) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES, isJumpingPhase = false) { +) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES) { private val supertypeResolver = object : FirSupertypeResolverVisitor( session = resolveTargetSession, supertypeComputationSession = supertypeComputationSession, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt index 874a4e348c1..91a5e842388 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt @@ -77,7 +77,7 @@ import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment internal sealed class LLFirTargetResolver( protected val resolveTarget: LLFirResolveTarget, val resolverPhase: FirResolvePhase, - private val isJumpingPhase: Boolean = false, + private val requiresJumpingLock: Boolean = false, ) : LLFirResolveTargetVisitor { val resolveTargetSession: LLFirSession get() = resolveTarget.session val resolveTargetScopeSession: ScopeSession get() = resolveTargetSession.getScopeSession() @@ -286,7 +286,7 @@ internal sealed class LLFirTargetResolver( if (doResolveWithoutLock(target)) return - if (isJumpingPhase) { + if (requiresJumpingLock) { checkThatResolvedAtLeastToPreviousPhase(target) lockProvider.withJumpingLock( target, @@ -324,11 +324,11 @@ internal sealed class LLFirTargetResolver( * * Allowed only for non-jumping phases. * - * @see isJumpingPhase + * @see requiresJumpingLock */ protected inline fun performCustomResolveUnderLock(target: FirElementWithResolveState, crossinline action: () -> Unit) { checkThatResolvedAtLeastToPreviousPhase(target) - requireWithAttachment(!isJumpingPhase, { "This function cannot be called for jumping phase" }) { + requireWithAttachment(!requiresJumpingLock, { "This function cannot be called with enabled jumping lock" }) { withFirEntry("target", target) }