From 6db4d0c468c9c5d4072d9eec898a1111ff09ab39 Mon Sep 17 00:00:00 2001 From: Slobodan Predolac Date: Mon, 8 Jun 2026 08:59:44 -0700 Subject: [PATCH] Make ehooks_default_merge static (export was vestigial after merge fast-path removal) --- include/jemalloc/internal/ehooks.h | 7 ------- src/ehooks.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/jemalloc/internal/ehooks.h b/include/jemalloc/internal/ehooks.h index 128d2f2c..03599b97 100644 --- a/include/jemalloc/internal/ehooks.h +++ b/include/jemalloc/internal/ehooks.h @@ -57,13 +57,6 @@ bool ehooks_default_purge_lazy_impl(void *addr, size_t offset, size_t length); bool ehooks_default_purge_forced_impl(void *addr, size_t offset, size_t length); #endif bool ehooks_default_split_impl(void); -/* - * Merge is the only default extent hook we declare -- see the comment in - * ehooks_merge. - */ -bool ehooks_default_merge(extent_hooks_t *extent_hooks, void *addr_a, - size_t size_a, void *addr_b, size_t size_b, bool committed, - unsigned arena_ind); bool ehooks_default_merge_impl(tsdn_t *tsdn, void *addr_a, void *addr_b); void ehooks_default_zero_impl(void *addr, size_t size); void ehooks_default_guard_impl(void *guard1, void *guard2); diff --git a/src/ehooks.c b/src/ehooks.c index bd9a8ac6..533ba1b4 100644 --- a/src/ehooks.c +++ b/src/ehooks.c @@ -228,7 +228,7 @@ ehooks_default_merge_impl(tsdn_t *tsdn, void *addr_a, void *addr_b) { return false; } -bool +static bool ehooks_default_merge(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a, void *addr_b, size_t size_b, bool committed, unsigned arena_ind) { tsdn_t *tsdn = tsdn_fetch();