Make compile without ICE_THREAD_LOCAL_HACK (avoid "Type *TLS = TLS;")

src/IceGlobalContext.h

 //===- subzero/src/IceGlobalContext.h - Global context defs -----*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares aspects of the compilation that persist across
@@ skipping 208 matching lines @@
 
   // Reset stats at the beginning of a function.
   void resetStats() {
     if (ALLOW_DUMP)
       ICE_TLS_GET_FIELD(TLS)->StatsFunction.reset();
   }
   void dumpStats(const IceString &Name, bool Final = false);
   void statsUpdateEmitted(uint32_t InstCount) {
     if (!getFlags().getDumpStats())
       return;
-    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
-    TLS->StatsFunction.update(CodeStats::CS_InstCount, InstCount);
-    TLS->StatsCumulative.update(CodeStats::CS_InstCount, InstCount);
+    ThreadContext *Tls = ICE_TLS_GET_FIELD(TLS);
+    Tls->StatsFunction.update(CodeStats::CS_InstCount, InstCount);
+    Tls->StatsCumulative.update(CodeStats::CS_InstCount, InstCount);
   }
   void statsUpdateRegistersSaved(uint32_t Num) {
     if (!getFlags().getDumpStats())
       return;
-    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
-    TLS->StatsFunction.update(CodeStats::CS_RegsSaved, Num);
-    TLS->StatsCumulative.update(CodeStats::CS_RegsSaved, Num);
+    ThreadContext *Tls = ICE_TLS_GET_FIELD(TLS);
+    Tls->StatsFunction.update(CodeStats::CS_RegsSaved, Num);
+    Tls->StatsCumulative.update(CodeStats::CS_RegsSaved, Num);
   }
   void statsUpdateFrameBytes(uint32_t Bytes) {
     if (!getFlags().getDumpStats())
       return;
-    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
-    TLS->StatsFunction.update(CodeStats::CS_FrameByte, Bytes);
-    TLS->StatsCumulative.update(CodeStats::CS_FrameByte, Bytes);
+    ThreadContext *Tls = ICE_TLS_GET_FIELD(TLS);
+    Tls->StatsFunction.update(CodeStats::CS_FrameByte, Bytes);
+    Tls->StatsCumulative.update(CodeStats::CS_FrameByte, Bytes);
   }
   void statsUpdateSpills() {
     if (!getFlags().getDumpStats())
       return;
-    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
-    TLS->StatsFunction.update(CodeStats::CS_NumSpills);
-    TLS->StatsCumulative.update(CodeStats::CS_NumSpills);
+    ThreadContext *Tls = ICE_TLS_GET_FIELD(TLS);
+    Tls->StatsFunction.update(CodeStats::CS_NumSpills);
+    Tls->StatsCumulative.update(CodeStats::CS_NumSpills);
   }
   void statsUpdateFills() {
     if (!getFlags().getDumpStats())
       return;
-    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
-    TLS->StatsFunction.update(CodeStats::CS_NumFills);
-    TLS->StatsCumulative.update(CodeStats::CS_NumFills);
+    ThreadContext *Tls = ICE_TLS_GET_FIELD(TLS);
+    Tls->StatsFunction.update(CodeStats::CS_NumFills);
+    Tls->StatsCumulative.update(CodeStats::CS_NumFills);
   }
 
   // These are predefined TimerStackIdT values.
   enum TimerStackKind { TSK_Default = 0, TSK_Funcs, TSK_Num };
 
   // newTimerStackID() creates a new TimerStack in the global space.
   // It does not affect any TimerStack objects in TLS.
   TimerStackIdT newTimerStackID(const IceString &Name);
   // dumpTimers() dumps the global timer data.  As such, one probably
   // wants to call mergeTimerStacks() as a prerequisite.
@@ skipping 227 matching lines @@
   explicit OstreamLocker(GlobalContext *Ctx) : Ctx(Ctx) { Ctx->lockStr(); }
   ~OstreamLocker() { Ctx->unlockStr(); }
 
 private:
   GlobalContext *const Ctx;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEGLOBALCONTEXT_H