Show Hash#default_proc and Hash#default differently

Author: etiennebarrie

bootstraptest/test_ractor.rb

@@ -986,10 +986,10 @@ def self.fstr = @fstr
   a + b + c + d + e + f
 }
 
-assert_equal "  from hash default value\n" \
+assert_equal "  from hash default proc\n" \
     "  from instance variable @ivar\n" \
     "  from block self #<Foo @ivar={}>\n" \
-    "  from hash default value\n" \
+    "  from hash default proc\n" \
     "  from instance variable @ivar\n" \
     "  from instance variable @foo", %q{
   class Foo

ractor.c

@@ -1347,7 +1347,11 @@ obj_traverse_i(VALUE obj, struct obj_traverse_data *data)
         {
             const VALUE ifnone = RHASH_IFNONE(obj);
             if (obj_traverse_i(ifnone, data)) {
-                rb_ractor_error_chain_append(data->chain, "\n  from hash default value");
+                if (RB_FL_TEST_RAW(obj, RHASH_PROC_DEFAULT)) {
+                    rb_ractor_error_chain_append(data->chain, "\n  from hash default proc");
+                } else {
+                    rb_ractor_error_chain_append(data->chain, "\n  from hash default value");
+                }
                 return 1;
             }
 

test/ruby/test_ractor.rb

@@ -234,9 +234,14 @@ def test_error_includes_hash_unshareable_key
     assert_unshareable({ -> {} => true }, /from hash key #<Proc:0x[[:xdigit:]]+ #{__FILE__}:#{__LINE__}/)
   end
 
-  def test_error_includes_hash_default
+  def test_error_includes_hash_default_proc
     h = Hash.new {}
-    assert_unshareable(h, /from hash default value/)
+    assert_unshareable(h, /from hash default proc/)
+  end
+
+  def test_error_includes_hash_default_value
+    h = Hash.new(Mutex.new)
+    assert_unshareable(h, /from hash default value/, exception: Ractor::Error)
   end
 
   def test_error_includes_struct_member
@@ -272,7 +277,7 @@ def test_error_for_module_instance_variable
         $!
       end.value
       assert_kind_of Ractor::IsolationError, e
-      assert_match(/from hash default value/, e.message)
+      assert_match(/from hash default proc/, e.message)
     RUBY
   end
 
@@ -288,7 +293,7 @@ module ModuleWithUnshareableConstant
         $!
       end.value
       assert_kind_of(Ractor::IsolationError, e)
-      assert_match(/from hash default value/, e.message)
+      assert_match(/from hash default proc/, e.message)
     RUBY
   end