commit a5fe17a11eae0bbbbed481ea31806d45606198c9
author Jim Stichnoth <stichnot@chromium.org> Mon Jan 26 11:10:03 2015 -0800
committer Jim Stichnoth <stichnot@chromium.org> Mon Jan 26 11:10:03 2015 -0800
tree 70997a7bff8fbd7c51a2848630dc02aab1b963aa
parent fed97afff11dfdf934a8d3f980651804ddd93586

Subzero: Second attempt at fixing MacOS 10.6 build.

Manages thread_local pointer fields through a set of macros.  If ICE_THREAD_LOCAL_HACK is defined, the thread_local definitions and accesses are defined in terms of pthread operations.  This assumes that the underlying std::thread library is based on pthread.

BUG= none
R=jfb@chromium.org, jvoung@chromium.org

Review URL: https://codereview.chromium.org/872933002

src/IceGlobalContext.h

diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index 1f0a600..35d5493 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -179,37 +179,37 @@
   // Reset stats at the beginning of a function.
   void resetStats() {
     if (ALLOW_DUMP)
-      TLS->StatsFunction.reset();
+      ICE_TLS_GET_FIELD(TLS)->StatsFunction.reset();
   }
   void dumpStats(const IceString &Name, bool Final = false);
   void statsUpdateEmitted(uint32_t InstCount) {
     if (!ALLOW_DUMP || !getFlags().DumpStats)
       return;
-    TLS->StatsFunction.updateEmitted(InstCount);
+    ICE_TLS_GET_FIELD(TLS)->StatsFunction.updateEmitted(InstCount);
     getStatsCumulative()->updateEmitted(InstCount);
   }
   void statsUpdateRegistersSaved(uint32_t Num) {
     if (!ALLOW_DUMP || !getFlags().DumpStats)
       return;
-    TLS->StatsFunction.updateRegistersSaved(Num);
+    ICE_TLS_GET_FIELD(TLS)->StatsFunction.updateRegistersSaved(Num);
     getStatsCumulative()->updateRegistersSaved(Num);
   }
   void statsUpdateFrameBytes(uint32_t Bytes) {
     if (!ALLOW_DUMP || !getFlags().DumpStats)
       return;
-    TLS->StatsFunction.updateFrameBytes(Bytes);
+    ICE_TLS_GET_FIELD(TLS)->StatsFunction.updateFrameBytes(Bytes);
     getStatsCumulative()->updateFrameBytes(Bytes);
   }
   void statsUpdateSpills() {
     if (!ALLOW_DUMP || !getFlags().DumpStats)
       return;
-    TLS->StatsFunction.updateSpills();
+    ICE_TLS_GET_FIELD(TLS)->StatsFunction.updateSpills();
     getStatsCumulative()->updateSpills();
   }
   void statsUpdateFills() {
     if (!ALLOW_DUMP || !getFlags().DumpStats)
       return;
-    TLS->StatsFunction.updateFills();
+    ICE_TLS_GET_FIELD(TLS)->StatsFunction.updateFills();
     getStatsCumulative()->updateFills();
   }
 
@@ -274,11 +274,14 @@
   std::vector<ThreadContext *> AllThreadContexts;
   // Each thread has its own TLS pointer which is also held in
   // AllThreadContexts.
-  ICE_ATTRIBUTE_TLS static ThreadContext *TLS;
+  ICE_TLS_DECLARE_FIELD(ThreadContext *, TLS);
 
   // Private helpers for mangleName()
   typedef llvm::SmallVector<char, 32> ManglerVector;
   void incrementSubstitutions(ManglerVector &OldName) const;
+
+public:
+  static void TlsInit() { ICE_TLS_INIT_FIELD(TLS); }
 };
 
 // Helper class to push and pop a timer marker.  The constructor