diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | gc.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 13 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vm_trace.c | 1 |
5 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,16 @@ +Sun Jan 12 22:46:49 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + patch inspired from r44260 on trunk. [ruby-core:58652] [Bug #9168] + + * gc.c (run_finalizer): clear th->errinfo before invoke finalizer and + restore afterward. + + * test/ruby/test_gc.rb (test_exception_in_finalizer): add test for + above. + + * vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear th->errinfo + before invoke hook. + Sun Jan 12 16:07:52 2014 vo.x (Vit Ondruch) <vondruch@redhat.com> * tool/rbinstall.rb (Gem::Specification#collect): make stable @@ -1375,6 +1375,7 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table) int status; VALUE args[3]; VALUE objid = nonspecial_obj_id(obj); + VALUE saved_errinfo = rb_errinfo(); if (RARRAY_LEN(table) > 0) { args[1] = rb_obj_freeze(rb_ary_new3(1, objid)); @@ -1384,6 +1385,7 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table) } args[2] = (VALUE)rb_safe_level(); + rb_set_errinfo(Qnil); for (i=0; i<RARRAY_LEN(table); i++) { VALUE final = RARRAY_PTR(table)[i]; args[0] = RARRAY_PTR(final)[1]; @@ -1393,6 +1395,7 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table) if (status) rb_set_errinfo(Qnil); } + GET_THREAD()->errinfo = saved_errinfo; } static void diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index c678c3c6c6..b7de62b195 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -174,4 +174,17 @@ class TestGc < Test::Unit::TestCase end; end end + + def test_exception_in_finalizer + bug9168 = '[ruby-core:58652] [Bug #9168]' + assert_normal_exit(<<-'end;', bug9168) + raise_proc = proc {raise} + 10000.times do + ObjectSpace.define_finalizer(Object.new, raise_proc) + Thread.handle_interrupt(RuntimeError => :immediate) {break} + Thread.handle_interrupt(RuntimeError => :on_blocking) {break} + Thread.handle_interrupt(RuntimeError => :never) {break} + end + end; + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-01-12" -#define RUBY_PATCHLEVEL 383 +#define RUBY_PATCHLEVEL 384 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 diff --git a/vm_trace.c b/vm_trace.c index 0d6e43c786..2b21426e27 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -290,6 +290,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) const int outer_state = th->state; int state = 0; th->state = 0; + th->errinfo = Qnil; th->vm->trace_running++; th->trace_arg = trace_arg; |