forked from OSchip/llvm-project
#include <iostream> is forbidden. Remove it in favor of raw_ostream.
llvm-svn: 74507
This commit is contained in:
parent
cfbfe78e9e
commit
855263371a
|
@ -13,10 +13,8 @@
|
|||
|
||||
#include "llvm/CompilerDriver/Action.h"
|
||||
#include "llvm/CompilerDriver/BuiltinOptions.h"
|
||||
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/System/Program.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
|
||||
using namespace llvm;
|
||||
|
@ -58,15 +56,15 @@ namespace {
|
|||
}
|
||||
|
||||
void print_string (const std::string& str) {
|
||||
std::cerr << str << ' ';
|
||||
errs() << str << ' ';
|
||||
}
|
||||
}
|
||||
|
||||
int llvmc::Action::Execute() const {
|
||||
if (DryRun || VerboseMode) {
|
||||
std::cerr << Command_ << " ";
|
||||
errs() << Command_ << " ";
|
||||
std::for_each(Args_.begin(), Args_.end(), print_string);
|
||||
std::cerr << '\n';
|
||||
errs() << '\n';
|
||||
}
|
||||
if (DryRun)
|
||||
return 0;
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/Support/DOTGraphTraits.h"
|
||||
#include "llvm/Support/GraphWriter.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
#include <limits>
|
||||
#include <queue>
|
||||
|
@ -346,8 +346,8 @@ int CompilationGraph::CheckLanguageNames() const {
|
|||
|
||||
if (!N2.ToolPtr) {
|
||||
++ret;
|
||||
std::cerr << "Error: there is an edge from '" << N1.ToolPtr->Name()
|
||||
<< "' back to the root!\n\n";
|
||||
errs() << "Error: there is an edge from '" << N1.ToolPtr->Name()
|
||||
<< "' back to the root!\n\n";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -363,17 +363,17 @@ int CompilationGraph::CheckLanguageNames() const {
|
|||
|
||||
if (!eq) {
|
||||
++ret;
|
||||
std::cerr << "Error: Output->input language mismatch in the edge '" <<
|
||||
N1.ToolPtr->Name() << "' -> '" << N2.ToolPtr->Name() << "'!\n";
|
||||
|
||||
std::cerr << "Expected one of { ";
|
||||
errs() << "Error: Output->input language mismatch in the edge '"
|
||||
<< N1.ToolPtr->Name() << "' -> '" << N2.ToolPtr->Name()
|
||||
<< "'!\n"
|
||||
<< "Expected one of { ";
|
||||
|
||||
InLangs = N2.ToolPtr->InputLanguages();
|
||||
for (;*InLangs; ++InLangs) {
|
||||
std::cerr << '\'' << *InLangs << (*(InLangs+1) ? "', " : "'");
|
||||
errs() << '\'' << *InLangs << (*(InLangs+1) ? "', " : "'");
|
||||
}
|
||||
|
||||
std::cerr << " }, but got '" << OutLang << "'!\n\n";
|
||||
errs() << " }, but got '" << OutLang << "'!\n\n";
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -406,9 +406,8 @@ int CompilationGraph::CheckMultipleDefaultEdges() const {
|
|||
}
|
||||
else if (EdgeWeight == MaxWeight) {
|
||||
++ret;
|
||||
std::cerr
|
||||
<< "Error: there are multiple maximal edges stemming from the '"
|
||||
<< N.ToolPtr->Name() << "' node!\n\n";
|
||||
errs() << "Error: there are multiple maximal edges stemming from the '"
|
||||
<< N.ToolPtr->Name() << "' node!\n\n";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -440,9 +439,9 @@ int CompilationGraph::CheckCycles() {
|
|||
}
|
||||
|
||||
if (deleted != NodesMap.size()) {
|
||||
std::cerr << "Error: there are cycles in the compilation graph!\n"
|
||||
<< "Try inspecting the diagram produced by "
|
||||
"'llvmc --view-graph'.\n\n";
|
||||
errs() << "Error: there are cycles in the compilation graph!\n"
|
||||
<< "Try inspecting the diagram produced by "
|
||||
<< "'llvmc --view-graph'.\n\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -518,9 +517,9 @@ void CompilationGraph::writeGraph(const std::string& OutputFilename) {
|
|||
std::ofstream O(OutputFilename.c_str());
|
||||
|
||||
if (O.good()) {
|
||||
std::cerr << "Writing '"<< OutputFilename << "' file...";
|
||||
errs() << "Writing '"<< OutputFilename << "' file...";
|
||||
llvm::WriteGraph(O, this);
|
||||
std::cerr << "done.\n";
|
||||
errs() << "done.\n";
|
||||
O.close();
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
#include "llvm/CompilerDriver/Error.h"
|
||||
#include "llvm/CompilerDriver/Plugin.h"
|
||||
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/System/Path.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
|
@ -91,7 +91,7 @@ int Main(int argc, char** argv) {
|
|||
if (CheckGraph) {
|
||||
int ret = graph.Check();
|
||||
if (!ret)
|
||||
std::cerr << "check-graph: no errors found.\n";
|
||||
llvm::errs() << "check-graph: no errors found.\n";
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -119,10 +119,10 @@ int Main(int argc, char** argv) {
|
|||
return ec.code();
|
||||
}
|
||||
catch(const std::exception& ex) {
|
||||
std::cerr << argv[0] << ": " << ex.what() << '\n';
|
||||
llvm::errs() << argv[0] << ": " << ex.what() << '\n';
|
||||
}
|
||||
catch(...) {
|
||||
std::cerr << argv[0] << ": unknown error!\n";
|
||||
llvm::errs() << argv[0] << ": unknown error!\n";
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue