mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

classext replacement never happen on non-iclass classes

Browse Source
This commit is contained in:
Satoshi Tagomori 2025-10-25 13:35:15 +09:00 committed by Satoshi Tagomori
parent efe9a3cda9
commit be118cf946
Notes: git 2025-10-26 08:50:18 +00:00 
Merged: https://github.com/ruby/ruby/pull/14920
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
class.c
View File

@ -144,11 +144,11 @@ rb_class_set_namespace_classext_update(st_data_t *key_ptr, st_data_t *val_ptr, s
struct rb_class_set_namespace_classext_args *args = (struct rb_class_set_namespace_classext_args *)a;
if (existing) {
if (BUILTIN_TYPE(args->obj) == T_ICLASS) {
if (LIKELY(BUILTIN_TYPE(args->obj) == T_ICLASS)) {
rb_iclass_classext_free(args->obj, (rb_classext_t *)*val_ptr, false);
}
else {
rb_class_classext_free(args->obj, (rb_classext_t *)*val_ptr, false);
rb_bug("Updating existing classext for non-iclass never happen");
}
}
@ -375,6 +375,8 @@ class_duplicate_iclass_classext(VALUE iclass, rb_classext_t *mod_ext, const rb_n
RCLASSEXT_SET_INCLUDER(ext, iclass, RCLASSEXT_INCLUDER(src));
VM_ASSERT(FL_TEST_RAW(iclass, RCLASS_NAMESPACEABLE));
first_set = RCLASS_SET_NAMESPACE_CLASSEXT(iclass, ns, ext);
if (first_set) {
RCLASS_SET_PRIME_CLASSEXT_WRITABLE(iclass, false);
@ -454,6 +456,7 @@ rb_class_duplicate_classext(rb_classext_t *orig, VALUE klass, const rb_namespace
if (RBASIC_CLASS(iclass) == klass) {
// Is the subclass an ICLASS including this module into another class
// If so we need to re-associate it under our namespace with the new ext
VM_ASSERT(FL_TEST_RAW(iclass, RCLASS_NAMESPACEABLE));
class_duplicate_iclass_classext(iclass, ext, ns);
}
}