Subzero: Fix -timing-funcs and -timing-focus flags.

src/IceGlobalContext.cpp

Index: src/IceGlobalContext.cpp
diff --git a/src/IceGlobalContext.cpp b/src/IceGlobalContext.cpp
index 5689a3ec3ea50c7ca8d7340fce8a4801c2c56896..e7faa506f6e3ea4278a23b260cc22be8a4728dcf 100644
--- a/src/IceGlobalContext.cpp
+++ b/src/IceGlobalContext.cpp
@@ -966,6 +966,10 @@ void GlobalContext::dumpStats(const Cfg *Func) {
   }
 }
 
+void GlobalContext::mergeTimersFromTLS() {
+  getTimers()->mergeFrom(ICE_TLS_GET_FIELD(TLS)->Timers);
+}
+
 void GlobalContext::dumpTimers(TimerStackIdT StackID, bool DumpCumulative) {
   if (!BuildDefs::timers())
     return;
@@ -992,7 +996,8 @@ TimerIdT TimerMarker::getTimerIdFromFuncName(GlobalContext *Ctx,
 void TimerMarker::push() {
   switch (StackID) {
   case GlobalContext::TSK_Default:
-    Active = getFlags().getSubzeroTimingEnabled();
+    Active = getFlags().getSubzeroTimingEnabled() ||
+             !getFlags().getTimingFocusOn().empty();
     break;
   case GlobalContext::TSK_Funcs:
     Active = getFlags().getTimeEachFunction();