From b18fcd6a7c45f4726f8ee68dfac4cae662caf384 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 27 May 2010 15:39:34 +0000 Subject: [PATCH] * insns.def (invokesuper): check consistency between class of self and class of method being invoked by super. This is temporary measure for YARV. See [ruby-core:30313] in detail. See [ruby-dev:40959] [ruby-dev:39772] [ruby-core:27000] [ruby-core:27230] * vm_insnhelper.c (vm_search_superclass): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ insns.def | 6 ++++++ vm_insnhelper.c | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 674201a034..494237df29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri May 28 00:32:25 2010 Yusuke Endoh + + * insns.def (invokesuper): check consistency between class of self and + class of method being invoked by super. This is temporary measure + for YARV. See [ruby-core:30313] in detail. See [ruby-dev:40959] + [ruby-dev:39772] [ruby-core:27000] [ruby-core:27230] + + * vm_insnhelper.c (vm_search_superclass): ditto. + Thu May 27 23:38:31 2010 NARUSE, Yui * file.c (rb_home_dir): set filesystem encoding. diff --git a/insns.def b/insns.def index 79b92d8a4d..23c0143907 100644 --- a/insns.def +++ b/insns.def @@ -1022,6 +1022,12 @@ invokesuper recv = GET_SELF(); vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass); + + /* temporary measure for [Bug #2402] [Bug #2502] [Bug #3136] */ + if (!rb_obj_is_kind_of(recv, klass)) { + rb_raise(rb_eNotImpError, "super from singleton method that is defined to multiple classes is not supported; this will be fixed in 1.9.3 or later"); + } + me = rb_method_entry(klass, id); CALL_METHOD(num, blockptr, flag, id, me, recv); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 0bd29b5208..3b442c8d9e 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1402,6 +1402,11 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip, } } + /* temporary measure for [Bug #2420] [Bug #3136] */ + if (!lcfp->me) { + rb_raise(rb_eNoMethodError, "super called outside of method"); + } + id = lcfp->me->def->original_id; klass = vm_search_normal_superclass(lcfp->me->klass, recv); }