From 6e901939c67d7c1275c183b0bde4d5d1c78ef081 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 26 Jan 2022 05:51:37 +0900
Subject: [PATCH] Revert "`ID` in `rb_id_table_foreach_with_replace` [Feature
 #18253]"

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.
---
 id_table.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/id_table.c b/id_table.c
index 281a0fb50a..b2ba6fae89 100644
--- a/id_table.c
+++ b/id_table.c
@@ -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)