From: Kovarththanan Rajaratnam Date: Wed, 17 Mar 2010 09:36:02 +0000 (+0000) Subject: Simplify ProcessWarningOptions since it can't fail X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bf932bd0d5db98273938675dbf81cbb2f5ffff7;p=clang Simplify ProcessWarningOptions since it can't fail git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98721 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Frontend/Utils.h b/include/clang/Frontend/Utils.h index 7f43b2ad80..c1d483164a 100644 --- a/include/clang/Frontend/Utils.h +++ b/include/clang/Frontend/Utils.h @@ -59,7 +59,7 @@ void InitializePreprocessor(Preprocessor &PP, /// ProcessWarningOptions - Initialize the diagnostic client and process the /// warning options specified on the command line. -bool ProcessWarningOptions(Diagnostic &Diags, const DiagnosticOptions &Opts); +void ProcessWarningOptions(Diagnostic &Diags, const DiagnosticOptions &Opts); /// DoPrintPreprocessedInput - Implement -E mode. void DoPrintPreprocessedInput(Preprocessor &PP, llvm::raw_ostream* OS, diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 2f7c2481f6..edd19d7a53 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -169,8 +169,7 @@ Diagnostic *CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts, SetUpBuildDumpLog(Opts, Argc, Argv, *Diags); // Configure our handling of diagnostics. - if (ProcessWarningOptions(*Diags, Opts)) - return 0; + ProcessWarningOptions(*Diags, Opts); return Diags.take(); } diff --git a/lib/Frontend/Warnings.cpp b/lib/Frontend/Warnings.cpp index 4bf507d48d..ea9635e798 100644 --- a/lib/Frontend/Warnings.cpp +++ b/lib/Frontend/Warnings.cpp @@ -31,7 +31,7 @@ #include using namespace clang; -bool clang::ProcessWarningOptions(Diagnostic &Diags, +void clang::ProcessWarningOptions(Diagnostic &Diags, const DiagnosticOptions &Opts) { Diags.setSuppressSystemWarnings(true); // Default to -Wno-system-headers Diags.setIgnoreAllWarnings(Opts.IgnoreWarnings); @@ -122,6 +122,4 @@ bool clang::ProcessWarningOptions(Diagnostic &Diags, if (Diags.setDiagnosticGroupMapping(OptStart, Mapping)) Diags.Report(diag::warn_unknown_warning_option) << ("-W" + Opt); } - - return false; }