From 07de51fc4fbb392cedc5b5700bab7b2ac37cfd02 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 28 Jul 2009 18:38:59 +0000 Subject: * vm_core.h, vm_insnhelper.c (vm_call_method): revive VM_CALL_OPT_SEND_BIT and use it to recognize "send" method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_core.h | 1 + vm_insnhelper.c | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e52e84931c..c759ca3641 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 29 03:34:46 2009 Koichi Sasada + + * vm_core.h, vm_insnhelper.c (vm_call_method): revive + VM_CALL_OPT_SEND_BIT and use it to recognize "send" method. + Wed Jul 29 03:11:59 2009 Koichi Sasada * proc.c (rb_method_entry_arity): support not_implemented method. diff --git a/vm_core.h b/vm_core.h index a435ce0f20..fe7bcacfa7 100644 --- a/vm_core.h +++ b/vm_core.h @@ -500,6 +500,7 @@ typedef struct { #define VM_CALL_TAILCALL_BIT (0x01 << 5) #define VM_CALL_TAILRECURSION_BIT (0x01 << 6) #define VM_CALL_SUPER_BIT (0x01 << 7) +#define VM_CALL_OPT_SEND_BIT (0x01 << 8) #define VM_SPECIAL_OBJECT_VMCORE 0x01 #define VM_SPECIAL_OBJECT_CBASE 0x02 diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 4e7ce63f84..b1d36fb234 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -496,7 +496,6 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, ID id, const rb_method_entry_t *me, VALUE recv) { VALUE val; - int opt_send = 0; start_method_dispatch: @@ -567,8 +566,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, me = rb_method_entry(CLASS_OF(recv), id); num -= 1; DEC_SP(1); - flag |= VM_CALL_FCALL_BIT; - opt_send = 1; + flag |= VM_CALL_FCALL_BIT | VM_CALL_OPT_SEND_BIT; goto start_method_dispatch; } @@ -607,7 +605,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, } val = vm_method_missing(th, id, recv, num, blockptr, stat); } - else if (!opt_send && (me->flag & NOEX_MASK) & NOEX_PROTECTED) { + else if (!(flag & VM_CALL_OPT_SEND_BIT) && (me->flag & NOEX_MASK) & NOEX_PROTECTED) { VALUE defined_class = me->klass; if (TYPE(defined_class) == T_ICLASS) { -- cgit v1.2.3