mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
Prune #includes from llvm/Linker.h and llvm/System/Path.h,
forcing them down into various .cpp files. This change also: 1. Renames TimeValue::toString() and Path::toString() to ::str() for similarity with the STL. 2. Removes all stream insertion support for sys::Path, forcing clients to call .str(). 3. Removes a use of Config/alloca.h from bugpoint, using smallvector instead. 4. Weans llvm-db off <iostream> sys::Path really needs to be gutted, but I don't have the desire to do it at this point. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79869 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -257,10 +257,8 @@ raw_ostream &WriteGraph(raw_ostream &O, const GraphType &G,
|
||||
}
|
||||
|
||||
template<typename GraphType>
|
||||
sys::Path WriteGraph(const GraphType &G,
|
||||
const std::string& Name,
|
||||
bool ShortNames = false,
|
||||
const std::string& Title = "") {
|
||||
sys::Path WriteGraph(const GraphType &G, const std::string &Name,
|
||||
bool ShortNames = false, const std::string &Title = "") {
|
||||
std::string ErrMsg;
|
||||
sys::Path Filename = sys::Path::GetTemporaryDirectory(&ErrMsg);
|
||||
if (Filename.isEmpty()) {
|
||||
@@ -273,7 +271,7 @@ sys::Path WriteGraph(const GraphType &G,
|
||||
return sys::Path();
|
||||
}
|
||||
|
||||
errs() << "Writing '" << Filename << "'... ";
|
||||
errs() << "Writing '" << Filename.str() << "'... ";
|
||||
|
||||
std::string ErrorInfo;
|
||||
raw_fd_ostream O(Filename.c_str(), ErrorInfo, raw_fd_ostream::F_Force);
|
||||
@@ -282,7 +280,7 @@ sys::Path WriteGraph(const GraphType &G,
|
||||
WriteGraph(O, G, ShortNames, Name, Title);
|
||||
errs() << " done. \n";
|
||||
} else {
|
||||
errs() << "error opening file '" << Filename << "' for writing!\n";
|
||||
errs() << "error opening file '" << Filename.str() << "' for writing!\n";
|
||||
Filename.clear();
|
||||
}
|
||||
|
||||
@@ -293,16 +291,13 @@ sys::Path WriteGraph(const GraphType &G,
|
||||
/// then cleanup. For use from the debugger.
|
||||
///
|
||||
template<typename GraphType>
|
||||
void ViewGraph(const GraphType& G,
|
||||
const std::string& Name,
|
||||
bool ShortNames = false,
|
||||
const std::string& Title = "",
|
||||
void ViewGraph(const GraphType &G, const std::string &Name,
|
||||
bool ShortNames = false, const std::string &Title = "",
|
||||
GraphProgram::Name Program = GraphProgram::DOT) {
|
||||
sys::Path Filename = WriteGraph(G, Name, ShortNames, Title);
|
||||
sys::Path Filename = WriteGraph(G, Name, ShortNames, Title);
|
||||
|
||||
if (Filename.isEmpty()) {
|
||||
if (Filename.isEmpty())
|
||||
return;
|
||||
}
|
||||
|
||||
DisplayGraph(Filename, true, Program);
|
||||
}
|
||||
|
Reference in New Issue
Block a user