* vm_trace.c (exec_hooks): add volatile to avoid segv.
On test-all with -j, it may crash in TH_POP_TAG. Detailed mechanism is not known but this fixes it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1e7ef5882e
commit
497f8904cb
@ -1,3 +1,9 @@
|
|||||||
|
Fri Dec 14 10:36:10 2012 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
|
* vm_trace.c (exec_hooks): add volatile to avoid segv.
|
||||||
|
On test-all with -j, it may crash in TH_POP_TAG.
|
||||||
|
Detailed mechanism is not known but this fixes it.
|
||||||
|
|
||||||
Fri Dec 14 04:08:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
|
Fri Dec 14 04:08:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* test/ruby/envutil.rb (EnvUtil::Unit::Assertionsassert_separately):
|
* test/ruby/envutil.rb (EnvUtil::Unit::Assertionsassert_separately):
|
||||||
|
@ -244,7 +244,7 @@ clean_hooks(rb_hook_list_t *list)
|
|||||||
static int
|
static int
|
||||||
exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg, int can_clean_hooks)
|
exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg, int can_clean_hooks)
|
||||||
{
|
{
|
||||||
int state;
|
volatile int state;
|
||||||
volatile int raised;
|
volatile int raised;
|
||||||
|
|
||||||
if (UNLIKELY(list->need_clean > 0) && can_clean_hooks) {
|
if (UNLIKELY(list->need_clean > 0) && can_clean_hooks) {
|
||||||
@ -275,6 +275,9 @@ exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_ar
|
|||||||
if (raised) {
|
if (raised) {
|
||||||
rb_threadptr_set_raised(th);
|
rb_threadptr_set_raised(th);
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
rb_thread_t volatile *tmp = th;
|
||||||
|
}
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user