summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-02 08:56:27 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-02 08:56:27 +0000
commitd64a73e1ddba8706617205dab4e640f5ce7191b0 (patch)
tree135411dbe186a1ff238ec7c52ca46759936523ee /thread.c
parent1e88b393e07f76e548eb7377d81e8834abdfaa33 (diff)
revert r38141 for stack problem
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c7
1 files changed, 5 insertions, 2 deletions
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);
}
/*