diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-28 10:01:54 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-28 10:01:54 +0000 |
commit | f8a9d044f416e04e0c340fe77bf5c603fc753ff2 (patch) | |
tree | df3d94237a6d12d099e235ba62bb743549b5b1b4 /vm.c | |
parent | e6f133b66aa705d1022dcb8dbe48cf93acec519b (diff) | |
download | ruby-f8a9d044f416e04e0c340fe77bf5c603fc753ff2.tar.gz |
move fields from `th` to `ec`.
* vm_core.h: move rb_thread_t::passed_block_handler to
rb_execution_context_t::passed_block_handler.
Also move rb_thread_t::passed_bmethod_me to
rb_execution_context_t::passed_bmethod_me.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -168,10 +168,10 @@ VM_BH_FROM_CFP_P(VALUE block_handler, const rb_control_frame_t *cfp) } static VALUE -vm_passed_block_handler(rb_thread_t *th) +vm_passed_block_handler(rb_execution_context_t *ec) { - VALUE block_handler = th->passed_block_handler; - th->passed_block_handler = VM_BLOCK_HANDLER_NONE; + VALUE block_handler = ec->passed_block_handler; + ec->passed_block_handler = VM_BLOCK_HANDLER_NONE; vm_block_handler_verify(block_handler); return block_handler; } @@ -1018,8 +1018,8 @@ invoke_iseq_block_from_c(rb_execution_context_t *ec, const struct rb_captured_bl VALUE type = VM_FRAME_MAGIC_BLOCK | (is_lambda ? VM_FRAME_FLAG_LAMBDA : 0); rb_control_frame_t *cfp = ec->cfp; VALUE *sp = cfp->sp; - const rb_callable_method_entry_t *me = th->passed_bmethod_me; - th->passed_bmethod_me = NULL; + const rb_callable_method_entry_t *me = ec->passed_bmethod_me; + ec->passed_bmethod_me = NULL; stack_check(th); CHECK_VM_STACK_OVERFLOW(cfp, argc); |