aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3089: garbage collection has useless code

Browse Source 
Problem:    Garbage collection has useless code.
Solution:   Bail out when aborting. (closes #8504)
This commit is contained in:
Bram Moolenaar 2021-07-03 16:33:16 +02:00
parent 9cee4a1c9c
commit 20cc528320
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/userfunc.c
View File

@ -5478,35 +5478,32 @@ find_var_in_scoped_ht(char_u *name, int no_autoload)
int int
set_ref_in_previous_funccal(int copyID) set_ref_in_previous_funccal(int copyID)
{ {
int abort = FALSE;
funccall_T *fc; funccall_T *fc;
for (fc = previous_funccal; !abort && fc != NULL; fc = fc->caller) for (fc = previous_funccal; fc != NULL; fc = fc->caller)
{ {
fc->fc_copyID = copyID + 1; fc->fc_copyID = copyID + 1;
abort = abort if (set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1, NULL)
|| set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1, NULL) || set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1, NULL)
|| set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1, NULL) || set_ref_in_list_items(&fc->l_varlist, copyID + 1, NULL))
|| set_ref_in_list_items(&fc->l_varlist, copyID + 1, NULL); return TRUE;
} }
return abort; return FALSE;
} }
static int static int
set_ref_in_funccal(funccall_T *fc, int copyID) set_ref_in_funccal(funccall_T *fc, int copyID)
{ {
int abort = FALSE;
if (fc->fc_copyID != copyID) if (fc->fc_copyID != copyID)
{ {
fc->fc_copyID = copyID; fc->fc_copyID = copyID;
abort = abort if (set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID, NULL)
|| set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID, NULL) || set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID, NULL)
|| set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID, NULL) || set_ref_in_list_items(&fc->l_varlist, copyID, NULL)
|| set_ref_in_list_items(&fc->l_varlist, copyID, NULL) || set_ref_in_func(NULL, fc->func, copyID))
|| set_ref_in_func(NULL, fc->func, copyID); return TRUE;
} }
return abort; return FALSE;
} }
/* /*
@ -5515,19 +5512,19 @@ set_ref_in_funccal(funccall_T *fc, int copyID)
int int
set_ref_in_call_stack(int copyID) set_ref_in_call_stack(int copyID)
{ {
int abort = FALSE;
funccall_T *fc; funccall_T *fc;
funccal_entry_T *entry; funccal_entry_T *entry;
for (fc = current_funccal; !abort && fc != NULL; fc = fc->caller) for (fc = current_funccal; fc != NULL; fc = fc->caller)
abort = abort || set_ref_in_funccal(fc, copyID); if (set_ref_in_funccal(fc, copyID))
return TRUE;
// Also go through the funccal_stack. // Also go through the funccal_stack.
for (entry = funccal_stack; !abort && entry != NULL; entry = entry->next) for (entry = funccal_stack; entry != NULL; entry = entry->next)
for (fc = entry->top_funccal; !abort && fc != NULL; fc = fc->caller) for (fc = entry->top_funccal; fc != NULL; fc = fc->caller)
abort = abort || set_ref_in_funccal(fc, copyID); if (set_ref_in_funccal(fc, copyID))
return TRUE;
return abort; return FALSE;
} }
/* /*
@ -5538,7 +5535,6 @@ set_ref_in_functions(int copyID)
{ {
int todo; int todo;
hashitem_T *hi = NULL; hashitem_T *hi = NULL;
int abort = FALSE;
ufunc_T *fp; ufunc_T *fp;
todo = (int)func_hashtab.ht_used; todo = (int)func_hashtab.ht_used;
@ -5548,11 +5544,12 @@ set_ref_in_functions(int copyID)
{ {
--todo; --todo;
fp = HI2UF(hi); fp = HI2UF(hi);
if (!func_name_refcount(fp->uf_name)) if (!func_name_refcount(fp->uf_name)
abort = abort || set_ref_in_func(NULL, fp, copyID); && set_ref_in_func(NULL, fp, copyID))
return TRUE;
} }
} }
return abort; return FALSE;
} }
/* /*
@ -5562,12 +5559,12 @@ set_ref_in_functions(int copyID)
set_ref_in_func_args(int copyID) set_ref_in_func_args(int copyID)
{ {
int i; int i;
int abort = FALSE;
for (i = 0; i < funcargs.ga_len; ++i) for (i = 0; i < funcargs.ga_len; ++i)
abort = abort || set_ref_in_item(((typval_T **)funcargs.ga_data)[i], if (set_ref_in_item(((typval_T **)funcargs.ga_data)[i],
copyID, NULL, NULL); copyID, NULL, NULL))
return abort; return TRUE;
return FALSE;
} }
/* /*

2
src/version.c
View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3089,
/**/ /**/
3088, 3088,
/**/ /**/