archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 3f70bf14e3 into a04555c8ab

Browse source
This commit is contained in:
Aaron Patterson 2025-08-14 19:38:48 +03:00 • committed by GitHub
commit a976d2d745
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bootstraptest/test_ractor.rb
View file

@ -434,8 +434,8 @@ assert_equal "allocator undefined for Thread", %q{
r = Ractor.new obj do |msg|
msg
end
rescue TypeError => e
e.message #=> no _dump_data is defined for class Thread
rescue Ractor::IsolationError => e
e.cause.message #=> no _dump_data is defined for class Thread
else
'ng'
end
@ -1429,7 +1429,7 @@ assert_equal "ok", %q{
end
begin
Ractor.new{} << err
rescue TypeError
rescue Ractor::IsolationError
'ok'
end
}

7
ractor.c
View file

@ -1945,7 +1945,12 @@ copy_enter(VALUE obj, struct obj_traverse_replace_data *data)
return traverse_skip;
}
else {
data->replacement = rb_obj_clone(obj);
int state;
VALUE result = rb_protect(rb_obj_clone, obj, &state);
if (state) {
rb_raise(rb_eRactorIsolationError, "cannot copy %"PRIsVALUE"", obj);
}
data->replacement = result;
return traverse_cont;
}
}

8
test/ruby/test_ractor.rb
View file

@ -30,6 +30,10 @@ class TestRactor < Test::Unit::TestCase
assert_make_shareable(x)
end
def test_cannot_copy_proc
assert_unshareable(-> { }, /cannot copy/, copy: true)
end
def test_shareability_of_method_proc
str = +""
@ -207,10 +211,10 @@ class TestRactor < Test::Unit::TestCase
assert Ractor.shareable?(obj), "object didn't become shareable"
end
def assert_unshareable(obj, msg=nil, exception: Ractor::IsolationError)
def assert_unshareable(obj, msg=nil, copy: false, exception: Ractor::IsolationError)
refute Ractor.shareable?(obj), "object is already shareable"
assert_raise_with_message(exception, msg) do
Ractor.make_shareable(obj)
Ractor.make_shareable(obj, copy:)
end
refute Ractor.shareable?(obj), "despite raising, object became shareable"
end