diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_object.rb | 18 | ||||
| -rw-r--r-- | vm_method.c | 16 |
3 files changed, 39 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Mar 12 12:44:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_method.c (Init_eval_method): copy basic methods to Exception. + [ruby-core:40287][Bug #5473] + Mon Mar 12 10:13:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval_jump.c (rb_exec_end_proc): remember the latest exit status. diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index eca1be78d5..f4a38e0ee3 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -728,4 +728,22 @@ class TestObject < Test::Unit::TestCase :foo.singleton_class end end + + def test_redef_method_missing + bug5473 = '[ruby-core:40287]' + ['ArgumentError.new("bug5473")', 'ArgumentError, "bug5473"', '"bug5473"'].each do |code| + out, err, status = EnvUtil.invoke_ruby([], <<-SRC, true, true) + class ::Object + def method_missing(m, *a, &b) + raise #{code} + end + end + + p((1.foo rescue $!)) + SRC + assert_send([status, :success?], bug5473) + assert_equal("", err, bug5473) + assert_equal((eval("raise #{code}") rescue $!.inspect), out.chomp, bug5473) + end + end end diff --git a/vm_method.c b/vm_method.c index d9f4a0315a..aa636d02ea 100644 --- a/vm_method.c +++ b/vm_method.c @@ -6,6 +6,8 @@ #define CACHE_MASK 0x7ff #define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK) +#define NOEX_NOREDEF NOEX_RESPONDS + static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass); static ID object_id, respond_to_missing; @@ -195,6 +197,11 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, rb_method_definition_t *old_def = old_me->def; if (rb_method_definition_eq(old_def, def)) return old_me; +#if 0 + if (old_me->flag & NOEX_NOREDEF) { + rb_raise(rb_eTypeError, "cannot redefine %s#%s", rb_class2name(klass), rb_id2name(mid)); + } +#endif rb_vm_check_redefinition_opt_method(old_me, klass); if (RTEST(ruby_verbose) && @@ -1385,5 +1392,14 @@ Init_eval_method(void) singleton_undefined = rb_intern("singleton_method_undefined"); attached = rb_intern("__attached__"); respond_to_missing = rb_intern("respond_to_missing?"); + + { +#define REPLICATE_METHOD(klass, id) \ + rb_method_entry_set((klass), (id), rb_method_entry((klass), (id)), \ + (rb_method_flag_t)(NOEX_PRIVATE | NOEX_BASIC | NOEX_NOREDEF)) + REPLICATE_METHOD(rb_eException, idMethodMissing); + REPLICATE_METHOD(rb_eException, idRespond_to); + REPLICATE_METHOD(rb_eException, respond_to_missing); + } } |