diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-28 14:27:49 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-28 14:27:49 +0000 |
| commit | 478770b81a1839d17de0c75edbb84bc937d97f91 (patch) | |
| tree | fb3e3b2351ee24ff78d21116d18b9604c4a53fa0 /eval_jump.c | |
| parent | 6ea99f4571a52a0de5232a41f17ef7533d14e910 (diff) | |
| download | ruby-478770b81a1839d17de0c75edbb84bc937d97f91.tar.gz | |
move fields to ec.
* vm_core.h (rb_thread.h): move errinfo and trace_arg to
rb_execution_context_t.
* cont.c (fiber_switch, rb_cont_call): do not restore "trace_arg" here.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_jump.c')
| -rw-r--r-- | eval_jump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eval_jump.c b/eval_jump.c index 37f5ab591d..22722719b5 100644 --- a/eval_jump.c +++ b/eval_jump.c @@ -116,26 +116,26 @@ rb_exec_end_proc(void) enum ruby_tag_type state; volatile int safe = rb_safe_level(); rb_thread_t *th = GET_THREAD(); - volatile VALUE errinfo = th->errinfo; + volatile VALUE errinfo = th->ec.errinfo; TH_PUSH_TAG(th); if ((state = EXEC_TAG()) == TAG_NONE) { again: - exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo); - exec_end_procs_chain(&end_procs, &th->errinfo); + exec_end_procs_chain(&ephemeral_end_procs, &th->ec.errinfo); + exec_end_procs_chain(&end_procs, &th->ec.errinfo); } else { VAR_INITIALIZED(th); TH_TMPPOP_TAG(); error_handle(state); - if (!NIL_P(th->errinfo)) errinfo = th->errinfo; + if (!NIL_P(th->ec.errinfo)) errinfo = th->ec.errinfo; TH_REPUSH_TAG(); goto again; } TH_POP_TAG(); rb_set_safe_level_force(safe); - th->errinfo = errinfo; + th->ec.errinfo = errinfo; } void |