commit 3e5009f643a931184cf3437e7204e40c7a61d4d1
author Jan Voung <jvoung@chromium.org> Tue Mar 24 09:04:13 2015 -0700
committer Jan Voung <jvoung@chromium.org> Tue Mar 24 09:04:13 2015 -0700
tree 0a20de9d792fa1c50fbb0acfe49872c4e7abb2fd
parent f79d2cb6a27ad93a9080b0b0bf5b0bc1da5539d9

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

Otherwise you get:

In file included from src/IceGlobalContext.cpp:21:
In file included from src/IceCfg.h:21:
src/IceGlobalContext.h:257:44: error: variable 'TLS' is uninitialized when used within its own initialization [-Werror,-Wuninitialized]
    ThreadContext *TLS = ICE_TLS_GET_FIELD(TLS);
                   ~~~                     ^~~
src/IceTLS.h:95:39: note: expanded from macro 'ICE_TLS_GET_FIELD'
                                      ^
So rename the local var to Tls.

BUG=none
R=stichnot@chromium.org

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

src/IceGlobalContext.h

diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index a709981..d81697d 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -226,37 +226,37 @@
   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.