archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't try to move objects with finalizer attached

Browse source
This commit is contained in:
zzak 2025-05-27 23:58:50 +09:00
parent 326c120aa7
commit fe803d4dee
No known key found for this signature in database
GPG key ID: 12F68DC863673D82
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ractor.c
View file

@ -3645,6 +3645,10 @@ move_enter(VALUE obj, struct obj_traverse_replace_data *data)
return traverse_skip; return traverse_skip;
} }
else { else {
if (FL_TEST_RAW(obj, FL_FINALIZE)) {
rb_raise(rb_eRactorError, "can not move an object with finalizer");
}
VALUE type = RB_BUILTIN_TYPE(obj); VALUE type = RB_BUILTIN_TYPE(obj);
type |= wb_protected_types[type] ? FL_WB_PROTECTED : 0; type |= wb_protected_types[type] ? FL_WB_PROTECTED : 0;
NEWOBJ_OF(moved, struct RBasic, 0, type, rb_gc_obj_slot_size(obj), 0); NEWOBJ_OF(moved, struct RBasic, 0, type, rb_gc_obj_slot_size(obj), 0);
@ -3680,6 +3684,7 @@ move_leave(VALUE obj, struct obj_traverse_replace_data *data)
MEMZERO((char *)obj, char, sizeof(struct RBasic)); MEMZERO((char *)obj, char, sizeof(struct RBasic));
RBASIC(obj)->flags = flags; RBASIC(obj)->flags = flags;
RBASIC_SET_CLASS_RAW(obj, rb_cRactorMovedObject); RBASIC_SET_CLASS_RAW(obj, rb_cRactorMovedObject);
return traverse_cont; return traverse_cont;
} }

19
test/objspace/test_ractor.rb
View file

@ -54,4 +54,23 @@ class TestObjSpaceRactor < Test::Unit::TestCase
ractors.each(&:take) ractors.each(&:take)
RUBY RUBY
end end
def test_move_finalizer
assert_ractor(<<~'RUBY', require: 'objspace')
r = Ractor.new do
Ractor.receive
end
1_000.times do
o = Object.new
ObjectSpace.define_finalizer(o, proc { })
begin
r.send(o, move: true)
rescue Ractor::Error => e
raise unless e.message.include?("finalizer")
break
end
end
RUBY
end
end end