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_args.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_args.c')
-rw-r--r-- | vm_args.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -806,7 +806,7 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) VALUE obj; ID mid; const rb_callable_method_entry_t *me; - rb_thread_t *th; + rb_execution_context_t *ec; if (argc-- < 1) { rb_raise(rb_eArgError, "no receiver given"); @@ -814,14 +814,14 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)) obj = *argv++; mid = SYM2ID(callback_arg); me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid, NULL); - th = GET_THREAD(); + ec = GET_EC(); if (!NIL_P(blockarg)) { - vm_passed_block_handler_set(th, blockarg); + vm_passed_block_handler_set(ec, blockarg); } if (!me) { return method_missing(obj, mid, argc, argv, MISSING_NOENTRY); } - return vm_call0(th->ec, obj, mid, argc, argv, me); + return vm_call0(ec, obj, mid, argc, argv, me); } static void |