diff options
| -rw-r--r-- | eval.c | 26 | ||||
| -rw-r--r-- | test/ruby/test_exception.rb | 7 |
2 files changed, 22 insertions, 11 deletions
@@ -481,18 +481,17 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) mesg = rb_exc_new(rb_eRuntimeError, 0, 0); nocause = 0; } - if (cause != Qundef) { - exc_setup_cause(mesg, cause); - } - else if (nocause) { - exc_setup_cause(mesg, Qnil); - } - else if (!rb_ivar_defined(mesg, id_cause)) { - exc_setup_cause(mesg, get_thread_errinfo(th)); + if (cause == Qundef) { + if (nocause) { + cause = Qnil; + } + else if (!rb_ivar_defined(mesg, id_cause)) { + cause = get_thread_errinfo(th); + } } file = rb_source_loc(&line); - if (file && !NIL_P(mesg)) { + if ((file && !NIL_P(mesg)) || (cause != Qundef)) { VALUE at; int status; @@ -501,11 +500,16 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) VALUE bt; if (rb_threadptr_set_raised(th)) goto fatal; bt = rb_get_backtrace(mesg); - if (NIL_P(bt)) { - at = rb_threadptr_backtrace_object(th); + if (!NIL_P(bt) || cause == Qundef) { if (OBJ_FROZEN(mesg)) { mesg = rb_obj_dup(mesg); } + } + if (cause != Qundef) { + exc_setup_cause(mesg, cause); + } + if (NIL_P(bt)) { + at = rb_threadptr_backtrace_object(th); rb_ivar_set(mesg, idBt_locations, at); set_backtrace(mesg, at); } diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 37b5f7068c..1179c26c51 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -799,6 +799,13 @@ end.join assert_nil(orig_error.cause, bug13043) end + def test_cause_with_frozen_exception + exc = ArgumentError.new("foo").freeze + assert_raise_with_message(ArgumentError, exc.message) { + raise exc, cause: RuntimeError.new("bar") + } + end + def test_anonymous_message assert_in_out_err([], "raise Class.new(RuntimeError), 'foo'", [], /foo\n/) end |