maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Support] Fix TempFile::discard to not leave behind temporary files 

Moved the remove of the temporary file to after the close to avoid
remove failures caused by ETXTBSY errors.

This issue was seen when FileOutputBuffer falls back to an in memory
buffer due to the inability to mmap the on disk file. This occurred when
running LLD on an Ubuntu VM in VirtualBox on a Windows host attempting
to write the output to a VirtualBox shared folder.

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

llvm-svn: 354017
This commit is contained in:
Andrew Ng 2019-02-14 11:08:49 +00:00
parent 7f95f96391
commit d27cf27eb1
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
llvm/lib/Support/Path.cpp
View File

@ -1128,26 +1128,27 @@ TempFile::~TempFile() { assert(Done); }
Error TempFile::discard() {
Done = true;
std::error_code RemoveEC;
// On windows closing will remove the file.
#ifndef _WIN32
// Always try to close and remove.
if (!TmpName.empty()) {
RemoveEC = fs::remove(TmpName);
sys::DontRemoveFileOnSignal(TmpName);
}
#endif
if (!RemoveEC)
TmpName = "";
if (FD != -1 && close(FD) == -1) {
std::error_code EC = std::error_code(errno, std::generic_category());
return errorCodeToError(EC);
}
FD = -1;
#ifdef _WIN32
// On windows closing will remove the file.
TmpName = "";
return Error::success();
#else
// Always try to close and remove.
std::error_code RemoveEC;
if (!TmpName.empty()) {
RemoveEC = fs::remove(TmpName);
sys::DontRemoveFileOnSignal(TmpName);
if (!RemoveEC)
TmpName = "";
}
return errorCodeToError(RemoveEC);
#endif
}
Error TempFile::keep(const Twine &Name) {