unify FOLLY_SANITIZE existing uses and add a few new

[folly.git] / folly / memory / Malloc.h

diff --git a/folly/memory/Malloc.h b/folly/memory/Malloc.h
index 9eaf2c6ccec0f2777614262295924f32ed8d1dc9..c8aeaddd4573bacbf9e1f244be326f150d789eaa 100644 (file)
--- a/folly/memory/Malloc.h
+++ b/folly/memory/Malloc.h
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <folly/CPortability.h>
 #include <folly/portability/Config.h>
 
 /**
@@ -26,7 +27,7 @@
  * them so that we don't have to include jemalloc.h, in case the program is
  * built without jemalloc support.
  */
-#if defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)
+#if (defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)) && !FOLLY_SANITIZE
 // We have JEMalloc, so use it.
 # include <jemalloc/jemalloc.h>
 #else
@@ -149,9 +150,9 @@ namespace folly {
  * Determine if we are using jemalloc or not.
  */
 #if defined(USE_JEMALLOC) && !FOLLY_SANITIZE
-inline bool usingJEMalloc() noexcept {
-  return true;
-}
+  inline bool usingJEMalloc() noexcept {
+    return true;
+  }
 #else
 FOLLY_MALLOC_NOINLINE inline bool usingJEMalloc() noexcept {
   // Checking for rallocx != nullptr is not sufficient; we may be in a