X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FCPortability.h;h=3b362d2a885b96781ea4a7bbf000574694cb3387;hp=ca5070a0f551991d6bf541c775aab7798f0458be;hb=614eb71734a284e1a9fefabcc48743a3c8efd653;hpb=f634a70117bf1fa4627c93864df104821fbfabae

diff --git a/folly/CPortability.h b/folly/CPortability.h
index ca5070a0..3b362d2a 100644
--- a/folly/CPortability.h
+++ b/folly/CPortability.h
@@ -45,15 +45,21 @@
 # endif
 #endif
 
+#if defined(__has_builtin)
+#define FOLLY_HAS_BUILTIN(...) __has_builtin(__VA_ARGS__)
+#else
+#define FOLLY_HAS_BUILTIN(...) 0
+#endif
+
+#if defined(__has_feature)
+#define FOLLY_HAS_FEATURE(...) __has_feature(__VA_ARGS__)
+#else
+#define FOLLY_HAS_FEATURE(...) 0
+#endif
+
 /* Define a convenience macro to test when address sanitizer is being used
  * across the different compilers (e.g. clang, gcc) */
-#if defined(__clang__)
-# if __has_feature(address_sanitizer)
-#  define FOLLY_SANITIZE_ADDRESS 1
-# endif
-#elif defined (__GNUC__) && \
-      (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ >= 5)) && \
-      __SANITIZE_ADDRESS__
+#if FOLLY_HAS_FEATURE(address_sanitizer) || __SANITIZE_ADDRESS__
 # define FOLLY_SANITIZE_ADDRESS 1
 #endif
 
@@ -83,14 +89,19 @@
 
 /* Define a convenience macro to test when thread sanitizer is being used
  * across the different compilers (e.g. clang, gcc) */
-#if defined(__clang__)
-# if __has_feature(thread_sanitizer)
-#  define FOLLY_SANITIZE_THREAD 1
-# endif
-#elif defined(__GNUC__) && __SANITIZE_THREAD__
+#if FOLLY_HAS_FEATURE(thread_sanitizer) || __SANITIZE_THREAD__
 # define FOLLY_SANITIZE_THREAD 1
 #endif
 
+/**
+ * Define a convenience macro to test when ASAN, UBSAN or TSAN sanitizer are
+ * being used
+ */
+#if defined(FOLLY_SANITIZE_ADDRESS) || defined(FOLLY_SANITIZE_THREAD) || \
+    defined(UNDEFINED_SANITIZER)
+#define FOLLY_SANITIZE 1
+#endif
+
 /**
  * ASAN/MSAN/TSAN define pre-processor symbols:
  * ADDRESS_SANITIZER/MEMORY_SANITIZER/THREAD_SANITIZER.