diff options
Diffstat (limited to 'include/llvm/Support')
-rw-r--r-- | include/llvm/Support/Compiler.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 6ca86bdd50..61c40f4a19 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -15,7 +15,7 @@ #ifndef LLVM_SUPPORT_COMPILER_H #define LLVM_SUPPORT_COMPILER_H -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #ifndef __has_feature # define __has_feature(x) 0 @@ -295,12 +295,11 @@ # define LLVM_FUNCTION_NAME __func__ #endif -/// \macro LLVM_ENABLE_MSAN_ANNOTATIONS -/// \brief Are MemorySanitizer annotations available. -#if defined(HAVE_SANITIZER_MSAN_INTERFACE_H) +#if defined(LLVM_HAVE_MSAN_ANNOTATIONS) # include <sanitizer/msan_interface.h> #else # define __msan_allocated_memory(p, size) +# define __msan_unpoison(p, size) #endif /// \macro LLVM_MEMORY_SANITIZER_BUILD @@ -311,6 +310,14 @@ # define LLVM_MEMORY_SANITIZER_BUILD 0 #endif +/// \macro LLVM_ADDRESS_SANITIZER_BUILD +/// \brief Whether LLVM itself is built with AddressSanitizer instrumentation. +#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__) +# define LLVM_ADDRESS_SANITIZER_BUILD 1 +#else +# define LLVM_ADDRESS_SANITIZER_BUILD 0 +#endif + /// \macro LLVM_IS_UNALIGNED_ACCESS_FAST /// \brief Is unaligned memory access fast on the host machine. /// |