azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL FIR] LLFirTargetResolver: rename isJumpingPhase into requiresJumpingLock

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAbstractBodyTargetResolver.kt
+2 -2
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt
+1 -1
View File
@@ -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
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirImplicitTypesLazyResolver.kt
+1 -1
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirStatusLazyResolver.kt
+1 -1
View File
@@ -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)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt
+1 -1
View File
@@ -69,7 +69,7 @@ private class LLFirSuperTypeTargetResolver(
target: LLFirResolveTarget,
private val supertypeComputationSession: LLFirSupertypeComputationSession = LLFirSupertypeComputationSession(target.session),
private val visitedElements: MutableSet<FirElementWithResolveState> = hashSetOf(),
) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES, isJumpingPhase = false) {
) : LLFirTargetResolver(target, FirResolvePhase.SUPER_TYPES) {
private val supertypeResolver = object : FirSupertypeResolverVisitor(
session = resolveTargetSession,
supertypeComputationSession = supertypeComputationSession,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt
+4 -4
View File
@@ -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)
}