Subzero: Add -Wshadow to the build.

src/IceInstX8632.cpp

Index: src/IceInstX8632.cpp
diff --git a/src/IceInstX8632.cpp b/src/IceInstX8632.cpp
index 96d801a7cc727ac32cd38af81cf0de21617cf674..dfa1fec2fb9273f544252e5818874c9fdf7cc63b 100644
--- a/src/IceInstX8632.cpp
+++ b/src/IceInstX8632.cpp
@@ -89,11 +89,12 @@ CondX86::BrCond InstX8632::getOppositeCondition(CondX86::BrCond Cond) {
   return InstX8632BrAttributes[Cond].Opposite;
 }
 
-OperandX8632Mem::OperandX8632Mem(Cfg *Func, Type Ty, Variable *Base,
-                                 Constant *Offset, Variable *Index,
-                                 uint16_t Shift, SegmentRegisters SegmentReg)
-    : OperandX8632(kMem, Ty), Base(Base), Offset(Offset), Index(Index),
-      Shift(Shift), SegmentReg(SegmentReg), Randomized(false) {
+OperandX8632Mem::OperandX8632Mem(Cfg *Func, Type Ty, Variable *MyBase,
+                                 Constant *MyOffset, Variable *MyIndex,
+                                 uint16_t MyShift,
+                                 SegmentRegisters MySegmentReg)
+    : OperandX8632(kMem, Ty), Base(MyBase), Offset(MyOffset), Index(MyIndex),
+      Shift(MyShift), SegmentReg(MySegmentReg), Randomized(false) {
   assert(Shift <= 3);
   Vars = nullptr;
   NumVars = 0;
@@ -113,16 +114,17 @@ OperandX8632Mem::OperandX8632Mem(Cfg *Func, Type Ty, Variable *Base,
 }
 
 InstX8632FakeRMW::InstX8632FakeRMW(Cfg *Func, Operand *Data, Operand *Addr,
-                                   InstArithmetic::OpKind Op, Variable *Beacon)
-    : InstX8632(Func, InstX8632::FakeRMW, 3, nullptr), Op(Op) {
+                                   InstArithmetic::OpKind MyOp,
+                                   Variable *Beacon)
+    : InstX8632(Func, InstX8632::FakeRMW, 3, nullptr), Op(MyOp) {
   addSource(Data);
   addSource(Addr);
   addSource(Beacon);
 }
 
-InstX8632AdjustStack::InstX8632AdjustStack(Cfg *Func, SizeT Amount,
+InstX8632AdjustStack::InstX8632AdjustStack(Cfg *Func, SizeT MyAmount,
                                            Variable *Esp)
-    : InstX8632(Func, InstX8632::Adjuststack, 1, Esp), Amount(Amount) {
+    : InstX8632(Func, InstX8632::Adjuststack, 1, Esp), Amount(MyAmount) {
   addSource(Esp);
 }
 
@@ -157,11 +159,12 @@ IceString InstX8632Label::getName(const Cfg *Func) const {
   return ".L" + Func->getFunctionName() + "$local$__" + std::to_string(Number);
 }
 
-InstX8632Br::InstX8632Br(Cfg *Func, const CfgNode *TargetTrue,
-                         const CfgNode *TargetFalse,
-                         const InstX8632Label *Label, CondX86::BrCond Condition)
-    : InstX8632(Func, InstX8632::Br, 0, nullptr), Condition(Condition),
-      TargetTrue(TargetTrue), TargetFalse(TargetFalse), Label(Label) {}
+InstX8632Br::InstX8632Br(Cfg *Func, const CfgNode *MyTargetTrue,
+                         const CfgNode *MyTargetFalse,
+                         const InstX8632Label *MyLabel,
+                         CondX86::BrCond MyCondition)
+    : InstX8632(Func, InstX8632::Br, 0, nullptr), Condition(MyCondition),
+      TargetTrue(MyTargetTrue), TargetFalse(MyTargetFalse), Label(MyLabel) {}
 
 bool InstX8632Br::optimizeBranch(const CfgNode *NextNode) {
   // If there is no next block, then there can be no fallthrough to
@@ -225,8 +228,8 @@ InstX8632Call::InstX8632Call(Cfg *Func, Variable *Dest, Operand *CallTarget)
 }
 
 InstX8632Cmov::InstX8632Cmov(Cfg *Func, Variable *Dest, Operand *Source,
-                             CondX86::BrCond Condition)
-    : InstX8632(Func, InstX8632::Cmov, 2, Dest), Condition(Condition) {
+                             CondX86::BrCond MyCondition)
+    : InstX8632(Func, InstX8632::Cmov, 2, Dest), Condition(MyCondition) {
   // The final result is either the original Dest, or Source, so mark
   // both as sources.
   addSource(Dest);
@@ -234,8 +237,8 @@ InstX8632Cmov::InstX8632Cmov(Cfg *Func, Variable *Dest, Operand *Source,
 }
 
 InstX8632Cmpps::InstX8632Cmpps(Cfg *Func, Variable *Dest, Operand *Source,
-                               CondX86::CmppsCond Condition)
-    : InstX8632(Func, InstX8632::Cmpps, 2, Dest), Condition(Condition) {
+                               CondX86::CmppsCond MyCondition)
+    : InstX8632(Func, InstX8632::Cmpps, 2, Dest), Condition(MyCondition) {
   addSource(Dest);
   addSource(Source);
 }
@@ -268,8 +271,8 @@ InstX8632Cmpxchg8b::InstX8632Cmpxchg8b(Cfg *Func, OperandX8632Mem *Addr,
 }
 
 InstX8632Cvt::InstX8632Cvt(Cfg *Func, Variable *Dest, Operand *Source,
-                           CvtVariant Variant)
-    : InstX8632(Func, InstX8632::Cvt, 1, Dest), Variant(Variant) {
+                           CvtVariant MyVariant)
+    : InstX8632(Func, InstX8632::Cvt, 1, Dest), Variant(MyVariant) {
   addSource(Source);
 }
 
@@ -319,8 +322,8 @@ InstX8632StoreQ::InstX8632StoreQ(Cfg *Func, Variable *Value,
   addSource(Mem);
 }
 
-InstX8632Nop::InstX8632Nop(Cfg *Func, InstX8632Nop::NopVariant Variant)
-    : InstX8632(Func, InstX8632::Nop, 0, nullptr), Variant(Variant) {}
+InstX8632Nop::InstX8632Nop(Cfg *Func, InstX8632Nop::NopVariant MyVariant)
+    : InstX8632(Func, InstX8632::Nop, 0, nullptr), Variant(MyVariant) {}
 
 InstX8632Fld::InstX8632Fld(Cfg *Func, Operand *Src)
     : InstX8632(Func, InstX8632::Fld, 1, nullptr) {
@@ -1399,17 +1402,17 @@ template <> void InstX8632Imul::emitIAS(const Cfg *Func) const {
     const auto Src0Var = llvm::dyn_cast<Variable>(getSrc(0));
     (void)Src0Var;
     assert(Src0Var && Src0Var->getRegNum() == RegX8632::Reg_eax);
-    const X8632::AssemblerX8632::GPREmitterOneOp Emitter = {
+    const X8632::AssemblerX8632::GPREmitterOneOp MyEmitter = {
         &X8632::AssemblerX8632::imul, &X8632::AssemblerX8632::imul};
-    emitIASOpTyGPR(Func, Ty, getSrc(1), Emitter);
+    emitIASOpTyGPR(Func, Ty, getSrc(1), MyEmitter);
   } else {
     // We only use imul as a two-address instruction even though
     // there is a 3 operand version when one of the operands is a constant.
     assert(Var == getSrc(0));
-    const X8632::AssemblerX8632::GPREmitterRegOp Emitter = {
+    const X8632::AssemblerX8632::GPREmitterRegOp MyEmitter = {
         &X8632::AssemblerX8632::imul, &X8632::AssemblerX8632::imul,
         &X8632::AssemblerX8632::imul};
-    emitIASRegOpTyGPR(Func, Ty, Var, Src, Emitter);
+    emitIASRegOpTyGPR(Func, Ty, Var, Src, MyEmitter);
   }
 }