[llvm] r184120 - Reapply r183985 now that the missing check was added to PathV2.

[Rafael Espindola]

Author: rafael
Date: Mon Jun 17 15:37:56 2013
New Revision: 184120

URL: http://llvm.org/viewvc/llvm-project?rev=184120&view=rev
Log:
Reapply r183985 now that the missing check was added to PathV2.

Modified:
    llvm/trunk/lib/Support/ToolOutputFile.cpp

Modified: llvm/trunk/lib/Support/ToolOutputFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/ToolOutputFile.cpp?rev=184120&r1=184119&r2=184120&view=diff
==============================================================================
--- llvm/trunk/lib/Support/ToolOutputFile.cpp (original)
+++ llvm/trunk/lib/Support/ToolOutputFile.cpp Mon Jun 17 15:37:56 2013
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/PathV1.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Signals.h"
 using namespace llvm;
 
@@ -25,8 +25,10 @@ tool_output_file::CleanupInstaller::Clea
 
 tool_output_file::CleanupInstaller::~CleanupInstaller() {
   // Delete the file if the client hasn't told us not to.
-  if (!Keep && Filename != "-")
-    sys::Path(Filename).eraseFromDisk();
+  if (!Keep && Filename != "-") {
+    bool Existed;
+    sys::fs::remove(Filename, Existed);
+  }
 
   // Ok, the file is successfully written and closed, or deleted. There's no
   // further need to clean it up on signals.