summaryrefslogtreecommitdiff
path: root/vm_eval.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-14 17:59:42 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-14 17:59:42 +0000
commit639eff2ea7738cbaca771a8fb8e2e20dde1585e3 (patch)
tree57dd0b29d534329d5d6195eb7077813ba58eae2a /vm_eval.c
parentedf505a7e8d52970a2a1ae29ab450abf3819a63b (diff)
merge revision(s) 56520: [Backport #12876]
* vm_eval.c (vm_call0_body): follow the original class, not to loop the prepended module. [ruby-core:77784] [Bug #12876] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r--vm_eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_eval.c b/vm_eval.c
index ce95106fbb..57e6393610 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -207,7 +207,7 @@ vm_call0_body(rb_thread_t* th, struct rb_calling_info *calling, const struct rb_
goto again;
}
- super_class = RCLASS_SUPER(cc->me->defined_class);
+ super_class = RCLASS_SUPER(RCLASS_ORIGIN(cc->me->defined_class));
if (!super_class || !(cc->me = rb_callable_method_entry(super_class, ci->mid))) {
enum method_missing_reason ex = (type == VM_METHOD_TYPE_ZSUPER) ? MISSING_SUPER : 0;