summaryrefslogtreecommitdiffstats
path: root/lld/include/lld
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2019-08-02 07:22:34 +0000
committerRui Ueyama <ruiu@google.com>2019-08-02 07:22:34 +0000
commit4d41c332ef57281973e5e73295a56132ae12df77 (patch)
tree2fd94fb54c00a1233ce74978d3148d250bca01cd /lld/include/lld
parent206fe82be410ff8cc7619c89afdff6561275a015 (diff)
downloadbcm5719-llvm-4d41c332ef57281973e5e73295a56132ae12df77.tar.gz
bcm5719-llvm-4d41c332ef57281973e5e73295a56132ae12df77.zip
Revert r367649: Improve raw_ostream so that you can "write" colors using operator<<
This reverts commit r367649 in an attempt to unbreak Windows bots. llvm-svn: 367658
Diffstat (limited to 'lld/include/lld')
-rw-r--r--lld/include/lld/Common/ErrorHandler.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/lld/include/lld/Common/ErrorHandler.h b/lld/include/lld/Common/ErrorHandler.h
index 3c6ea973275..52e22001f05 100644
--- a/lld/include/lld/Common/ErrorHandler.h
+++ b/lld/include/lld/Common/ErrorHandler.h
@@ -87,6 +87,7 @@ public:
StringRef errorLimitExceededMsg = "too many errors emitted, stopping now";
StringRef logName = "lld";
llvm::raw_ostream *errorOS = &llvm::errs();
+ bool colorDiagnostics = llvm::errs().has_colors();
bool exitEarly = true;
bool fatalWarnings = false;
bool verbose = false;
@@ -101,9 +102,9 @@ public:
std::unique_ptr<llvm::FileOutputBuffer> outputBuffer;
private:
- using Color = raw_ostream::Color;
-
- std::string getLocation(const Twine &msg);
+ void printHeader(StringRef s, raw_ostream::Colors c, const Twine &msg);
+ void printErrorMsg(const Twine &msg);
+ void printError(const Twine &msg);
};
/// Returns the default error handler.
OpenPOWER on IntegriCloud