merge revision(s) 54681: [Backport ruby#12302]

unak · unak · commit ba1bd67dbecb · 2016-04-26T04:17:39.000Z
* eval_jump.c (exec_end_procs_chain): restore previous error info for each end procs. [ruby-core:75038] [Bug ruby#12302] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 26 13:16:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_jump.c (exec_end_procs_chain): restore previous error info
+	  for each end procs.  [ruby-core:75038] [Bug #12302]
+
 Fri Apr 22 18:36:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (new_label_body): initialize bit fields, since
diff --git a/eval_jump.c b/eval_jump.c
@@ -94,17 +94,19 @@ rb_mark_end_proc(void)
 }
 
 static void
-exec_end_procs_chain(struct end_proc_data *volatile *procs)
+exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
 {
     struct end_proc_data volatile endproc;
     struct end_proc_data *link;
+    VALUE errinfo = *errp;
 
     while ((link = *procs) != 0) {
 	*procs = link->next;
 	endproc = *link;
 	xfree(link);
 	rb_set_safe_level_force(endproc.safe);
 	(*endproc.func) (endproc.data);
+	*errp = errinfo;
     }
 }
 
@@ -119,8 +121,8 @@ rb_exec_end_proc(void)
     PUSH_TAG();
     if ((status = EXEC_TAG()) == 0) {
       again:
-	exec_end_procs_chain(&ephemeral_end_procs);
-	exec_end_procs_chain(&end_procs);
+	exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo);
+	exec_end_procs_chain(&end_procs, &th->errinfo);
     }
     else {
 	VAR_INITIALIZED(th);
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
@@ -187,4 +187,22 @@ def test_callcc_at_exit
 EOS
     assert_normal_exit(script, bug9110)
   end
+
+  def test_errinfo_at_exit
+    bug12302 = '[ruby-core:75038] [Bug #12302]'
+    assert_in_out_err([], <<-'end;', %w[2:exit 1:exit], [], bug12302)
+      at_exit do
+        puts "1:#{$!}"
+      end
+
+      at_exit do
+        puts "2:#{$!}"
+        raise 'x' rescue nil
+      end
+
+      at_exit do
+        exit
+      end
+    end;
+  end
 end
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.5"
-#define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 314
+#define RUBY_RELEASE_DATE "2016-04-26"
+#define RUBY_PATCHLEVEL 315
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -94,17 +94,19 @@ rb_mark_end_proc(void)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`static void`
`97`		`-exec_end_procs_chain(struct end_proc_data volatile procs)`
	`97`	`+exec_end_procs_chain(struct end_proc_data volatile procs, VALUE *errp)`
`98`	`98`	`{`
`99`	`99`	`struct end_proc_data volatile endproc;`
`100`	`100`	`struct end_proc_data *link;`
	`101`	`+ VALUE errinfo = *errp;`
`101`	`102`
`102`	`103`	`while ((link = *procs) != 0) {`
`103`	`104`	`*procs = link->next;`
`104`	`105`	`endproc = *link;`
`105`	`106`	`xfree(link);`
`106`	`107`	`rb_set_safe_level_force(endproc.safe);`
`107`	`108`	`(*endproc.func) (endproc.data);`
	`109`	`+ *errp = errinfo;`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`
`@@ -119,8 +121,8 @@ rb_exec_end_proc(void)`
`119`	`121`	`PUSH_TAG();`
`120`	`122`	`if ((status = EXEC_TAG()) == 0) {`
`121`	`123`	`again:`
`122`		`- exec_end_procs_chain(&ephemeral_end_procs);`
`123`		`- exec_end_procs_chain(&end_procs);`
	`124`	`+ exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo);`
	`125`	`+ exec_end_procs_chain(&end_procs, &th->errinfo);`
`124`	`126`	`}`
`125`	`127`	`else {`
`126`	`128`	`VAR_INITIALIZED(th);`