diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-03 15:47:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-03 15:47:33 +0200 |
| commit | 3df02f507f96a246366f96dcce156a0ae7b95611 (patch) | |
| tree | c15bb5a9446371376ac29485c1aaacc48e486bcf | |
| parent | f7779c63d4fe531e2483502d4441f24802342768 (diff) | |
patch 8.2.0685: Build failurev8.2.0685
Problem: Build failure.
Solution: Include missing changes.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 20 |
2 files changed, 5 insertions, 17 deletions
diff --git a/src/version.c b/src/version.c index 2bccb328a8..105df760fb 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 685, +/**/ 684, /**/ 683, diff --git a/src/vim9compile.c b/src/vim9compile.c index a4a71de1f3..c18cdc0a8a 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3905,6 +3905,9 @@ compile_expr1(char_u **arg, cctx_T *cctx) { char_u *p; + // TODO: Try parsing as a constant. If that works just one PUSH + // instruction needs to be generated. + // evaluate the first expression if (compile_expr2(arg, cctx) == FAIL) return FAIL; @@ -6634,23 +6637,6 @@ delete_def_function_contents(dfunc_T *dfunc) delete_instr(dfunc->df_instr + idx); VIM_CLEAR(dfunc->df_instr); } - if (dfunc->df_funcstack != NULL) - { - // Decrease the reference count for the context of a closure. If down - // to zero free it and clear the variables on the stack. - if (--dfunc->df_funcstack->fs_refcount == 0) - { - garray_T *gap = &dfunc->df_funcstack->fs_ga; - typval_T *stack = gap->ga_data; - int i; - - for (i = 0; i < gap->ga_len; ++i) - clear_tv(stack + i); - ga_clear(gap); - vim_free(dfunc->df_funcstack); - } - dfunc->df_funcstack = NULL; - } dfunc->df_deleted = TRUE; } |