summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: 3dd4679)
rawpatchinlineside by side (parent: 3dd4679)
| author | Peter Zhu <[email protected]> | |
| Tue, 20 Aug 2024 15:23:01 +0000 (20 11:23 -0400) | ||
| committer | Peter Zhu <[email protected]> | |
| Thu, 22 Aug 2024 14:01:55 +0000 (22 10:01 -0400) |
| weakmap.c | patchblobblamehistory |
diff --git a/weakmap.c b/weakmap.c
--- a/weakmap.c
+++ b/weakmap.c
return !UNDEF_P(obj);
}
-static void
-wmap_free_entry(VALUE *key, VALUE *val)
-{
- RUBY_ASSERT(key + 1 == val);
-
- /* We only need to free key because val is allocated beside key on in the
- * same malloc call. */
- ruby_sized_xfree(key, sizeof(struct weakmap_entry));
-}
-
struct wmap_foreach_data {
int (*func)(struct weakmap_entry *, st_data_t);
st_data_t arg;
return ret;
}
else {
- wmap_free_entry((VALUE *)key, (VALUE *)val);
+ ruby_sized_xfree(entry, sizeof(struct weakmap_entry));
return ST_DELETE;
}
static int
wmap_free_table_i(st_data_t key, st_data_t val, st_data_t arg)
{
- wmap_free_entry((VALUE *)key, (VALUE *)val);
+ struct weakmap_entry *entry = (struct weakmap_entry *)key;
+ RUBY_ASSERT(&entry->val == (VALUE *)val);
+ ruby_sized_xfree(entry, sizeof(struct weakmap_entry));
+
return ST_CONTINUE;
}
rb_gc_remove_weak(self, (VALUE *)orig_key_data);
rb_gc_remove_weak(self, (VALUE *)orig_val_data);
- wmap_free_entry((VALUE *)orig_key_data, (VALUE *)orig_val_data);
+ struct weakmap_entry *entry = (struct weakmap_entry *)orig_key_data;
+ ruby_sized_xfree(entry, sizeof(struct weakmap_entry));
if (wmap_live_p(orig_val)) {
return orig_val;