summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJohn Hawthorn <[email protected]>2025-05-26 11:48:41 -0700
committerJohn Hawthorn <[email protected]>2025-05-28 11:44:07 -0400
commitd1343e12d253cef9c8af22ff58275d28c484d6f2 (patch)
tree82b03d79298f8fdf55032fe90ec8a66dfc51761d /object.c
parent3935b1c401d00f52b9ee0ce0b58767cc32e280fc (diff)
Use flag for RCLASS_IS_INITIALIZED
Previously we used a flag to set whether a module was uninitialized. When checked whether a class was initialized, we first had to check that it had a non-zero superclass, as well as that it wasn't BasicObject. With the advent of namespaces, RCLASS_SUPER is now an expensive operation, and though we could just check for the prime superclass, we might as well take this opportunity to use a flag so that we can perform the initialized check with as few instructions as possible. It's possible in the future that we could prevent uninitialized classes from being available to the user, but currently there are a few ways to do that.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/13443
Diffstat (limited to 'object.c')
-rw-r--r--object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/object.c b/object.c
index 5e5329a5f8..9bd1d96e9f 100644
--- a/object.c
+++ b/object.c
@@ -2069,7 +2069,7 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
else {
super = argv[0];
rb_check_inheritable(super);
- if (super != rb_cBasicObject && !RCLASS_SUPER(super)) {
+ if (!RCLASS_INITIALIZED_P(super)) {
rb_raise(rb_eTypeError, "can't inherit uninitialized class");
}
}
@@ -2126,7 +2126,7 @@ class_get_alloc_func(VALUE klass)
{
rb_alloc_func_t allocator;
- if (RCLASS_SUPER(klass) == 0 && klass != rb_cBasicObject) {
+ if (!RCLASS_INITIALIZED_P(klass)) {
rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
}
if (RCLASS_SINGLETON_P(klass)) {