From 668a2a58be067e45df67ee3cff25e7a8ef7fc7e2 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 29 Oct 2019 11:59:36 +0300 Subject: [PATCH] FIR: switch off body visiting in status & type resolve transformers (breaks many tests) --- .../fir/resolve/transformers/FirStatusResolveTransformer.kt | 5 +++++ .../fir/resolve/transformers/FirTypeResolveTransformer.kt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt index 4270192f83a..99719dbdba9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolveTransformer.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl +import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult import org.jetbrains.kotlin.fir.visitors.compose @@ -160,4 +161,8 @@ class FirStatusResolveTransformer : FirAbstractTreeTransformer(phase = FirResolv override fun transformValueParameter(valueParameter: FirValueParameter, data: Nothing?): CompositeTransformResult { return (transformDeclaration(valueParameter, data).single as FirStatement).compose() } + + override fun transformBlock(block: FirBlock, data: Nothing?): CompositeTransformResult { + return block.compose() + } } \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 41f916fd2a8..f8a51b4c257 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.scopes.addImportingScopes @@ -95,4 +96,7 @@ open class FirTypeResolveTransformer : FirAbstractTreeTransformerWithSuperTypes( return result.compose() } + override fun transformBlock(block: FirBlock, data: Nothing?): CompositeTransformResult { + return block.compose() + } }