diff options
| author | Jean Boussier <[email protected]> | 2025-05-27 11:46:02 +0200 |
|---|---|---|
| committer | Jean Boussier <[email protected]> | 2025-05-27 12:45:24 +0200 |
| commit | cc48fcdff22689cdca04181105582150b01904a1 (patch) | |
| tree | 11a3f9d128a34b1f3dc5e12bf4ca139cab1608d6 | |
| parent | 8b0868cbb106c49d8761536abc408dae0b2e1c1c (diff) | |
Get rid of `rb_shape_canonical_p`
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/13448
| -rw-r--r-- | shape.h | 8 | ||||
| -rw-r--r-- | variable.c | 2 |
2 files changed, 2 insertions, 8 deletions
@@ -151,15 +151,9 @@ rb_obj_shape(VALUE obj) } static inline bool -rb_shape_canonical_p(rb_shape_t *shape) -{ - return !shape->flags; -} - -static inline bool rb_shape_id_canonical_p(shape_id_t shape_id) { - return rb_shape_canonical_p(RSHAPE(shape_id)); + return !RSHAPE(shape_id)->flags; } static inline shape_id_t diff --git a/variable.c b/variable.c index 1f948fb356..e8aedc5ac0 100644 --- a/variable.c +++ b/variable.c @@ -1663,7 +1663,7 @@ rb_obj_init_too_complex(VALUE obj, st_table *table) { // This method is meant to be called on newly allocated object. RUBY_ASSERT(!rb_shape_obj_too_complex_p(obj)); - RUBY_ASSERT(rb_shape_canonical_p(rb_obj_shape(obj))); + RUBY_ASSERT(rb_shape_id_canonical_p(RBASIC_SHAPE_ID(obj))); RUBY_ASSERT(rb_obj_shape(obj)->next_field_index == 0); obj_transition_too_complex(obj, table); |