diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-11-06 07:44:28 +0000 |
| commit | 1096d702ed9e4cbc26499fe3749acc7f3609da8f (patch) | |
| tree | e8d9634d0184a97f1d342a65b20207b03d272b20 /vm_insnhelper.c | |
| parent | f0f7f42e8810fe80056df83771004c52fea28b08 (diff) | |
| download | ruby-1096d702ed9e4cbc26499fe3749acc7f3609da8f.tar.gz | |
move rb_thread_t::interrupt_flag and mask
to rb_execution_context_t.
* vm_core.h (rb_thread_t): move
`rb_thread_t::interrupt_flag` and
`rb_thread_t::interrupt_mask` to rb_execution_context_t.
RUBY_VM_CHECK_INTS() accepts `ec` instead of `th`.
* cont.c (rb_fiber_terminate): to propagate interrupt information,
add new parameter `need_interrupt`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index fb2ca371ed..1cb1e5664f 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1712,7 +1712,7 @@ vm_call_iseq_setup_tailcall(rb_execution_context_t *ec, rb_control_frame_t *cfp, iseq->body->stack_max); cfp->sp = sp_orig; - RUBY_VM_CHECK_INTS(rb_ec_thread_ptr(ec)); + RUBY_VM_CHECK_INTS(ec); return Qundef; } @@ -3284,7 +3284,7 @@ vm_once_dispatch(ISEQ iseq, IC ic, rb_thread_t *th) } else { /* waiting for finish */ - RUBY_VM_CHECK_INTS(th); + RUBY_VM_CHECK_INTS(th->ec); rb_thread_schedule(); goto again; } |