nobu	2009-01-22 12:18:16 +0900 (Thu, 22 Jan 2009)

  New Revision: 21727

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

  Log:
    * 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/ChangeLog
    branches/ruby_1_8/gc.c
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21726)
+++ ChangeLog	(revision 21727)
@@ -1,3 +1,10 @@
+Thu Jan 22 12:19:29 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.
+
 Thu Jan 22 11:33:08 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (rb_time_timeval): made a real prototype.  a patch from
Index: gc.c
===================================================================
--- gc.c	(revision 21726)
+++ gc.c	(revision 21727)
@@ -2290,9 +2290,14 @@
 	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
 		 rb_obj_classname(block));
     }
-    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(rb_safe_level()), block);
+    OBJ_FREEZE(block);
 
     if (!finalizer_table) {
 	finalizer_table = st_init_numtable();
@@ -2301,7 +2306,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;
 }
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 21726)
+++ ruby_1_8/ChangeLog	(revision 21727)
@@ -1,3 +1,10 @@
+Thu Jan 22 12:19:29 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.
+
 Thu Jan 22 11:57:28 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 21726)
+++ ruby_1_8/gc.c	(revision 21727)
@@ -1904,9 +1904,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();
@@ -1915,7 +1920,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/