archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

move fields to ec.

Browse source 
* 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
This commit is contained in:
ko1 2017-06-28 14:27:49 +00:00
parent 75392e45f1
commit 8dd9c12c58
17 changed files with 105 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eval_error.c
View file

@ -69,7 +69,7 @@ set_backtrace(VALUE info, VALUE bt)
static void
error_print(rb_thread_t *th)
{
rb_threadptr_error_print(th, th->errinfo);
rb_threadptr_error_print(th, th->ec.errinfo);
}
static void
@ -202,7 +202,7 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
}
error:
TH_POP_TAG();
th->errinfo = errinfo;
th->ec.errinfo = errinfo;
rb_thread_raised_set(th, raised_flag);
}
@ -304,7 +304,7 @@ error_handle(int ex)
warn_print("unexpected throw\n");
break;
case TAG_RAISE: {
VALUE errinfo = th->errinfo;
VALUE errinfo = th->ec.errinfo;
if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
status = sysexit_status(errinfo);
}