From: Bin Liu <binliu@fb.com>
Date: Thu, 30 Nov 2017 23:52:54 +0000 (-0800)
Subject: fix ASAN build
X-Git-Tag: v2017.12.04.00~8
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=df9c2e3e07c9a5ae2052304cfc368791d8bc3644;hp=48d3f5e1691033d00ecc2ef0c3ced83ce148705a

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
---

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 <folly/CPortability.h>
 /**
  * Determine if we are using jemalloc or not.
  */
-#ifdef USE_JEMALLOC
+#if defined(USE_JEMALLOC) && !FOLLY_SANITIZE
 inline bool usingJEMalloc() noexcept {
   return true;
 }