From 4c0f022f45a9221c2f97b2d21a9eb476f40b1d93 Mon Sep 17 00:00:00 2001 From: nari Date: Fri, 5 Oct 2012 09:19:49 +0000 Subject: revert r37091 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index d34e70940b..c6bcb1698e 100644 --- a/gc.c +++ b/gc.c @@ -1457,7 +1457,8 @@ static int chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg) { RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg; - if ((p->as.basic.flags & FL_FINALIZE) == FL_FINALIZE) { + if ((p->as.basic.flags & FL_FINALIZE) == FL_FINALIZE && + !MARKED_IN_BITMAP(GET_HEAP_BITMAP(p), p)) { if (BUILTIN_TYPE(p) != T_ZOMBIE) { p->as.free.flags = T_ZOMBIE; RDATA(p)->dfree = 0; @@ -1499,17 +1500,20 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace) RVALUE *final_list = 0; size_t i; + /* run finalizers */ rest_sweep(objspace); if (ATOMIC_EXCHANGE(finalizing, 1)) return; - /* run finalizers */ do { + /* XXX: this loop will make no sense */ + /* 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); - /* force to run finalizer */ while (finalizer_table->num_entries) { struct force_finalize_list *list = 0; -- cgit v1.2.3