0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

patch 9.0.0617: calling function for reduce() has too much overhead

Problem:    Calling function for reduce() has too much overhead.
Solution:   Only call clear_tv() when needed.
This commit is contained in:
Bram Moolenaar
2022-09-28 15:19:10 +01:00
parent 371951d0c3
commit 1936c76536
3 changed files with 14 additions and 5 deletions

View File

@@ -3073,10 +3073,12 @@ list_reduce(
r = eval_expr_typval(expr, argv, 2, rettv); r = eval_expr_typval(expr, argv, 2, rettv);
clear_tv(&argv[0]); if (argv[0].v_type != VAR_NUMBER && argv[0].v_type != VAR_UNKNOWN)
clear_tv(&argv[0]);
if (r == FAIL || called_emsg != called_emsg_start) if (r == FAIL || called_emsg != called_emsg_start)
break; break;
// advance to the next item
if (range_list) if (range_list)
{ {
range_val += l->lv_u.nonmat.lv_stride; range_val += l->lv_u.nonmat.lv_stride;

View File

@@ -699,6 +699,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 */
/**/
617,
/**/ /**/
616, 616,
/**/ /**/

View File

@@ -710,7 +710,8 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
return FAIL; return FAIL;
funcstack->fs_var_offset = argcount + STACK_FRAME_SIZE; funcstack->fs_var_offset = argcount + STACK_FRAME_SIZE;
funcstack->fs_ga.ga_len = funcstack->fs_var_offset + dfunc->df_varcount; funcstack->fs_ga.ga_len = funcstack->fs_var_offset
+ dfunc->df_varcount;
stack = ALLOC_CLEAR_MULT(typval_T, funcstack->fs_ga.ga_len); stack = ALLOC_CLEAR_MULT(typval_T, funcstack->fs_ga.ga_len);
funcstack->fs_ga.ga_data = stack; funcstack->fs_ga.ga_data = stack;
if (stack == NULL) if (stack == NULL)
@@ -5881,7 +5882,11 @@ call_def_function(
failed_early: failed_early:
// Free all arguments and local variables. // Free all arguments and local variables.
for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx) for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx)
clear_tv(STACK_TV(idx)); {
tv = STACK_TV(idx);
if (tv->v_type != VAR_NUMBER && tv->v_type != VAR_UNKNOWN)
clear_tv(tv);
}
ex_nesting_level = orig_nesting_level; ex_nesting_level = orig_nesting_level;
vim_free(ectx.ec_stack.ga_data); vim_free(ectx.ec_stack.ga_data);
@@ -6371,11 +6376,11 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
break; break;
case ISN_NEWLIST: case ISN_NEWLIST:
smsg("%s%4d NEWLIST size %lld", pfx, current, smsg("%s%4d NEWLIST size %lld", pfx, current,
(varnumber_T)(iptr->isn_arg.number)); (varnumber_T)(iptr->isn_arg.number));
break; break;
case ISN_NEWDICT: case ISN_NEWDICT:
smsg("%s%4d NEWDICT size %lld", pfx, current, smsg("%s%4d NEWDICT size %lld", pfx, current,
(varnumber_T)(iptr->isn_arg.number)); (varnumber_T)(iptr->isn_arg.number));
break; break;
case ISN_NEWPARTIAL: case ISN_NEWPARTIAL:
smsg("%s%4d NEWPARTIAL", pfx, current); smsg("%s%4d NEWPARTIAL", pfx, current);