From 2fd03a60e42526ac4a6be8e9bde77a3c7b03ff92 Mon Sep 17 00:00:00 2001
From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date: Fri, 3 Dec 2010 01:17:19 +0000
Subject: [PATCH] Remove leftover code and use the text path diagnostic client
 even without a specified output file since it just uses diagnostic notes.

llvm-svn: 120773
---
 clang/lib/Checker/AnalysisConsumer.cpp    |  4 ++++
 clang/lib/Checker/TextPathDiagnostics.cpp | 10 +---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/clang/lib/Checker/AnalysisConsumer.cpp b/clang/lib/Checker/AnalysisConsumer.cpp
index 47dd7fa186dc..52dd06803468 100644
--- a/clang/lib/Checker/AnalysisConsumer.cpp
+++ b/clang/lib/Checker/AnalysisConsumer.cpp
@@ -108,6 +108,10 @@ public:
         case PD_##NAME: PD = CREATEFN(OutDir, PP); break;
 #include "clang/Frontend/Analyses.def"
       }
+    } else if (Opts.AnalysisDiagOpt == PD_TEXT) {
+      // Create the text client even without a specified output file since
+      // it just uses diagnostic notes.
+      PD = createTextPathDiagnosticClient("", PP);
     }
 
     // Create the analyzer component creators.
diff --git a/clang/lib/Checker/TextPathDiagnostics.cpp b/clang/lib/Checker/TextPathDiagnostics.cpp
index 03c6088027a2..83ff7a4409b1 100644
--- a/clang/lib/Checker/TextPathDiagnostics.cpp
+++ b/clang/lib/Checker/TextPathDiagnostics.cpp
@@ -20,7 +20,7 @@ using namespace llvm;
 
 namespace {
 
-/// \brief Simple path diagnostic client used for outputting as text
+/// \brief Simple path diagnostic client used for outputting as diagnostic notes
 /// the sequence of events.
 class TextPathDiagnostics : public PathDiagnosticClient {
   const std::string OutputFile;
@@ -61,14 +61,6 @@ void TextPathDiagnostics::HandlePathDiagnostic(const PathDiagnostic* D) {
     return;
   }
 
-  // Open the file.
-  std::string ErrMsg;
-  llvm::raw_fd_ostream o(OutputFile.c_str(), ErrMsg);
-  if (!ErrMsg.empty()) {
-    llvm::errs() << "warning: could not create file: " << OutputFile << '\n';
-    return;
-  }
-
   for (PathDiagnostic::const_iterator I=D->begin(), E=D->end(); I != E; ++I) {
     if (isa<PathDiagnosticEventPiece>(*I)) {
       PathDiagnosticEventPiece &event = cast<PathDiagnosticEventPiece>(*I);