archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't use namespaced classext for superclasses

Browse source 
Superclasses can't be modified by user code, so do not need namespace
indirection. For example Object.superclass is always BasicObject, no
matter what modules are included onto it.
This commit is contained in:
John Hawthorn 2025-05-20 13:10:41 -07:00
parent 1435ea7f44
commit 11ad7f5f47
Notes: git 2025-05-23 17:22:38 +00:00
3 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
class.c
View file

@ -183,16 +183,6 @@ duplicate_classext_const_tbl(struct rb_id_table *src, VALUE klass)
return dst;
}
static void
duplicate_classext_superclasses(rb_classext_t *orig, rb_classext_t *copy)
{
RCLASSEXT_SUPERCLASSES(copy) = RCLASSEXT_SUPERCLASSES(orig);
RCLASSEXT_SUPERCLASS_DEPTH(copy) = RCLASSEXT_SUPERCLASS_DEPTH(orig);
// the copy is always not the owner and the orig (or its parent class) will maintain the superclasses array
RCLASSEXT_SUPERCLASSES_OWNER(copy) = false;
RCLASSEXT_SUPERCLASSES_WITH_SELF(copy) = RCLASSEXT_SUPERCLASSES_WITH_SELF(orig);
}
static VALUE
namespace_subclasses_tbl_key(const rb_namespace_t *ns)
{
@ -349,9 +339,6 @@ rb_class_duplicate_classext(rb_classext_t *orig, VALUE klass, const rb_namespace
RCLASSEXT_CVC_TBL(ext) = duplicate_classext_id_table(RCLASSEXT_CVC_TBL(orig), dup_iclass);
// superclass_depth, superclasses
duplicate_classext_superclasses(orig, ext);
// subclasses, subclasses_index
duplicate_classext_subclasses(orig, ext);
@ -832,11 +819,11 @@ rb_class_update_superclasses(VALUE klass)
}
else {
superclasses = class_superclasses_including_self(super);
RCLASS_WRITE_SUPERCLASSES(super, super_depth, superclasses, true, true);
RCLASS_WRITE_SUPERCLASSES(super, super_depth, superclasses, true);
}
size_t depth = super_depth == RCLASS_MAX_SUPERCLASS_DEPTH ? super_depth : super_depth + 1;
RCLASS_WRITE_SUPERCLASSES(klass, depth, superclasses, false, false);
RCLASS_WRITE_SUPERCLASSES(klass, depth, superclasses, false);
}
void