From 30b1c1f23d4d58c3220eac6aee35fd23f109b35c Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 10 Apr 2022 01:07:44 -0700 Subject: [Driver] Simplify -f[no-]diagnostics-color handling. NFC Make them aliases for -f[no-]color-diagnostics. --- clang/lib/Frontend/CompilerInvocation.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clang/lib/Frontend/CompilerInvocation.cpp') diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index bbc6df5..6aa8558 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -2123,11 +2123,9 @@ static bool parseShowColorsArgs(const ArgList &Args, bool DefaultColor) { } ShowColors = DefaultColor ? Colors_Auto : Colors_Off; for (auto *A : Args) { const Option &O = A->getOption(); - if (O.matches(options::OPT_fcolor_diagnostics) || - O.matches(options::OPT_fdiagnostics_color)) { + if (O.matches(options::OPT_fcolor_diagnostics)) { ShowColors = Colors_On; - } else if (O.matches(options::OPT_fno_color_diagnostics) || - O.matches(options::OPT_fno_diagnostics_color)) { + } else if (O.matches(options::OPT_fno_color_diagnostics)) { ShowColors = Colors_Off; } else if (O.matches(options::OPT_fdiagnostics_color_EQ)) { StringRef Value(A->getValue()); -- cgit v1.1