ruby-changes:12598
From: ko1 <ko1@a...>
Date: Wed, 29 Jul 2009 03:40:18 +0900 (JST)
Subject: [ruby-changes:12598] Ruby:r24309 (trunk): * vm_core.h, vm_insnhelper.c (vm_call_method): revive
ko1 2009-07-29 03:38:59 +0900 (Wed, 29 Jul 2009) New Revision: 24309 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24309 Log: * vm_core.h, vm_insnhelper.c (vm_call_method): revive VM_CALL_OPT_SEND_BIT and use it to recognize "send" method. Modified files: trunk/ChangeLog trunk/vm_core.h trunk/vm_insnhelper.c Index: ChangeLog =================================================================== --- ChangeLog (revision 24308) +++ ChangeLog (revision 24309) @@ -1,3 +1,8 @@ +Wed Jul 29 03:34:46 2009 Koichi Sasada <ko1@a...> + + * 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 <ko1@a...> * proc.c (rb_method_entry_arity): support not_implemented method. Index: vm_core.h =================================================================== --- vm_core.h (revision 24308) +++ vm_core.h (revision 24309) @@ -500,6 +500,7 @@ #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 Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 24308) +++ vm_insnhelper.c (revision 24309) @@ -496,7 +496,6 @@ ID id, const rb_method_entry_t *me, VALUE recv) { VALUE val; - int opt_send = 0; start_method_dispatch: @@ -567,8 +566,7 @@ 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 @@ } 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) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/