shyouhei	2012-06-29 21:31:25 +0900 (Fri, 29 Jun 2012)

  New Revision: 36253

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

  Log:
    merge revision(s) 36251:
    * eval.c (stack_extend): prevent ALLOCA_N, which reserves a memory
      space with for restoring machine stack stored in each threads, from
      optimization out.  backport r34278 from the trunk.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 36252)
+++ ruby_1_8_7/ChangeLog	(revision 36253)
@@ -1,3 +1,9 @@
+Fri Jun 29 21:26:05 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (stack_extend): prevent ALLOCA_N, which reserves a memory
+	  space with for restoring machine stack stored in each threads, from
+	  optimization out.  backport r34278 from the trunk.
+
 Mon Jun 18 18:32:43 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* backport r32609 from trunk.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 36252)
+++ ruby_1_8_7/version.h	(revision 36253)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2012-06-18"
+#define RUBY_RELEASE_DATE "2012-06-29"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20120618
-#define RUBY_PATCHLEVEL 369
+#define RUBY_RELEASE_CODE 20120629
+#define RUBY_PATCHLEVEL 370
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 36252)
+++ ruby_1_8_7/eval.c	(revision 36253)
@@ -10824,6 +10824,7 @@
 	if (space > th->stk_pos) {
 # ifdef HAVE_ALLOCA
 	    sp = ALLOCA_N(VALUE, &space[0] - th->stk_pos);
+	    space[0] = *sp;
 # else
 	    stack_extend(th, exit);
 # endif
@@ -10838,6 +10839,7 @@
 	if (&space[STACK_PAD_SIZE] < th->stk_pos + th->stk_len) {
 # ifdef HAVE_ALLOCA
 	    sp = ALLOCA_N(VALUE, th->stk_pos + th->stk_len - &space[STACK_PAD_SIZE]);
+	    space[0] = *sp;
 # else
 	    stack_extend(th, exit);
 # endif

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