diff options
author | Jean Boussier <byroot@ruby-lang.org> | 2024-02-29 13:17:22 +0100 |
---|---|---|
committer | Jean Boussier <jean.boussier@gmail.com> | 2024-03-01 08:23:38 +0100 |
commit | e626da82eae3d437b84d4f9ead0164d436b08e1a (patch) | |
tree | 058421f46c3fe9eb0b1f1445cb3f4f0c902127f7 /struct.c | |
parent | 5d76fe6b2a413c71374c9f799c7a1023e2002457 (diff) |
Don't pin named structs defined in Ruby
[Bug #20311]
`rb_define_class_under` assumes it's called from C and that the
reference might be held in a C global variable, so it adds the
class to the VM root.
In the case of `Struct.new('Name')` it's wasteful and make
the struct immortal.
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -273,7 +273,7 @@ new_struct(VALUE name, VALUE super) rb_warn("redefining constant %"PRIsVALUE"::%"PRIsVALUE, super, name); rb_mod_remove_const(super, ID2SYM(id)); } - return rb_define_class_id_under(super, id, super); + return rb_define_class_id_under_no_pin(super, id, super); } NORETURN(static void invalid_struct_pos(VALUE s, VALUE idx)); @@ -491,8 +491,13 @@ rb_struct_define(const char *name, ...) ary = struct_make_members_list(ar); va_end(ar); - if (!name) st = anonymous_struct(rb_cStruct); - else st = new_struct(rb_str_new2(name), rb_cStruct); + if (!name) { + st = anonymous_struct(rb_cStruct); + } + else { + st = new_struct(rb_str_new2(name), rb_cStruct); + rb_vm_add_root_module(st); + } return setup_struct(st, ary); } @@ -506,7 +511,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...) ary = struct_make_members_list(ar); va_end(ar); - return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary); + return setup_struct(rb_define_class_id_under(outer, rb_intern(name), rb_cStruct), ary); } /* @@ -1699,7 +1704,9 @@ rb_data_define(VALUE super, ...) ary = struct_make_members_list(ar); va_end(ar); if (!super) super = rb_cData; - return setup_data(anonymous_struct(super), ary); + VALUE klass = setup_data(anonymous_struct(super), ary); + rb_vm_add_root_module(klass); + return klass; } /* |