Skip to content

Check for T_NONE during marking #58

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
Jan 2, 2026
Merged

Check for T_NONE during marking #58

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
21 changes: 21 additions & 0 deletions gc/mmtk/mmtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ struct MMTk_final_job {

#ifdef RB_THREAD_LOCAL_SPECIFIER
RB_THREAD_LOCAL_SPECIFIER struct MMTk_GCThreadTLS *rb_mmtk_gc_thread_tls;

RB_THREAD_LOCAL_SPECIFIER VALUE marking_parent_object;
#else
# error We currently need language-supported TLS
#endif
Expand Down Expand Up @@ -270,26 +272,34 @@ rb_mmtk_update_object_references(MMTk_ObjectReference mmtk_object)
VALUE object = (VALUE)mmtk_object;

if (!RB_FL_TEST(object, RUBY_FL_WEAK_REFERENCE)) {
marking_parent_object = object;
rb_gc_update_object_references(rb_gc_get_objspace(), object);
marking_parent_object = 0;
}
}

static void
rb_mmtk_call_gc_mark_children(MMTk_ObjectReference object)
{
marking_parent_object = (VALUE)object;
rb_gc_mark_children(rb_gc_get_objspace(), (VALUE)object);
marking_parent_object = 0;
}

static void
rb_mmtk_handle_weak_references(MMTk_ObjectReference mmtk_object, bool moving)
{
VALUE object = (VALUE)mmtk_object;

marking_parent_object = object;

rb_gc_handle_weak_references(object);

if (moving) {
rb_gc_update_object_references(rb_gc_get_objspace(), object);
}

marking_parent_object = 0;
}

static void
Expand Down Expand Up @@ -818,6 +828,17 @@ void rb_gc_impl_adjust_memory_usage(void *objspace_ptr, ssize_t diff) { }
static inline VALUE
rb_mmtk_call_object_closure(VALUE obj, bool pin)
{
if (RB_UNLIKELY(RB_BUILTIN_TYPE(obj) == T_NONE)) {
const size_t info_size = 256;
char obj_info_buf[info_size];
rb_raw_obj_info(obj_info_buf, info_size, obj);

char parent_obj_info_buf[info_size];
rb_raw_obj_info(parent_obj_info_buf, info_size, marking_parent_object);

rb_bug("try to mark T_NONE object (obj: %s, parent: %s)", obj_info_buf, parent_obj_info_buf);
}

return (VALUE)rb_mmtk_gc_thread_tls->object_closure.c_function(
rb_mmtk_gc_thread_tls->object_closure.rust_closure,
rb_mmtk_gc_thread_tls->gc_context,
Expand Down
Loading