Subzero: Add -Wshadow to the build.

src/IceGlobalContext.cpp

Index: src/IceGlobalContext.cpp
diff --git a/src/IceGlobalContext.cpp b/src/IceGlobalContext.cpp
index 51ca3f08240d49b4252358ef2c62389b2c0f05de..c3d8d898249c96b63633c29e08d783e9b15e2e8f 100644
--- a/src/IceGlobalContext.cpp
+++ b/src/IceGlobalContext.cpp
@@ -28,6 +28,7 @@
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wshadow"
 #include "llvm/Support/Timer.h"
 #pragma clang diagnostic pop
 
@@ -221,9 +222,9 @@ void GlobalContext::CodeStats::dump(const IceString &Name, Ostream &Str) {
 }
 
 GlobalContext::GlobalContext(Ostream *OsDump, Ostream *OsEmit, Ostream *OsError,
-                             ELFStreamer *ELFStr, const ClFlags &Flags)
+                             ELFStreamer *ELFStr, const ClFlags &MyFlags)
     : ConstPool(new ConstantPool()), ErrorStatus(), StrDump(OsDump),
-      StrEmit(OsEmit), StrError(OsError), Flags(Flags),
+      StrEmit(OsEmit), StrError(OsError), Flags(MyFlags),
       RNG(Flags.getRandomSeed()), ObjectWriter(),
       OptQ(/*Sequential=*/Flags.isSequential(),
            /*MaxSize=*/Flags.getNumTranslationThreads()),
@@ -879,42 +880,42 @@ ConstantList GlobalContext::getConstantExternSyms() {
 TimerStackIdT GlobalContext::newTimerStackID(const IceString &Name) {
   if (!BuildDefs::dump())
     return 0;
-  auto Timers = getTimers();
-  TimerStackIdT NewID = Timers->size();
-  Timers->push_back(TimerStack(Name));
+  auto MyTimers = getTimers();
+  TimerStackIdT NewID = MyTimers->size();
+  MyTimers->push_back(TimerStack(Name));
   return NewID;
 }
 
 TimerIdT GlobalContext::getTimerID(TimerStackIdT StackID,
                                    const IceString &Name) {
-  auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
-  assert(StackID < Timers->size());
-  return Timers->at(StackID).getTimerID(Name);
+  auto MyTimers = &ICE_TLS_GET_FIELD(TLS)->Timers;
+  assert(StackID < MyTimers->size());
+  return MyTimers->at(StackID).getTimerID(Name);
 }
 
 void GlobalContext::pushTimer(TimerIdT ID, TimerStackIdT StackID) {
-  auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
-  assert(StackID < Timers->size());
-  Timers->at(StackID).push(ID);
+  auto MyTimers = &ICE_TLS_GET_FIELD(TLS)->Timers;
+  assert(StackID < MyTimers->size());
+  MyTimers->at(StackID).push(ID);
 }
 
 void GlobalContext::popTimer(TimerIdT ID, TimerStackIdT StackID) {
-  auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
-  assert(StackID < Timers->size());
-  Timers->at(StackID).pop(ID);
+  auto MyTimers = &ICE_TLS_GET_FIELD(TLS)->Timers;
+  assert(StackID < MyTimers->size());
+  MyTimers->at(StackID).pop(ID);
 }
 
 void GlobalContext::resetTimer(TimerStackIdT StackID) {
-  auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
-  assert(StackID < Timers->size());
-  Timers->at(StackID).reset();
+  auto MyTimers = &ICE_TLS_GET_FIELD(TLS)->Timers;
+  assert(StackID < MyTimers->size());
+  MyTimers->at(StackID).reset();
 }
 
 void GlobalContext::setTimerName(TimerStackIdT StackID,
                                  const IceString &NewName) {
-  auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
-  assert(StackID < Timers->size());
-  Timers->at(StackID).setName(NewName);
+  auto MyTimers = &ICE_TLS_GET_FIELD(TLS)->Timers;
+  assert(StackID < MyTimers->size());
+  MyTimers->at(StackID).setName(NewName);
 }
 
 // Note: optQueueBlockingPush and optQueueBlockingPop use unique_ptr
@@ -958,10 +959,10 @@ void GlobalContext::dumpStats(const IceString &Name, bool Final) {
 void GlobalContext::dumpTimers(TimerStackIdT StackID, bool DumpCumulative) {
   if (!BuildDefs::dump())
     return;
-  auto Timers = getTimers();
-  assert(Timers->size() > StackID);
+  auto MyTimers = getTimers();
+  assert(MyTimers->size() > StackID);
   OstreamLocker L(this);
-  Timers->at(StackID).dump(getStrDump(), DumpCumulative);
+  MyTimers->at(StackID).dump(getStrDump(), DumpCumulative);
 }
 
 void TimerMarker::push() {