[lld] r298749 - Use raw_fd_ostream::has_colors instead of StandardErrHasColors().

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 24 16:21:34 PDT 2017


Author: ruiu
Date: Fri Mar 24 18:21:34 2017
New Revision: 298749

URL: http://llvm.org/viewvc/llvm-project?rev=298749&view=rev
Log:
Use raw_fd_ostream::has_colors instead of StandardErrHasColors().

I just didn't know that raw_fd_ostream has has_colors() function.

Modified:
    lld/trunk/ELF/DriverUtils.cpp

Modified: lld/trunk/ELF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/DriverUtils.cpp?rev=298749&r1=298748&r2=298749&view=diff
==============================================================================
--- lld/trunk/ELF/DriverUtils.cpp (original)
+++ lld/trunk/ELF/DriverUtils.cpp Fri Mar 24 18:21:34 2017
@@ -53,12 +53,10 @@ ELFOptTable::ELFOptTable() : OptTable(Op
 
 // Parse -color-diagnostics={auto,always,never} or -no-color-diagnostics.
 static bool getColorDiagnostics(opt::InputArgList &Args) {
-  bool Default = (ErrorOS == &errs() && Process::StandardErrHasColors());
-
   auto *Arg = Args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
                               OPT_no_color_diagnostics);
   if (!Arg)
-    return Default;
+    return ErrorOS->has_colors();
   if (Arg->getOption().getID() == OPT_color_diagnostics)
     return true;
   if (Arg->getOption().getID() == OPT_no_color_diagnostics)
@@ -66,7 +64,7 @@ static bool getColorDiagnostics(opt::Inp
 
   StringRef S = Arg->getValue();
   if (S == "auto")
-    return Default;
+    return ErrorOS->has_colors();
   if (S == "always")
     return true;
   if (S != "never")




More information about the llvm-commits mailing list