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.2614: Vim9: function is deleted while executing

Browse Source 
Problem:    Vim9: function is deleted while executing.
Solution:   increment the call count, when more than zero do not delete the
            function but mark it as dead. (closes #7977)
This commit is contained in:
Bram Moolenaar
2021-03-17 15:03:04 +01:00
parent 6ccfd99b92
commit c970e4225b
4 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vim9execute.c
View File

@@ -323,6 +323,8 @@ call_dfunc(int cdf_idx, partial_T *pt, int argcount_arg, ectx_T *ectx)
else
ectx->ec_outer = NULL;
++ufunc->uf_calls;
// Set execution state to the start of the called function.
ectx->ec_dfunc_idx = cdf_idx;
ectx->ec_instr = INSTRUCTIONS(dfunc);
@@ -556,6 +558,9 @@ func_return(ectx_T *ectx)
}
}
#endif
// TODO: when is it safe to delete the function when it is no longer used?
--dfunc->df_ufunc->uf_calls;
// execution context goes one level up
entry = estack_pop();
if (entry != NULL)
@@ -1334,7 +1339,7 @@ call_def_function(
++ectx.ec_stack.ga_len;
}
if (ufunc->uf_va_name != NULL)
++ectx.ec_stack.ga_len;
++ectx.ec_stack.ga_len;
// Frame pointer points to just after arguments.
ectx.ec_frame_idx = ectx.ec_stack.ga_len;
@@ -1407,6 +1412,9 @@ call_def_function(
// Do turn errors into exceptions.
suppress_errthrow = FALSE;
// Do not delete the function while executing it.
++ufunc->uf_calls;
// When ":silent!" was used before calling then we still abort the
// function. If ":silent!" is used in the function then we don't.
emsg_silent_def = emsg_silent;
@@ -3838,6 +3846,9 @@ failed:
estack_pop();
current_sctx = save_current_sctx;
// TODO: when is it safe to delete the function if it is no longer used?
--ufunc->uf_calls;
if (*msg_list != NULL && saved_msg_list != NULL)
{
msglist_T **plist = saved_msg_list;