diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2011-05-19 17:48:09 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2011-05-19 17:48:09 +0000 |
commit | 8bd71a1ec1cf2e24aca43b05319fad82e2c00af7 (patch) | |
tree | c85e01fbc559fdcf008bf077802491ccbceac75c /lib/MC/MCParser/AsmParser.cpp | |
parent | 440596ffe5bb77a202acb36d5eadd158976ff39a (diff) | |
download | llvm-8bd71a1ec1cf2e24aca43b05319fad82e2c00af7.tar.gz llvm-8bd71a1ec1cf2e24aca43b05319fad82e2c00af7.tar.bz2 llvm-8bd71a1ec1cf2e24aca43b05319fad82e2c00af7.tar.xz |
Revert r131644; it's breaking the build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131653 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCParser/AsmParser.cpp')
-rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 46e01c5535..179fd8d269 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -27,7 +27,6 @@ #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSymbol.h" #include "llvm/MC/MCDwarf.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" @@ -37,10 +36,6 @@ #include <vector> using namespace llvm; -static cl::opt<bool> -FatalAssemblerWarnings("fatal-assembler-warnings", - cl::desc("Consider warnings as error")); - namespace { /// \brief Helper class for tracking macro definitions. @@ -133,7 +128,7 @@ public: virtual MCContext &getContext() { return Ctx; } virtual MCStreamer &getStreamer() { return Out; } - virtual bool Warning(SMLoc L, const Twine &Meg); + virtual void Warning(SMLoc L, const Twine &Meg); virtual bool Error(SMLoc L, const Twine &Msg); const AsmToken &Lex(); @@ -375,12 +370,9 @@ void AsmParser::PrintMacroInstantiations() { "note"); } -bool AsmParser::Warning(SMLoc L, const Twine &Msg) { - if (FatalAssemblerWarnings) - return Error(L, Msg); +void AsmParser::Warning(SMLoc L, const Twine &Msg) { PrintMessage(L, Msg, "warning"); PrintMacroInstantiations(); - return false; } bool AsmParser::Error(SMLoc L, const Twine &Msg) { @@ -1137,9 +1129,9 @@ bool AsmParser::ParseStatement() { if (!getTargetParser().ParseDirective(ID)) return false; - bool retval = Warning(IDLoc, "ignoring directive for now"); + Warning(IDLoc, "ignoring directive for now"); EatToEndOfStatement(); - return retval; + return false; } CheckForValidSection(); |