From f8e37f5771e20ee532e14d2878a93618e6ba4d96 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 27 Mar 2017 16:28:28 +0000 Subject: merge revision(s) 57362: [Backport #13096] vm_method.c: resolve refined method to undef * vm_method.c (rb_undef): resolve the method entry which refines a prepended method entry. [ruby-core:78944] [Bug #13096] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_method.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vm_method.c') diff --git a/vm_method.c b/vm_method.c index a681df569f..68bebb600a 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1166,7 +1166,7 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex) void rb_undef(VALUE klass, ID id) { - rb_method_entry_t *me; + const rb_method_entry_t *me; if (NIL_P(klass)) { rb_raise(rb_eTypeError, "no class to undef method"); @@ -1177,6 +1177,9 @@ rb_undef(VALUE klass, ID id) } me = search_method(klass, id, 0); + if (me && me->def->type == VM_METHOD_TYPE_REFINED) { + me = rb_resolve_refined_method(Qnil, me); + } if (UNDEFINED_METHOD_ENTRY_P(me) || UNDEFINED_REFINED_METHOD_P(me->def)) { -- cgit v1.2.3