FIR: Temporary weaken required phase in ensureResolvedForCalls

Currently, lazy resolution in IDE immediately starts common body resolution
after STATUS (that lead to loops during recursive resolve)
This commit is contained in:
Denis Zharkov
2020-09-01 12:28:25 +03:00
parent b0a7960b42
commit 02b72e16ef
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.fir.resolve.transformers
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirFunction
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.toSymbol
@@ -37,18 +35,21 @@ fun AbstractFirBasedSymbol<*>.ensureResolvedForCalls(
useSiteSession: FirSession, useSiteSession: FirSession,
) { ) {
val fir = fir as FirDeclaration val fir = fir as FirDeclaration
if (fir.resolvePhase >= FirResolvePhase.CONTRACTS) return if (fir.resolvePhase >= FirResolvePhase.DECLARATIONS) return
val requiredPhase = when (fir) {
is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS
else -> FirResolvePhase.STATUS
}
if (requiredPhase == FirResolvePhase.CONTRACTS) { // val requiredPhase = when (fir) {
// Workaround for recursive contracts in CLI // is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS
// Otherwise the assertion about presence of fir.session.phaseManager would fail // else -> FirResolvePhase.STATUS
// See org.jetbrains.kotlin.fir.FirOldFrontendDiagnosticsTestWithStdlibGenerated.Contracts.Dsl.Errors.testRecursiveContract // }
if (fir.session.phaseManager == null) return //
} // if (requiredPhase == FirResolvePhase.CONTRACTS) {
// // Workaround for recursive contracts in CLI
// // Otherwise the assertion about presence of fir.session.phaseManager would fail
// // See org.jetbrains.kotlin.fir.FirOldFrontendDiagnosticsTestWithStdlibGenerated.Contracts.Dsl.Errors.testRecursiveContract
// if (fir.session.phaseManager == null) return
// }
val requiredPhase = FirResolvePhase.DECLARATIONS
ensureResolved(requiredPhase, useSiteSession) ensureResolved(requiredPhase, useSiteSession)
} }