patch 8.2.2223: Vim9: Reloading marks a :def function as deleted
Problem: Vim9: Reloading marks a :def function as deleted.
Solution: Clear the function contents but keep the index.
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index cdd83c3..c88420d 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1174,10 +1174,7 @@
var s:notReloaded = 'yes'
s:reloaded = 'first'
def g:Values(): list<string>
- return [s:reloaded, s:notReloaded, Once()]
- enddef
- def g:CallAgain(): string
- return Again()
+ return [s:reloaded, s:notReloaded, Again(), Once()]
enddef
def Once(): string
@@ -1188,20 +1185,16 @@
g:loadCount = 0
source XReloaded
assert_equal(1, g:loadCount)
- assert_equal(['first', 'yes', 'once'], g:Values())
- assert_equal('again', g:CallAgain())
+ assert_equal(['first', 'yes', 'again', 'once'], g:Values())
source XReloaded
assert_equal(2, g:loadCount)
- assert_equal(['init', 'yes', 'once'], g:Values())
- assert_fails('call g:CallAgain()', 'E933:')
+ assert_equal(['init', 'yes', 'again', 'once'], g:Values())
source XReloaded
assert_equal(3, g:loadCount)
- assert_equal(['init', 'yes', 'once'], g:Values())
- assert_fails('call g:CallAgain()', 'E933:')
+ assert_equal(['init', 'yes', 'again', 'once'], g:Values())
delete('Xreloaded')
delfunc g:Values
- delfunc g:CallAgain
unlet g:loadCount
enddef
diff --git a/src/userfunc.c b/src/userfunc.c
index cc41eed..e496bce 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3628,7 +3628,7 @@
fp->uf_profiling = FALSE;
fp->uf_prof_initialized = FALSE;
#endif
- unlink_def_function(fp);
+ fp->uf_def_status = UF_NOT_COMPILED;
}
}
}
@@ -3694,8 +3694,6 @@
fp = alloc_clear(offsetof(ufunc_T, uf_name) + STRLEN(name) + 1);
if (fp == NULL)
goto erret;
- fp->uf_def_status = eap->cmdidx == CMD_def ? UF_TO_BE_COMPILED
- : UF_NOT_COMPILED;
if (fudi.fd_dict != NULL)
{
diff --git a/src/version.c b/src/version.c
index f488d77..00e5596 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2223,
+/**/
2222,
/**/
2221,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index e515f2b..9d526ab 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -145,7 +145,7 @@
int ctx_has_cmdmod; // ISN_CMDMOD was generated
};
-static void delete_def_function_contents(dfunc_T *dfunc);
+static void delete_def_function_contents(dfunc_T *dfunc, int mark_deleted);
/*
* Lookup variable "name" in the local scope and return it in "lvar".
@@ -7498,12 +7498,12 @@
int new_def_function = FALSE;
// When using a function that was compiled before: Free old instructions.
- // Otherwise add a new entry in "def_functions".
+ // The index is reused. Otherwise add a new entry in "def_functions".
if (ufunc->uf_dfunc_idx > 0)
{
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
+ ufunc->uf_dfunc_idx;
- delete_def_function_contents(dfunc);
+ delete_def_function_contents(dfunc, FALSE);
}
else
{
@@ -8344,7 +8344,7 @@
* Free all instructions for "dfunc" except df_name.
*/
static void
-delete_def_function_contents(dfunc_T *dfunc)
+delete_def_function_contents(dfunc_T *dfunc, int mark_deleted)
{
int idx;
@@ -8355,9 +8355,13 @@
for (idx = 0; idx < dfunc->df_instr_count; ++idx)
delete_instr(dfunc->df_instr + idx);
VIM_CLEAR(dfunc->df_instr);
+ dfunc->df_instr = NULL;
}
- dfunc->df_deleted = TRUE;
+ if (mark_deleted)
+ dfunc->df_deleted = TRUE;
+ if (dfunc->df_ufunc != NULL)
+ dfunc->df_ufunc->uf_def_status = UF_NOT_COMPILED;
}
/*
@@ -8374,7 +8378,7 @@
+ ufunc->uf_dfunc_idx;
if (--dfunc->df_refcount <= 0)
- delete_def_function_contents(dfunc);
+ delete_def_function_contents(dfunc, TRUE);
ufunc->uf_def_status = UF_NOT_COMPILED;
ufunc->uf_dfunc_idx = 0;
if (dfunc->df_ufunc == ufunc)
@@ -8410,7 +8414,7 @@
{
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + idx;
- delete_def_function_contents(dfunc);
+ delete_def_function_contents(dfunc, TRUE);
vim_free(dfunc->df_name);
}