From 639eff2ea7738cbaca771a8fb8e2e20dde1585e3 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Nov 2016 17:59:42 +0000
Subject: 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
---
 vm_eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vm_eval.c')

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;
-- 
cgit v1.2.3