Skip to content

Commit

Permalink
Remove st_lookup when updating object ID
Browse files Browse the repository at this point in the history
  • Loading branch information
peterzhu2118 committed Mar 27, 2024
1 parent 4566843 commit c50b642
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -9560,19 +9560,21 @@ gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, s
}

if (FL_TEST((VALUE)src, FL_SEEN_OBJ_ID)) {
st_data_t srcid = (st_data_t)src, id;
/* If the source object's object_id has been seen, we need to update
* the object to object id mapping. */
if (st_lookup(objspace->obj_to_id_tbl, srcid, &id)) {
gc_report(4, objspace, "Moving object with seen id: %p -> %p\n", (void *)src, (void *)dest);
/* Resizing the st table could cause a malloc */
DURING_GC_COULD_MALLOC_REGION_START();
{
st_delete(objspace->obj_to_id_tbl, &srcid, 0);
st_insert(objspace->obj_to_id_tbl, (st_data_t)dest, id);
st_data_t srcid = (st_data_t)src, id;

gc_report(4, objspace, "Moving object with seen id: %p -> %p\n", (void *)src, (void *)dest);
/* Resizing the st table could cause a malloc */
DURING_GC_COULD_MALLOC_REGION_START();
{
if (!st_delete(objspace->obj_to_id_tbl, &srcid, &id)) {
rb_bug("gc_move: object ID seen, but not in mapping table: %s", obj_info((VALUE)src));
}
DURING_GC_COULD_MALLOC_REGION_END();

st_insert(objspace->obj_to_id_tbl, (st_data_t)dest, id);
}
DURING_GC_COULD_MALLOC_REGION_END();
}
else {
GC_ASSERT(!st_lookup(objspace->obj_to_id_tbl, (st_data_t)src, NULL));
Expand Down

0 comments on commit c50b642

Please sign in to comment.