diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-03 16:32:52 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-03 16:32:52 +0000 |
commit | 9bef3f051990afb7a437ddc120bbeaaabcc573e2 (patch) | |
tree | 4c893d53d3a8392d56cb04424e1d7b5e33be3d03 /insns.def | |
parent | 2d3d84155d6c114a0f76888a8e2779e887722788 (diff) | |
download | ruby-9bef3f051990afb7a437ddc120bbeaaabcc573e2.tar.gz |
* 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
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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); } |