Subzero: Fix -timing-focus .

src/IceGlobalContext.h

Index: src/IceGlobalContext.h
diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index 7aaf513de1aeb41e2a36d709819c846f4a68252c..14d21e8d3e94b2ed1947c094053040203c4dec0d 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -356,13 +356,14 @@ public:
   /// data.
   void dumpTimers(TimerStackIdT StackID = TSK_Default,
                   bool DumpCumulative = true);
-  /// Merges the current thread's copy of timer data into the global timer data.
-  void mergeTimersFromTLS();
+  void dumpLocalTimers(TimerStackIdT StackID = TSK_Default,
+                       bool DumpCumulative = true);
   /// The following methods affect only the calling thread's TLS timer data.
   TimerIdT getTimerID(TimerStackIdT StackID, const std::string &Name);
   void pushTimer(TimerIdT ID, TimerStackIdT StackID);
   void popTimer(TimerIdT ID, TimerStackIdT StackID);
   void resetTimer(TimerStackIdT StackID);
+  std::string getTimerName(TimerStackIdT StackID);
   void setTimerName(TimerStackIdT StackID, const std::string &NewName);
 
   /// This is the first work item sequence number that the parser produces, and