Use attribute(no_sanitize) instead of no_sanitize_address to prevent clang-3.7 from ICE

[folly.git] / folly / CPortability.h

diff --git a/folly/CPortability.h b/folly/CPortability.h
index 65ffa6f13536d380b4648aad1ae246d5b88a96cb..e5099d238b9de3b77edcb1d5c0babc9df4165bbd 100644 (file)
--- a/folly/CPortability.h
+++ b/folly/CPortability.h
@@ -37,7 +37,10 @@
  * has issues when inlining is used, so disable that as well. */
 #ifdef FOLLY_SANITIZE_ADDRESS
 # if defined(__clang__)
-#  if __has_attribute(__no_address_safety_analysis__)
+#  if __has_attribute(__no_sanitize__)
+#   define FOLLY_DISABLE_ADDRESS_SANITIZER \
+      __attribute__((__no_sanitize__("address"), __noinline__))
+#  elif __has_attribute(__no_address_safety_analysis__)
 #   define FOLLY_DISABLE_ADDRESS_SANITIZER \
       __attribute__((__no_address_safety_analysis__, __noinline__))
 #  elif __has_attribute(__no_sanitize_address__)