From f1a2033d759cda9806dd667a077235e6df80dabf Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 12 Mar 2017 18:01:22 +0000 Subject: merge revision(s) 57415,57463,57474: eval.c: copy special exception * eval.c (setup_exception): make unfrozen copy of special exception before setting up a cause. reduce iterations for slower machines test_io.rb: separate a test * test/ruby/test_io.rb (test_closed_stream_in_rescue): run in a separated process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 62509688e3..8a839ced7d 100644 --- a/eval.c +++ b/eval.c @@ -470,6 +470,17 @@ sysstack_error_p(VALUE exc) return exc == sysstack_error || (!SPECIAL_CONST_P(exc) && RBASIC_CLASS(exc) == rb_eSysStackError); } +static inline int +special_exception_p(rb_thread_t *th, VALUE exc) +{ + enum ruby_special_exceptions i; + const VALUE *exceptions = th->vm->special_exceptions; + for (i = 0; i < ruby_special_error_count; ++i) { + if (exceptions[i] == exc) return TRUE; + } + return FALSE; +} + static void setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) { @@ -487,6 +498,9 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) mesg = rb_exc_new(rb_eRuntimeError, 0, 0); nocause = 0; } + else if (special_exception_p(th, mesg)) { + mesg = ruby_vm_special_exception_copy(mesg); + } if (cause != Qundef) { exc_setup_cause(mesg, cause); } @@ -503,9 +517,6 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) if (sysstack_error_p(mesg)) { if (NIL_P(rb_attr_get(mesg, idBt))) { at = rb_vm_backtrace_object(); - if (mesg == sysstack_error) { - mesg = ruby_vm_sysstack_error_copy(); - } rb_ivar_set(mesg, idBt, at); rb_ivar_set(mesg, idBt_locations, at); } -- cgit v1.2.3