From f0130d046025fcd997beeffc78199eb22ff061e6 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 8 Nov 2019 10:55:40 +0300 Subject: [PATCH] FIR (minor): remove unnecessary withScopeCleanup call --- .../resolve/FirDeclarationsResolveTransformer.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 b9ea678c983..322d717eede 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 @@ -65,14 +65,12 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) } private fun prepareSignatureForBodyResolve(callableMember: FirCallableMemberDeclaration<*>) { - withScopeCleanup(topLevelScopes) { - callableMember.transformReturnTypeRef(transformer, ResolutionMode.ContextIndependent) - callableMember.transformReceiverTypeRef(transformer, ResolutionMode.ContextIndependent) - if (callableMember is FirFunction<*>) { - callableMember.valueParameters.forEach { - it.transformReturnTypeRef(transformer, ResolutionMode.ContextIndependent) - it.transformVarargTypeToArrayType() - } + callableMember.transformReturnTypeRef(transformer, ResolutionMode.ContextIndependent) + callableMember.transformReceiverTypeRef(transformer, ResolutionMode.ContextIndependent) + if (callableMember is FirFunction<*>) { + callableMember.valueParameters.forEach { + it.transformReturnTypeRef(transformer, ResolutionMode.ContextIndependent) + it.transformVarargTypeToArrayType() } } }