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

FIR: Temporary weaken required phase in ensureResolvedForCalls

Browse Source 
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
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
+14 -13
View File
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.fir.resolve.transformers
import org.jetbrains.kotlin.fir.FirSession
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.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.resolve.toSymbol
@@ -37,18 +35,21 @@ fun AbstractFirBasedSymbol<*>.ensureResolvedForCalls(
useSiteSession: FirSession,
) {
val fir = fir as FirDeclaration
if (fir.resolvePhase >= FirResolvePhase.CONTRACTS) return
val requiredPhase = when (fir) {
is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS
else -> FirResolvePhase.STATUS
}
if (fir.resolvePhase >= FirResolvePhase.DECLARATIONS) 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 = when (fir) {
// is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS
// else -> FirResolvePhase.STATUS
// }
//
// 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)
}