util/bitset: ensure the sets compared have the same size at compile time

Instead of checking this at run time.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23171>

diff --git a/src/util/bitset.h b/src/util/bitset.h
index 9765345..64d0d22 100644 (file)
--- a/src/util/bitset.h
+++ b/src/util/bitset.h
@@ -91,15 +91,15 @@ __bitset_not(BITSET_WORD *x, unsigned n)
 
 #define BITSET_AND(r, x, y)   \
    do { \
-      assert(ARRAY_SIZE(r) == ARRAY_SIZE(x)); \
-      assert(ARRAY_SIZE(r) == ARRAY_SIZE(y)); \
+      STATIC_ASSERT(ARRAY_SIZE(r) == ARRAY_SIZE(x)); \
+      STATIC_ASSERT(ARRAY_SIZE(r) == ARRAY_SIZE(y)); \
       __bitset_and(r, x, y, ARRAY_SIZE(r)); \
    } while (0)
 
 #define BITSET_OR(r, x, y)   \
    do { \
-      assert(ARRAY_SIZE(r) == ARRAY_SIZE(x)); \
-      assert(ARRAY_SIZE(r) == ARRAY_SIZE(y)); \
+      STATIC_ASSERT(ARRAY_SIZE(r) == ARRAY_SIZE(x)); \
+      STATIC_ASSERT(ARRAY_SIZE(r) == ARRAY_SIZE(y)); \
       __bitset_or(r, x, y, ARRAY_SIZE(r)); \
    } while (0)