naruse	2013-04-15 11:00:45 +0900 (Mon, 15 Apr 2013)

  New Revision: 40303

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

  Log:
    merge revision(s) 34278:
    
    * cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
      reserving a memory space with ALLOCA_N for restoring machine stack
      stored in cont->machine_stack, but clang optimized out it (and
      maybe #5851 is also caused by this).
      This affected TestContinuation#test_check_localvars.
    
    * cont.c (cont_restore_1): revert workaround introduced in r32201.

  Modified directories:
    branches/ruby_1_9_2/
  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/cont.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 40302)
+++ ruby_1_9_2/ChangeLog	(revision 40303)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ChangeLog#L1
+Mon Apr 15 10:56:55 2013  NARUSE, Yui  <naruse@r...>
+
+	* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
+	  reserving a memory space with ALLOCA_N for restoring machine stack
+	  stored in cont->machine_stack, but clang optimized out it (and
+	  maybe #5851 is also caused by this).
+	  This affected TestContinuation#test_check_localvars.
+
+	* cont.c (cont_restore_1): revert workaround introduced in r32201.
+
 Tue May 22 11:09:52 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (ruby_init_loadpath_safe): use real path for non-shared
Index: ruby_1_9_2/cont.c
===================================================================
--- ruby_1_9_2/cont.c	(revision 40302)
+++ ruby_1_9_2/cont.c	(revision 40303)
@@ -476,7 +476,7 @@ cont_restore_0(rb_context_t *cont, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/cont.c#L476
 	    if (&space[0] > end) {
 # ifdef HAVE_ALLOCA
 		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
-		(void)sp;
+		space[0] = *sp;
 # else
 		cont_restore_0(cont, &space[0]);
 # endif
@@ -492,7 +492,7 @@ cont_restore_0(rb_context_t *cont, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/cont.c#L492
 	    if (&space[STACK_PAD_SIZE] < end) {
 # ifdef HAVE_ALLOCA
 		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
-		(void)sp;
+		space[0] = *sp;
 # else
 		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
 # endif
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 40302)
+++ ruby_1_9_2/version.h	(revision 40303)
@@ -1,13 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/version.h#L1
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 323
+#define RUBY_PATCHLEVEL 324
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
-#define RUBY_RELEASE_YEAR 2012
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 22
-#define RUBY_RELEASE_DATE "2012-05-22"
+#define RUBY_RELEASE_YEAR 2013
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DATE "2013-04-15"
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_2
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r34278


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