From 0dd18006e82e603de505fc662115bb52f0279680 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 10 Mar 2021 16:29:18 +0100 Subject: [PATCH] FIR: do not update phase from IMPLICIT_TYPES_BODY_RESOLVE to BODY_RESOLVE This is not needed as such declarations are now marked with body resolve phase --- .../resolve/FirDeclarationsResolveTransformer.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index ae8478107ae..f59b1d606f6 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -134,9 +134,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor return withTypeParametersOf(property) { val returnTypeRef = property.returnTypeRef if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return@withTypeParametersOf property.compose() - if (property.resolvePhase == transformerPhase) return@withTypeParametersOf property.compose() - if (property.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) { - transformer.replaceDeclarationResolvePhaseIfNeeded(property, transformerPhase) + if (property.resolvePhase == FirResolvePhase.BODY_RESOLVE || property.resolvePhase == transformerPhase) { return@withTypeParametersOf property.compose() } dataFlowAnalyzer.enterProperty(property) @@ -173,9 +171,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor override fun transformField(field: FirField, data: ResolutionMode): CompositeTransformResult { val returnTypeRef = field.returnTypeRef if (implicitTypeOnly) return field.compose() - if (field.resolvePhase == transformerPhase) return field.compose() - if (field.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) { - transformer.replaceDeclarationResolvePhaseIfNeeded(field, transformerPhase) + if (field.resolvePhase == FirResolvePhase.BODY_RESOLVE || field.resolvePhase == transformerPhase) { return field.compose() } dataFlowAnalyzer.enterField(field) @@ -517,9 +513,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor simpleFunction: FirSimpleFunction, data: ResolutionMode ): CompositeTransformResult { - if (simpleFunction.resolvePhase == transformerPhase) return simpleFunction.compose() - if (simpleFunction.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) { - transformer.replaceDeclarationResolvePhaseIfNeeded(simpleFunction, transformerPhase) + if (simpleFunction.resolvePhase == FirResolvePhase.BODY_RESOLVE || simpleFunction.resolvePhase == transformerPhase) { return simpleFunction.compose() } val returnTypeRef = simpleFunction.returnTypeRef