diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-22 03:18:16 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-22 03:18:16 +0000 |
commit | 55bde4fbbd5e3ce449a44c8d0154127438cddf4a (patch) | |
tree | d1c9a4e553cbc040013f06ca61c9547f36bcda90 /gc.c | |
parent | 3899c1bed7d5d4f519897b1d3b87292084fbcad6 (diff) |
* gc.c (define_final): cannot define finalizer for immediate
values. [ruby-core:21500]
* gc.c (define_final): freezes or hides internal values.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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(); @@ -2301,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; } |