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

FIR: do not update phase from IMPLICIT_TYPES_BODY_RESOLVE to BODY_RESOLVE

Browse Source 
This is not needed as such declarations are now marked with body resolve phase
This commit is contained in:
Ilya Kirillov
2021-03-10 16:29:18 +01:00
parent fe207492b7
commit 0dd18006e8
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+3 -9
View File
@@ -134,9 +134,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
return withTypeParametersOf(property) { return withTypeParametersOf(property) {
val returnTypeRef = property.returnTypeRef val returnTypeRef = property.returnTypeRef
if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return@withTypeParametersOf property.compose() if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return@withTypeParametersOf property.compose()
if (property.resolvePhase == transformerPhase) return@withTypeParametersOf property.compose() if (property.resolvePhase == FirResolvePhase.BODY_RESOLVE || property.resolvePhase == transformerPhase) {
if (property.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) {
transformer.replaceDeclarationResolvePhaseIfNeeded(property, transformerPhase)
return@withTypeParametersOf property.compose() return@withTypeParametersOf property.compose()
} }
dataFlowAnalyzer.enterProperty(property) dataFlowAnalyzer.enterProperty(property)
@@ -173,9 +171,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
override fun transformField(field: FirField, data: ResolutionMode): CompositeTransformResult<FirDeclaration> { override fun transformField(field: FirField, data: ResolutionMode): CompositeTransformResult<FirDeclaration> {
val returnTypeRef = field.returnTypeRef val returnTypeRef = field.returnTypeRef
if (implicitTypeOnly) return field.compose() if (implicitTypeOnly) return field.compose()
if (field.resolvePhase == transformerPhase) return field.compose() if (field.resolvePhase == FirResolvePhase.BODY_RESOLVE || field.resolvePhase == transformerPhase) {
if (field.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) {
transformer.replaceDeclarationResolvePhaseIfNeeded(field, transformerPhase)
return field.compose() return field.compose()
} }
dataFlowAnalyzer.enterField(field) dataFlowAnalyzer.enterField(field)
@@ -517,9 +513,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
simpleFunction: FirSimpleFunction, simpleFunction: FirSimpleFunction,
data: ResolutionMode data: ResolutionMode
): CompositeTransformResult<FirSimpleFunction> { ): CompositeTransformResult<FirSimpleFunction> {
if (simpleFunction.resolvePhase == transformerPhase) return simpleFunction.compose() if (simpleFunction.resolvePhase == FirResolvePhase.BODY_RESOLVE || simpleFunction.resolvePhase == transformerPhase) {
if (simpleFunction.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) {
transformer.replaceDeclarationResolvePhaseIfNeeded(simpleFunction, transformerPhase)
return simpleFunction.compose() return simpleFunction.compose()
} }
val returnTypeRef = simpleFunction.returnTypeRef val returnTypeRef = simpleFunction.returnTypeRef