Fix ractor move of unshareable frozen objects

luke-gru · ko1 · commit 38af38edcbce · 2024-12-24T11:38:44.000+09:00
These objects didn't retain their frozen status after the move

Bug [#19408]
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
@@ -752,6 +752,17 @@ def check obj1
   end
 }
 
+# unshareable frozen objects should still be frozen in new ractor after move
+assert_equal 'true', %q{
+r = Ractor.new do
+  obj = receive
+  { frozen: obj.frozen? }
+end
+obj = [Object.new].freeze
+r.send(obj, move: true)
+r.take[:frozen]
+}
+
 # move with yield
 assert_equal 'hello', %q{
   r = Ractor.new do
diff --git a/ractor.c b/ractor.c
@@ -3581,6 +3581,10 @@ move_leave(VALUE obj, struct obj_traverse_replace_data *data)
         rb_replace_generic_ivar(v, obj);
     }
 
+    if (OBJ_FROZEN(obj)) {
+        OBJ_FREEZE(v);
+    }
+
     // TODO: generic_ivar
 
     ractor_moved_bang(obj);

Original file line number	Diff line number	Diff line change
`@@ -3581,6 +3581,10 @@ move_leave(VALUE obj, struct obj_traverse_replace_data *data)`
`3581`	`3581`	`rb_replace_generic_ivar(v, obj);`
`3582`	`3582`	`}`
`3583`	`3583`
	`3584`	`+ if (OBJ_FROZEN(obj)) {`
	`3585`	`+ OBJ_FREEZE(v);`
	`3586`	`+ }`
	`3587`	`+`
`3584`	`3588`	`// TODO: generic_ivar`
`3585`	`3589`
`3586`	`3590`	`ractor_moved_bang(obj);`