diff options
| author | Peter Zhu <[email protected]> | 2023-04-14 16:27:37 -0400 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2023-04-16 11:06:31 -0400 |
| commit | 24b137336b71f77bf9ae9c532c0a5520709f73e8 () | |
| tree | 7d31e2d9cfa29e638144d666a262b76bb47861c9 | |
| parent | d7bb7e70cc954925d896a4185d9eb28cee2c2b6f (diff) | |
Move shape ID to flags for classes on 32 bit
Moves shape ID to FL_USER4 to FL_USER19 for the shape ID on 32 bit systems. This makes the rb_classext_struct smaller so that it can be embedded.
Notes: Merged: https://.com/ruby/ruby/pull/7719
| -rw-r--r-- | internal/class.h | 3 | ||||
| -rw-r--r-- | shape.c | 7 | ||||
| -rw-r--r-- | shape.h | 48 | ||||
| -rw-r--r-- | variable.c | 2 |
4 files changed, 23 insertions, 37 deletions
@@ -62,9 +62,6 @@ struct rb_classext_struct { } singleton_class; } as; const VALUE includer; -#if !SHAPE_IN_BASIC_FLAGS - shape_id_t shape_id; -#endif attr_index_t max_iv_count; unsigned char variation_count; bool permanent_classpath : 1; @@ -69,13 +69,6 @@ rb_shape_get_parent(rb_shape_t * shape) } #if !SHAPE_IN_BASIC_FLAGS -shape_id_t -rb_rclass_shape_id(VALUE obj) -{ - RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE)); - return RCLASS_EXT(obj)->shape_id; -} - shape_id_t rb_generic_shape_id(VALUE obj); #endif @@ -77,16 +77,15 @@ rb_current_shape_tree(void) } #define GET_SHAPE_TREE() rb_current_shape_tree() -#if SHAPE_IN_BASIC_FLAGS static inline shape_id_t -RBASIC_SHAPE_ID(VALUE obj) { RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj)); return (shape_id_t)(SHAPE_MASK & ((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT)); } static inline void -RBASIC_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id) { // Ractors are occupying the upper 32 bits of flags, but only in debug mode // Object shapes are occupying top bits @@ -94,51 +93,48 @@ RBASIC_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id) RBASIC(obj)->flags |= ((VALUE)(shape_id) << SHAPE_FLAG_SHIFT); } static inline shape_id_t -ROBJECT_SHAPE_ID(VALUE obj) { - RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT); - return RBASIC_SHAPE_ID(obj); } static inline void -ROBJECT_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id) -{ - RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT); - RBASIC_SET_SHAPE_ID(obj, shape_id); -} - -static inline shape_id_t -RCLASS_SHAPE_ID(VALUE obj) { - RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE)); - return RBASIC_SHAPE_ID(obj); } - -#else static inline shape_id_t ROBJECT_SHAPE_ID(VALUE obj) { RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT); - return (shape_id_t)(SHAPE_MASK & (RBASIC(obj)->flags >> SHAPE_FLAG_SHIFT)); } static inline void ROBJECT_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id) { - RBASIC(obj)->flags &= SHAPE_FLAG_MASK; - RBASIC(obj)->flags |= ((VALUE)(shape_id) << SHAPE_FLAG_SHIFT); } -shape_id_t rb_rclass_shape_id(VALUE obj); - -static inline shape_id_t RCLASS_SHAPE_ID(VALUE obj) { - return rb_rclass_shape_id(obj); } -#endif rb_shape_t * rb_shape_get_root_shape(void); int32_t rb_shape_id_offset(void); @@ -1527,7 +1527,7 @@ rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id) break; case T_CLASS: case T_MODULE: - RCLASS_EXT(obj)->shape_id = shape_id; break; default: if (shape_id != SPECIAL_CONST_SHAPE_ID) { |