nobu	2012-03-12 10:13:40 +0900 (Mon, 12 Mar 2012)

  New Revision: 34982

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34982

  Log:
    * eval_jump.c (rb_exec_end_proc): remember the latest exit status.
      [ruby-core:43173][Bug #5218]

  Modified files:
    trunk/ChangeLog
    trunk/eval_jump.c
    trunk/test/ruby/test_beginendblock.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34981)
+++ ChangeLog	(revision 34982)
@@ -1,3 +1,8 @@
+Mon Mar 12 10:13:36 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval_jump.c (rb_exec_end_proc): remember the latest exit status.
+	  [ruby-core:43173][Bug #5218]
+
 Mon Mar 12 07:33:12 2012  Tanaka Akira  <akr@f...>
 
 	* lib/tmpdir.rb: update document for changing
Index: eval_jump.c
===================================================================
--- eval_jump.c	(revision 34981)
+++ eval_jump.c	(revision 34982)
@@ -99,6 +99,8 @@
     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 @@
 	POP_TAG();
 	if (status) {
 	    error_handle(status);
+	    if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
 	}
 	xfree(link);
     }
@@ -128,10 +131,12 @@
 	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
Index: test/ruby/test_beginendblock.rb
===================================================================
--- test/ruby/test_beginendblock.rb	(revision 34981)
+++ test/ruby/test_beginendblock.rb	(revision 34982)
@@ -148,4 +148,17 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/