patch 9.0.2038: Vim9: object method funcref not cleaned up after use
Problem: Vim9: object method funcref not cleaned up after use
Solution: Clean up type stack after using object method funcref,
remove now longer used ISN_DEFEROBJ instrunction
closes: #13360
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
diff --git a/src/vim9cmds.c b/src/vim9cmds.c
index 8b5b569..92605cf 100644
--- a/src/vim9cmds.c
+++ b/src/vim9cmds.c
@@ -2000,7 +2000,6 @@
int defer_var_idx;
type_T *type;
int func_idx;
- int obj_method = 0;
// Get a funcref for the function name.
// TODO: better way to find the "(".
@@ -2016,15 +2015,8 @@
// TODO: better type
generate_PUSHFUNC(cctx, (char_u *)internal_func_name(func_idx),
&t_func_any, FALSE);
- else
- {
- int typecount = cctx->ctx_type_stack.ga_len;
- if (compile_expr0(&arg, cctx) == FAIL)
- return NULL;
- if (cctx->ctx_type_stack.ga_len >= typecount + 2)
- // must have seen "obj.Func", pushed an object and a function
- obj_method = 1;
- }
+ else if (compile_expr0(&arg, cctx) == FAIL)
+ return NULL;
*paren = '(';
// check for function type
@@ -2056,7 +2048,7 @@
defer_var_idx = get_defer_var_idx(cctx);
if (defer_var_idx == 0)
return NULL;
- if (generate_DEFER(cctx, defer_var_idx - 1, obj_method, argcount) == FAIL)
+ if (generate_DEFER(cctx, defer_var_idx - 1, argcount) == FAIL)
return NULL;
return skipwhite(arg);