1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't copy FL_PROMOTED to new object in Ractor move

Browse Source 
We should not copy the FL_PROMOTED flag when we move an object in Ractor#send(move: true)
because the newly created object may not be old.
This commit is contained in:
Peter Zhu 2025-05-26 14:11:51 -04:00
parent 909a0daab6
commit 386f874816
Notes: git 2025-05-26 19:04:13 +00:00 
Merged: https://github.com/ruby/ruby/pull/13442
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstraptest/test_ractor.rb
View File

@ -2427,6 +2427,7 @@ end
assert_equal 'ok', %q{ assert_equal 'ok', %q{
r = Ractor.new do r = Ractor.new do
o = Ractor.receive o = Ractor.receive
GC.verify_internal_consistency
GC.start GC.start
o o
end end

11
ractor.c
View File

@ -3656,8 +3656,15 @@ move_enter(VALUE obj, struct obj_traverse_replace_data *data)
static enum obj_traverse_iterator_result static enum obj_traverse_iterator_result
move_leave(VALUE obj, struct obj_traverse_replace_data *data) move_leave(VALUE obj, struct obj_traverse_replace_data *data)
{ {
size_t size = rb_gc_obj_slot_size(obj); // Copy flags
memcpy((void *)data->replacement, (void *)obj, size); VALUE ignored_flags = RUBY_FL_PROMOTED;
RBASIC(data->replacement)->flags = (RBASIC(obj)->flags & ~ignored_flags) | (RBASIC(data->replacement)->flags & ignored_flags);
// Copy contents without the flags
memcpy(
(char *)data->replacement + sizeof(VALUE),
(char *)obj + sizeof(VALUE),
rb_gc_obj_slot_size(obj) - sizeof(VALUE)
);
void rb_replace_generic_ivar(VALUE clone, VALUE obj); // variable.c void rb_replace_generic_ivar(VALUE clone, VALUE obj); // variable.c