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.

diff --git a/src/list.c b/src/list.c
index fab86fd752c0a1438aec83739f9ef1195d6d99b7..a39c9f974b34f237b5fa716e67b655461850d374 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -3073,10 +3073,12 @@ list_reduce(
 
        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)
            break;
 
+       // advance to the next item
        if (range_list)
        {
            range_val += l->lv_u.nonmat.lv_stride;

diff --git a/src/version.c b/src/version.c
index 815f27b8db50b221390593a57c1c4a758bfa66b3..43569d01c4d9af1a2e9959cd3f1396385073b911 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    617,
 /**/
     616,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 1699caf49640418fe2d9784b9585be578808343b..ddcbe2c76b68b1815e7c5c2f5eb74b8a28d6922a 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -710,7 +710,8 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
            return FAIL;
 
        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);
        funcstack->fs_ga.ga_data = stack;
        if (stack == NULL)
@@ -5881,7 +5882,11 @@ call_def_function(
 failed_early:
     // Free all arguments and local variables.
     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;
 
     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;
            case ISN_NEWLIST:
                smsg("%s%4d NEWLIST size %lld", pfx, current,
-                                           (varnumber_T)(iptr->isn_arg.number));
+                                         (varnumber_T)(iptr->isn_arg.number));
                break;
            case ISN_NEWDICT:
                smsg("%s%4d NEWDICT size %lld", pfx, current,
-                                           (varnumber_T)(iptr->isn_arg.number));
+                                         (varnumber_T)(iptr->isn_arg.number));
                break;
            case ISN_NEWPARTIAL:
                smsg("%s%4d NEWPARTIAL", pfx, current);