Convert the last use of sys::fs::createUniqueFile in bugpoint.

llvm-svn: 318459

1 files changed, 8 insertions, 14 deletions

diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp
index 912eeb006c2..7562aa603bb 100644
--- a/llvm/tools/bugpoint/ExecutionDriver.cpp
+++ b/llvm/tools/bugpoint/ExecutionDriver.cpp
@@ -302,32 +302,26 @@ Expected<std::string> BugDriver::executeProgram(const Module *Program,
   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...
-    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()
+    auto File =
+        sys::fs::TempFile::create(OutputPrefix + "-test-program-%%%%%%%.bc");
+    if (!File) {
+      errs() << ToolName
+             << ": Error making unique filename: " << toString(File.takeError())
              << "!\n";
       exit(1);
     }
-    BitcodeFile = UniqueFilename.str();
+    DiscardTemp Discard{*File};
+    BitcodeFile = File->TmpName;
 
-    if (writeProgramToFile(BitcodeFile, UniqueFD, Program)) {
+    if (writeProgramToFile(File->FD, 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-%%%%%%%";