aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.3147: Vim9: profiling does not work with a nested function

Browse Source 
Problem:    Vim9: profiling does not work with a nested function.
Solution:   Also compile a nested function without profiling. (closes #8543)
            Handle that compiling may cause the table of compiled functions to
            change.
This commit is contained in:
Bram Moolenaar
2021-07-11 17:55:01 +02:00
parent c03fe66ade
commit 648594eaf7
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vim9compile.c
View File

@@ -3624,10 +3624,12 @@ compile_lambda(char_u **arg, cctx_T *cctx)
ufunc->uf_ret_type = &t_unknown;
compile_def_function(ufunc, FALSE, cctx->ctx_compile_type, cctx);
#ifdef FEAT_PROFILE
// When the outer function is compiled for profiling, the lambda may be
// called without profiling. Compile it here in the right context.
if (cctx->ctx_compile_type == CT_PROFILE)
compile_def_function(ufunc, FALSE, CT_NONE, cctx);
#endif
// evalarg.eval_tofree_cmdline may have a copy of the last line and "*arg"
// points into it. Point to the original line to avoid a dangling pointer.
@@ -5631,6 +5633,14 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx)
goto theend;
}
#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))
compile_def_function(ufunc, FALSE, CT_NONE, cctx);
#endif
if (is_global)
{
char_u *func_name = vim_strnsave(name_start + 2,