Factor out some common code, fix more typoes, and add a memory fence that might be needed.

llvm-svn: 71853

1 files changed, 15 insertions, 31 deletions

diff --git a/llvm/include/llvm/Support/ManagedStatic.h b/llvm/include/llvm/Support/ManagedStatic.h
index c1ff0fef935..a504be31d8a 100644
--- a/llvm/include/llvm/Support/ManagedStatic.h
+++ b/llvm/include/llvm/Support/ManagedStatic.h
@@ -51,51 +51,35 @@ public:
 ///
 template<class C>
 class ManagedStatic : public ManagedStaticBase {
-public:
-
-  // Accessors.
-  C &operator*() {
+private:
+  void checkInit() {
     sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0);
     if (OldFlag == 0) {
       LazyInit();
       sys::MemoryFence();
       InitFlag = 2;
-    } else if (OldFlag == 1)
-      while (OldFlag == 1) ;
-      
+    } else if (OldFlag == 1) {
+      while (InitFlag == 1) ;
+      sys::MemoryFence();
+    }
+  }
+public:
+
+  // Accessors.
+  C &operator*() {
+    checkInit();
     return *static_cast<C*>(Ptr);
   }
   C *operator->() {
-    sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0);
-    if (OldFlag == 0) {
-      LazyInit();
-      sys::MemoryFence();
-      InitFlag = 2;
-    } else if (OldFlag == 1)
-      while (OldFlag == 1) ;
-    
+    checkInit();
     return static_cast<C*>(Ptr);
   }
   const C &operator*() const {
-    sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0);
-    if (OldFlag == 0) {
-      LazyInit();
-      sys::MemoryFence();
-      InitFlag = 2;
-    } else if (OldFlag == 1)
-      while (InitFlag == 1) ;
-    
+    checkInit();
     return *static_cast<C*>(Ptr);
   }
   const C *operator->() const {
-    sys::cas_flag OldFlag = sys::CompareAndSwap(&InitFlag, 1, 0);
-    if (OldFlag == 0) {
-      LazyInit();
-      sys::MemoryFence();
-      InitFlag = 2;
-    } else if (OldFlag == 1)
-      while (OldFlag == 1) ;
-    
+    checkInit();
     return static_cast<C*>(Ptr);
   }