X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=unittests%2FSupport%2FManagedStatic.cpp;h=1497f4e34082d520fa8b934691be0c34b9893f99;hb=e2ff00e117ba9b758b298e671f65c0b002f8a52d;hp=a4137619f4d70303bfa0b8a1cfc6d00e76183546;hpb=41d35a335efb30710c0ad806833379fe0373c7a0;p=oota-llvm.git

diff --git a/unittests/Support/ManagedStatic.cpp b/unittests/Support/ManagedStatic.cpp
index a4137619f4d..1497f4e3408 100644
--- a/unittests/Support/ManagedStatic.cpp
+++ b/unittests/Support/ManagedStatic.cpp
@@ -19,7 +19,8 @@ using namespace llvm;
 
 namespace {
 
-#ifdef HAVE_PTHREAD_H
+#if LLVM_ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) && \
+  !__has_feature(memory_sanitizer)
 namespace test1 {
   llvm::ManagedStatic<int> ms;
   void *helper(void*) {