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)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index b21b63cbe0e7fbfedbc186da83ae0d099c795e7a..eb4c5d120c649faabb6f7c9522353f4145a55228 100644 (file)
--- 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 729d0e4a51b8ef288c47d6ab156c6b5bbd43321e..76dbacda3ae86e05f58f1ff909a75e0843e7986d 100644 (file)
--- 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 c27a1cc34afb58f9e309cf8a02a1401cb05a99f6..9aa11f6210af10edb186f7987045e968b761783f 100644 (file)
--- 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)