From 5268802d5d4eac943762d282758173b31ac65b71 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 8 May 2020 10:46:33 +0300 Subject: [PATCH] FIR: Minor. Move "storeFunction" call to transformSimpleFunction It's only neede there and also scope structure will be cleaned up after transformFunctionWithGivenSignature in the following commits --- .../body/resolve/FirDeclarationsResolveTransformer.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 db16f293928..bb5aac50641 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 @@ -439,6 +439,10 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor return simpleFunction.compose() } + if (context.containerIfAny !is FirClass<*>) { + context.storeFunction(simpleFunction) + } + return withTypeParametersOf(simpleFunction) { val containingDeclaration = context.containerIfAny if (containingDeclaration != null && containingDeclaration !is FirClass<*>) { @@ -464,9 +468,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor function: F, resolutionMode: ResolutionMode, ): CompositeTransformResult { - if (function is FirSimpleFunction && context.containerIfAny !is FirClass<*>) { - context.storeFunction(function) - } @Suppress("UNCHECKED_CAST") val result = transformFunction(function, resolutionMode).single as F