Fix handling of bins when updating dedup st_table

wks · wks · commit 310837dbbf6c · 2024-05-29T21:32:06.000+08:00
The code didn't take ENTRY_BASE into account, and deleted wrong entries.
diff --git a/st.c b/st.c
@@ -2394,7 +2394,11 @@ rb_mmtk_st_update_dedup_table(st_table *tab)
     // Delete bins that point to deleted entries.
     for (st_index_t ind = 0; ind < num_bins; ind++) {
         st_index_t bin = get_bin(tab->bins, size_ind, ind);
-        if (DELETED_ENTRY_P(&tab->entries[bin])) {
+        if (EMPTY_OR_DELETED_BIN_P(bin)) {
+            continue;
+        }
+        st_table_entry *entry = &tab->entries[bin - ENTRY_BASE];
+        if (DELETED_ENTRY_P(entry)) {
             MARK_BIN_DELETED(tab, ind);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -2394,7 +2394,11 @@ rb_mmtk_st_update_dedup_table(st_table *tab)`
`2394`	`2394`	`// Delete bins that point to deleted entries.`
`2395`	`2395`	`for (st_index_t ind = 0; ind < num_bins; ind++) {`
`2396`	`2396`	`st_index_t bin = get_bin(tab->bins, size_ind, ind);`
`2397`		`- if (DELETED_ENTRY_P(&tab->entries[bin])) {`
	`2397`	`+ if (EMPTY_OR_DELETED_BIN_P(bin)) {`
	`2398`	`+ continue;`
	`2399`	`+ }`
	`2400`	`+ st_table_entry *entry = &tab->entries[bin - ENTRY_BASE];`
	`2401`	`+ if (DELETED_ENTRY_P(entry)) {`
`2398`	`2402`	`MARK_BIN_DELETED(tab, ind);`
`2399`	`2403`	`}`
`2400`	`2404`	`}`