summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 16:02:45 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 16:02:45 +0000
commit4ed0c2c6ff3505cdc3c7e761c193547aee7e5a3e (patch)
tree5d313227945207c09df7bb0ba38a77ed28f6e25f /proc.c
parenta42f44459f36046b46aa36424bd502a06bb596ed (diff)
merge revision(s) 56489: [Backport #12832]
* proc.c (mnew_internal): follow the original class, not to loop the prepended module. [ruby-core:77591] [Bug #12832] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/proc.c b/proc.c
index 5387298692..9df55c45c4 100644
--- a/proc.c
+++ b/proc.c
@@ -1296,7 +1296,7 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass,
}
if (me->def->type == VM_METHOD_TYPE_ZSUPER) {
if (me->defined_class) {
- VALUE klass = RCLASS_SUPER(me->defined_class);
+ VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class));
id = me->def->original_id;
me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id);
}