kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

gc.c: running finalizer state

Browse source 
* gc.c (run_finalizer): make saved running finalizer state
  volatile to ensure not to be clobbered by longjmp.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-07-26 13:43:38 +00:00
parent 63e9325781
commit 3084f43047
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jul 26 22:43:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (run_finalizer): make saved running finalizer state
volatile to ensure not to be clobbered by longjmp.
Tue Jul 26 19:26:00 2016 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c: introduce rb_vm_pop_frame() and use it

32
gc.c
View file

@ -2706,26 +2706,34 @@ run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
{
long i;
int status;
const int safe = rb_safe_level();
const VALUE errinfo = rb_errinfo();
const VALUE objid = nonspecial_obj_id(obj);
volatile struct {
VALUE errinfo;
VALUE objid;
long finished;
int safe;
} saved;
rb_thread_t *const th = GET_THREAD();
volatile long finished = 0;
#define RESTORE_FINALIZER() (\
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.finished = 0;
TH_PUSH_TAG(th);
status = TH_EXEC_TAG();
if (status) {
++finished; /* skip failed finalizer */
rb_set_safe_level_force(safe);
rb_set_errinfo(errinfo);
++saved.finished; /* skip failed finalizer */
}
for (i = finished; i<RARRAY_LEN(table); i++) {
finished = i;
run_single_final(RARRAY_AREF(table, i), objid);
rb_set_safe_level_force(safe);
rb_set_errinfo(errinfo);
for (i = saved.finished;
RESTORE_FINALIZER(), i<RARRAY_LEN(table);
saved.finished = ++i) {
run_single_final(RARRAY_AREF(table, i), saved.objid);
}
TH_POP_TAG();
#undef RESTORE_FINALIZER
}
static void