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

FIR: Add workaround for recursive contracts in ensureResolvedForCalls

Browse Source
This commit is contained in:
Denis Zharkov
2020-08-28 12:39:22 +03:00
parent 0a1440d80c
commit d532529c30
1 changed files with 10 additions and 2 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
+10 -2
View File
@@ -36,12 +36,20 @@ fun AbstractFirBasedSymbol<*>.ensureResolved(
fun AbstractFirBasedSymbol<*>.ensureResolvedForCalls( fun AbstractFirBasedSymbol<*>.ensureResolvedForCalls(
useSiteSession: FirSession, useSiteSession: FirSession,
) { ) {
if ((fir as FirDeclaration).resolvePhase >= FirResolvePhase.CONTRACTS) return val fir = fir as FirDeclaration
val requiredPhase = when (this.fir) { if (fir.resolvePhase >= FirResolvePhase.CONTRACTS) return
val requiredPhase = when (fir) {
is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS is FirFunction<*>, is FirProperty -> FirResolvePhase.CONTRACTS
else -> FirResolvePhase.STATUS 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
}
ensureResolved(requiredPhase, useSiteSession) ensureResolved(requiredPhase, useSiteSession)
} }