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 "ID in rb_id_table_foreach_with_replace [Feature #18253]"

Browse source 
This reverts commit 530e485265.
`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++) {
if (ITEM_KEY_ISSET(tbl, i)) {
const id_key_t key = ITEM_GET_KEY(tbl, i);
ID id = key2id(key);
enum rb_id_table_iterator_result ret = (*func)(id, tbl->items[i].val, data);
assert(key != 0);
enum rb_id_table_iterator_result ret = (*func)((ID)0, tbl->items[i].val, data);
assert(ITEM_GET_KEY(tbl, i));
if (ret == ID_TABLE_REPLACE) {
VALUE val = tbl->items[i].val;
ret = (*replace)(&id, &val, data, TRUE);
ret = (*replace)(NULL, &val, data, TRUE);
tbl->items[i].val = val;
}
else if (ret == ID_TABLE_STOP)