Skip to content

[pull] master from ruby:master #203

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 11 commits into from
Aug 25, 2025
Merged

[pull] master from ruby:master #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b4a380
Import https://github.com/ruby/pathname/pull/57
hsbt Aug 22, 2025
7d79475
Restore Pathname#realdirpath
hsbt Aug 22, 2025
c085672
Raise TypeError without String argument same as C version
hsbt Aug 22, 2025
3aa5680
Make Kernel.Pathname as public again
hsbt Aug 22, 2025
9243326
Skip rbs tests for pathname_bundle.rb
hsbt Aug 22, 2025
23ec1fe
Suppress CodeQL warnings to use File methods instead of IO
hsbt Aug 22, 2025
6ab2cd0
Omit extra allocation of Array object in Windows platform temporary
hsbt Aug 22, 2025
d2995a5
[DOC] Add ObjectSpace._id2ref deprecated to NEWS.md
peterzhu2118 Aug 22, 2025
e535b0d
Get rid of obj_ivar_set_transition_too_complex
byroot Aug 25, 2025
78b8ecd
Refactor rb_obj_ivar_set
byroot Aug 25, 2025
f1727b5
Get rid of rb_obj_set_shape_id
byroot Aug 25, 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
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ The following bundled gems are updated.

[[Feature #21262]]

* `ObjectSpace._id2ref` is deprecated. [[Feature #15408]]

## Stdlib compatibility issues

* CGI library is removed from the default gems. Now we only provide `cgi/escape` for
Expand Down Expand Up @@ -259,6 +261,7 @@ The following bundled gems are updated.
* `--rjit` is removed. We will move the implementation of the third-party JIT API
to the [ruby/rjit](https://github.com/ruby/rjit) repository.

[Feature #15408]: https://bugs.ruby-lang.org/issues/15408
[Feature #17473]: https://bugs.ruby-lang.org/issues/17473
[Feature #18455]: https://bugs.ruby-lang.org/issues/18455
[Feature #19908]: https://bugs.ruby-lang.org/issues/19908
Expand Down
2 changes: 1 addition & 1 deletion gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ rb_gc_get_shape(VALUE obj)
void
rb_gc_set_shape(VALUE obj, uint32_t shape_id)
{
rb_obj_set_shape_id(obj, (uint32_t)shape_id);
RBASIC_SET_SHAPE_ID(obj, (uint32_t)shape_id);
}

uint32_t
Expand Down
1 change: 0 additions & 1 deletion internal/variable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ VALUE rb_mod_set_temporary_name(VALUE, VALUE);
void rb_obj_copy_ivs_to_hash_table(VALUE obj, st_table *table);
void rb_obj_init_too_complex(VALUE obj, st_table *table);
void rb_evict_ivars_to_hash(VALUE obj);
shape_id_t rb_evict_fields_to_hash(VALUE obj);
VALUE rb_obj_field_get(VALUE obj, shape_id_t target_shape_id);
void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
void rb_obj_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE val);
Expand Down
4 changes: 2 additions & 2 deletions object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
}

rb_shape_copy_fields(dest, dest_buf, dest_shape_id, src_buf, src_shape_id);
rb_obj_set_shape_id(dest, dest_shape_id);
RBASIC_SET_SHAPE_ID(dest, dest_shape_id);
}

static void
Expand Down Expand Up @@ -496,7 +496,7 @@ rb_obj_clone_setup(VALUE obj, VALUE clone, VALUE kwfreeze)

if (RB_OBJ_FROZEN(obj)) {
shape_id_t next_shape_id = rb_shape_transition_frozen(clone);
rb_obj_set_shape_id(clone, next_shape_id);
RBASIC_SET_SHAPE_ID(clone, next_shape_id);
}
break;
case Qtrue: {
Expand Down
Loading