summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 05:36:09 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 05:36:09 +0000
commita2a0b976b2d01420ed8f006b28e82d75d47f480a (patch)
treedb70c60a2cfd35575979148bc36b27a86ccd41aa /gc.c
parent8ae151e7ab6f85185416b53528347f0cca55a10e (diff)
bump up RUBY_PATCHLEVEL
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gc.c b/gc.c
index e240d311e2..48658feb1b 100644
--- a/gc.c
+++ b/gc.c
@@ -2728,17 +2728,20 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
volatile struct {
VALUE errinfo;
VALUE objid;
+ rb_control_frame_t *cfp;
long finished;
int safe;
} 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);