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

Revert "Protect finalizer references during execution"

Browse source 
This reverts commit 60a7f9f446.

We can't have Ruby objects pointing at T_ZOMBIE objects otherwise we get
an error in the GC.  We need to find a different way to update
references.
This commit is contained in:
Aaron Patterson 2019-10-28 16:14:50 -07:00
parent 60a7f9f446
commit da3774e5eb
No known key found for this signature in database
GPG key ID: 953170BCB4FFAFC6
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gc.c
View file

@ -3370,7 +3370,12 @@ struct force_finalize_list {
static int static int
force_chain_object(st_data_t key, st_data_t val, st_data_t arg) force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
{ {
rb_ary_push((VALUE)arg, rb_ary_new_from_args(2, (VALUE)key, (VALUE)val)); struct force_finalize_list **prev = (struct force_finalize_list **)arg;
struct force_finalize_list *curr = ALLOC(struct force_finalize_list);
curr->obj = key;
curr->table = val;
curr->next = *prev;
*prev = curr;
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -3397,18 +3402,16 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
/* force to run finalizer */ /* force to run finalizer */
while (finalizer_table->num_entries) { while (finalizer_table->num_entries) {
long i; struct force_finalize_list *list = 0;
VALUE list = rb_ary_new_capa(finalizer_table->num_entries); st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
while (list) {
st_foreach(finalizer_table, force_chain_object, (st_data_t)list); struct force_finalize_list *curr = list;
st_data_t obj = (st_data_t)curr->obj;
for (i = 0; i < RARRAY_LEN(list); i++) { run_finalizer(objspace, curr->obj, curr->table);
VALUE tuple = RARRAY_AREF(list, i);
VALUE obj = RARRAY_AREF(tuple, 0);
VALUE table = RARRAY_AREF(tuple, 1);
run_finalizer(objspace, obj, table);
st_delete(finalizer_table, &obj, 0); st_delete(finalizer_table, &obj, 0);
} list = curr->next;
xfree(curr);
}
} }
/* prohibit GC because force T_DATA finalizers can break an object graph consistency */ /* prohibit GC because force T_DATA finalizers can break an object graph consistency */