patch 8.2.3151: Vim9: profiling fails if nested function is also profiled
Problem: Vim9: profiling fails if nested function is also profiled.
Solution: Use the compile type from the outer function. (closes #8543)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 10f41c7..b4107e9 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -4190,6 +4190,14 @@
Nested()
enddef
+def ProfiledNestedProfiled()
+ var x = 0
+ def Nested(): any
+ return x
+ enddef
+ Nested()
+enddef
+
" Execute this near the end, profiling doesn't stop until Vim exists.
" This only tests that it works, not the profiling output.
def Test_xx_profile_with_lambda()
@@ -4198,8 +4206,17 @@
profile start Xprofile.log
profile func ProfiledWithLambda
ProfiledWithLambda()
+
profile func ProfiledNested
ProfiledNested()
+
+ # Also profile the nested function. Use a different function, although the
+ # contents is the same, to make sure it was not already compiled.
+ profile func *
+ ProfiledNestedProfiled()
+
+ profdel func *
+ profile pause
enddef
" Keep this last, it messes up highlighting.
diff --git a/src/version.c b/src/version.c
index 0047c7d..7f9f49e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3151,
+/**/
3150,
/**/
3149,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 15c8ef6..d25183f 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5570,6 +5570,7 @@
char_u *lambda_name;
ufunc_T *ufunc;
int r = FAIL;
+ compiletype_T compile_type;
if (eap->forceit)
{
@@ -5636,9 +5637,15 @@
}
}
- if (func_needs_compiling(ufunc, COMPILE_TYPE(ufunc))
- && compile_def_function(ufunc, TRUE, COMPILE_TYPE(ufunc), cctx)
- == FAIL)
+ compile_type = COMPILE_TYPE(ufunc);
+#ifdef FEAT_PROFILE
+ // If the outer function is profiled, also compile the nested function for
+ // profiling.
+ if (cctx->ctx_compile_type == CT_PROFILE)
+ compile_type = CT_PROFILE;
+#endif
+ if (func_needs_compiling(ufunc, compile_type)
+ && compile_def_function(ufunc, TRUE, compile_type, cctx) == FAIL)
{
func_ptr_unref(ufunc);
goto theend;
@@ -5647,8 +5654,7 @@
#ifdef FEAT_PROFILE
// When the outer function is compiled for profiling, the nested function
// may be called without profiling. Compile it here in the right context.
- if (COMPILE_TYPE(ufunc) == CT_PROFILE
- && func_needs_compiling(ufunc, CT_NONE))
+ if (compile_type == CT_PROFILE && func_needs_compiling(ufunc, CT_NONE))
compile_def_function(ufunc, FALSE, CT_NONE, cctx);
#endif