diff --git a/ChangeLog b/ChangeLog index b56318d13b..4011563804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 4 19:45:27 2010 Koichi Sasada + + * gc.c (run_final): do not need argument obj. + Thu Nov 4 19:26:10 2010 Koichi Sasada * gc.c (before_gc_sweep): fix commit miss. diff --git a/gc.c b/gc.c index ad0118f63f..725e212724 100644 --- a/gc.c +++ b/gc.c @@ -2782,17 +2782,20 @@ run_single_final(VALUE arg) } 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; iobj, 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);