1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context):

Browse Source 
Don't set machine_regs and machine_stack_end with a different scope.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tarui 2012-12-02 08:45:14 +00:00
parent c5824f38ad
commit 1e88b393e0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Dec 2 17:43:04 2012 Masaya Tarui <tarui@ruby-lang.org>
* 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@zacharyscott.net> Sun Dec 2 16:48:00 2012 Zachary Scott <zachary@zacharyscott.net>
* lib/weakref.rb (rdoc): Clean up usage, add example, * lib/weakref.rb (rdoc): Clean up usage, add example,

7
thread.c
View File

@ -99,11 +99,7 @@ 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); 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); static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region);
#define RB_GC_SAVE_MACHINE_CONTEXT(th) \ #define RB_GC_SAVE_MACHINE_CONTEXT(th) 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 { \ #define GVL_UNLOCK_BEGIN() do { \
rb_thread_t *_th_stored = GET_THREAD(); \ rb_thread_t *_th_stored = GET_THREAD(); \
@ -3619,6 +3615,7 @@ rb_gc_save_machine_context(rb_thread_t *th)
th->machine_register_stack_end = rb_ia64_bsp(); th->machine_register_stack_end = rb_ia64_bsp();
#endif #endif
setjmp(th->machine_regs); setjmp(th->machine_regs);
SET_MACHINE_STACK_END(&th->machine_stack_end);
} }
/* /*