ko1	2010-11-04 20:46:26 +0900 (Thu, 04 Nov 2010)

  New Revision: 29687

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29687

  Log:
    * gc.c (run_final): do not need argument obj.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29686)
+++ ChangeLog	(revision 29687)
@@ -1,3 +1,7 @@
+Thu Nov  4 19:45:27 2010  Koichi Sasada  <ko1@a...>
+
+	* gc.c (run_final): do not need argument obj.
+
 Thu Nov  4 19:26:10 2010  Koichi Sasada  <ko1@a...>
 
 	* gc.c (before_gc_sweep): fix commit miss.
Index: gc.c
===================================================================
--- gc.c	(revision 29686)
+++ gc.c	(revision 29687)
@@ -2782,17 +2782,20 @@
 }
 
 static void
-run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE objid, VALUE table)
+run_finalizer(rb_objspace_t *objspace, VALUE objid, VALUE table)
 {
     long i;
     int status;
     VALUE args[3];
 
-    args[1] = 0;
-    args[2] = (VALUE)rb_safe_level();
-    if (!args[1] && RARRAY_LEN(table) > 0) {
+    if (RARRAY_LEN(table) > 0) {
 	args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
     }
+    else {
+	args[1] = 0;
+    }
+
+    args[2] = (VALUE)rb_safe_level();
     for (i=0; i<RARRAY_LEN(table); i++) {
 	VALUE final = RARRAY_PTR(table)[i];
 	args[0] = RARRAY_PTR(final)[1];
@@ -2825,7 +2828,7 @@
 
     key = (st_data_t)obj;
     if (st_delete(finalizer_table, &key, &table)) {
-	run_finalizer(objspace, obj, objid, (VALUE)table);
+	run_finalizer(objspace, objid, (VALUE)table);
     }
 }
 
@@ -2916,7 +2919,7 @@
 	st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
 	while (list) {
 	    struct force_finalize_list *curr = list;
-	    run_finalizer(objspace, curr->obj, rb_obj_id(curr->obj), curr->table);
+	    run_finalizer(objspace, rb_obj_id(curr->obj), curr->table);
 	    st_delete(finalizer_table, (st_data_t*)&curr->obj, 0);
 	    list = curr->next;
 	    xfree(curr);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/