kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc()

Browse source 
directly to reduce method dispatch overhead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2016-07-08 05:21:54 +00:00
parent ceca045485
commit 286eec2646
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 8 14:16:48 2016 Shugo Maeda <shugo@ruby-lang.org>
* vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc()
directly to reduce method dispatch overhead.
Fri Jul 8 08:43:31 2016 Shugo Maeda <shugo@ruby-lang.org> Fri Jul 8 08:43:31 2016 Shugo Maeda <shugo@ruby-lang.org>
* io.c (rb_io_s_read): add description of pipes to the documentation * io.c (rb_io_s_read): add description of pipes to the documentation

31
vm_args.c
View file

@ -766,12 +766,23 @@ vm_caller_setup_arg_kw(rb_control_frame_t *cfp, struct rb_calling_info *calling,
calling->argc -= kw_len - 1; calling->argc -= kw_len - 1;
} }
static inline void
vm_caller_setup_proc_as_block(rb_control_frame_t *reg_cfp,
struct rb_calling_info *calling,
VALUE proc)
{
rb_proc_t *po;
GetProcPtr(proc, po);
calling->blockptr = &po->block;
RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp)->proc = proc;
}
static void static void
vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp, vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
struct rb_calling_info *calling, const struct rb_call_info *ci, rb_iseq_t *blockiseq, const int is_super) struct rb_calling_info *calling, const struct rb_call_info *ci, rb_iseq_t *blockiseq, const int is_super)
{ {
if (ci->flag & VM_CALL_ARGS_BLOCKARG) { if (ci->flag & VM_CALL_ARGS_BLOCKARG) {
rb_proc_t *po;
VALUE proc; VALUE proc;
proc = *(--reg_cfp->sp); proc = *(--reg_cfp->sp);
@ -779,11 +790,17 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
if (NIL_P(proc)) { if (NIL_P(proc)) {
calling->blockptr = NULL; calling->blockptr = NULL;
} }
else if (LIKELY(!(ci->flag & VM_CALL_TAILCALL)) && SYMBOL_P(proc) && else if (SYMBOL_P(proc) &&
rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) { rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) {
calling->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp); if (LIKELY(!(ci->flag & VM_CALL_TAILCALL))) {
calling->blockptr->iseq = (rb_iseq_t *)proc; calling->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp);
calling->blockptr->proc = proc; calling->blockptr->iseq = (rb_iseq_t *)proc;
calling->blockptr->proc = proc;
}
else {
proc = rb_sym_to_proc(proc);
vm_caller_setup_proc_as_block(reg_cfp, calling, proc);
}
} }
else { else {
if (!rb_obj_is_proc(proc)) { if (!rb_obj_is_proc(proc)) {
@ -797,9 +814,7 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
} }
proc = b; proc = b;
} }
GetProcPtr(proc, po); vm_caller_setup_proc_as_block(reg_cfp, calling, proc);
calling->blockptr = &po->block;
RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp)->proc = proc;
} }
} }
else if (blockiseq != 0) { /* likely */ else if (blockiseq != 0) { /* likely */