diff options
Diffstat (limited to 'lib/Frontend')
-rw-r--r-- | lib/Frontend/ASTConsumers.cpp | 9 | ||||
-rw-r--r-- | lib/Frontend/AnalysisConsumer.cpp | 11 | ||||
-rw-r--r-- | lib/Frontend/CacheTokens.cpp | 5 | ||||
-rw-r--r-- | lib/Frontend/FixItRewriter.cpp | 3 | ||||
-rw-r--r-- | lib/Frontend/GeneratePCH.cpp | 1 | ||||
-rw-r--r-- | lib/Frontend/HTMLDiagnostics.cpp | 11 | ||||
-rw-r--r-- | lib/Frontend/RewriteMacros.cpp | 1 | ||||
-rw-r--r-- | lib/Frontend/RewriteObjC.cpp | 5 |
8 files changed, 19 insertions, 27 deletions
diff --git a/lib/Frontend/ASTConsumers.cpp b/lib/Frontend/ASTConsumers.cpp index 8f0ad13319..026848bcd5 100644 --- a/lib/Frontend/ASTConsumers.cpp +++ b/lib/Frontend/ASTConsumers.cpp @@ -23,7 +23,6 @@ #include "clang/AST/PrettyPrinter.h" #include "clang/CodeGen/ModuleBuilder.h" #include "llvm/Module.h" -#include "llvm/Support/Streams.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" @@ -117,9 +116,9 @@ void ASTViewer::HandleTopLevelSingleDecl(Decl *D) { FD->print(llvm::errs()); if (FD->getBodyIfAvailable()) { - llvm::cerr << '\n'; + llvm::errs() << '\n'; FD->getBodyIfAvailable()->viewAST(); - llvm::cerr << '\n'; + llvm::errs() << '\n'; } return; } @@ -128,9 +127,9 @@ void ASTViewer::HandleTopLevelSingleDecl(Decl *D) { MD->print(llvm::errs()); if (MD->getBody()) { - llvm::cerr << '\n'; + llvm::errs() << '\n'; MD->getBody()->viewAST(); - llvm::cerr << '\n'; + llvm::errs() << '\n'; } } } diff --git a/lib/Frontend/AnalysisConsumer.cpp b/lib/Frontend/AnalysisConsumer.cpp index 9e6bf0b1a8..33097c6f28 100644 --- a/lib/Frontend/AnalysisConsumer.cpp +++ b/lib/Frontend/AnalysisConsumer.cpp @@ -17,8 +17,6 @@ #include "clang/AST/ASTConsumer.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" -#include "llvm/Support/Compiler.h" -#include "llvm/ADT/OwningPtr.h" #include "clang/Analysis/CFG.h" #include "clang/Analysis/Analyses/LiveVariables.h" #include "clang/Analysis/PathDiagnostic.h" @@ -32,10 +30,11 @@ #include "clang/Analysis/PathSensitive/GRTransferFuncs.h" #include "clang/Analysis/PathSensitive/GRExprEngine.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/Streams.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" #include "llvm/System/Program.h" +#include "llvm/ADT/OwningPtr.h" using namespace clang; @@ -476,7 +475,7 @@ static ExplodedNode::Auditor* CreateUbiViz() { if (!ErrMsg.empty()) return 0; - llvm::cerr << "Writing '" << Filename << "'.\n"; + llvm::errs() << "Writing '" << Filename << "'.\n"; llvm::OwningPtr<llvm::raw_fd_ostream> Stream; std::string filename = Filename.toString(); @@ -534,7 +533,7 @@ UbigraphViz::UbigraphViz(llvm::raw_ostream* out, llvm::sys::Path& dir, UbigraphViz::~UbigraphViz() { Out.reset(0); - llvm::cerr << "Running 'ubiviz' program... "; + llvm::errs() << "Running 'ubiviz' program... "; std::string ErrMsg; llvm::sys::Path Ubiviz = llvm::sys::Program::FindProgramByName("ubiviz"); std::vector<const char*> args; @@ -543,7 +542,7 @@ UbigraphViz::~UbigraphViz() { args.push_back(0); if (llvm::sys::Program::ExecuteAndWait(Ubiviz, &args[0],0,0,0,0,&ErrMsg)) { - llvm::cerr << "Error viewing graph: " << ErrMsg << "\n"; + llvm::errs() << "Error viewing graph: " << ErrMsg << "\n"; } // Delete the directory. diff --git a/lib/Frontend/CacheTokens.cpp b/lib/Frontend/CacheTokens.cpp index 0065828c6d..1852e7d54c 100644 --- a/lib/Frontend/CacheTokens.cpp +++ b/lib/Frontend/CacheTokens.cpp @@ -20,12 +20,11 @@ #include "clang/Basic/OnDiskHashTable.h" #include "clang/Lex/Lexer.h" #include "clang/Lex/Preprocessor.h" -#include "llvm/ADT/StringMap.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" -#include "llvm/Support/Compiler.h" -#include "llvm/Support/Streams.h" +#include "llvm/ADT/StringMap.h" // FIXME: put this somewhere else? #ifndef S_ISDIR diff --git a/lib/Frontend/FixItRewriter.cpp b/lib/Frontend/FixItRewriter.cpp index 317693323f..1499fa9491 100644 --- a/lib/Frontend/FixItRewriter.cpp +++ b/lib/Frontend/FixItRewriter.cpp @@ -16,10 +16,9 @@ #include "clang/Frontend/FixItRewriter.h" #include "clang/Basic/SourceManager.h" #include "clang/Frontend/FrontendDiagnostic.h" -#include "llvm/ADT/OwningPtr.h" -#include "llvm/Support/Streams.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" +#include "llvm/ADT/OwningPtr.h" using namespace clang; FixItRewriter::FixItRewriter(Diagnostic &Diags, SourceManager &SourceMgr, diff --git a/lib/Frontend/GeneratePCH.cpp b/lib/Frontend/GeneratePCH.cpp index 3b7715ad28..43a3a6cbc0 100644 --- a/lib/Frontend/GeneratePCH.cpp +++ b/lib/Frontend/GeneratePCH.cpp @@ -23,7 +23,6 @@ #include "llvm/System/Path.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Streams.h" #include <string> using namespace clang; diff --git a/lib/Frontend/HTMLDiagnostics.cpp b/lib/Frontend/HTMLDiagnostics.cpp index d92e0d4353..838b162b79 100644 --- a/lib/Frontend/HTMLDiagnostics.cpp +++ b/lib/Frontend/HTMLDiagnostics.cpp @@ -23,7 +23,6 @@ #include "clang/Lex/Preprocessor.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/Streams.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" #include <fstream> @@ -151,9 +150,9 @@ void HTMLDiagnostics::ReportDiag(const PathDiagnostic& D) { Directory.createDirectoryOnDisk(true, &ErrorMsg); if (!Directory.isDirectory()) { - llvm::cerr << "warning: could not create directory '" - << Directory.toString() << "'\n" - << "reason: " << ErrorMsg << '\n'; + llvm::errs() << "warning: could not create directory '" + << Directory.toString() << "'\n" + << "reason: " << ErrorMsg << '\n'; noDir = true; @@ -313,7 +312,7 @@ void HTMLDiagnostics::ReportDiag(const PathDiagnostic& D) { const RewriteBuffer *Buf = R.getRewriteBufferFor(FID); if (!Buf) { - llvm::cerr << "warning: no diagnostics generated for main file.\n"; + llvm::errs() << "warning: no diagnostics generated for main file.\n"; return; } @@ -333,7 +332,7 @@ void HTMLDiagnostics::ReportDiag(const PathDiagnostic& D) { os.open(H.toString().c_str()); if (!os) { - llvm::cerr << "warning: could not create file '" << F.toString() << "'\n"; + llvm::errs() << "warning: could not create file '" << F.toString() << "'\n"; return; } diff --git a/lib/Frontend/RewriteMacros.cpp b/lib/Frontend/RewriteMacros.cpp index 1a477be4b5..5db2170d63 100644 --- a/lib/Frontend/RewriteMacros.cpp +++ b/lib/Frontend/RewriteMacros.cpp @@ -16,7 +16,6 @@ #include "clang/Rewrite/Rewriter.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/SourceManager.h" -#include "llvm/Support/Streams.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" #include "llvm/ADT/OwningPtr.h" diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp index b3de53671b..4d7bb314ed 100644 --- a/lib/Frontend/RewriteObjC.cpp +++ b/lib/Frontend/RewriteObjC.cpp @@ -20,12 +20,11 @@ #include "clang/Basic/IdentifierTable.h" #include "clang/Basic/Diagnostic.h" #include "clang/Lex/Lexer.h" +#include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/OwningPtr.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/Streams.h" -#include "llvm/Support/raw_ostream.h" using namespace clang; using llvm::utostr; |