[C++11] Replace LLVM atomics with std::atomic.

[oota-llvm.git] / include / llvm / PassSupport.h

diff --git a/include/llvm/PassSupport.h b/include/llvm/PassSupport.h
index baee77f1338f2e93690ecf2ebad87d041fbce2d0..c746506f47399f233d04e540a880120ac739d4d4 100644 (file)
--- a/include/llvm/PassSupport.h
+++ b/include/llvm/PassSupport.h
@@ -24,8 +24,8 @@
 #include "Pass.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/PassRegistry.h"
-#include "llvm/Support/Atomic.h"
 #include "llvm/Support/Valgrind.h"
+#include <atomic>
 #include <vector>
 
 namespace llvm {
@@ -147,21 +147,21 @@ private:
 };
 
 #define CALL_ONCE_INITIALIZATION(function) \
-  static volatile sys::cas_flag initialized = 0; \
-  sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-  if (old_val == 0) { \
+  static std::atomic<int> initialized; \
+  int old_val = 0; \
+  if (initialized.compare_exchange_strong(old_val, 1)) { \
     function(Registry); \
-    sys::MemoryFence(); \
+    std::atomic_thread_fence(std::memory_order_seq_cst); \
     TsanIgnoreWritesBegin(); \
     TsanHappensBefore(&initialized); \
     initialized = 2; \
     TsanIgnoreWritesEnd(); \
   } else { \
-    sys::cas_flag tmp = initialized; \
-    sys::MemoryFence(); \
+    int tmp = initialized.load(); \
+    std::atomic_thread_fence(std::memory_order_seq_cst); \
     while (tmp != 2) { \
-      tmp = initialized; \
-      sys::MemoryFence(); \
+      tmp = initialized.load(); \
+      std::atomic_thread_fence(std::memory_order_seq_cst); \
     } \
   } \
   TsanHappensAfter(&initialized);