diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 21:10:24 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 21:10:24 +0000 |
commit | f4db8aedc87d0ff901206e4c59478554b7b952a6 (patch) | |
tree | 0b6a38f278849be443d5ef538b1e92b4f12ada2c /vm.c | |
parent | da4d3e846407a538aef893af8478aa13ba7d8cb8 (diff) |
* compile.c (setup_args), vm.c (invoke_block_from_c),
vm_insnhelper.c (caller_setup_args): reverted r30241 and r30243
except for the test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -531,10 +531,7 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, const rb_control_frame_t *cfp; rb_control_frame_t *ncfp; int i, opt_pc, arg_size = iseq->arg_size; - int type = - block->proc == Qtrue ? VM_FRAME_MAGIC_LAMBDA : - block->proc == Qfalse ? VM_FRAME_MAGIC_BLOCK : - block_proc_is_lambda(block->proc) ? + int type = block_proc_is_lambda(block->proc) ? VM_FRAME_MAGIC_LAMBDA : VM_FRAME_MAGIC_BLOCK; rb_vm_set_finish_env(th); |