From 508874c8af7ce2f0a8708256e166b001f62870e1 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jan 2009 09:21:08 +0000
Subject: merges the 1/2 of r21727 from trunk into ruby_1_9_1. * gc.c
 (define_final): cannot define finalizer for immediate   values. 
 [ruby-core:21500]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gc.c')

diff --git a/gc.c b/gc.c
index d56d2d170a..2d4da31a75 100644
--- a/gc.c
+++ b/gc.c
@@ -2290,9 +2290,14 @@ define_final(int argc, VALUE *argv, VALUE os)
 	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();
-- 
cgit v1.2.3