nagachika	2014-08-21 01:52:33 +0900 (Thu, 21 Aug 2014)

  New Revision: 47229

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

  Log:
    merge revision(s) r45542,r45543: [Backport #9717]
    
    * gc.c (mark_current_machine_context): Call SET_STACK_END.
      This reverts a hunk of r40703 by ko1.
      This fixes [ruby-dev:48098] [Bug #9717].

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/gc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47228)
+++ ruby_2_1/ChangeLog	(revision 47229)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Aug 21 01:44:46 2014  Tanaka Akira  <akr@f...>
+
+	* gc.c (mark_current_machine_context): Call SET_STACK_END.
+	  This reverts a hunk of r40703 by ko1.
+	  This fixes [ruby-dev:48098] [Bug #9717].
+
 Thu Aug 21 01:41:09 2014  Tanaka Akira  <akr@f...>
 
 	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
Index: ruby_2_1/gc.c
===================================================================
--- ruby_2_1/gc.c	(revision 47228)
+++ ruby_2_1/gc.c	(revision 47229)
@@ -3478,6 +3478,10 @@ mark_current_machine_context(rb_objspace https://github.com/ruby/ruby/blob/trunk/ruby_2_1/gc.c#L3478
     /* This assumes that all registers are saved into the jmp_buf (and stack) */
     rb_setjmp(save_regs_gc_mark.j);
 
+    /* SET_STACK_END must be called in this function because
+     * the stack frame of this function may contain
+     * callee save registers and they should be marked. */
+    SET_STACK_END;
     GET_STACK_BOUNDS(stack_start, stack_end, 1);
 
     mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47228)
+++ ruby_2_1/version.h	(revision 47229)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-21"
-#define RUBY_PATCHLEVEL 204
+#define RUBY_PATCHLEVEL 205
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45542-45543


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