diff options
| author | Diana Picus <diana.picus@linaro.org> | 2017-02-08 14:02:16 +0000 |
|---|---|---|
| committer | Diana Picus <diana.picus@linaro.org> | 2017-02-08 14:02:16 +0000 |
| commit | 79add417b44a5e793adf1375e9968ded2972b028 (patch) | |
| tree | 6c4b2bb9c9e875cb057869ae4c40de8d3ff0cc2f /llvm/lib/MC/MCContext.cpp | |
| parent | a3bc043caaa306fbddd3c448cc72c2bb34315cff (diff) | |
| download | bcm5719-llvm-79add417b44a5e793adf1375e9968ded2972b028.tar.gz bcm5719-llvm-79add417b44a5e793adf1375e9968ded2972b028.zip | |
Revert "[Assembler] Enable nicer diagnostics for inline assembly."
This reverts commit r294433 because it seems it broke the buildbots.
llvm-svn: 294448
Diffstat (limited to 'llvm/lib/MC/MCContext.cpp')
| -rw-r--r-- | llvm/lib/MC/MCContext.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/llvm/lib/MC/MCContext.cpp b/llvm/lib/MC/MCContext.cpp index 2bfd8e55cad..16c2c99be67 100644 --- a/llvm/lib/MC/MCContext.cpp +++ b/llvm/lib/MC/MCContext.cpp @@ -521,15 +521,13 @@ CodeViewContext &MCContext::getCVContext() { void MCContext::reportError(SMLoc Loc, const Twine &Msg) { HadError = true; - // If we have a source manager use it. Otherwise, try using the inline source - // manager. - // If that fails, use the generic report_fatal_error(). - if (SrcMgr) - SrcMgr->PrintMessage(Loc, SourceMgr::DK_Error, Msg); - else if (InlineSrcMgr) - InlineSrcMgr->PrintMessage(Loc, SourceMgr::DK_Error, Msg); - else + // If we have a source manager use it. Otherwise just use the generic + // report_fatal_error(). + if (!SrcMgr) report_fatal_error(Msg, false); + + // Use the source manager to print the message. + SrcMgr->PrintMessage(Loc, SourceMgr::DK_Error, Msg); } void MCContext::reportFatalError(SMLoc Loc, const Twine &Msg) { |
