2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b902afbe1..784e1dd113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  4 17:24:51 2012  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (rb_objspace_call_finalizer): call gc_mark_stacked_objects
+	  at suitable point.
+
 Thu Oct  4 16:31:29 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (rb_objspace_call_finalizer): mark self-referencing finalizers
diff --git a/gc.c b/gc.c
index 661f48d008..5d0c1befd6 100644
--- a/gc.c
+++ b/gc.c
@@ -1484,9 +1484,6 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
     RVALUE *final_list = 0;
     size_t i;
 
-    mark_tbl(objspace, finalizer_table);
-    gc_mark_stacked_objects(objspace);
-
     /* run finalizers */
     rest_sweep(objspace);
 
@@ -1497,6 +1494,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
 	/* because mark will not be removed */
 	finalize_deferred(objspace);
 	mark_tbl(objspace, finalizer_table);
+	gc_mark_stacked_objects(objspace);
 	st_foreach(finalizer_table, chain_finalized_object,
 		   (st_data_t)&deferred_final_list);
     } while (deferred_final_list);