diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | vm_trace.c | 6 |
2 files changed, 1 insertions, 11 deletions
@@ -414,12 +414,6 @@ Fri Dec 14 13:58:40 2012 Eric Hodel <drbrain@segment7.net> * lib/rubygems/rdoc.rb: Reduced diff with RDoc::RubyGemsHook * test/rubygems/test_gem_rdoc.rb: ditto -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> * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately): diff --git a/vm_trace.c b/vm_trace.c index 558b6a87ce..861ee0511a 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -244,7 +244,7 @@ clean_hooks(rb_hook_list_t *list) static int exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_arg, int can_clean_hooks) { - volatile int state; + int state; volatile int raised; if (UNLIKELY(list->need_clean > 0) && can_clean_hooks) { @@ -275,10 +275,6 @@ exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_ar if (raised) { rb_threadptr_set_raised(th); } - { - /* maybe rb_thread_t *volatile? */ - rb_thread_t volatile *RB_UNUSED_VAR(tmp) = th; - } return state; } |