Skip to content

[pull] master from ruby:master #1027

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 1 commit into from
May 18, 2026
+4 −4
Merged

[pull] master from ruby:master #1027

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
2 changes: 1 addition & 1 deletion compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12204,7 +12204,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
VALUE sym = RARRAY_AREF(op, i+1);
LABEL *label =
register_label(iseq, labels_table, sym);
rb_hash_aset(map, key, (VALUE)label | 1);
cdhash_aset(map, key, (VALUE)label);
}
RB_GC_GUARD(op);
RB_OBJ_SET_SHAREABLE(map); // allow mutation while compiling
Expand Down
6 changes: 3 additions & 3 deletions iseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3340,7 +3340,7 @@ static int
cdhash_each(VALUE key, VALUE value, VALUE ary)
{
rb_ary_push(ary, obj_resurrect(key));
rb_ary_push(ary, value);
rb_ary_push(ary, INT2FIX(value));
return ST_CONTINUE;
}

Expand Down Expand Up @@ -3581,11 +3581,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
break;
case TS_CDHASH:
{
VALUE hash = *seq;
VALUE cdhash = *seq;
VALUE val = rb_ary_new();
int i;

rb_hash_foreach(hash, cdhash_each, val);
st_foreach(rb_imemo_cdhash_tbl(cdhash), cdhash_each, val);

for (i=0; i<RARRAY_LEN(val); i+=2) {
VALUE pos = FIX2INT(rb_ary_entry(val, i+1));
Expand Down