1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shape.c: assert we're not returning INVALID_SHAPE_ID.

Browse Source
This commit is contained in:
Jean Boussier 2025-06-07 13:42:46 +02:00
parent 8c4e368dcf
commit 2de67d424f
Notes: git 2025-06-07 16:31:00 +00:00 
Merged: https://github.com/ruby/ruby/pull/13556
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shape.c
View File

@ -357,18 +357,14 @@ static const rb_data_type_t shape_tree_type = {
static inline shape_id_t static inline shape_id_t
raw_shape_id(rb_shape_t *shape) raw_shape_id(rb_shape_t *shape)
{ {
if (shape == NULL) { RUBY_ASSERT(shape);
return INVALID_SHAPE_ID;
}
return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list); return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);
} }
static inline shape_id_t static inline shape_id_t
shape_id(rb_shape_t *shape, shape_id_t previous_shape_id) shape_id(rb_shape_t *shape, shape_id_t previous_shape_id)
{ {
if (shape == NULL) { RUBY_ASSERT(shape);
return INVALID_SHAPE_ID;
}
shape_id_t raw_id = (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list); shape_id_t raw_id = (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);
return raw_id | (previous_shape_id & SHAPE_ID_FLAGS_MASK); return raw_id | (previous_shape_id & SHAPE_ID_FLAGS_MASK);
} }