neovim

commit 4aec442b5af5a1a7c3aa47626fee09452117575e
parent 146c428a533b649adbc95fc29b41af42624b6ece
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 27 Dec 2022 19:29:43 +0800

Merge pull request #21555 from zeertzjq/vim-9.0.1096

vim-patch:9.0.{1096,1097,1099,1100}: reallocating hashtab when the size didn't change
Diffstat:
M
src/nvim/hashtab.c
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
@@ -292,6 +292,7 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
 #endif  // ifdef HT_DEBUG
 
   size_t minsize;
+  const size_t oldsize = ht->ht_mask + 1;
   if (minitems == 0) {
     // Return quickly for small tables with at least two NULL items.
     // items are required for the lookup to decide a key isn't there.
@@ -304,7 +305,6 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
     // removed items, so that they get cleaned up).
     // Shrink the array when it's less than 1/5 full. When growing it is
     // at least 1/4 full (avoids repeated grow-shrink operations)
-    size_t oldsize = ht->ht_mask + 1;
     if ((ht->ht_filled * 3 < oldsize * 2) && (ht->ht_used > oldsize / 5)) {
       return;
     }
@@ -335,6 +335,13 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
   }
 
   bool newarray_is_small = newsize == HT_INIT_SIZE;
+
+  if (!newarray_is_small && newsize == oldsize && ht->ht_filled * 3 < oldsize * 2) {
+    // The hashtab is already at the desired size, and there are not too
+    // many removed items, bail out.
+    return;
+  }
+
   bool keep_smallarray = newarray_is_small
                          && ht->ht_array == ht->ht_smallarray;