Ensure -mcpu=xscale works for arm targets, after rL252903 and rL252904

[oota-llvm.git] / include / llvm / Support / ManagedStatic.h

diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h
index 7753105f7e61882bdbb95400e86f9663f47d94f7..2e131e47177d3c54ad68c0cabccc636b882c840a 100644 (file)
--- a/include/llvm/Support/ManagedStatic.h
+++ b/include/llvm/Support/ManagedStatic.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Chris Lattner and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -11,18 +11,30 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SUPPORT_MANAGED_STATIC_H
-#define LLVM_SUPPORT_MANAGED_STATIC_H
+#ifndef LLVM_SUPPORT_MANAGEDSTATIC_H
+#define LLVM_SUPPORT_MANAGEDSTATIC_H
+
+#include "llvm/Support/Atomic.h"
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/Threading.h"
 
 namespace llvm {
 
-/// object_deleter - Helper method for ManagedStatic.
-///
+/// object_creator - Helper method for ManagedStatic.
 template<class C>
-void object_deleter(void *Ptr) {
-  delete (C*)Ptr;
+void* object_creator() {
+  return new C();
 }
 
+/// object_deleter - Helper method for ManagedStatic.
+///
+template<typename T> struct object_deleter {
+  static void call(void * Ptr) { delete (T*)Ptr; }
+};
+template<typename T, size_t N> struct object_deleter<T[N]> {
+  static void call(void * Ptr) { delete[] (T*)Ptr; }
+};
+
 /// ManagedStaticBase - Common base class for ManagedStatic instances.
 class ManagedStaticBase {
 protected:
@@ -31,9 +43,12 @@ protected:
   mutable void *Ptr;
   mutable void (*DeleterFn)(void*);
   mutable const ManagedStaticBase *Next;
-  
-  void RegisterManagedStatic(void *ObjPtr, void (*deleter)(void*)) const;
+
+  void RegisterManagedStatic(void *(*creator)(), void (*deleter)(void*)) const;
 public:
+  /// isConstructed - Return true if this object has not been created yet.
+  bool isConstructed() const { return Ptr != nullptr; }
+
   void destroy() const;
 };
 
@@ -45,35 +60,52 @@ public:
 template<class C>
 class ManagedStatic : public ManagedStaticBase {
 public:
-  
+
   // Accessors.
   C &operator*() {
-    if (!Ptr) LazyInit();
+    void* tmp = Ptr;
+    if (llvm_is_multithreaded()) sys::MemoryFence();
+    if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
+    TsanHappensAfter(this);
+
     return *static_cast<C*>(Ptr);
   }
   C *operator->() {
-    if (!Ptr) LazyInit();
+    void* tmp = Ptr;
+    if (llvm_is_multithreaded()) sys::MemoryFence();
+    if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
+    TsanHappensAfter(this);
+
     return static_cast<C*>(Ptr);
   }
   const C &operator*() const {
-    if (!Ptr) LazyInit();
+    void* tmp = Ptr;
+    if (llvm_is_multithreaded()) sys::MemoryFence();
+    if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
+    TsanHappensAfter(this);
+
     return *static_cast<C*>(Ptr);
   }
   const C *operator->() const {
-    if (!Ptr) LazyInit();
+    void* tmp = Ptr;
+    if (llvm_is_multithreaded()) sys::MemoryFence();
+    if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
+    TsanHappensAfter(this);
+
     return static_cast<C*>(Ptr);
   }
-  
-public:
-  void LazyInit() const {
-    RegisterManagedStatic(new C(), object_deleter<C>);
-  }
 };
 
-
 /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
 void llvm_shutdown();
 
+/// llvm_shutdown_obj - This is a simple helper class that calls
+/// llvm_shutdown() when it is destroyed.
+struct llvm_shutdown_obj {
+  llvm_shutdown_obj() { }
+  ~llvm_shutdown_obj() { llvm_shutdown(); }
+};
+
 }
 
 #endif