From df9c2e3e07c9a5ae2052304cfc368791d8bc3644 Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 30 Nov 2017 15:52:54 -0800 Subject: [PATCH 1/1] fix ASAN build Summary: Fix bug in non-jemalloc build. (Note: this ignores all push blocking failures!) Reviewed By: igorsugak Differential Revision: D6451342 fbshipit-source-id: 44725d4e0c685a59325fa3d08877d0f62120c5c2 --- folly/memory/Malloc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/folly/memory/Malloc.h b/folly/memory/Malloc.h index e774dd0e..9eaf2c6c 100644 --- a/folly/memory/Malloc.h +++ b/folly/memory/Malloc.h @@ -144,10 +144,11 @@ namespace folly { #define FOLLY_MALLOC_CHECKED_MALLOC #endif +#include /** * Determine if we are using jemalloc or not. */ -#ifdef USE_JEMALLOC +#if defined(USE_JEMALLOC) && !FOLLY_SANITIZE inline bool usingJEMalloc() noexcept { return true; } -- 2.34.1