kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 65554: [Backport #15282]

Browse source 
Don't set throw data as cause [Bug #15282]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@65582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-11-06 15:52:16 +00:00
parent 218ac97bd8
commit 783f1b2908
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eval.c
View file

@ -516,7 +516,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)) {

6
test/ruby/test_exception.rb
View file

@ -698,6 +698,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")

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.4"
#define RUBY_RELEASE_DATE "2018-11-07"
#define RUBY_PATCHLEVEL 110
#define RUBY_PATCHLEVEL 111
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 11