Add a Force option to raw_fd_ostream to specify whether opening
an existing file is considered an error. Convert several tools
to use raw_fd_ostream instead of std::ostream, and to use this
new option instead of doing a manual check.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75801 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp
index d610676..a5e1e8b 100644
--- a/tools/bugpoint/ToolRunner.cpp
+++ b/tools/bugpoint/ToolRunner.cpp
@@ -20,7 +20,6 @@
#include "llvm/Support/FileUtilities.h"
#include <fstream>
#include <sstream>
-#include <iostream>
using namespace llvm;
namespace {
@@ -158,7 +157,7 @@
LLIArgs.push_back(Args[i].c_str());
LLIArgs.push_back(0);
- std::cout << "<lli>" << std::flush;
+ outs() << "<lli>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = LLIArgs.size()-1; i != e; ++i)
errs() << " " << LLIArgs[i];
@@ -312,7 +311,7 @@
LLCArgs.push_back (Bitcode.c_str()); // This is the input bitcode
LLCArgs.push_back (0);
- std::cout << "<llc>" << std::flush;
+ outs() << "<llc>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = LLCArgs.size()-1; i != e; ++i)
errs() << " " << LLCArgs[i];
@@ -429,7 +428,7 @@
JITArgs.push_back(Args[i].c_str());
JITArgs.push_back(0);
- std::cout << "<jit>" << std::flush;
+ outs() << "<jit>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = JITArgs.size()-1; i != e; ++i)
errs() << " " << JITArgs[i];
@@ -478,7 +477,7 @@
LLCArgs.push_back (Bitcode.c_str()); // This is the input bitcode
LLCArgs.push_back (0);
- std::cout << "<cbe>" << std::flush;
+ outs() << "<cbe>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = LLCArgs.size()-1; i != e; ++i)
errs() << " " << LLCArgs[i];
@@ -621,7 +620,7 @@
#endif
GCCArgs.push_back(0); // NULL terminator
- std::cout << "<gcc>" << std::flush;
+ outs() << "<gcc>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = GCCArgs.size()-1; i != e; ++i)
errs() << " " << GCCArgs[i];
@@ -665,7 +664,7 @@
ProgramArgs.push_back(0); // NULL terminator
// Now that we have a binary, run it!
- std::cout << "<program>" << std::flush;
+ outs() << "<program>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = ProgramArgs.size()-1; i != e; ++i)
errs() << " " << ProgramArgs[i];
@@ -680,7 +679,7 @@
sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile),
Timeout, MemoryLimit);
} else {
- std::cout << "<run remotely>" << std::flush;
+ outs() << "<run remotely>"; outs().flush();
int RemoteClientStatus = RunProgramWithTimeout(sys::Path(RemoteClientPath),
&ProgramArgs[0], sys::Path(InputFile), sys::Path(OutputFile),
sys::Path(OutputFile), Timeout, MemoryLimit);
@@ -756,7 +755,7 @@
- std::cout << "<gcc>" << std::flush;
+ outs() << "<gcc>"; outs().flush();
DEBUG(errs() << "\nAbout to run:\t";
for (unsigned i=0, e = GCCArgs.size()-1; i != e; ++i)
errs() << " " << GCCArgs[i];