Skip to content

Directly allocate FrozenCore as an ICLASS #7940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterzhu2118 merged 1 commit into from
Jun 14, 2023
Merged

Directly allocate FrozenCore as an ICLASS #7940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,10 +1129,16 @@ rb_define_module_id_under(VALUE outer, ID id)
return module;
}

VALUE
rb_iclass_alloc(VALUE klass)
{
return class_alloc(T_ICLASS, klass);
}

VALUE
rb_include_class_new(VALUE module, VALUE super)
{
VALUE klass = class_alloc(T_ICLASS, rb_cClass);
VALUE klass = rb_iclass_alloc(rb_cClass);

RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);

Expand Down Expand Up @@ -1409,7 +1415,7 @@ ensure_origin(VALUE klass)
{
VALUE origin = RCLASS_ORIGIN(klass);
if (origin == klass) {
origin = class_alloc(T_ICLASS, klass);
origin = rb_iclass_alloc(klass);
RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
RCLASS_SET_SUPER(klass, origin);
RCLASS_SET_ORIGIN(klass, origin);
Expand Down
3 changes: 2 additions & 1 deletion internal/class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ VALUE rb_module_s_alloc(VALUE klass);
void rb_module_set_initialized(VALUE module);
void rb_module_check_initializable(VALUE module);
VALUE rb_make_metaclass(VALUE, VALUE);
VALUE rb_iclass_alloc(VALUE klass);
VALUE rb_include_class_new(VALUE, VALUE);
void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE);
void rb_class_detach_subclasses(VALUE);
Expand Down Expand Up @@ -205,7 +206,7 @@ RCLASS_SET_SUPER(VALUE klass, VALUE super)
static inline void
RCLASS_SET_CLASSPATH(VALUE klass, VALUE classpath, bool permanent)
{
assert(BUILTIN_TYPE(klass) == T_CLASS || BUILTIN_TYPE(klass) == T_MODULE);
assert(BUILTIN_TYPE(klass) == T_CLASS || BUILTIN_TYPE(klass) == T_MODULE || klass == rb_mRubyVMFrozenCore);
assert(classpath == 0 || BUILTIN_TYPE(classpath) == T_STRING);

RB_OBJ_WRITE(klass, &(RCLASS_EXT(klass)->classpath), classpath);
Expand Down
5 changes: 1 addition & 4 deletions vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3638,7 +3638,6 @@ Init_VM(void)
{
VALUE opts;
VALUE klass;
VALUE fcore;

/*
* Document-class: RubyVM
Expand All @@ -3664,9 +3663,8 @@ Init_VM(void)
#endif

/* FrozenCore (hidden) */
fcore = rb_class_new(rb_cBasicObject);
VALUE fcore = rb_mRubyVMFrozenCore = rb_iclass_alloc(rb_cBasicObject);
rb_set_class_path(fcore, rb_cRubyVM, "FrozenCore");
RBASIC(fcore)->flags = T_ICLASS;
klass = rb_singleton_class(fcore);
rb_define_method_id(klass, id_core_set_method_alias, m_core_set_method_alias, 3);
rb_define_method_id(klass, id_core_set_variable_alias, m_core_set_variable_alias, 2);
Expand All @@ -3685,7 +3683,6 @@ Init_VM(void)
RBASIC_CLEAR_CLASS(klass);
rb_obj_freeze(klass);
rb_gc_register_mark_object(fcore);
rb_mRubyVMFrozenCore = fcore;

/*
* Document-class: Thread
Expand Down