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

byroot · byroot · commit 2de67d424fa9 · 2025-06-07T18:30:44.000+02:00
diff --git a/shape.c b/shape.c
@@ -357,18 +357,14 @@ static const rb_data_type_t shape_tree_type = {
 static inline shape_id_t
 raw_shape_id(rb_shape_t *shape)
 {
-    if (shape == NULL) {
-        return INVALID_SHAPE_ID;
-    }
+    RUBY_ASSERT(shape);
     return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);
 }
 
 static inline shape_id_t
 shape_id(rb_shape_t *shape, shape_id_t previous_shape_id)
 {
-    if (shape == NULL) {
-        return INVALID_SHAPE_ID;
-    }
+    RUBY_ASSERT(shape);
     shape_id_t raw_id = (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);
     return raw_id | (previous_shape_id & SHAPE_ID_FLAGS_MASK);
 }

Original file line number	Diff line number	Diff line change
`@@ -357,18 +357,14 @@ static const rb_data_type_t shape_tree_type = {`
`357`	`357`	`static inline shape_id_t`
`358`	`358`	`raw_shape_id(rb_shape_t *shape)`
`359`	`359`	`{`
`360`		`- if (shape == NULL) {`
`361`		`- return INVALID_SHAPE_ID;`
`362`		`- }`
	`360`	`+ RUBY_ASSERT(shape);`
`363`	`361`	`return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);`
`364`	`362`	`}`
`365`	`363`
`366`	`364`	`static inline shape_id_t`
`367`	`365`	`shape_id(rb_shape_t *shape, shape_id_t previous_shape_id)`
`368`	`366`	`{`
`369`		`- if (shape == NULL) {`
`370`		`- return INVALID_SHAPE_ID;`
`371`		`- }`
	`367`	`+ RUBY_ASSERT(shape);`
`372`	`368`	`shape_id_t raw_id = (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list);`
`373`	`369`	`return raw_id \| (previous_shape_id & SHAPE_ID_FLAGS_MASK);`
`374`	`370`	`}`