From 18488c1117dfcb492694b2733cd96dba3602aae3 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 22 Feb 2013 05:28:36 +0000 Subject: merge revision(s) 34982: [Backport #5218] * eval_jump.c (rb_exec_end_proc): remember the latest exit status. [ruby-core:43173][Bug #5218] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval_jump.c | 5 +++++ test/ruby/test_beginendblock.rb | 13 +++++++++++++ version.h | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ebf2534329..fa3bcf75ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 22 14:28:17 2013 Nobuyoshi Nakada + + * eval_jump.c (rb_exec_end_proc): remember the latest exit status. + [ruby-core:43173][Bug #5218] + Fri Feb 22 14:25:57 2013 NARUSE, Yui * ext/readline/readline.c (Init_readline): don't set 0 to diff --git a/eval_jump.c b/eval_jump.c index a8f04808ca..f3a1f78a3f 100644 --- a/eval_jump.c +++ b/eval_jump.c @@ -99,6 +99,8 @@ rb_exec_end_proc(void) struct end_proc_data *volatile link; int status; volatile int safe = rb_safe_level(); + rb_thread_t *th = GET_THREAD(); + VALUE errinfo = th->errinfo; while (ephemeral_end_procs) { link = ephemeral_end_procs; @@ -112,6 +114,7 @@ rb_exec_end_proc(void) POP_TAG(); if (status) { error_handle(status); + if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } xfree(link); } @@ -128,10 +131,12 @@ rb_exec_end_proc(void) POP_TAG(); if (status) { error_handle(status); + if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } xfree(link); } rb_set_safe_level_force(safe); + th->errinfo = errinfo; } void diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index 7e460b989d..b590835a2d 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -145,4 +145,17 @@ EOW assert_in_out_err(t.path, "", expected, [], "[ruby-core:35237]") t.close end + + def test_rescue_at_exit + bug5218 = '[ruby-core:43173][Bug #5218]' + cmd = [ + "raise 'X' rescue nil", + "nil", + "exit(42)", + ] + %w[at_exit END].each do |ex| + out, err, status = EnvUtil.invoke_ruby(cmd.map {|s|["-e", "#{ex} {#{s}}"]}.flatten, "", true, true) + assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}") + end + end end diff --git a/version.h b/version.h index 10ec8736c1..815752a5ad 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 387 +#define RUBY_PATCHLEVEL 388 #define RUBY_RELEASE_DATE "2013-02-22" #define RUBY_RELEASE_YEAR 2013 -- cgit v1.2.3