nagachika	2013-06-04 00:27:24 +0900 (Tue, 04 Jun 2013)

  New Revision: 41054

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

  Log:
    merge revision(s) 40791,40806: [Backport #8424]
    
    * eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
      pushing tag to get rid of unaccessible tag by stack overflow.
    
    * vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
      be accessible.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_core.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41053)
+++ ruby_2_0_0/ChangeLog	(revision 41054)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jun  4 00:02:45 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
+	  be accessible.
+
+Tue Jun  4 00:02:45 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
+	  pushing tag to get rid of unaccessible tag by stack overflow.
+
 Mon Jun  3 23:22:58 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_compile_each): forward anonymous and first keyword
Index: ruby_2_0_0/vm_core.h
===================================================================
--- ruby_2_0_0/vm_core.h	(revision 41053)
+++ ruby_2_0_0/vm_core.h	(revision 41054)
@@ -461,10 +461,14 @@ enum rb_thread_status { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_core.h#L461
 
 typedef RUBY_JMP_BUF rb_jmpbuf_t;
 
+/*
+  the members which are written in TH_PUSH_TAG() should be placed at
+  the beginning and the end, so that entire region is accessible.
+*/
 struct rb_vm_tag {
-    rb_jmpbuf_t buf;
     VALUE tag;
     VALUE retval;
+    rb_jmpbuf_t buf;
     struct rb_vm_tag *prev;
 };
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41053)
+++ ruby_2_0_0/version.h	(revision 41054)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-03"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_RELEASE_DATE "2013-06-04"
+#define RUBY_PATCHLEVEL 200
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40791,40806


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