summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHal Finkel <hfinkel@anl.gov>2013-06-28 16:37:52 +0000
committerHal Finkel <hfinkel@anl.gov>2013-06-28 16:37:52 +0000
commite852add40ed7d93da626d4e2286c840afb9d98d8 (patch)
tree8d171b2a3bc2f6dfbc14f874a5d21cdcb8e8bcc3
parent3b27b992ca168e128077754bafda944920869c08 (diff)
downloadbcm5719-llvm-e852add40ed7d93da626d4e2286c840afb9d98d8.tar.gz
bcm5719-llvm-e852add40ed7d93da626d4e2286c840afb9d98d8.zip
Fix bugpoint execution/reference output file name
sys::fs::unique_file will now loop infinitely if provided with a file name without '%' characters and the input file already exists. As a result, bugpoint cannot use a fixed file name for the execution output (including the reference output). llvm-svn: 185166
-rw-r--r--llvm/tools/bugpoint/BugDriver.h2
-rw-r--r--llvm/tools/bugpoint/ExecutionDriver.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/bugpoint/BugDriver.h b/llvm/tools/bugpoint/BugDriver.h
index bb15b79034c..27b37f4dc69 100644
--- a/llvm/tools/bugpoint/BugDriver.h
+++ b/llvm/tools/bugpoint/BugDriver.h
@@ -191,7 +191,7 @@ public:
/// this function.
///
bool createReferenceFile(Module *M, const std::string &Filename
- = "bugpoint.reference.out");
+ = "bugpoint.reference.out-%%%%%%%");
/// diffProgram - This method executes the specified module and diffs the
/// output against the file specified by ReferenceOutputFile. If the output
diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp
index 6edf2335f6c..270dab23171 100644
--- a/llvm/tools/bugpoint/ExecutionDriver.cpp
+++ b/llvm/tools/bugpoint/ExecutionDriver.cpp
@@ -328,7 +328,7 @@ std::string BugDriver::executeProgram(const Module *Program,
FileRemover BitcodeFileRemover(BitcodePath,
CreatedBitcode && !SaveTemps);
- if (OutputFile.empty()) OutputFile = OutputPrefix + "-execution-output";
+ if (OutputFile.empty()) OutputFile = OutputPrefix + "-execution-output-%%%%%%%";
// Check to see if this is a valid output filename...
SmallString<128> UniqueFile;
OpenPOWER on IntegriCloud