[LL FIR] LLFirLazyResolver: inline updatePhaseForDeclarationInternals
This is the responsibility of `LLFirTargetResolver` to call it
This commit is contained in:
committed by
Space Team
parent
141b187e37
commit
ca740b70f3
-9
@@ -6,7 +6,6 @@
|
|||||||
package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers
|
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.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.checkCanceled
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase
|
||||||
import org.jetbrains.kotlin.fir.FirElementWithResolveState
|
import org.jetbrains.kotlin.fir.FirElementWithResolveState
|
||||||
@@ -53,14 +52,6 @@ internal sealed class LLFirLazyResolver(val resolverPhase: FirResolvePhase) {
|
|||||||
*/
|
*/
|
||||||
protected abstract fun phaseSpecificCheckIsResolved(target: FirElementWithResolveState)
|
protected abstract fun phaseSpecificCheckIsResolved(target: FirElementWithResolveState)
|
||||||
|
|
||||||
fun updatePhaseForDeclarationInternals(target: FirElementWithResolveState) {
|
|
||||||
LLFirPhaseUpdater.updateDeclarationInternalsPhase(
|
|
||||||
target = target,
|
|
||||||
newPhase = resolverPhase,
|
|
||||||
updateForLocalDeclarations = resolverPhase == FirResolvePhase.BODY_RESOLVE,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun checkNestedDeclarationsAreResolved(target: FirElementWithResolveState) {
|
private fun checkNestedDeclarationsAreResolved(target: FirElementWithResolveState) {
|
||||||
if (target !is FirDeclaration) return
|
if (target !is FirDeclaration) return
|
||||||
|
|
||||||
|
|||||||
+6
-1
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirGlobalResolveCompone
|
|||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.*
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.*
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDesignationEntry
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDesignationEntry
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
|
||||||
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirPhaseUpdater
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase
|
||||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.errorWithFirSpecificEntries
|
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.errorWithFirSpecificEntries
|
||||||
@@ -335,7 +336,11 @@ internal sealed class LLFirTargetResolver(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updatePhaseForDeclarationInternals(target: FirElementWithResolveState) {
|
private fun updatePhaseForDeclarationInternals(target: FirElementWithResolveState) {
|
||||||
LLFirLazyPhaseResolverByPhase.getByPhase(resolverPhase).updatePhaseForDeclarationInternals(target)
|
LLFirPhaseUpdater.updateDeclarationInternalsPhase(
|
||||||
|
target = target,
|
||||||
|
newPhase = resolverPhase,
|
||||||
|
updateForLocalDeclarations = resolverPhase == FirResolvePhase.BODY_RESOLVE,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user