From b942e7891a4ac1a74f1ed45612b21aee617bc163 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 3 Dec 2010 23:25:19 +0000 Subject: * vm_insnhelper.c (vm_call_method): revert r30064 and r30071, because of [ruby-core:26761]. Bug#4106 rejected. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index cc01cdf7ef..0ae0aec714 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -629,7 +629,10 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, else if (!(flag & VM_CALL_OPT_SEND_BIT) && (me->flag & NOEX_MASK) & NOEX_PROTECTED) { VALUE defined_class = me->klass; - defined_class = rb_class_real(defined_class); + if (RB_TYPE_P(defined_class, T_ICLASS)) { + defined_class = RBASIC(defined_class)->klass; + } + if (!rb_obj_is_kind_of(cfp->self, defined_class)) { val = vm_method_missing(th, id, recv, num, blockptr, NOEX_PROTECTED); } -- cgit v1.2.3