From a201939a8150bc4c2f221925797ea2751c74b77c Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sat, 7 Dec 2024 15:59:37 -0500
Subject: Use likely()/unlikely() macros and a few bugfixes for integers

---
 stdlib/tables.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'stdlib/tables.c')

diff --git a/stdlib/tables.c b/stdlib/tables.c
index 449f37ca..38e98ccc 100644
--- a/stdlib/tables.c
+++ b/stdlib/tables.c
@@ -200,7 +200,7 @@ static void Table$set_bucket(Table_t *t, const void *entry, int32_t index, const
 
 static void hashmap_resize_buckets(Table_t *t, uint32_t new_capacity, const TypeInfo_t *type)
 {
-    if (__builtin_expect(new_capacity > TABLE_MAX_BUCKETS, 0))
+    if (unlikely(new_capacity > TABLE_MAX_BUCKETS))
         fail("Table has exceeded the maximum table size (2^31) and cannot grow further!");
     hdebug("About to resize from %u to %u\n", t->bucket_info ? t->bucket_info->count : 0, new_capacity);
     hshow(t);
@@ -252,7 +252,7 @@ public void *Table$reserve(Table_t *t, const void *key, const void *value, const
     // Resize buckets if necessary
     if (t->entries.length >= (int64_t)t->bucket_info->count) {
         uint32_t newsize = (uint32_t)t->bucket_info->count + MIN((uint32_t)t->bucket_info->count, 64);
-        if (__builtin_expect(newsize > TABLE_MAX_BUCKETS, 0))
+        if (unlikely(newsize > TABLE_MAX_BUCKETS))
             newsize = t->entries.length + 1;
         hashmap_resize_buckets(t, newsize, type);
     }
-- 
cgit v1.2.3