patch 8.2.1207: Vim9: crash in expr test when run in the GUI
Problem: Vim9: crash in expr test when run in the GUI.
Solution: Break out of loop over hashtab also when function got removed and
added.
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 020a752..dc95144 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1563,10 +1563,8 @@
enddef
func Test_expr7_trailing_fails()
- " Temporarily commented out - somehow crash occurs with too many
- " CheckDefFailure calls in the GUI only.
- " call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
- " call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
+ call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
+ call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
endfunc
func Test_expr_fails()
diff --git a/src/userfunc.c b/src/userfunc.c
index 467a046..6e49c03 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3444,8 +3444,8 @@
void
ex_defcompile(exarg_T *eap UNUSED)
{
- long_u ht_used = func_hashtab.ht_used;
- int todo = (int)ht_used;
+ long todo = (long)func_hashtab.ht_used;
+ int changed = func_hashtab.ht_changed;
hashitem_T *hi;
ufunc_T *ufunc;
@@ -3460,12 +3460,12 @@
{
compile_def_function(ufunc, FALSE, NULL);
- if (func_hashtab.ht_used != ht_used)
+ if (func_hashtab.ht_changed != changed)
{
- // another function has been defined, need to start over
+ // a function has been added or removed, need to start over
+ todo = (long)func_hashtab.ht_used;
+ changed = func_hashtab.ht_changed;
hi = func_hashtab.ht_array;
- ht_used = func_hashtab.ht_used;
- todo = (int)ht_used;
--hi;
}
}
diff --git a/src/version.c b/src/version.c
index a2775b3..490e5a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1207,
+/**/
1206,
/**/
1205,