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

fix wmap_finalize.

Browse source 
wmap_finalize expects id2ref() returns a corresponding object
even if the object is dead. Make id2ref_obj_tbl() for this
purpose.
This commit is contained in:
Koichi Sasada 2019-12-23 17:04:31 +09:00
parent 9eeaae432b
commit 100fc2750b
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gc.c
View file

@ -3608,6 +3608,18 @@ rb_objspace_garbage_object_p(VALUE obj)
return is_garbage_object(objspace, obj); return is_garbage_object(objspace, obj);
} }
static VALUE
id2ref_obj_tbl(rb_objspace_t *objspace, VALUE objid)
{
VALUE orig;
if (st_lookup(objspace->id_to_obj_tbl, objid, &orig)) {
return orig;
}
else {
return Qundef;
}
}
/* /*
* call-seq: * call-seq:
* ObjectSpace._id2ref(object_id) -> an_object * ObjectSpace._id2ref(object_id) -> an_object
@ -3652,7 +3664,7 @@ id2ref(VALUE objid)
} }
} }
if (st_lookup(objspace->id_to_obj_tbl, objid, &orig) && if ((orig = id2ref_obj_tbl(objspace, objid)) != Qundef &&
is_live_object(objspace, orig)) { is_live_object(objspace, orig)) {
return orig; return orig;
} }
@ -10442,7 +10454,9 @@ wmap_finalize(RB_BLOCK_CALL_FUNC_ARGLIST(objid, self))
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w); TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
/* Get reference from object id. */ /* Get reference from object id. */
obj = id2ref(objid); if ((obj = id2ref_obj_tbl(&rb_objspace, objid)) == Qundef) {
rb_bug("wmap_finalize: objid is not found.");
}
/* obj is original referenced object and/or weak reference. */ /* obj is original referenced object and/or weak reference. */
orig = (st_data_t)obj; orig = (st_data_t)obj;