diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | vm_method.c | 10 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Apr 19 00:27:03 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * vm_method.c (rb_add_method_def): workarond fix for redefinition + of methods. This is because cfp->me uses the rb_method_entry + which is freed by redefinition of remove_method. Note that + reusing may cause another problem when the usage is changed. + [ruby-core:27320] [ruby-core:29464] + Sun Apr 18 22:13:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (string_content): cond_stack and cmdarg_stack are VALUE. diff --git a/vm_method.c b/vm_method.c index 027042b79c..04b62f2c9d 100644 --- a/vm_method.c +++ b/vm_method.c @@ -210,12 +210,18 @@ rb_add_method_def(VALUE klass, ID mid, rb_method_type_t type, rb_method_definiti rb_id2name(old_def->original_id)); } } - rb_free_method_entry(old_me); + + /* FIXME: this avoid to free methods used in cfp, but reusing may cause + * another problem when the usage is changed. + */ + me = old_me; + } + else { + me = ALLOC(rb_method_entry_t); } rb_clear_cache_by_id(mid); - me = ALLOC(rb_method_entry_t); me->flag = NOEX_WITH_SAFE(noex); me->called_id = mid; me->klass = klass; |