archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename RB_OBJ_SHAPE -> rb_obj_shape

Browse source 
As well as `RB_OBJ_SHAPE_ID` -> `rb_obj_shape_id`
and `RSHAPE` is now a simple alias for `rb_shape_lookup`.

I tried to turn all these into `static inline` but I'm having
trouble with `RUBY_EXTERN rb_shape_tree_t *rb_shape_tree_ptr;`
not being exposed as I'd expect.
This commit is contained in:
Jean Boussier 2025-05-09 08:58:07 +02:00
parent 0b81359b3f
commit ea77250847
Notes: git 2025-05-09 08:23:05 +00:00
14 changed files with 68 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
object.c
View file

@ -132,7 +132,7 @@ rb_class_allocate_instance(VALUE klass)
T_OBJECT | ROBJECT_EMBED | (RGENGC_WB_PROTECTED_OBJECT ? FL_WB_PROTECTED : 0), size, 0);
VALUE obj = (VALUE)o;
RUBY_ASSERT(RB_OBJ_SHAPE(obj)->type == SHAPE_ROOT);
RUBY_ASSERT(rb_obj_shape(obj)->type == SHAPE_ROOT);
// Set the shape to the specific T_OBJECT shape.
ROBJECT_SET_SHAPE_ID(obj, (shape_id_t)(rb_gc_heap_id_for_size(size) + FIRST_T_OBJECT_SHAPE_ID));
@ -335,7 +335,7 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
return;
}
rb_shape_t *src_shape = RB_OBJ_SHAPE(obj);
rb_shape_t *src_shape = rb_obj_shape(obj);
if (rb_shape_too_complex_p(src_shape)) {
// obj is TOO_COMPLEX so we can copy its iv_hash
@ -350,7 +350,7 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
}
rb_shape_t *shape_to_set_on_dest = src_shape;
rb_shape_t *initial_shape = RB_OBJ_SHAPE(dest);
rb_shape_t *initial_shape = rb_obj_shape(dest);
if (initial_shape->heap_index != src_shape->heap_index || !rb_shape_canonical_p(src_shape)) {
RUBY_ASSERT(initial_shape->type == SHAPE_T_OBJECT);