| Index: src/IceGlobalInits.h
|
| diff --git a/src/IceGlobalInits.h b/src/IceGlobalInits.h
|
| index fb86f7cd4748de4a48eaab7c1e4a3a6d6311715e..97e2177157a516d0cfda408f2d723915d0ee00fe 100644
|
| --- a/src/IceGlobalInits.h
|
| +++ b/src/IceGlobalInits.h
|
| @@ -24,6 +24,7 @@
|
|
|
| #pragma clang diagnostic push
|
| #pragma clang diagnostic ignored "-Wunused-parameter"
|
| +#pragma clang diagnostic ignored "-Wshadow"
|
| #include "llvm/Bitcode/NaCl/NaClBitcodeParser.h" // for NaClBitcodeRecord.
|
| #include "llvm/IR/CallingConv.h"
|
| #include "llvm/IR/GlobalValue.h" // for GlobalValue::LinkageTypes.
|
| @@ -87,9 +88,9 @@ public:
|
| }
|
|
|
| protected:
|
| - GlobalDeclaration(GlobalDeclarationKind Kind,
|
| - llvm::GlobalValue::LinkageTypes Linkage)
|
| - : Kind(Kind), Linkage(Linkage) {}
|
| + GlobalDeclaration(GlobalDeclarationKind MyKind,
|
| + llvm::GlobalValue::LinkageTypes MyLinkage)
|
| + : Kind(MyKind), Linkage(MyLinkage) {}
|
|
|
| const GlobalDeclarationKind Kind;
|
| IceString Name;
|
| @@ -128,11 +129,12 @@ private:
|
| llvm::CallingConv::ID CallingConv;
|
| bool IsProto;
|
|
|
| - FunctionDeclaration(const FuncSigType &Signature,
|
| - llvm::CallingConv::ID CallingConv,
|
| - llvm::GlobalValue::LinkageTypes Linkage, bool IsProto)
|
| + FunctionDeclaration(const FuncSigType &MySignature,
|
| + llvm::CallingConv::ID MyCallingConv,
|
| + llvm::GlobalValue::LinkageTypes Linkage, bool MyIsProto)
|
| : GlobalDeclaration(FunctionDeclarationKind, Linkage),
|
| - Signature(Signature), CallingConv(CallingConv), IsProto(IsProto) {}
|
| + Signature(MySignature), CallingConv(MyCallingConv), IsProto(MyIsProto) {
|
| + }
|
| };
|
|
|
| /// Models a global variable declaration, and its initializers.
|
| @@ -164,7 +166,7 @@ public:
|
| virtual void dumpType(Ostream &Stream) const;
|
|
|
| protected:
|
| - explicit Initializer(InitializerKind Kind) : Kind(Kind) {}
|
| + explicit Initializer(InitializerKind MyKind) : Kind(MyKind) {}
|
|
|
| private:
|
| const InitializerKind Kind;
|
| @@ -228,8 +230,8 @@ public:
|
| private:
|
| ENABLE_MAKE_UNIQUE;
|
|
|
| - explicit ZeroInitializer(SizeT Size)
|
| - : Initializer(ZeroInitializerKind), Size(Size) {}
|
| + explicit ZeroInitializer(SizeT MySize)
|
| + : Initializer(ZeroInitializerKind), Size(MySize) {}
|
|
|
| /// The number of bytes to be zero initialized.
|
| SizeT Size;
|
| @@ -258,9 +260,10 @@ public:
|
| private:
|
| ENABLE_MAKE_UNIQUE;
|
|
|
| - RelocInitializer(const GlobalDeclaration *Declaration, RelocOffsetT Offset)
|
| - : Initializer(RelocInitializerKind), Declaration(Declaration),
|
| - Offset(Offset) {} // The global declaration used in the relocation.
|
| + RelocInitializer(const GlobalDeclaration *MyDeclaration,
|
| + RelocOffsetT MyOffset)
|
| + : Initializer(RelocInitializerKind), Declaration(MyDeclaration),
|
| + Offset(MyOffset) {} // The global declaration used in the relocation.
|
|
|
| const GlobalDeclaration *Declaration;
|
| /// The offset to add to the relocation.
|
|
|