merges the 2/2 of r21727 from trunk into ruby_1_9_1.

* gc.c (define_final): freezes or hides internal values.

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

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index aee1dd95c2..191b16bd20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Thu Jan 22 12:19:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* gc.c (define_final): cannot define finalizer for immediate
 	  values.  [ruby-core:21500]
 
+	* gc.c (define_final): freezes or hides internal values.
+
 Thu Jan 22 11:33:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread.c (rb_time_timeval): made a real prototype.  a patch from
diff --git a/gc.c b/gc.c
index 2d4da31a75..002abb3bcb 100644
--- a/gc.c
+++ b/gc.c
@@ -2306,7 +2306,9 @@ define_final(int argc, VALUE *argv, VALUE os)
 	rb_ary_push(table, block);
     }
     else {
-	st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
+	table = rb_ary_new3(1, block);
+	RBASIC(table)->klass = 0;
+	st_add_direct(finalizer_table, obj, table);
     }
     return block;
 }