* gc.c (rb_gc_call_finalizer_at_exit): finalize deferred IO and Data.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 76f970ae1..9f8a10dca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Oct  1 19:13:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct  1 21:36:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): finalize deferred IO and Data.
 
 	* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.
 	  [ruby-dev:36646]
diff --git a/gc.c b/gc.c
index 919663b47..dd3bc44ba 100644
--- a/gc.c
+++ b/gc.c
@@ -2357,13 +2357,13 @@ rb_gc_call_finalizer_at_exit(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
     RVALUE *p, *pend;
+    RVALUE *final_list = 0;
     size_t i;
 
     /* run finalizers */
     if (finalizer_table) {
 	finalize_deferred(objspace);
 	while (finalizer_table->num_entries > 0) {
-	    RVALUE *final_list = 0;
 	    st_foreach(finalizer_table, chain_finalized_object,
 		       (st_data_t)&final_list);
 	    if (!(p = final_list)) break;
@@ -2390,18 +2390,24 @@ rb_gc_call_finalizer_at_exit(void)
 		}
 		else if (RANY(p)->as.data.dfree) {
 		    make_deferred(RANY(p));
+		    RANY(p)->as.free.next = final_list;
+		    final_list = p;
 		}
 	    }
 	    else if (BUILTIN_TYPE(p) == T_FILE) {
 		if (RANY(p)->as.file.fptr) {
 		    make_io_deferred(RANY(p));
+		    RANY(p)->as.free.next = final_list;
+		    final_list = p;
 		}
 	    }
 	    p++;
 	}
     }
     during_gc = 0;
-    finalize_deferred(objspace);
+    if (final_list) {
+	finalize_list(objspace, final_list);
+    }
 }
 
 void