Mercurial > vim
diff src/vim9compile.c @ 25230:658dfd6be868 v8.2.3151
patch 8.2.3151: Vim9: profiling fails if nested function is also profiled
Commit: https://github.com/vim/vim/commit/ffcfddc759e583471a1ed55e0938d042bf68c507
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 11 20:22:30 2021 +0200
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 https://github.com/vim/vim/issues/8543)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 11 Jul 2021 20:30:04 +0200 |
| parents | 10a5eb15a3bf |
| children | 205a0126ac2d |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5570,6 +5570,7 @@ compile_nested_function(exarg_T *eap, cc char_u *lambda_name; ufunc_T *ufunc; int r = FAIL; + compiletype_T compile_type; if (eap->forceit) { @@ -5636,9 +5637,15 @@ compile_nested_function(exarg_T *eap, cc } } - 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 @@ compile_nested_function(exarg_T *eap, cc #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