| Index: src/IceOperand.h
|
| diff --git a/src/IceOperand.h b/src/IceOperand.h
|
| index 8db3cf1187b630e35af9a95ed546372d0aa35005..0b971996ecfa7c1e98ee2ba837e5c9dd96a34691 100644
|
| --- a/src/IceOperand.h
|
| +++ b/src/IceOperand.h
|
| @@ -86,7 +86,7 @@ public:
|
| /// @}
|
|
|
| protected:
|
| - Operand(OperandKind Kind, Type Ty) : Ty(Ty), Kind(Kind) {}
|
| + Operand(OperandKind MyKind, Type MyTy) : Ty(MyTy), Kind(MyKind) {}
|
| virtual ~Operand() = default;
|
|
|
| const Type Ty;
|
| @@ -134,8 +134,8 @@ public:
|
| bool getShouldBePooled() const { return shouldBePooled; }
|
|
|
| protected:
|
| - Constant(OperandKind Kind, Type Ty, uint32_t PoolEntryID)
|
| - : Operand(Kind, Ty), PoolEntryID(PoolEntryID), shouldBePooled(false) {
|
| + Constant(OperandKind Kind, Type Ty, uint32_t MyPoolEntryID)
|
| + : Operand(Kind, Ty), PoolEntryID(MyPoolEntryID), shouldBePooled(false) {
|
| Vars = nullptr;
|
| NumVars = 0;
|
| }
|
| @@ -184,8 +184,8 @@ public:
|
| }
|
|
|
| private:
|
| - ConstantPrimitive(Type Ty, PrimType Value, uint32_t PoolEntryID)
|
| - : Constant(K, Ty, PoolEntryID), Value(Value) {}
|
| + ConstantPrimitive(Type Ty, PrimType MyValue, uint32_t PoolEntryID)
|
| + : Constant(K, Ty, PoolEntryID), Value(MyValue) {}
|
| const PrimType Value;
|
| };
|
|
|
| @@ -225,9 +225,9 @@ class RelocatableTuple {
|
| RelocatableTuple &operator=(const RelocatableTuple &) = delete;
|
|
|
| public:
|
| - RelocatableTuple(const RelocOffsetT Offset, const IceString &Name,
|
| - bool SuppressMangling)
|
| - : Offset(Offset), Name(Name), SuppressMangling(SuppressMangling) {}
|
| + RelocatableTuple(const RelocOffsetT MyOffset, const IceString &MyName,
|
| + bool MySuppressMangling)
|
| + : Offset(MyOffset), Name(MyName), SuppressMangling(MySuppressMangling) {}
|
| RelocatableTuple(const RelocatableTuple &) = default;
|
|
|
| const RelocOffsetT Offset;
|
| @@ -270,10 +270,10 @@ public:
|
| }
|
|
|
| private:
|
| - ConstantRelocatable(Type Ty, RelocOffsetT Offset, const IceString &Name,
|
| - bool SuppressMangling, uint32_t PoolEntryID)
|
| - : Constant(kConstRelocatable, Ty, PoolEntryID), Offset(Offset),
|
| - Name(Name), SuppressMangling(SuppressMangling) {}
|
| + ConstantRelocatable(Type Ty, RelocOffsetT MyOffset, const IceString &MyName,
|
| + bool MySuppressMangling, uint32_t PoolEntryID)
|
| + : Constant(kConstRelocatable, Ty, PoolEntryID), Offset(MyOffset),
|
| + Name(MyName), SuppressMangling(MySuppressMangling) {}
|
| const RelocOffsetT Offset; /// fixed offset to add
|
| const IceString Name; /// optional for debug/dump
|
| bool SuppressMangling;
|
| @@ -318,7 +318,7 @@ private:
|
| class RegWeight {
|
| public:
|
| RegWeight() = default;
|
| - explicit RegWeight(uint32_t Weight) : Weight(Weight) {}
|
| + explicit RegWeight(uint32_t MyWeight) : Weight(MyWeight) {}
|
| RegWeight(const RegWeight &) = default;
|
| RegWeight &operator=(const RegWeight &) = default;
|
| const static uint32_t Inf = ~0; /// Force regalloc to give a register
|
| @@ -603,7 +603,7 @@ class VariablesMetadata {
|
| VariablesMetadata &operator=(const VariablesMetadata &) = delete;
|
|
|
| public:
|
| - explicit VariablesMetadata(const Cfg *Func) : Func(Func) {}
|
| + explicit VariablesMetadata(const Cfg *MyFunc) : Func(MyFunc) {}
|
| /// Initialize the state by traversing all instructions/variables in
|
| /// the CFG.
|
| void init(MetadataKind TrackingKind);
|
|
|