summaryrefslogtreecommitdiff
path: root/vm_args.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-01 10:50:49 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-01 10:50:49 (GMT)
commita7f64368ae1cef2bc9c95372e5d90d99dd7b032f (patch)
tree457142e72e19d4724c6fbad6652e680d46bd4ee7 /vm_args.c
parenteee3546b16c0d6bfba96f61b0d4f03fb9194d5ae (diff)
revert r51991
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_args.c')
-rw-r--r--vm_args.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/vm_args.c b/vm_args.c
index 7211701..1ed98b5 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -766,11 +766,10 @@ vm_caller_setup_arg_kw(rb_control_frame_t *cfp, struct rb_calling_info *calling,
calling->argc -= kw_len - 1;
}
-static VALUE
+static void
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)
{
- VALUE mark = 0;
if (ci->flag & VM_CALL_ARGS_BLOCKARG) {
rb_proc_t *po;
VALUE proc;
@@ -779,10 +778,8 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
if (SYMBOL_P(proc) && rb_method_basic_definition_p(rb_cSymbol, idTo_proc)) {
calling->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp);
- blockiseq = (rb_iseq_t *)IFUNC_NEW(rb_sym_proc_call, SYM2ID(proc), 0);
- calling->blockptr->iseq = blockiseq;
+ calling->blockptr->iseq = (rb_iseq_t *)IFUNC_NEW(rb_sym_proc_call, SYM2ID(proc), 0);
calling->blockptr->proc = 0;
- mark = (VALUE)blockiseq;
}
else if (!NIL_P(proc)) {
if (!rb_obj_is_proc(proc)) {
@@ -817,8 +814,6 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
calling->blockptr = NULL;
}
}
-
- return mark;
}
#define IS_ARGS_SPLAT(ci) ((ci)->flag & VM_CALL_ARGS_SPLAT)