From 3ee2fe0199fd4ee7e844b86ccc550ca84e5d36ba Mon Sep 17 00:00:00 2001 From: Michal Meloun Date: Sun, 10 Dec 2017 08:55:48 +0000 Subject: [PATCH] Relax too restrictive assert. The problem has been reported to upstream and similar change will be included in next jemalloc release. Submitted by: David Goldblatt MFC after: 2 weeks --- .../include/jemalloc/internal/jemalloc_internal_inlines_c.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h index 7ffce6fb035..62f8fab78fa 100644 --- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h +++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h @@ -91,9 +91,11 @@ idalloctm(tsdn_t *tsdn, void *ptr, tcache_t *tcache, alloc_ctx_t *alloc_ctx, if (config_stats && is_internal) { arena_internal_sub(iaalloc(tsdn, ptr), isalloc(tsdn, ptr)); } +#if 0 if (!is_internal && tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) { assert(tcache == NULL); } +#endif arena_dalloc(tsdn, ptr, tcache, alloc_ctx, slow_path); }