usa	2016-04-27 22:17:50 +0900 (Wed, 27 Apr 2016)

  New Revision: 54799

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54799

  Log:
    * compile.c (new_label_body): missed backporting r54548 in r54698.
      this fixes randomly test failure introduced by r54698.
      cf. [Bug #12082]

  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/compile.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54798)
+++ ruby_2_2/version.h	(revision 54799)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
-#define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 320
+#define RUBY_RELEASE_DATE "2016-04-27"
+#define RUBY_PATCHLEVEL 321
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54798)
+++ ruby_2_2/ChangeLog	(revision 54799)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Apr 27 22:16:04 2016  NAKAMURA Usaku  <usa@r...>
+
+	* compile.c (new_label_body): missed backporting r54548 in r54698.
+	  this fixes randomly test failure introduced by r54698.
+	  cf. [Bug #12082]
+
 Tue Apr 26 13:38:31 2016  NAKAMURA Usaku  <usa@r...>
 
 	* README.EXT{,.ja}: `nul` should be uppercase.
Index: ruby_2_2/compile.c
===================================================================
--- ruby_2_2/compile.c	(revision 54798)
+++ ruby_2_2/compile.c	(revision 54799)
@@ -929,6 +929,8 @@ new_label_body(rb_iseq_t *iseq, long lin https://github.com/ruby/ruby/blob/trunk/ruby_2_2/compile.c#L929
     labelobj->label_no = iseq->compile_data->label_no++;
     labelobj->sc_state = 0;
     labelobj->sp = -1;
+    labelobj->set = 0;
+    labelobj->rescued = LABEL_RESCUE_NONE;
     return labelobj;
 }
 

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