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

FIR: mark declarations resolved to BODY_RESOLVE with BODY_RESOLVE phase in implicit body transformer

Browse Source
This commit is contained in:
Ilya Kirillov
2021-03-10 18:11:21 +01:00
parent ded234074d
commit fe207492b7
2 changed files with 7 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/FirAbstractPhaseTransformer.kt
+4 -2
View File
@@ -14,13 +14,15 @@ import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult
import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer
abstract class FirAbstractPhaseTransformer<D>( abstract class FirAbstractPhaseTransformer<D>(
val transformerPhase: FirResolvePhase protected val baseTransformerPhase: FirResolvePhase
) : FirDefaultTransformer<D>() { ) : FirDefaultTransformer<D>() {
open val transformerPhase get() = baseTransformerPhase
abstract val session: FirSession abstract val session: FirSession
init { init {
assert(transformerPhase != FirResolvePhase.RAW_FIR) { assert(baseTransformerPhase != FirResolvePhase.RAW_FIR) {
"Raw FIR building shouldn't be done in phase transformer" "Raw FIR building shouldn't be done in phase transformer"
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
+3
View File
@@ -38,6 +38,9 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb
abstract var implicitTypeOnly: Boolean abstract var implicitTypeOnly: Boolean
internal set internal set
override val transformerPhase: FirResolvePhase
get() = if (implicitTypeOnly) baseTransformerPhase else FirResolvePhase.BODY_RESOLVE
final override val session: FirSession get() = components.session final override val session: FirSession get() = components.session
protected inline fun <T> withLocalScopeCleanup(crossinline l: () -> T): T { protected inline fun <T> withLocalScopeCleanup(crossinline l: () -> T): T {