diff options
| author | Jean Boussier <jean.boussier@gmail.com> | 2025-08-28 16:45:45 +0200 |
|---|---|---|
| committer | Jean Boussier <jean.boussier@gmail.com> | 2025-08-28 20:14:01 +0200 |
| commit | 041450ad417caa5b12a32b38ae5ec54618f0c792 (patch) | |
| tree | 7027f660e9f5d9148ea26a8cb7be2666d425bc6a /variable.c | |
| parent | fa3c23eb811c7bee7c9ed945c8f12cb40ecd9b6a (diff) | |
rb_ivar_delete: also re-embed T_IMEMO/fields
Right now JITs don't generate any code to access ivar on types
other than T_OBJECT, but they might soon, so we must ensure
two IMEMO/fields can't have the same `shape_id` but diffent
embed/heap status.
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/variable.c b/variable.c index 690b7a26cf..f80f1a56a6 100644 --- a/variable.c +++ b/variable.c @@ -1614,12 +1614,12 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef) MEMMOVE(&fields[removed_index], &fields[removed_index + 1], VALUE, trailing_fields); RBASIC_SET_SHAPE_ID(fields_obj, next_shape_id); - if (type == T_OBJECT && FL_TEST_RAW(obj, ROBJECT_HEAP) && rb_obj_embedded_size(new_fields_count) <= rb_gc_obj_slot_size(obj)) { + if (FL_TEST_RAW(fields_obj, OBJ_FIELD_HEAP) && rb_obj_embedded_size(new_fields_count) <= rb_gc_obj_slot_size(fields_obj)) { // Re-embed objects when instances become small enough // This is necessary because YJIT assumes that objects with the same shape // have the same embeddedness for efficiency (avoid extra checks) - FL_UNSET_RAW(obj, ROBJECT_HEAP); - MEMCPY(ROBJECT_FIELDS(obj), fields, VALUE, new_fields_count); + FL_UNSET_RAW(fields_obj, ROBJECT_HEAP); + MEMCPY(rb_imemo_fields_ptr(fields_obj), fields, VALUE, new_fields_count); xfree(fields); } } |