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

1 files changed, 17 insertions, 2 deletions

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