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

Ensure shape_id is never used on T_IMEMO

Browse Source 
It doesn't make sense to set ivars or anything shape
related on a T_IMEMO.

Co-Authored-By: John Hawthorn <john@hawthorn.email>
This commit is contained in:
Jean Boussier 2025-05-15 12:14:53 +02:00
parent ed632cd0ba
commit 60ffb714d2
Notes: git 2025-05-15 14:07:06 +00:00 
Merged: https://github.com/ruby/ruby/pull/13347
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eval.c
View File

@ -529,10 +529,14 @@ exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
rb_exc_check_circular_cause(*cause); rb_exc_check_circular_cause(*cause);
#else #else
VALUE c = *cause; VALUE c = *cause;
while (!NIL_P(c = rb_attr_get(c, id_cause))) { while (!NIL_P(c)) {
if (c == mesg) { if (c == mesg) {
rb_raise(rb_eArgError, "circular causes"); rb_raise(rb_eArgError, "circular causes");
} }
if (THROW_DATA_P(c)) {
break;
}
c = rb_attr_get(c, id_cause);
} }
#endif #endif
} }

8
ext/objspace/objspace_dump.c
View File

@ -414,9 +414,11 @@ dump_object(VALUE obj, struct dump_config *dc)
dump_append(dc, obj_type(obj)); dump_append(dc, obj_type(obj));
dump_append(dc, "\""); dump_append(dc, "\"");
size_t shape_id = rb_obj_shape_id(obj); if (BUILTIN_TYPE(obj) != T_IMEMO) {
dump_append(dc, ", \"shape_id\":"); size_t shape_id = rb_obj_shape_id(obj);
dump_append_sizet(dc, shape_id); dump_append(dc, ", \"shape_id\":");
dump_append_sizet(dc, shape_id);
}
dump_append(dc, ", \"slot_size\":"); dump_append(dc, ", \"slot_size\":");
dump_append_sizet(dc, dc->cur_page_slot_size); dump_append_sizet(dc, dc->cur_page_slot_size);

11
gc.c
View File

@ -1934,6 +1934,9 @@ object_id(VALUE obj)
// in different namespaces, so we cannot store the object id // in different namespaces, so we cannot store the object id
// in fields. // in fields.
return class_object_id(obj); return class_object_id(obj);
case T_IMEMO:
rb_bug("T_IMEMO can't have an object_id");
break;
default: default:
break; break;
} }
@ -1960,6 +1963,8 @@ build_id2ref_i(VALUE obj, void *data)
st_insert(id2ref_tbl, RCLASS(obj)->object_id, obj); st_insert(id2ref_tbl, RCLASS(obj)->object_id, obj);
} }
break; break;
case T_IMEMO:
break;
default: default:
if (rb_shape_obj_has_id(obj)) { if (rb_shape_obj_has_id(obj)) {
st_insert(id2ref_tbl, rb_obj_id(obj), obj); st_insert(id2ref_tbl, rb_obj_id(obj), obj);
@ -2007,6 +2012,10 @@ object_id_to_ref(void *objspace_ptr, VALUE object_id)
static inline void static inline void
obj_free_object_id(VALUE obj) obj_free_object_id(VALUE obj)
{ {
if (RB_BUILTIN_TYPE(obj) == T_IMEMO) {
return;
}
VALUE obj_id = 0; VALUE obj_id = 0;
if (RB_UNLIKELY(id2ref_tbl)) { if (RB_UNLIKELY(id2ref_tbl)) {
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
@ -2210,7 +2219,7 @@ rb_obj_id(VALUE obj)
bool bool
rb_obj_id_p(VALUE obj) rb_obj_id_p(VALUE obj)
{ {
return rb_shape_obj_has_id(obj); return !RB_TYPE_P(obj, T_IMEMO) && rb_shape_obj_has_id(obj);
} }
static enum rb_id_table_iterator_result static enum rb_id_table_iterator_result

1
iseq.c
View File

@ -1530,7 +1530,6 @@ iseqw_new(const rb_iseq_t *iseq)
/* cache a wrapper object */ /* cache a wrapper object */
RB_OBJ_WRITE((VALUE)iseq, &iseq->wrapper, obj); RB_OBJ_WRITE((VALUE)iseq, &iseq->wrapper, obj);
RB_OBJ_FREEZE((VALUE)iseq);
return obj; return obj;
} }

3
shape.h
View File

@ -94,12 +94,15 @@ static inline shape_id_t
get_shape_id_from_flags(VALUE obj) get_shape_id_from_flags(VALUE obj)
{ {
RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj)); RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj));
RUBY_ASSERT(!RB_TYPE_P(obj, T_IMEMO));
return (shape_id_t)((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT); return (shape_id_t)((RBASIC(obj)->flags) >> SHAPE_FLAG_SHIFT);
} }
static inline void static inline void
set_shape_id_in_flags(VALUE obj, shape_id_t shape_id) set_shape_id_in_flags(VALUE obj, shape_id_t shape_id)
{ {
RUBY_ASSERT(!RB_SPECIAL_CONST_P(obj));
RUBY_ASSERT(!RB_TYPE_P(obj, T_IMEMO));
// Ractors are occupying the upper 32 bits of flags, but only in debug mode // Ractors are occupying the upper 32 bits of flags, but only in debug mode
// Object shapes are occupying top bits // Object shapes are occupying top bits
RBASIC(obj)->flags &= SHAPE_FLAG_MASK; RBASIC(obj)->flags &= SHAPE_FLAG_MASK;