summaryrefslogtreecommitdiff
path: root/vm_method.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-02 17:17:59 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-02 17:17:59 +0000
commit362f70c3cfb861c543ebb99f4ee816ad02dd3785 (patch)
tree19b750c97f347af94f3cbec2dc5a7e563597a0c3 /vm_method.c
parent00ded5b2591816eabd2b1d517c53ab9b5b0cab16 (diff)
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
Diffstat (limited to 'vm_method.c')
-rw-r--r--vm_method.c3
1 files changed, 2 insertions, 1 deletions
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