* insns.def (invokesuper): reverted r36612 so that super in an

  aliased method will not call the same method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 1 deletions

diff --git a/insns.def b/insns.def
index 57e6666b75..24e358d16f 100644
--- a/insns.def
+++ b/insns.def
@@ -1045,7 +1045,12 @@ invokesuper
     while (ip && !ip->klass) {
 	ip = ip->parent_iseq;
     }
-    me = rb_method_entry_get_with_omod(Qnil, klass, id, &klass);
+    me = rb_method_entry(klass, id, &klass);
+    if (me && me->def->type == VM_METHOD_TYPE_ISEQ &&
+	me->def->body.iseq == ip) {
+	klass = RCLASS_SUPER(klass);
+	me = rb_method_entry_get_with_omod(Qnil, klass, id, &klass);
+    }
 
     CALL_METHOD(num, blockptr, flag, id, me, recv, klass);
 }