Merge 3f70bf14e3 into a04555c8ab

bootstraptest/test_ractor.rb

@@ -434,8 +434,8 @@ assert_equal "allocator undefined for Thread", %q{
     r = Ractor.new obj do |msg|
       msg
     end
-  rescue TypeError => e
+  rescue Ractor::IsolationError => e
-    e.message #=> no _dump_data is defined for class Thread
+    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
 }

ractor.c

@@ -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;
     }
 }

test/ruby/test_ractor.rb

@@ -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