mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.3143: Vim9: wrong context if lambda called from profiled function
Problem: Vim9: A lambda may be compiled with the wrong context if it is called from a profiled function. Solution: Compile the lambda with and without profiling. (closes #8543)
This commit is contained in:
parent
1aeddeb8bd
commit
d9162550aa
@ -4167,6 +4167,19 @@ def Test_option_modifier()
|
||||
set hlsearch&
|
||||
enddef
|
||||
|
||||
def ProfiledFunc()
|
||||
var n = 3
|
||||
echo [[1, 2], [3, 4]]->filter((_, l) => l[0] == n)
|
||||
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()
|
||||
profile start Xprofile.log
|
||||
profile func ProfiledFunc
|
||||
ProfiledFunc()
|
||||
enddef
|
||||
|
||||
" Keep this last, it messes up highlighting.
|
||||
def Test_substitute_cmd()
|
||||
new
|
||||
|
@ -755,6 +755,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3143,
|
||||
/**/
|
||||
3142,
|
||||
/**/
|
||||
|
@ -3624,6 +3624,11 @@ compile_lambda(char_u **arg, cctx_T *cctx)
|
||||
ufunc->uf_ret_type = &t_unknown;
|
||||
compile_def_function(ufunc, FALSE, cctx->ctx_compile_type, cctx);
|
||||
|
||||
// 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);
|
||||
|
||||
// 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.
|
||||
if (evalarg.eval_tofree_cmdline != NULL)
|
||||
|
Loading…
x
Reference in New Issue
Block a user