Skip to content

[pull] master from ruby:master #615

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
Dec 24, 2025
Merged

[pull] master from ruby:master #615

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
20 changes: 15 additions & 5 deletions gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ void rb_vm_update_references(void *ptr);
#define RMOVED(obj) ((struct RMoved *)(obj))

#define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \
if (rb_gc_impl_object_moved_p((_objspace), (VALUE)(_thing))) { \
if (gc_object_moved_p_internal((_objspace), (VALUE)(_thing))) { \
*(_type *)&(_thing) = (_type)gc_location_internal(_objspace, (VALUE)_thing); \
} \
} while (0)
Expand Down Expand Up @@ -2868,6 +2868,16 @@ gc_mark_machine_stack_location_maybe(VALUE obj, void *data)
#endif
}

static bool
gc_object_moved_p_internal(void *objspace, VALUE obj)
{
if (SPECIAL_CONST_P(obj)) {
return false;
}

return rb_gc_impl_object_moved_p(objspace, obj);
}

static VALUE
gc_location_internal(void *objspace, VALUE value)
{
Expand Down Expand Up @@ -3646,7 +3656,7 @@ check_id_table_move(VALUE value, void *data)
{
void *objspace = (void *)data;

if (rb_gc_impl_object_moved_p(objspace, (VALUE)value)) {
if (gc_object_moved_p_internal(objspace, (VALUE)value)) {
return ID_TABLE_REPLACE;
}

Expand Down Expand Up @@ -3690,7 +3700,7 @@ update_id_table(VALUE *value, void *data, int existing)
{
void *objspace = (void *)data;

if (rb_gc_impl_object_moved_p(objspace, (VALUE)*value)) {
if (gc_object_moved_p_internal(objspace, (VALUE)*value)) {
*value = gc_location_internal(objspace, (VALUE)*value);
}

Expand Down Expand Up @@ -3733,11 +3743,11 @@ update_const_tbl_i(VALUE value, void *objspace)
{
rb_const_entry_t *ce = (rb_const_entry_t *)value;

if (rb_gc_impl_object_moved_p(objspace, ce->value)) {
if (gc_object_moved_p_internal(objspace, ce->value)) {
ce->value = gc_location_internal(objspace, ce->value);
}

if (rb_gc_impl_object_moved_p(objspace, ce->file)) {
if (gc_object_moved_p_internal(objspace, ce->file)) {
ce->file = gc_location_internal(objspace, ce->file);
}

Expand Down
14 changes: 5 additions & 9 deletions gc/default/default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,16 +1375,12 @@ check_rvalue_consistency(rb_objspace_t *objspace, const VALUE obj)
static inline bool
gc_object_moved_p(rb_objspace_t *objspace, VALUE obj)
{
if (RB_SPECIAL_CONST_P(obj)) {
return FALSE;
}
else {
int ret;
asan_unpoisoning_object(obj) {
ret = BUILTIN_TYPE(obj) == T_MOVED;
}
return ret;

bool ret;
asan_unpoisoning_object(obj) {
ret = BUILTIN_TYPE(obj) == T_MOVED;
}
return ret;
}

static inline int
Expand Down