Use an enum instead of a macro for bindgen

k0kubun · k0kubun · commit d9f67abed79d · 2025-07-16T15:24:01.000-07:00
diff --git a/shape.h b/shape.h
@@ -48,8 +48,9 @@ enum shape_id_fl_type {
 
 // This masks allows to check if a shape_id contains any ivar.
 // It rely on ROOT_SHAPE_WITH_OBJ_ID==1.
-#define SHAPE_ID_HAS_IVAR_MASK 0x807fffe
-STATIC_ASSERT(shape_id_has_ivar_mask, SHAPE_ID_HAS_IVAR_MASK == (SHAPE_ID_FL_TOO_COMPLEX | (SHAPE_ID_OFFSET_MASK - 1)));
+enum shape_id_mask {
+    SHAPE_ID_HAS_IVAR_MASK = SHAPE_ID_FL_TOO_COMPLEX | (SHAPE_ID_OFFSET_MASK - 1),
+};
 
 // The interpreter doesn't care about frozen status or slot size when reading ivars.
 // So we normalize shape_id by clearing these bits to improve cache hits.
diff --git a/yjit/bindgen/src/main.rs b/yjit/bindgen/src/main.rs
@@ -103,7 +103,7 @@ fn main() {
         .allowlist_function("rb_yjit_shape_capacity")
         .allowlist_function("rb_yjit_shape_index")
         .allowlist_var("SHAPE_ID_NUM_BITS")
-        .allowlist_var("SHAPE_ID_HAS_IVAR_MASK")
+        .allowlist_type("shape_id_mask")
 
         // From ruby/internal/intern/object.h
         .allowlist_function("rb_obj_is_kind_of")
diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs
