unify FOLLY_SANITIZE existing uses and add a few new

Reviewed By: yfeldblum

Differential Revision: D6453972

fbshipit-source-id: fa083c0b782188f5f45a2a354045aee03e528829

folly/experimental/JemallocNodumpAllocator.h

@@ -21,7 +21,7 @@
 #include <folly/CPortability.h>
 #include <folly/portability/Config.h>
 
-#if defined(FOLLY_HAVE_LIBJEMALLOC) && !defined(FOLLY_SANITIZE)
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !FOLLY_SANITIZE
 
 #include <folly/portability/SysMman.h>
 #include <jemalloc/jemalloc.h>

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

folly/memory/test/MallctlHelperTest.cpp

@@ -20,7 +20,7 @@
 #include <folly/memory/Malloc.h>
 #include <folly/portability/GTest.h>
 
-#if defined(FOLLY_HAVE_LIBJEMALLOC) && !defined(FOLLY_SANITIZE)
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !FOLLY_SANITIZE
 #include <jemalloc/jemalloc.h>
 #endif
 

folly/portability/Malloc.h

@@ -16,10 +16,12 @@
 
 #pragma once
 
-#include <folly/portability/Config.h>
 #include <stdlib.h>
 
-#if defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)
+#include <folly/CPortability.h>
+#include <folly/portability/Config.h>
+
+#if (defined(USE_JEMALLOC) || defined(FOLLY_USE_JEMALLOC)) && !FOLLY_SANITIZE
 // JEMalloc provides it's own implementation of
 // malloc_usable_size, and that's what we should be using.
 #include <jemalloc/jemalloc.h>