diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-28 18:38:59 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-28 18:38:59 +0000 |
| commit | 86410b397e7921d8f67730ba8f8f268f7fc3a16c (patch) | |
| tree | 333f31d0965f43a152380c86154f8a955ad63f53 | |
| parent | f254242169b52f3e192382e2bdd00fd87d934ec7 (diff) | |
| download | ruby-86410b397e7921d8f67730ba8f8f268f7fc3a16c.tar.gz ruby-86410b397e7921d8f67730ba8f8f268f7fc3a16c.tar.xz ruby-86410b397e7921d8f67730ba8f8f268f7fc3a16c.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@24309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_core.h | 1 | ||||
| -rw-r--r-- | vm_insnhelper.c | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Jul 29 03:34:46 2009 Koichi Sasada <ko1@atdot.net> + + * 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@atdot.net> * proc.c (rb_method_entry_arity): support not_implemented method. @@ -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 4e7ce63f8..b1d36fb23 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) { |