[LL FIR] LLFirTargetResolver: rename isJumpingPhase into requiresJumpingLock

to avoid conflicting terms with jumping phases from `FirResolvePhase` KDoc
This commit is contained in:
Dmitrii Gridin
2024-03-13 17:13:04 +01:00
committed by Space Team
parent c7765258d1
commit d67dde8395
6 changed files with 10 additions and 10 deletions
@@ -19,8 +19,8 @@ internal sealed class LLFirAbstractBodyTargetResolver(
resolveTarget: LLFirResolveTarget, resolveTarget: LLFirResolveTarget,
resolvePhase: FirResolvePhase, resolvePhase: FirResolvePhase,
protected val llImplicitBodyResolveComputationSession: LLImplicitBodyResolveComputationSession = LLImplicitBodyResolveComputationSession(), protected val llImplicitBodyResolveComputationSession: LLImplicitBodyResolveComputationSession = LLImplicitBodyResolveComputationSession(),
isJumpingPhase: Boolean = false, requiresJumpingLock: Boolean = false,
) : LLFirTargetResolver(resolveTarget, resolvePhase, isJumpingPhase) { ) : LLFirTargetResolver(resolveTarget, resolvePhase, requiresJumpingLock) {
protected fun createReturnTypeCalculator(): LLFirReturnTypeCalculatorWithJump = LLFirReturnTypeCalculatorWithJump( protected fun createReturnTypeCalculator(): LLFirReturnTypeCalculatorWithJump = LLFirReturnTypeCalculatorWithJump(
resolveTargetScopeSession, resolveTargetScopeSession,
llImplicitBodyResolveComputationSession, llImplicitBodyResolveComputationSession,
@@ -55,7 +55,7 @@ internal object LLFirCompilerAnnotationsLazyResolver : LLFirLazyResolver(FirReso
private class LLFirCompilerRequiredAnnotationsTargetResolver( private class LLFirCompilerRequiredAnnotationsTargetResolver(
target: LLFirResolveTarget, target: LLFirResolveTarget,
computationSession: LLFirCompilerRequiredAnnotationsComputationSession? = null, computationSession: LLFirCompilerRequiredAnnotationsComputationSession? = null,
) : LLFirTargetResolver(target, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS, isJumpingPhase = false) { ) : LLFirTargetResolver(target, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) {
inner class LLFirCompilerRequiredAnnotationsComputationSession : CompilerRequiredAnnotationsComputationSession() { inner class LLFirCompilerRequiredAnnotationsComputationSession : CompilerRequiredAnnotationsComputationSession() {
override fun resolveAnnotationSymbol(symbol: FirRegularClassSymbol, scopeSession: ScopeSession) { override fun resolveAnnotationSymbol(symbol: FirRegularClassSymbol, scopeSession: ScopeSession) {
val regularClass = symbol.fir val regularClass = symbol.fir
@@ -143,7 +143,7 @@ internal class LLFirImplicitBodyTargetResolver(
target, target,
FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE,
llImplicitBodyResolveComputationSession = llImplicitBodyResolveComputationSessionParameter ?: LLImplicitBodyResolveComputationSession(), llImplicitBodyResolveComputationSession = llImplicitBodyResolveComputationSessionParameter ?: LLImplicitBodyResolveComputationSession(),
isJumpingPhase = true, requiresJumpingLock = true,
) { ) {
override val transformer = object : FirImplicitAwareBodyResolveTransformer( override val transformer = object : FirImplicitAwareBodyResolveTransformer(
resolveTargetSession, resolveTargetSession,
@@ -97,7 +97,7 @@ private class LLFirStatusTargetResolver(
target: LLFirResolveTarget, target: LLFirResolveTarget,
private val statusComputationSession: LLStatusComputationSession = LLStatusComputationSession(target.session), private val statusComputationSession: LLStatusComputationSession = LLStatusComputationSession(target.session),
private val resolveMode: StatusResolveMode, private val resolveMode: StatusResolveMode,
) : LLFirTargetResolver(target, FirResolvePhase.STATUS, isJumpingPhase = false) { ) : LLFirTargetResolver(target, FirResolvePhase.STATUS) {
private val transformer = Transformer(resolveTargetSession, resolveTargetScopeSession) private val transformer = Transformer(resolveTargetSession, resolveTargetScopeSession)
@Deprecated("Should never be called directly, only for override purposes, please use withRegularClass", level = DeprecationLevel.ERROR) @Deprecated("Should never be called directly, only for override purposes, please use withRegularClass", level = DeprecationLevel.ERROR)
@@ -69,7 +69,7 @@ private class LLFirSuperTypeTargetResolver(
target: LLFirResolveTarget, target: LLFirResolveTarget,
private val supertypeComputationSession: LLFirSupertypeComputationSession = LLFirSupertypeComputationSession(target.session), private val supertypeComputationSession: LLFirSupertypeComputationSession = LLFirSupertypeComputationSession(target.session),
private val visitedElements: MutableSet<FirElementWithResolveState> = hashSetOf(), private val visitedElements: MutableSet<FirElementWithResolveState> = hashSetOf(),
) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES, isJumpingPhase = false) { ) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES) {
private val supertypeResolver = object : FirSupertypeResolverVisitor( private val supertypeResolver = object : FirSupertypeResolverVisitor(
session = resolveTargetSession, session = resolveTargetSession,
supertypeComputationSession = supertypeComputationSession, supertypeComputationSession = supertypeComputationSession,
@@ -77,7 +77,7 @@ import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment
internal sealed class LLFirTargetResolver( internal sealed class LLFirTargetResolver(
protected val resolveTarget: LLFirResolveTarget, protected val resolveTarget: LLFirResolveTarget,
val resolverPhase: FirResolvePhase, val resolverPhase: FirResolvePhase,
private val isJumpingPhase: Boolean = false, private val requiresJumpingLock: Boolean = false,
) : LLFirResolveTargetVisitor { ) : LLFirResolveTargetVisitor {
val resolveTargetSession: LLFirSession get() = resolveTarget.session val resolveTargetSession: LLFirSession get() = resolveTarget.session
val resolveTargetScopeSession: ScopeSession get() = resolveTargetSession.getScopeSession() val resolveTargetScopeSession: ScopeSession get() = resolveTargetSession.getScopeSession()
@@ -286,7 +286,7 @@ internal sealed class LLFirTargetResolver(
if (doResolveWithoutLock(target)) return if (doResolveWithoutLock(target)) return
if (isJumpingPhase) { if (requiresJumpingLock) {
checkThatResolvedAtLeastToPreviousPhase(target) checkThatResolvedAtLeastToPreviousPhase(target)
lockProvider.withJumpingLock( lockProvider.withJumpingLock(
target, target,
@@ -324,11 +324,11 @@ internal sealed class LLFirTargetResolver(
* *
* Allowed only for non-jumping phases. * Allowed only for non-jumping phases.
* *
* @see isJumpingPhase * @see requiresJumpingLock
*/ */
protected inline fun performCustomResolveUnderLock(target: FirElementWithResolveState, crossinline action: () -> Unit) { protected inline fun performCustomResolveUnderLock(target: FirElementWithResolveState, crossinline action: () -> Unit) {
checkThatResolvedAtLeastToPreviousPhase(target) 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) withFirEntry("target", target)
} }