From d64a73e1ddba8706617205dab4e640f5ce7191b0 Mon Sep 17 00:00:00 2001 From: tarui Date: Sun, 2 Dec 2012 08:56:27 +0000 Subject: [PATCH] revert r38141 for stack problem git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ----- thread.c | 7 +++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45422f0776..0b2e53e1e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -Sun Dec 2 17:43:04 2012 Masaya Tarui - - * 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 * lib/weakref.rb (rdoc): Clean up usage, add example, diff --git a/thread.c b/thread.c index 959589da33..00529dada5 100644 --- a/thread.c +++ b/thread.c @@ -99,7 +99,11 @@ static inline int blocking_region_begin(rb_thread_t *th, struct rb_blocking_regi 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) rb_gc_save_machine_context(th) +#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 GVL_UNLOCK_BEGIN() do { \ rb_thread_t *_th_stored = GET_THREAD(); \ @@ -3615,7 +3619,6 @@ rb_gc_save_machine_context(rb_thread_t *th) th->machine_register_stack_end = rb_ia64_bsp(); #endif setjmp(th->machine_regs); - SET_MACHINE_STACK_END(&th->machine_stack_end); } /*