diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt index 043bef90199..c669b16109d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt @@ -88,7 +88,7 @@ class FirTowerDataContext private constructor( ) } - fun addTowerDataElements(newElements: List): FirTowerDataContext { + fun addNonLocalTowerDataElements(newElements: List): FirTowerDataContext { return FirTowerDataContext( towerDataElements.addAll(newElements), implicitReceiverStack.addAll(newElements.mapNotNull { it.implicitReceiver }), diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt index 750a2361788..c436125549d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt @@ -178,12 +178,12 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb towerDataContext = newContext } - fun addTowerDataElement(element: FirTowerDataElement) { - replaceTowerDataContext(towerDataContext.addTowerDataElements(listOf(element))) + fun addNonLocalTowerDataElement(element: FirTowerDataElement) { + replaceTowerDataContext(towerDataContext.addNonLocalTowerDataElements(listOf(element))) } - fun addTowerDataElements(newElements: List) { - replaceTowerDataContext(towerDataContext.addTowerDataElements(newElements)) + fun addNonLocalTowerDataElements(newElements: List) { + replaceTowerDataContext(towerDataContext.addNonLocalTowerDataElements(newElements)) } fun addLocalScope(localScope: FirLocalScope) { 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 52c11d01ab7..968009df9cc 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 @@ -51,7 +51,7 @@ open class FirBodyResolveTransformer( return withScopeCleanup(context.fileImportsScope) { val importingScopes = createImportingScopes(file, session, components.scopeSession) context.fileImportsScope += importingScopes - context.addTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) + context.addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) file.replaceResolvePhase(transformerPhase) @Suppress("UNCHECKED_CAST") 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 64203b5c57d..20bffcaa9bf 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 @@ -83,7 +83,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor val scope = createTypeParameterScope(declaration) ?: return l() return context.withTowerDataCleanup { - context.addTowerDataElement(scope.asTowerDataElement(isLocal = false)) + context.addNonLocalTowerDataElement(scope.asTowerDataElement(isLocal = false)) l() } } @@ -691,7 +691,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor val staticsAndCompanion = context.towerDataContext - .addTowerDataElements(towerElementsForClass.superClassesStaticsAndCompanionReceivers) + .addNonLocalTowerDataElements(towerElementsForClass.superClassesStaticsAndCompanionReceivers) .run { if (towerElementsForClass.companionReceiver != null) addReceiver(null, towerElementsForClass.companionReceiver)