summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 22:52:15 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 22:52:15 +0000
commit4ff235fe433124eed0ee089b8a9d85f74891952f (patch)
tree7a4099b5938f1e67db95d1117812525bc555f9f7 /proc.c
parent41dab62222a24c1ca1d2bf370afbfc02cd5e0d16 (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_2@56731 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 5995c9778e..3ddbe3e2e3 100644
--- a/proc.c
+++ b/proc.c
@@ -1206,7 +1206,7 @@ mnew_internal(rb_method_entry_t *me, VALUE defined_class, VALUE klass,
}
}
if (def && def->type == VM_METHOD_TYPE_ZSUPER) {
- klass = RCLASS_SUPER(defined_class);
+ klass = RCLASS_SUPER(RCLASS_ORIGIN(defined_class));
id = def->original_id;
me = rb_method_entry_without_refinements(klass, id, &defined_class);
goto again;