[lld] r354081 - Revert "Revert "[lld] Fix elf::unlinkAsync detached thread""

Nick Desaulniers via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 14 15:41:23 PST 2019


Author: nickdesaulniers
Date: Thu Feb 14 15:41:23 2019
New Revision: 354081

URL: http://llvm.org/viewvc/llvm-project?rev=354081&view=rev
Log:
Revert "Revert "[lld] Fix elf::unlinkAsync detached thread""

This reverts commit 9934f2ff02dba9fdabe6e27a83f9f95388bf4132.

Modified:
    lld/trunk/ELF/Filesystem.cpp

Modified: lld/trunk/ELF/Filesystem.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Filesystem.cpp?rev=354081&r1=354080&r2=354081&view=diff
==============================================================================
--- lld/trunk/ELF/Filesystem.cpp (original)
+++ lld/trunk/ELF/Filesystem.cpp Thu Feb 14 15:41:23 2019
@@ -58,9 +58,26 @@ void elf::unlinkAsync(StringRef Path) {
   std::error_code EC = sys::fs::openFileForRead(Path, FD);
   sys::fs::remove(Path);
 
+  if (EC)
+    return;
+
   // close and therefore remove TempPath in background.
-  if (!EC)
-    std::thread([=] { ::close(FD); }).detach();
+  std::mutex M;
+  std::condition_variable CV;
+  bool Started = false;
+  std::thread([&, FD] {
+    {
+      std::lock_guard<std::mutex> L(M);
+      Started = true;
+      CV.notify_all();
+    }
+    ::close(FD);
+  }).detach();
+
+  // GLIBC 2.26 and earlier have race condition that crashes an entire process
+  // if the main thread calls exit(2) while other thread is starting up.
+  std::unique_lock<std::mutex> L(M);
+  CV.wait(L, [&] { return Started; });
 #endif
 }
 




More information about the llvm-commits mailing list