From 8df635a4e0e0b03abaab5bb218c7e4487f8edacf Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 19 May 2020 11:58:36 +0300
Subject: [PATCH] [FIR] Add cleanup of tower data for imports

---
 .../body/resolve/FirBodyResolveTransformer.kt      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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<FirFile>
+                file.replaceResolvePhase(transformerPhase)
+                @Suppress("UNCHECKED_CAST")
+                transformDeclarationContent(file, data) as CompositeTransformResult<FirFile>
+            }
         }
     }