Simplify error message output. NFC.

[ruiu]

Summary

Simplify error message output. NFC.

[ruiu]

• fix typo

[ruiu]

• fix another typo

[MaskRay]

lld/Common/ErrorHandler.cpp

34 ↗

(On Diff #213828)

static StringRef sep;

lld/trunk/Common/ErrorHandler.cpp

 
 using namespace llvm;
 using namespace lld;
 
 // The functions defined in this file can be called from multiple threads,
 // but outs() or errs() are not thread-safe. We protect them using a mutex.
 static std::mutex mu;
 
-// Prints "\n" or does nothing, depending on Msg contents of
-// the previous call of this function.
-static void newline(raw_ostream *errorOS, const Twine &msg) {
-  // True if the previous error message contained "\n".
-  // We want to separate multi-line error messages with a newline.
-  static bool flag;
-
-  if (flag)
-    *errorOS << "\n";
-  flag = StringRef(msg.str()).contains('\n');
+// We want to separate multi-line messages with a newline. `sep` is "\n"
+// if the last messages was multi-line. Otherwise "".
+static StringRef sep;
+
+static StringRef getSeparator(const Twine &msg) {
+  if (StringRef(msg.str()).contains('\n'))
+    return "\n";
+  return "";
 }
 
 ErrorHandler &lld::errorHandler() {
   static ErrorHandler handler;
   return handler;
 }
 
 void lld::enableColors(bool enable) {

 
 void ErrorHandler::warn(const Twine &msg) {
   if (fatalWarnings) {
     error(msg);
     return;
   }
 
   std::lock_guard<std::mutex> lock(mu);
-  newline(errorOS, msg);
-  *errorOS << getLocation(msg) << ": " << Colors::MAGENTA
+  *errorOS << sep << getLocation(msg) << ": " << Colors::MAGENTA
            << "warning: " << Colors::RESET << msg << "\n";
+  sep = getSeparator(msg);
 }
 
 void ErrorHandler::error(const Twine &msg) {
   // If Visual Studio-style error message mode is enabled,
   // this particular error is printed out as two errors.
   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));
       return;
     }
   }
 
   std::lock_guard<std::mutex> lock(mu);
 
   if (errorLimit == 0 || errorCount < errorLimit) {
-    newline(errorOS, msg);
-    *errorOS << getLocation(msg) << ": " << Colors::RED
+    *errorOS << sep << getLocation(msg) << ": " << Colors::RED
              << "error: " << Colors::RESET << msg << "\n";
   } else if (errorCount == errorLimit) {
-    newline(errorOS, msg);
-    *errorOS << getLocation(msg) << ": " << Colors::RED
+    *errorOS << sep << getLocation(msg) << ": " << Colors::RED
              << "error: " << Colors::RESET << errorLimitExceededMsg << "\n";
     if (exitEarly)
       exitLld(1);
   }
 
+  sep = getSeparator(msg);
   ++errorCount;
 }
 
 void ErrorHandler::fatal(const Twine &msg) {
   error(msg);
   exitLld(1);
 }