summaryrefslogtreecommitdiff
path: root/insns.def
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 10:27:21 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-03 10:27:21 +0000
commit2d3d84155d6c114a0f76888a8e2779e887722788 (patch)
treeeaaded667ea40494ac6c5c1840931f457eb04a7a /insns.def
parentbea3f0df108ad4a983843eae83231cca2843b30d (diff)
* insns.def (invokesuper): don't skip the same class. instead, use
rb_method_entry_get_with_omod() to avoid infinite loop when super is used with refinements. [ruby-core:30450] [Bug #3351] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r--insns.def7
1 files changed, 1 insertions, 6 deletions
diff --git a/insns.def b/insns.def
index 24e358d16f..57e6666b75 100644
--- a/insns.def
+++ b/insns.def
@@ -1045,12 +1045,7 @@ invokesuper
while (ip && !ip->klass) {
ip = ip->parent_iseq;
}
- 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);
- }
+ me = rb_method_entry_get_with_omod(Qnil, klass, id, &klass);
CALL_METHOD(num, blockptr, flag, id, me, recv, klass);
}