rb_gc_impl_copy_finalizer: generate a new object id

byroot · byroot · commit c082a983d6df · 2025-05-15T14:04:36.000+02:00
Fix a regression introduced by: #13155
diff --git a/gc/default/default.c b/gc/default/default.c
@@ -2793,7 +2793,8 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
 
     int lev = rb_gc_vm_lock();
     if (RB_LIKELY(st_lookup(finalizer_table, obj, &data))) {
-        table = (VALUE)data;
+        table = rb_ary_dup((VALUE)data);
+        RARRAY_ASET(table, 0, rb_obj_id(dest));
         st_insert(finalizer_table, dest, table);
         FL_SET(dest, FL_FINALIZE);
     }
diff --git a/gc/mmtk/mmtk.c b/gc/mmtk/mmtk.c
@@ -985,7 +985,8 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
 
     int lev = rb_gc_vm_lock();
     if (RB_LIKELY(st_lookup(objspace->finalizer_table, obj, &data))) {
-        table = (VALUE)data;
+        table = rb_ary_dup((VALUE)data);
+        RARRAY_ASET(table, 0, rb_obj_id(dest));
         st_insert(objspace->finalizer_table, dest, table);
         FL_SET(dest, FL_FINALIZE);
     }
diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
@@ -94,7 +94,7 @@ def test_count_objects
   end
 
   def test_finalizer
-    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok :ok), [])
+    assert_in_out_err(["-e", <<-END], "", %w(:ok :ok :ok), [])
       a = []
       ObjectSpace.define_finalizer(a) { p :ok }
       b = a.dup
@@ -137,6 +137,25 @@ class << fin
     }
   end
 
+  def test_finalizer_copy
+    assert_in_out_err(["-e", <<~'RUBY'], "", %w(:ok), [])
+      def fin
+        ids = Set.new
+        ->(id) { puts "object_id (#{id}) reused" unless ids.add?(id) }
+      end
+
+      OBJ = Object.new
+      ObjectSpace.define_finalizer(OBJ, fin)
+      OBJ.freeze
+
+      10.times do
+        OBJ.clone
+      end
+
+      p :ok
+    RUBY
+  end
+
   def test_finalizer_with_super
     assert_in_out_err(["-e", <<-END], "", %w(:ok), [])
       class A

Original file line number	Diff line number	Diff line change
`@@ -2793,7 +2793,8 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)`
`2793`	`2793`
`2794`	`2794`	`int lev = rb_gc_vm_lock();`
`2795`	`2795`	`if (RB_LIKELY(st_lookup(finalizer_table, obj, &data))) {`
`2796`		`- table = (VALUE)data;`
	`2796`	`+ table = rb_ary_dup((VALUE)data);`
	`2797`	`+ RARRAY_ASET(table, 0, rb_obj_id(dest));`
`2797`	`2798`	`st_insert(finalizer_table, dest, table);`
`2798`	`2799`	`FL_SET(dest, FL_FINALIZE);`
`2799`	`2800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -985,7 +985,8 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)`
`985`	`985`
`986`	`986`	`int lev = rb_gc_vm_lock();`
`987`	`987`	`if (RB_LIKELY(st_lookup(objspace->finalizer_table, obj, &data))) {`
`988`		`- table = (VALUE)data;`
	`988`	`+ table = rb_ary_dup((VALUE)data);`
	`989`	`+ RARRAY_ASET(table, 0, rb_obj_id(dest));`
`989`	`990`	`st_insert(objspace->finalizer_table, dest, table);`
`990`	`991`	`FL_SET(dest, FL_FINALIZE);`
`991`	`992`	`}`