On error, close the temporary file descriptor.
With this change llvm-ar can remove the temporary file on windows too.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186423 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 32bcb49..d65f9ec 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -41,10 +41,13 @@
static StringRef ToolName;
static const char *TemporaryOutput;
+static int TmpArchiveFD = -1;
// fail - Show the error message and exit.
LLVM_ATTRIBUTE_NORETURN static void fail(Twine Error) {
outs() << ToolName << ": " << Error << ".\n";
+ if (TmpArchiveFD != -1)
+ close(TmpArchiveFD);
if (TemporaryOutput)
sys::fs::remove(TemporaryOutput);
exit(1);
@@ -526,7 +529,6 @@
static void performWriteOperation(ArchiveOperation Operation,
object::Archive *OldArchive) {
- int TmpArchiveFD;
SmallString<128> TmpArchive;
failIfError(sys::fs::createUniqueFile(ArchiveName + ".temp-archive-%%%%%%%.a",
TmpArchiveFD, TmpArchive));