diff options
| -rw-r--r-- | include/llvm/Support/SourceMgr.h | 15 | ||||
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 8 | ||||
| -rw-r--r-- | lib/Support/SourceMgr.cpp | 19 |
3 files changed, 16 insertions, 26 deletions
diff --git a/include/llvm/Support/SourceMgr.h b/include/llvm/Support/SourceMgr.h index 9203e67779..4c0d9927fa 100644 --- a/include/llvm/Support/SourceMgr.h +++ b/include/llvm/Support/SourceMgr.h @@ -126,8 +126,7 @@ public: /// specified string. /// void PrintMessage(SMLoc Loc, DiagKind Kind, const Twine &Msg, - ArrayRef<SMRange> Ranges = ArrayRef<SMRange>(), - bool ShowLine = true) const; + ArrayRef<SMRange> Ranges = ArrayRef<SMRange>()) const; /// GetMessage - Return an SMDiagnostic at the specified location with the @@ -135,10 +134,8 @@ public: /// /// @param Type - If non-null, the kind of message (e.g., "error") which is /// prefixed to the message. - /// @param ShowLine - Should the diagnostic show the source line. SMDiagnostic GetMessage(SMLoc Loc, DiagKind Kind, const Twine &Msg, - ArrayRef<SMRange> Ranges = ArrayRef<SMRange>(), - bool ShowLine = true) const; + ArrayRef<SMRange> Ranges = ArrayRef<SMRange>()) const; /// PrintIncludeStack - Prints the names of included files and the line of the /// file they were included from. A diagnostic handler can use this before @@ -159,24 +156,23 @@ class SMDiagnostic { int LineNo, ColumnNo; SourceMgr::DiagKind Kind; std::string Message, LineContents; - unsigned ShowLine : 1; std::vector<std::pair<unsigned, unsigned> > Ranges; public: // Null diagnostic. SMDiagnostic() - : SM(0), LineNo(0), ColumnNo(0), Kind(SourceMgr::DK_Error), ShowLine(0) {} + : SM(0), LineNo(0), ColumnNo(0), Kind(SourceMgr::DK_Error) {} // Diagnostic with no location (e.g. file not found, command line arg error). SMDiagnostic(const std::string &filename, SourceMgr::DiagKind Kind, const std::string &Msg) : SM(0), Filename(filename), LineNo(-1), ColumnNo(-1), Kind(Kind), - Message(Msg), ShowLine(false) {} + Message(Msg) {} // Diagnostic with a location. SMDiagnostic(const SourceMgr &sm, SMLoc L, const std::string &FN, int Line, int Col, SourceMgr::DiagKind Kind, const std::string &Msg, const std::string &LineStr, - ArrayRef<std::pair<unsigned,unsigned> > Ranges, bool showline); + ArrayRef<std::pair<unsigned,unsigned> > Ranges); const SourceMgr *getSourceMgr() const { return SM; } SMLoc getLoc() const { return Loc; } @@ -186,7 +182,6 @@ public: SourceMgr::DiagKind getKind() const { return Kind; } const std::string &getMessage() const { return Message; } const std::string &getLineContents() const { return LineContents; } - bool getShowLine() const { return ShowLine; } const std::vector<std::pair<unsigned, unsigned> > &getRanges() const { return Ranges; } diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 0be8f51f0c..a05f767328 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -172,9 +172,8 @@ private: void PrintMacroInstantiations(); void PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind, const Twine &Msg, - ArrayRef<SMRange> Ranges = ArrayRef<SMRange>(), - bool ShowLine = true) const { - SrcMgr.PrintMessage(Loc, Kind, Msg, Ranges, ShowLine); + ArrayRef<SMRange> Ranges = ArrayRef<SMRange>()) const { + SrcMgr.PrintMessage(Loc, Kind, Msg, Ranges); } static void DiagHandler(const SMDiagnostic &Diag, void *Context); @@ -1306,8 +1305,7 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) { SMDiagnostic NewDiag(*Diag.getSourceMgr(), Diag.getLoc(), Filename, LineNo, Diag.getColumnNo(), Diag.getKind(), Diag.getMessage(), - Diag.getLineContents(), - Diag.getRanges(), Diag.getShowLine()); + Diag.getLineContents(), Diag.getRanges()); NewDiag.print(0, OS); } diff --git a/lib/Support/SourceMgr.cpp b/lib/Support/SourceMgr.cpp index 91cb25a60a..5a6090d05e 100644 --- a/lib/Support/SourceMgr.cpp +++ b/lib/Support/SourceMgr.cpp @@ -141,8 +141,8 @@ void SourceMgr::PrintIncludeStack(SMLoc IncludeLoc, raw_ostream &OS) const { /// @param Type - If non-null, the kind of message (e.g., "error") which is /// prefixed to the message. SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, SourceMgr::DiagKind Kind, - const Twine &Msg, ArrayRef<SMRange> Ranges, - bool ShowLine) const { + const Twine &Msg, + ArrayRef<SMRange> Ranges) const { // First thing to do: find the current buffer containing the specified // location. @@ -189,13 +189,12 @@ SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, SourceMgr::DiagKind Kind, return SMDiagnostic(*this, Loc, CurMB->getBufferIdentifier(), FindLineNumber(Loc, CurBuf), Loc.getPointer()-LineStart, Kind, Msg.str(), - LineStr, ColRanges, ShowLine); + LineStr, ColRanges); } void SourceMgr::PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind, - const Twine &Msg, ArrayRef<SMRange> Ranges, - bool ShowLine) const { - SMDiagnostic Diagnostic = GetMessage(Loc, Kind, Msg, Ranges, ShowLine); + const Twine &Msg, ArrayRef<SMRange> Ranges) const { + SMDiagnostic Diagnostic = GetMessage(Loc, Kind, Msg, Ranges); // Report the message with the diagnostic handler if present. if (DiagHandler) { @@ -220,11 +219,9 @@ SMDiagnostic::SMDiagnostic(const SourceMgr &sm, SMLoc L, const std::string &FN, int Line, int Col, SourceMgr::DiagKind Kind, const std::string &Msg, const std::string &LineStr, - ArrayRef<std::pair<unsigned,unsigned> > Ranges, - bool showline) + ArrayRef<std::pair<unsigned,unsigned> > Ranges) : SM(&sm), Loc(L), Filename(FN), LineNo(Line), ColumnNo(Col), Kind(Kind), - Message(Msg), LineContents(LineStr), ShowLine(showline), - Ranges(Ranges.vec()) { + Message(Msg), LineContents(LineStr), Ranges(Ranges.vec()) { } @@ -255,7 +252,7 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const { S << Message << '\n'; - if (LineNo == -1 || ColumnNo == -1 || !ShowLine) + if (LineNo == -1 || ColumnNo == -1) return; // Build the line with the caret and ranges. |