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 9.0.1292: :defer may call the wrong method for an object

Browse Source 
Problem:    :defer may call the wrong method for an object. (Ernie Rael)
Solution:   When en object is from a class that extends or implements, figure
            out the method to call at runtime. (closes #11910)
This commit is contained in:
Bram Moolenaar
2023-02-08 20:55:27 +00:00
parent 6642982bea
commit 313e4724c3
8 changed files with 94 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vim9instr.c
View File

@@ -1328,12 +1328,16 @@ generate_NEWDICT(cctx_T *cctx, int count, int use_null)
/*
* Generate an ISN_FUNCREF instruction.
* For "obj.Method" "cl" is the class of the object (can be an interface or a
* base class) and "fi" the index of the method on that class.
* "isnp" is set to the instruction, so that fr_dfunc_idx can be set later.
*/
int
generate_FUNCREF(
cctx_T *cctx,
ufunc_T *ufunc,
class_T *cl,
int fi,
isn_T **isnp)
{
isn_T *isn;
@@ -1349,17 +1353,23 @@ generate_FUNCREF(
*isnp = isn;
has_vars = get_loop_var_info(cctx, &loopinfo);
if (ufunc->uf_def_status == UF_NOT_COMPILED || has_vars)
if (ufunc->uf_def_status == UF_NOT_COMPILED || has_vars || cl != NULL)
{
extra = ALLOC_CLEAR_ONE(funcref_extra_T);
if (extra == NULL)
return FAIL;
isn->isn_arg.funcref.fr_extra = extra;
extra->fre_loopvar_info = loopinfo;
if (cl != NULL)
{
extra->fre_class = cl;
++cl->class_refcount;
extra->fre_method_idx = fi;
}
}
if (ufunc->uf_def_status == UF_NOT_COMPILED)
if (ufunc->uf_def_status == UF_NOT_COMPILED || cl != NULL)
extra->fre_func_name = vim_strsave(ufunc->uf_name);
else
if (ufunc->uf_def_status != UF_NOT_COMPILED && cl == NULL)
{
if (isnp == NULL && ufunc->uf_def_status == UF_TO_BE_COMPILED)
// compile the function now, we need the uf_dfunc_idx value
@@ -2484,6 +2494,8 @@ delete_instr(isn_T *isn)
func_unref(name);
vim_free(name);
}
if (extra->fre_class != NULL)
class_unref(extra->fre_class);
vim_free(extra);
}
}