merge revision(s) 22882,22961,22971:

	* gc.c (run_final): calls free function.  [ruby-core:22578]
	* gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects
	  unfinalized.  [ruby-dev:38168]
	* gc.c (run_final): frees zombies only.  [ruby-dev:38171]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 22 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b6a2f2a7f..87caff5c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_final): frees zombies only.  [ruby-dev:38171]
+
+Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects
+	  unfinalized.  [ruby-dev:38168]
+
+Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_final): calls free function.  [ruby-core:22578]
+
 Mon Mar 23 19:17:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/thread/thread.c (rb_queue_pop, rb_queue_push): should not lock
diff --git a/gc.c b/gc.c
index 489533251d..a564f0be22 100644
--- a/gc.c
+++ b/gc.c
@@ -1942,6 +1942,9 @@ run_final(obj)
 
     objid = rb_obj_id(obj);	/* make obj into id */
     rb_thread_critical = Qtrue;
+    if (BUILTIN_TYPE(obj) == T_DEFERRED && RDATA(obj)->dfree) {
+	(*RDATA(obj)->dfree)(DATA_PTR(obj));
+    }
     args[1] = 0;
     args[2] = (VALUE)ruby_safe_level;
     for (i=0; i<RARRAY(finalizers)->len; i++) {
@@ -2010,7 +2013,8 @@ rb_gc_call_finalizer_at_exit()
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if (BUILTIN_TYPE(p) == T_DATA &&
-		DATA_PTR(p) && RANY(p)->as.data.dfree) {
+		DATA_PTR(p) && RANY(p)->as.data.dfree &&
+		RANY(p)->as.basic.klass != rb_cThread) {
 		p->as.free.flags = 0;
 		if ((long)RANY(p)->as.data.dfree == -1) {
 		    RUBY_CRITICAL(free(DATA_PTR(p)));
diff --git a/version.h b/version.h
index 5396b5f543..511b87de84 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-03-23"
+#define RUBY_RELEASE_DATE "2009-03-27"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090323
-#define RUBY_PATCHLEVEL 153
+#define RUBY_RELEASE_CODE 20090327
+#define RUBY_PATCHLEVEL 154
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 27
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];