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

Make compile without ICE_THREAD_LOCAL_HACK (avoid "Type *TLS = TLS;")
3e5009f6 · Jan Voung · f79d2cb6 · 3e5009f6
Commit 3e5009f6 authored Mar 24, 2015 by Jan Voung
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

IceGlobalContext.h src/IceGlobalContext.h +15 -15

No files found.
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -226,37 +226,37 @@ public:
  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.