diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 14:23:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-12 14:23:53 +0000 |
| commit | 75e7f2ff2d23c8a148558c71c88157635ba3fda3 (patch) | |
| tree | 8ce41ebfdc3d466db8bf350a7acfbc17acdcf547 /gc.c | |
| parent | e76761e7f269e82d7c51386590319fc13addae9c (diff) | |
merge revision(s) 44260: [Backport #9168]
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |