From d9162550aa47ca3865a5cadf78ff2212a1d8eca7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 11 Jul 2021 15:26:13 +0200 Subject: 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) --- src/testdir/test_vim9_script.vim | 13 +++++++++++++ src/version.c | 2 ++ src/vim9compile.c | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index b21b63cbe0..eb4c5d120c 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -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 diff --git a/src/version.c b/src/version.c index 729d0e4a51..76dbacda3a 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3143, /**/ 3142, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index c27a1cc34a..9aa11f6210 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -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) -- cgit v1.2.3