diff options
| -rw-r--r-- | gc.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 23 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 26 insertions, 1 deletions
@@ -2734,12 +2734,14 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table) } saved; rb_thread_t *const th = GET_THREAD(); #define RESTORE_FINALIZER() (\ + th->cfp = saved.cfp, \ rb_set_safe_level_force(saved.safe), \ rb_set_errinfo(saved.errinfo)) saved.safe = rb_safe_level(); saved.errinfo = rb_errinfo(); saved.objid = nonspecial_obj_id(obj); + saved.cfp = th->cfp; saved.finished = 0; TH_PUSH_TAG(th); diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index a5fd2897a2..5b85d3d8d9 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -397,4 +397,27 @@ class TestGc < Test::Unit::TestCase ObjectSpace.each_object{|o| case o when Module then o.instance_methods end} end end + + def test_exception_in_finalizer_method + @result = [] + def self.c1(x) + @result << :c1 + raise + end + def self.c2(x) + @result << :c2 + raise + end + tap { + tap { + obj = Object.new + ObjectSpace.define_finalizer(obj, method(:c1)) + ObjectSpace.define_finalizer(obj, method(:c2)) + obj = nil + } + } + GC.start + skip "finalizers did not get run" if @result.empty? + assert_equal([:c1, :c2], @result) + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-09-10" -#define RUBY_PATCHLEVEL 190 +#define RUBY_PATCHLEVEL 191 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 9 |