shyouhei	2009-03-09 09:05:03 +0900 (Mon, 09 Mar 2009)

  New Revision: 22834

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22834

  Log:
    merge revision(s) 21727:
    * gc.c (define_final): cannot define finalizer for immediate
      values.  [ruby-core:21500]
    * gc.c (define_final): freezes or hides internal values.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/gc.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22833)
+++ ruby_1_8_7/ChangeLog	(revision 22834)
@@ -1,3 +1,10 @@
+Mon Mar  9 09:04:39 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (define_final): cannot define finalizer for immediate
+	  values.  [ruby-core:21500]
+
+	* gc.c (define_final): freezes or hides internal values.
+
 Mon Mar  9 08:54:47 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (IS_BEG): EXPR_CLASS should be treated like EXPR_BEG.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22833)
+++ ruby_1_8_7/version.h	(revision 22834)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-03-09"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090309
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/gc.c
===================================================================
--- ruby_1_8_7/gc.c	(revision 22833)
+++ ruby_1_8_7/gc.c	(revision 22834)
@@ -1887,9 +1887,14 @@
 		 rb_obj_classname(block));
     }
     need_call_final = 1;
-    FL_SET(obj, FL_FINALIZE);
+    if (!FL_ABLE(obj)) {
+	rb_raise(rb_eArgError, "cannot define finalizer for %s",
+		 rb_obj_classname(obj));
+    }
+    RBASIC(obj)->flags |= FL_FINALIZE;
 
     block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
+    OBJ_FREEZE(block);
 
     if (!finalizer_table) {
 	finalizer_table = st_init_numtable();
@@ -1898,7 +1903,9 @@
 	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;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/