RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[bugpoint] Revert r318459

Browse Source 
Summary: Revert r318459 which introduced a TempFile scoping bug.

Differential Revision: https://reviews.llvm.org/D51836

llvm-svn: 342503
This commit is contained in:
Don Hinton 2018-09-18 18:39:27 +00:00
parent 79e13b3973
commit 6c50f7113c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/bugpoint/ExecutionDriver.cpp
View File

@ -299,26 +299,32 @@ 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...
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-%%%%%%%";