diff --git a/eval.c b/eval.c index 35255e0975..5900f22dbd 100644 --- a/eval.c +++ b/eval.c @@ -531,7 +531,7 @@ setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE mesg = rb_obj_dup(mesg); } } - if (cause != Qundef) { + if (cause != Qundef && !THROW_DATA_P(cause)) { exc_setup_cause(mesg, cause); } if (NIL_P(bt)) { diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 8784dd7dd7..88b02293e8 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -699,6 +699,12 @@ end.join assert_same(a, e.cause.cause) end + def test_cause_at_end + assert_in_out_err([], <<-'end;', [], [/-: unexpected return\n/, /.*undefined local variable or method `n'.*\n/]) + END{n}; END{return} + end; + end + def test_raise_with_cause msg = "[Feature #8257]" cause = ArgumentError.new("foobar")