[bugpoint] Revert r318459
Summary: Revert r318459 which introduced a TempFile scoping bug.
Differential Revision: https://reviews.llvm.org/D51836
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342503 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp
index 773bad6..690a48d 100644
--- a/tools/bugpoint/ExecutionDriver.cpp
+++ b/tools/bugpoint/ExecutionDriver.cpp
@@ -299,26 +299,32 @@
if (!AI)
AI = Interpreter;
assert(AI && "Interpreter should have been created already!");
+ bool CreatedBitcode = false;
if (BitcodeFile.empty()) {
// Emit the program to a bitcode file...
- auto File =
- sys::fs::TempFile::create(OutputPrefix + "-test-program-%%%%%%%.bc");
- if (!File) {
- errs() << ToolName
- << ": Error making unique filename: " << toString(File.takeError())
+ SmallString<128> UniqueFilename;
+ int UniqueFD;
+ std::error_code EC = sys::fs::createUniqueFile(
+ OutputPrefix + "-test-program-%%%%%%%.bc", UniqueFD, UniqueFilename);
+ if (EC) {
+ errs() << ToolName << ": Error making unique filename: " << EC.message()
<< "!\n";
exit(1);
}
- DiscardTemp Discard{*File};
- BitcodeFile = File->TmpName;
+ BitcodeFile = UniqueFilename.str();
- if (writeProgramToFile(File->FD, Program)) {
+ if (writeProgramToFile(BitcodeFile, UniqueFD, Program)) {
errs() << ToolName << ": Error emitting bitcode to file '" << BitcodeFile
<< "'!\n";
exit(1);
}
+ CreatedBitcode = true;
}
+ // Remove the temporary bitcode file when we are done.
+ std::string BitcodePath(BitcodeFile);
+ FileRemover BitcodeFileRemover(BitcodePath, CreatedBitcode && !SaveTemps);
+
if (OutputFile.empty())
OutputFile = OutputPrefix + "-execution-output-%%%%%%%";