For PR797:

[oota-llvm.git] / lib / System / Win32 / Signals.inc

diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index a44c034ba1d9334533214157406c884db8ff3822..c2bfb01b386c2269d5a0497cc0013baa0a819308 100644 (file)
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -96,17 +96,19 @@ void sys::RemoveFileOnSignal(const sys::Path &Filename) {
 
 // RemoveDirectoryOnSignal - The public API
 void sys::RemoveDirectoryOnSignal(const sys::Path& path) {
+  // Not a directory?
+  sys::FileStatus Status;
+  if (path.getFileStatus(Status) || !Status.isDir)
+    return;
+
   RegisterHandler();
 
   if (CleanupExecuted)
     throw std::string("Process terminating -- cannot register for removal");
 
-  if (path.isDirectory()) {
-    if (DirectoriesToRemove == NULL)
-      DirectoriesToRemove = new std::vector<sys::Path>;
-
-    DirectoriesToRemove->push_back(path);
-  }
+  if (DirectoriesToRemove == NULL)
+    DirectoriesToRemove = new std::vector<sys::Path>;
+  DirectoriesToRemove->push_back(path);
 
   LeaveCriticalSection(&CriticalSection);
 }