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

Revert r38371 and r38384. they didn't solve the issue

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-12-19 02:25:40 +00:00
parent 526d7af1a7
commit 056bdfd2e5
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 * lib/rubygems/rdoc.rb: Reduced diff with RDoc::RubyGemsHook
* test/rubygems/test_gem_rdoc.rb: ditto * 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> Fri Dec 14 04:08:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately): * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):

6
vm_trace.c
View File

@ -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)
{ {
volatile int state; 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,10 +275,6 @@ 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);
} }
{
/* maybe rb_thread_t *volatile? */
rb_thread_t volatile *RB_UNUSED_VAR(tmp) = th;
}
return state; return state;
} }