[cfe-commits] r98719 - in /cfe/trunk: include/clang/Basic/DiagnosticFrontendKinds.td lib/Frontend/CompilerInstance.cpp
Kovarththanan Rajaratnam
kovarththanan.rajaratnam at gmail.com
Wed Mar 17 02:24:48 PDT 2010
Author: krj
Date: Wed Mar 17 04:24:48 2010
New Revision: 98719
URL: http://llvm.org/viewvc/llvm-project?rev=98719&view=rev
Log:
Issue a proper diagnostic if we couldn't open dump file
Modified:
cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td
cfe/trunk/lib/Frontend/CompilerInstance.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td?rev=98719&r1=98718&r2=98719&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td Wed Mar 17 04:24:48 2010
@@ -57,6 +57,8 @@
"error at end of module block in PCH file: '%0'">;
def err_fe_unable_to_open_output : Error<
"unable to open output file '%0': '%1'">;
+def err_fe_unable_to_open_logfile : Error<
+ "unable to open logfile file '%0': '%1'">;
def err_fe_pth_file_has_no_source_header : Error<
"PTH file '%0' does not designate an original source header file for -include-pth">;
def warn_fe_macro_contains_embedded_newline : Warning<
Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=98719&r1=98718&r2=98719&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original)
+++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Wed Mar 17 04:24:48 2010
@@ -107,14 +107,13 @@
static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts,
unsigned argc, char **argv,
- llvm::OwningPtr<DiagnosticClient> &DiagClient) {
+ Diagnostic &Diags) {
std::string ErrorInfo;
llvm::raw_ostream *OS =
new llvm::raw_fd_ostream(DiagOpts.DumpBuildInformation.c_str(), ErrorInfo);
if (!ErrorInfo.empty()) {
- // FIXME: Do not fail like this.
- llvm::errs() << "error opening -dump-build-information file '"
- << DiagOpts.DumpBuildInformation << "', option ignored!\n";
+ Diags.Report(diag::err_fe_unable_to_open_logfile)
+ << DiagOpts.DumpBuildInformation << ErrorInfo;
delete OS;
return;
}
@@ -127,7 +126,7 @@
// Chain in a diagnostic client which will log the diagnostics.
DiagnosticClient *Logger =
new TextDiagnosticPrinter(*OS, DiagOpts, /*OwnsOutputStream=*/true);
- DiagClient.reset(new ChainedDiagnosticClient(DiagClient.take(), Logger));
+ Diags.setClient(new ChainedDiagnosticClient(Diags.getClient(), Logger));
}
void CompilerInstance::createDiagnostics(int Argc, char **Argv) {
@@ -165,11 +164,11 @@
if (Opts.VerifyDiagnostics)
DiagClient.reset(new VerifyDiagnosticsClient(*Diags, DiagClient.take()));
+ Diags->setClient(DiagClient.take());
if (!Opts.DumpBuildInformation.empty())
- SetUpBuildDumpLog(Opts, Argc, Argv, DiagClient);
+ SetUpBuildDumpLog(Opts, Argc, Argv, *Diags);
// Configure our handling of diagnostics.
- Diags->setClient(DiagClient.take());
if (ProcessWarningOptions(*Diags, Opts))
return 0;
More information about the cfe-commits
mailing list