diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt index 13616a7cc96..86f475b4400 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt @@ -50,13 +50,15 @@ open class FirBodyResolveTransformer( context.file = file packageFqName = file.packageFqName return withScopeCleanup(context.fileImportsScope) { - val importingScopes = createImportingScopes(file, session, components.scopeSession) - context.fileImportsScope += importingScopes - context.addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) + context.withTowerDataCleanup { + val importingScopes = createImportingScopes(file, session, components.scopeSession) + context.fileImportsScope += importingScopes + context.addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) - file.replaceResolvePhase(transformerPhase) - @Suppress("UNCHECKED_CAST") - transformDeclarationContent(file, data) as CompositeTransformResult + file.replaceResolvePhase(transformerPhase) + @Suppress("UNCHECKED_CAST") + transformDeclarationContent(file, data) as CompositeTransformResult + } } }