[lld] r367658 - Revert r367649: Improve raw_ostream so that you can "write" colors using operator<<
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 2 00:22:35 PDT 2019
Author: ruiu
Date: Fri Aug 2 00:22:34 2019
New Revision: 367658
URL: http://llvm.org/viewvc/llvm-project?rev=367658&view=rev
Log:
Revert r367649: Improve raw_ostream so that you can "write" colors using operator<<
This reverts commit r367649 in an attempt to unbreak Windows bots.
Modified:
lld/trunk/COFF/Driver.cpp
lld/trunk/COFF/DriverUtils.cpp
lld/trunk/Common/ErrorHandler.cpp
lld/trunk/ELF/Driver.cpp
lld/trunk/ELF/DriverUtils.cpp
lld/trunk/include/lld/Common/ErrorHandler.h
lld/trunk/lib/Driver/DarwinLdDriver.cpp
lld/trunk/test/COFF/color-diagnostics.test
lld/trunk/test/ELF/color-diagnostics.test
lld/trunk/wasm/Driver.cpp
Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Fri Aug 2 00:22:34 2019
@@ -62,6 +62,7 @@ LinkerDriver *driver;
bool link(ArrayRef<const char *> args, bool canExitEarly, raw_ostream &diag) {
errorHandler().logName = args::getFilenameWithoutExe(args[0]);
errorHandler().errorOS = &diag;
+ errorHandler().colorDiagnostics = diag.has_colors();
errorHandler().errorLimitExceededMsg =
"too many errors emitted, stopping now"
" (use /errorlimit:0 to see all errors)";
Modified: lld/trunk/COFF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/DriverUtils.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/COFF/DriverUtils.cpp (original)
+++ lld/trunk/COFF/DriverUtils.cpp Fri Aug 2 00:22:34 2019
@@ -756,17 +756,16 @@ static void handleColorDiagnostics(opt::
OPT_no_color_diagnostics);
if (!arg)
return;
-
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
else if (s == "never")
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
Modified: lld/trunk/Common/ErrorHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/Common/ErrorHandler.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/Common/ErrorHandler.cpp (original)
+++ lld/trunk/Common/ErrorHandler.cpp Fri Aug 2 00:22:34 2019
@@ -106,42 +106,54 @@ void lld::checkError(Error e) {
//
// This function returns an error location string. An error location is
// extracted from an error message using regexps.
-std::string ErrorHandler::getLocation(const Twine &msg) {
- if (!vsDiagnostics)
- return logName;
-
- static std::regex regexes[] = {
- std::regex(
- R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"),
+static std::string getLocation(std::string msg, std::string defaultMsg) {
+ static std::vector<std::regex> Regexes{
+ std::regex(R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"),
std::regex(R"(^undefined symbol:.*\n>>> referenced by (.*):)"),
std::regex(
R"(^duplicate symbol: .*\n>>> defined in (\S+)\n>>> defined in.*)"),
- std::regex(R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+).*)"),
- std::regex(R"(.*\n>>> defined in .*\n>>> referenced by (\S+):(\d+))"),
+ std::regex(
+ R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+).*)"),
+ std::regex(
+ R"(.*\n>>> defined in .*\n>>> referenced by (\S+):(\d+))"),
std::regex(R"((\S+):(\d+): unclosed quote)"),
};
- std::string str = msg.str();
+ std::smatch Match;
+ for (std::regex &Re : Regexes) {
+ if (std::regex_search(msg, Match, Re)) {
+ return Match.size() > 2 ? Match.str(1) + "(" + Match.str(2) + ")"
+ : Match.str(1);
+ }
+ }
+ return defaultMsg;
+}
- for (std::regex &re : regexes) {
- std::smatch m;
- if (!std::regex_search(str, m, re))
- continue;
- assert(m.size() == 2 || m.size() == 3);
+void ErrorHandler::printHeader(StringRef s, raw_ostream::Colors c,
+ const Twine &msg) {
- if (m.size() == 2)
- return m.str(1);
- return m.str(1) + "(" + m.str(2) + ")";
+ if (vsDiagnostics) {
+ // A Visual Studio-style error message starts with an error location.
+ // If a location cannot be extracted then we default to LogName.
+ *errorOS << getLocation(msg.str(), logName) << ": ";
+ } else {
+ *errorOS << logName << ": ";
}
- return logName;
+ if (colorDiagnostics) {
+ errorOS->changeColor(c, true);
+ *errorOS << s;
+ errorOS->resetColor();
+ } else {
+ *errorOS << s;
+ }
}
void ErrorHandler::log(const Twine &msg) {
- if (!verbose)
- return;
- std::lock_guard<std::mutex> lock(mu);
- *errorOS << logName << ": " << msg << "\n";
+ if (verbose) {
+ std::lock_guard<std::mutex> lock(mu);
+ *errorOS << logName << ": " << msg << "\n";
+ }
}
void ErrorHandler::message(const Twine &msg) {
@@ -158,37 +170,42 @@ void ErrorHandler::warn(const Twine &msg
std::lock_guard<std::mutex> lock(mu);
newline(errorOS, msg);
- *errorOS << getLocation(msg) << ": " << Color::MAGENTA
- << "warning: " << Color::RESET << msg << "\n";
+ printHeader("warning: ", raw_ostream::MAGENTA, msg);
+ *errorOS << msg << "\n";
}
-void ErrorHandler::error(const Twine &msg) {
- // If Microsoft Visual Studio-style error message mode is enabled,
- // this particular error is printed out as two errors.
+void ErrorHandler::printErrorMsg(const Twine &msg) {
+ newline(errorOS, msg);
+ printHeader("error: ", raw_ostream::RED, msg);
+ *errorOS << msg << "\n";
+}
+
+void ErrorHandler::printError(const Twine &msg) {
if (vsDiagnostics) {
- static std::regex re(R"(^(duplicate symbol: .*))"
- R"((\n>>> defined at \S+:\d+\n>>>.*))"
- R"((\n>>> defined at \S+:\d+\n>>>.*))");
- std::string str = msg.str();
- std::smatch m;
-
- if (std::regex_match(str, m, re)) {
- error(m.str(1) + m.str(2));
- error(m.str(1) + m.str(3));
+ static std::regex reDuplicateSymbol(
+ R"(^(duplicate symbol: .*))"
+ R"((\n>>> defined at \S+:\d+\n>>>.*))"
+ R"((\n>>> defined at \S+:\d+\n>>>.*))");
+ std::string msgStr = msg.str();
+ std::smatch match;
+ if (std::regex_match(msgStr, match, reDuplicateSymbol)) {
+ printErrorMsg(match.str(1) + match.str(2));
+ printErrorMsg(match.str(1) + match.str(3));
return;
}
}
+ printErrorMsg(msg);
+}
+void ErrorHandler::error(const Twine &msg) {
std::lock_guard<std::mutex> lock(mu);
if (errorLimit == 0 || errorCount < errorLimit) {
- newline(errorOS, msg);
- *errorOS << getLocation(msg) << ": " << Color::RED
- << "error: " << Color::RESET << msg << "\n";
+ printError(msg);
} else if (errorCount == errorLimit) {
newline(errorOS, msg);
- *errorOS << getLocation(msg) << ": " << Color::RED
- << "error: " << Color::RESET << errorLimitExceededMsg << "\n";
+ printHeader("error: ", raw_ostream::RED, msg);
+ *errorOS << errorLimitExceededMsg << "\n";
if (exitEarly)
exitLld(1);
}
Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Fri Aug 2 00:22:34 2019
@@ -82,6 +82,7 @@ bool elf::link(ArrayRef<const char *> ar
"-error-limit=0 to see all errors)";
errorHandler().errorOS = &error;
errorHandler().exitEarly = canExitEarly;
+ errorHandler().colorDiagnostics = error.has_colors();
inputSections.clear();
outputSections.clear();
Modified: lld/trunk/ELF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/DriverUtils.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/ELF/DriverUtils.cpp (original)
+++ lld/trunk/ELF/DriverUtils.cpp Fri Aug 2 00:22:34 2019
@@ -58,17 +58,16 @@ static void handleColorDiagnostics(opt::
OPT_no_color_diagnostics);
if (!arg)
return;
-
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
else if (s == "never")
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
Modified: lld/trunk/include/lld/Common/ErrorHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Common/ErrorHandler.h?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/include/lld/Common/ErrorHandler.h (original)
+++ lld/trunk/include/lld/Common/ErrorHandler.h Fri Aug 2 00:22:34 2019
@@ -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.
Modified: lld/trunk/lib/Driver/DarwinLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinLdDriver.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/lib/Driver/DarwinLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/DarwinLdDriver.cpp Fri Aug 2 00:22:34 2019
@@ -1151,6 +1151,7 @@ bool link(llvm::ArrayRef<const char *> a
"'-error-limit 0' to see all errors)";
errorHandler().errorOS = &Error;
errorHandler().exitEarly = CanExitEarly;
+ errorHandler().colorDiagnostics = Error.has_colors();
MachOLinkingContext ctx;
if (!parse(args, ctx))
Modified: lld/trunk/test/COFF/color-diagnostics.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/color-diagnostics.test?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/test/COFF/color-diagnostics.test (original)
+++ lld/trunk/test/COFF/color-diagnostics.test Fri Aug 2 00:22:34 2019
@@ -6,8 +6,8 @@
# RUN: not lld-link -xyz --color-diagnostics=always /nosuchfile 2>&1 \
# RUN: | FileCheck -check-prefix=COLOR %s
-# COLOR: {{lld-link: .\[0;35mwarning: .\[0mignoring unknown argument '-xyz'}}
-# COLOR: {{lld-link: .\[0;31merror: .\[0mcould not open '/nosuchfile'}}
+# COLOR: {{lld-link: .\[0;1;35mwarning: .\[0mignoring unknown argument '-xyz'}}
+# COLOR: {{lld-link: .\[0;1;31merror: .\[0mcould not open '/nosuchfile'}}
# RUN: not lld-link /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
# RUN: not lld-link -color-diagnostics=never /nosuchfile 2>&1 \
Modified: lld/trunk/test/ELF/color-diagnostics.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/color-diagnostics.test?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/test/ELF/color-diagnostics.test (original)
+++ lld/trunk/test/ELF/color-diagnostics.test Fri Aug 2 00:22:34 2019
@@ -6,8 +6,8 @@
# RUN: not ld.lld -xyz -color-diagnostics=always /nosuchfile 2>&1 \
# RUN: | FileCheck -check-prefix=COLOR %s
-# COLOR: {{ld.lld: .\[0;31merror: .\[0munknown argument '-xyz'}}
-# COLOR: {{ld.lld: .\[0;31merror: .\[0mcannot open /nosuchfile}}
+# COLOR: {{ld.lld: .\[0;1;31merror: .\[0munknown argument '-xyz'}}
+# COLOR: {{ld.lld: .\[0;1;31merror: .\[0mcannot open /nosuchfile}}
# RUN: not ld.lld -color-diagnostics=foobar 2>&1 | FileCheck -check-prefix=ERR %s
# ERR: unknown option: --color-diagnostics=foobar
Modified: lld/trunk/wasm/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Driver.cpp?rev=367658&r1=367657&r2=367658&view=diff
==============================================================================
--- lld/trunk/wasm/Driver.cpp (original)
+++ lld/trunk/wasm/Driver.cpp Fri Aug 2 00:22:34 2019
@@ -83,6 +83,7 @@ bool lld::wasm::link(ArrayRef<const char
raw_ostream &error) {
errorHandler().logName = args::getFilenameWithoutExe(args[0]);
errorHandler().errorOS = &error;
+ errorHandler().colorDiagnostics = error.has_colors();
errorHandler().errorLimitExceededMsg =
"too many errors emitted, stopping now (use "
"-error-limit=0 to see all errors)";
@@ -132,17 +133,16 @@ static void handleColorDiagnostics(opt::
OPT_no_color_diagnostics);
if (!arg)
return;
-
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().errorOS->enable_colors();
+ errorHandler().colorDiagnostics = true;
else if (s == "never")
- errorHandler().errorOS->disable_colors();
+ errorHandler().colorDiagnostics = false;
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
More information about the llvm-commits
mailing list