Skip to content

[pull] master from ruby:master #376

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
pull merged 3 commits into from
Oct 18, 2025
Merged

[pull] master from ruby:master #376

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7f412e
Add rb_root_namespace_data_type
peterzhu2118 Oct 18, 2025
eb4a6f0
Fix memory leak of TypedData data in Namespace
peterzhu2118 Oct 18, 2025
ddd1aea
Free loaded_features_index in namespace
peterzhu2118 Oct 18, 2025
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
26 changes: 24 additions & 2 deletions namespace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,25 @@ free_loading_table_entry(st_data_t key, st_data_t value, st_data_t arg)
}

static void
namespace_entry_free(void *ptr)
namespace_root_free(void *ptr)
{
rb_namespace_t *ns = (rb_namespace_t *)ptr;
if (ns->loading_table) {
st_foreach(ns->loading_table, free_loading_table_entry, 0);
st_free_table(ns->loading_table);
ns->loading_table = 0;
}

if (ns->loaded_features_index) {
st_free_table(ns->loaded_features_index);
}
}

static void
namespace_entry_free(void *ptr)
{
namespace_root_free(ptr);
xfree(ptr);
}

static size_t
Expand All @@ -238,6 +249,17 @@ const rb_data_type_t rb_namespace_data_type = {
0, 0, RUBY_TYPED_FREE_IMMEDIATELY // TODO: enable RUBY_TYPED_WB_PROTECTED when inserting write barriers
};

const rb_data_type_t rb_root_namespace_data_type = {
"Namespace::Root",
{
rb_namespace_entry_mark,
namespace_root_free,
namespace_entry_memsize,
rb_namespace_gc_update_references,
},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY // TODO: enable RUBY_TYPED_WB_PROTECTED when inserting write barriers
};

VALUE
rb_namespace_entry_alloc(VALUE klass)
{
Expand Down Expand Up @@ -708,7 +730,7 @@ initialize_root_namespace(void)
root->ns_id = namespace_generate_id();
root->ns_object = root_namespace;

entry = TypedData_Wrap_Struct(rb_cNamespaceEntry, &rb_namespace_data_type, root);
entry = TypedData_Wrap_Struct(rb_cNamespaceEntry, &rb_root_namespace_data_type, root);
rb_ivar_set(root_namespace, id_namespace_entry, entry);
}
else {
Expand Down