From 362f70c3cfb861c543ebb99f4ee816ad02dd3785 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 2 Mar 2013 17:17:59 +0000 Subject: merge revision(s) 39234,39235: [Backport #7843] * vm_method.c: call method_removed hook on called class, not on prepending iclass. prepending iclass. [ruby-core:52207] [Bug #7843] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_module.rb | 19 +++++++++++++++++-- version.h | 2 +- vm_method.c | 3 ++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index be51810d86..bc47334550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 3 02:16:24 2013 Nobuyoshi Nakada + + * vm_method.c: call method_removed hook on called class, not on + prepending iclass. [ruby-core:52207] [Bug #7843] + Sun Mar 3 01:57:50 2013 Nobuyoshi Nakada * configure.in (warnflags): disable -Werror by default unless diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 6e25dac1d5..6fbf3af2e3 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1382,12 +1382,27 @@ class TestModule < Test::Unit::TestCase end def test_prepend_remove_method + c = Class.new do + prepend Module.new {def foo; end} + end assert_raise(NameError) do - Class.new do - prepend Module.new {def foo; end} + c.class_eval do + remove_method(:foo) + end + end + c.class_eval do + def foo; end + end + removed = nil + c.singleton_class.class_eval do + define_method(:method_removed) {|id| removed = id} + end + assert_nothing_raised(NoMethodError, NameError, '[Bug #7843]') do + c.class_eval do remove_method(:foo) end end + assert_equal(:foo, removed) end def test_prepend_class_ancestors diff --git a/version.h b/version.h index fbf40c15ef..8f5f77ec19 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-03" -#define RUBY_PATCHLEVEL 4 +#define RUBY_PATCHLEVEL 5 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 diff --git a/vm_method.c b/vm_method.c index a82ba5faea..1dbbdd511b 100644 --- a/vm_method.c +++ b/vm_method.c @@ -648,6 +648,7 @@ remove_method(VALUE klass, ID mid) { st_data_t key, data; rb_method_entry_t *me = 0; + VALUE self = klass; klass = RCLASS_ORIGIN(klass); if (klass == rb_cObject) { @@ -674,7 +675,7 @@ remove_method(VALUE klass, ID mid) rb_clear_cache_for_undef(klass, mid); rb_unlink_method_entry(me); - CALL_METHOD_HOOK(klass, removed, mid); + CALL_METHOD_HOOK(self, removed, mid); } void -- cgit v1.2.3