| Index: src/PNaClTranslator.cpp
|
| diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
|
| index 11e0b8e3997e1fd7bc28fca0c3126fd9ffcd745f..68d0ec9e1f3229356251f63a8ffdedfe22030a20 100644
|
| --- a/src/PNaClTranslator.cpp
|
| +++ b/src/PNaClTranslator.cpp
|
| @@ -27,6 +27,7 @@
|
|
|
| #pragma clang diagnostic push
|
| #pragma clang diagnostic ignored "-Wunused-parameter"
|
| +#pragma clang diagnostic ignored "-Wshadow"
|
| #include "llvm/ADT/SmallString.h"
|
| #include "llvm/Bitcode/NaCl/NaClBitcodeDecoders.h"
|
| #include "llvm/Bitcode/NaCl/NaClBitcodeDefs.h"
|
| @@ -168,10 +169,10 @@ class TopLevelParser : public NaClBitcodeParser {
|
| public:
|
| typedef std::vector<Ice::FunctionDeclaration *> FunctionDeclarationListType;
|
|
|
| - TopLevelParser(Ice::Translator &Translator, NaClBitstreamCursor &Cursor,
|
| - Ice::ErrorCode &ErrorStatus)
|
| - : NaClBitcodeParser(Cursor), Translator(Translator),
|
| - ErrorStatus(ErrorStatus),
|
| + TopLevelParser(Ice::Translator &MyTranslator, NaClBitstreamCursor &Cursor,
|
| + Ice::ErrorCode &MyErrorStatus)
|
| + : NaClBitcodeParser(Cursor), Translator(MyTranslator),
|
| + ErrorStatus(MyErrorStatus),
|
| VariableDeclarations(new Ice::VariableDeclarationList()) {}
|
|
|
| ~TopLevelParser() override = default;
|
| @@ -578,8 +579,8 @@ class BlockParserBaseClass : public NaClBitcodeParser {
|
|
|
| public:
|
| // Constructor for the top-level module block parser.
|
| - BlockParserBaseClass(unsigned BlockID, TopLevelParser *Context)
|
| - : NaClBitcodeParser(BlockID, Context), Context(Context) {
|
| + BlockParserBaseClass(unsigned BlockID, TopLevelParser *MyContext)
|
| + : NaClBitcodeParser(BlockID, MyContext), Context(MyContext) {
|
| Context->setBlockParser(this);
|
| }
|
|
|
| @@ -2681,10 +2682,10 @@ class ConstantsParser : public BlockParserBaseClass {
|
| ConstantsParser &operator=(const ConstantsParser &) = delete;
|
|
|
| public:
|
| - ConstantsParser(unsigned BlockID, FunctionParser *FuncParser)
|
| - : BlockParserBaseClass(BlockID, FuncParser),
|
| + ConstantsParser(unsigned BlockID, FunctionParser *MyFuncParser)
|
| + : BlockParserBaseClass(BlockID, MyFuncParser),
|
| Timer(Ice::TimerStack::TT_parseConstants, getTranslator().getContext()),
|
| - FuncParser(FuncParser) {}
|
| + FuncParser(MyFuncParser) {}
|
|
|
| ~ConstantsParser() override = default;
|
|
|
|
|