ci fixes for wasl and c-global checker

Author: clintonsteiner

Modules/_testinternalcapi.c

@@ -1913,11 +1913,13 @@ dict_index_bytes_for_keys(PyDictKeysObject *keys)
     if (index_shift == 1) {
         return 2;
     }
-#if SIZEOF_VOID_P > 4
     if (index_shift == 3) {
+#if SIZEOF_VOID_P > 4
         return 8;
-    }
 #endif
+        /* Py_EMPTY_KEYS uses dk_log2_index_bytes=3 even on 32-bit builds. */
+        return 4;
+    }
     assert(index_shift == 2);
     return 4;
 }

Objects/dictobject.c

@@ -648,9 +648,6 @@ static _PyDict_EmptyKeysStorage empty_keys_storage = {
     }
 };
 
-static_assert(offsetof(_PyDict_EmptyKeysStorage, keys) == 8,
-              "empty_keys_storage layout mismatch");
-
 #define Py_EMPTY_KEYS (&empty_keys_storage.keys)
 
 /* Uncomment to check the dict content in _PyDict_CheckConsistency() */
@@ -665,6 +662,7 @@ static_assert(offsetof(_PyDict_EmptyKeysStorage, keys) == 8,
 static inline int
 get_index_from_order(PyDictObject *mp, Py_ssize_t i)
 {
+    Py_BUILD_ASSERT(offsetof(_PyDict_EmptyKeysStorage, keys) == 8);
     assert(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
     assert(i < mp->ma_values->size);
     uint8_t *array = get_insertion_order_array(mp->ma_values);