1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "ID in rb_id_table_foreach_with_replace [Feature #18253]"

Browse Source 
This reverts commit 530e485265dac6e2aea1d587a4a79a314cc772cf.
`rb_id_table_foreach_with_replace` is used during GC compaction,
and the global symbols array can have been moved at that time.
This commit is contained in:
Nobuyoshi Nakada 2022-01-26 05:51:37 +09:00
parent ac57405235
commit 6e901939c6
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
id_table.c
View File

@ -274,14 +274,12 @@ rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_fu
for (i=0; i<capa; i++) { for (i=0; i<capa; i++) {
if (ITEM_KEY_ISSET(tbl, i)) { if (ITEM_KEY_ISSET(tbl, i)) {
const id_key_t key = ITEM_GET_KEY(tbl, i); enum rb_id_table_iterator_result ret = (*func)((ID)0, tbl->items[i].val, data);
ID id = key2id(key); assert(ITEM_GET_KEY(tbl, i));
enum rb_id_table_iterator_result ret = (*func)(id, tbl->items[i].val, data);
assert(key != 0);
if (ret == ID_TABLE_REPLACE) { if (ret == ID_TABLE_REPLACE) {
VALUE val = tbl->items[i].val; VALUE val = tbl->items[i].val;
ret = (*replace)(&id, &val, data, TRUE); ret = (*replace)(NULL, &val, data, TRUE);
tbl->items[i].val = val; tbl->items[i].val = val;
} }
else if (ret == ID_TABLE_STOP) else if (ret == ID_TABLE_STOP)