summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-28 18:38:59 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-28 18:38:59 +0000
commit07de51fc4fbb392cedc5b5700bab7b2ac37cfd02 (patch)
tree333f31d0965f43a152380c86154f8a955ad63f53 /vm_insnhelper.c
parent8c0e6223f20e8e2318f43f9a957de00fb08b2d24 (diff)
* 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
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c6
1 files changed, 2 insertions, 4 deletions
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) {