Skip to content

[pull] master from ruby:master #1002

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 2 commits into from
May 12, 2026
+6 −7
Merged

[pull] master from ruby:master #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da9e384
publish.yml: Bump an example version a little
k0kubun May 11, 2026
24a1b09
Don't use obj_id in Box classext_cow_classes
peterzhu2118 May 9, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
version:
description: 'Version of the Ruby package to release'
required: true
default: '3.3.4'
default: '4.0.0'

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions box.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ rb_box_entry_mark(void *ptr)
rb_gc_mark(box->ruby_dln_libmap);
rb_gc_mark(box->gvar_tbl);
if (box->classext_cow_classes) {
rb_mark_tbl(box->classext_cow_classes);
rb_mark_set(box->classext_cow_classes);
}
}

Expand Down Expand Up @@ -271,10 +271,10 @@ free_box_st_tables(void *ptr)
}

static int
free_classext_for_box(st_data_t _key, st_data_t obj_value, st_data_t box_arg)
free_classext_for_box(st_data_t key, st_data_t _value, st_data_t box_arg)
{
rb_classext_t *ext;
VALUE obj = (VALUE)obj_value;
VALUE obj = (VALUE)key;
const rb_box_t *box = (const rb_box_t *)box_arg;

if (RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE)) {
Expand Down
5 changes: 2 additions & 3 deletions class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ rb_class_unlink_classext(VALUE klass, const rb_box_t *box)
{
st_data_t ext;
st_data_t key = (st_data_t)box->box_object;
VALUE obj_id = rb_obj_id(klass);
st_delete(box->classext_cow_classes, &obj_id, 0);
st_delete(box->classext_cow_classes, &klass, 0);
st_delete(RCLASS_CLASSEXT_TBL(klass), &key, &ext);
return (rb_classext_t *)ext;
}
Expand Down Expand Up @@ -203,7 +202,7 @@ rb_class_set_box_classext(VALUE obj, const rb_box_t *box, rb_classext_t *ext)
// (e.g. st_insert below) that could trigger GC.
rb_gc_writebarrier_remember(obj);

st_insert(box->classext_cow_classes, (st_data_t)rb_obj_id(obj), obj);
st_insert(box->classext_cow_classes, (st_data_t)obj, 0);
}

RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;
Expand Down