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.1944: Vim9: function instruction pointer invalidated

Browse Source 
Problem:  Vim9: function instruction pointer invalidated
Solution: Use the funcref index instead of the instruction pointer

closes: #13178
closes: #13196

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-09-27 18:51:43 +02:00
committed by Christian Brabandt
parent 91adcbdcc1
commit a76fbe6e00
5 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vim9instr.c
View File

@@ -1378,7 +1378,9 @@ 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.
* "isn_idx" is set to the index of the instruction, so that fr_dfunc_idx can
* be set later. The index is used instead of a pointer to the instruction
* because the instruction memory can be reallocated.
*/
int
generate_FUNCREF(
@@ -1386,7 +1388,7 @@ generate_FUNCREF(
ufunc_T *ufunc,
class_T *cl,
int fi,
isn_T **isnp)
int *isn_idx)
{
isn_T *isn;
type_T *type;
@@ -1397,8 +1399,9 @@ generate_FUNCREF(
RETURN_OK_IF_SKIP(cctx);
if ((isn = generate_instr(cctx, ISN_FUNCREF)) == NULL)
return FAIL;
if (isnp != NULL)
*isnp = isn;
if (isn_idx != NULL)
// save the index of the new instruction
*isn_idx = cctx->ctx_instr.ga_len - 1;
has_vars = get_loop_var_info(cctx, &loopinfo);
if (ufunc->uf_def_status == UF_NOT_COMPILED || has_vars || cl != NULL)
@@ -1419,7 +1422,7 @@ generate_FUNCREF(
extra->fre_func_name = vim_strsave(ufunc->uf_name);
if (ufunc->uf_def_status != UF_NOT_COMPILED && cl == NULL)
{
if (isnp == NULL && ufunc->uf_def_status == UF_TO_BE_COMPILED)
if (isn_idx == NULL && ufunc->uf_def_status == UF_TO_BE_COMPILED)
// compile the function now, we need the uf_dfunc_idx value
(void)compile_def_function(ufunc, FALSE, CT_NONE, NULL);
isn->isn_arg.funcref.fr_dfunc_idx = ufunc->uf_dfunc_idx;