tarui	2012-12-02 17:45:14 +0900 (Sun, 02 Dec 2012)

  New Revision: 38141

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

  Log:
    * thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context):
     	  Don't set machine_regs and machine_stack_end with a different scope.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38140)
+++ ChangeLog	(revision 38141)
@@ -1,3 +1,8 @@
+Sun Dec  2 17:43:04 2012  Masaya Tarui  <tarui@r...>
+
+        * thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context):
+	  Don't set machine_regs and machine_stack_end with a different scope.
+	  
 Sun Dec  2 16:48:00 2012  Zachary Scott  <zachary@z...>
 
 	* lib/weakref.rb (rdoc): Clean up usage, add example,
Index: thread.c
===================================================================
--- thread.c	(revision 38140)
+++ thread.c	(revision 38141)
@@ -99,11 +99,7 @@
 					rb_unblock_function_t *ubf, void *arg, int fail_if_interrupted);
 static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region);
 
-#define RB_GC_SAVE_MACHINE_CONTEXT(th) \
-  do { \
-    rb_gc_save_machine_context(th); \
-    SET_MACHINE_STACK_END(&(th)->machine_stack_end); \
-  } while (0)
+#define RB_GC_SAVE_MACHINE_CONTEXT(th) rb_gc_save_machine_context(th)
 
 #define GVL_UNLOCK_BEGIN() do { \
   rb_thread_t *_th_stored = GET_THREAD(); \
@@ -3619,6 +3615,7 @@
     th->machine_register_stack_end = rb_ia64_bsp();
 #endif
     setjmp(th->machine_regs);
+    SET_MACHINE_STACK_END(&th->machine_stack_end);
 }
 
 /*

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