diff options
Diffstat (limited to 'eval.c')
| -rw-r--r-- | eval.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -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); } |