Revert r199628: "[AArch64 NEON] Fix a bug caused by undef lane when generating VEXT."

[oota-llvm.git] / lib / Support / ToolOutputFile.cpp

diff --git a/lib/Support/ToolOutputFile.cpp b/lib/Support/ToolOutputFile.cpp
index af44b4386669cde54398fcf8e13a9e7ca2869294..b5fb20f4b20f3b9cf8c0777f0090856540a8b7a4 100644 (file)
--- a/lib/Support/ToolOutputFile.cpp
+++ b/lib/Support/ToolOutputFile.cpp
@@ -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;
 
@@ -26,7 +26,7 @@ tool_output_file::CleanupInstaller::CleanupInstaller(const char *filename)
 tool_output_file::CleanupInstaller::~CleanupInstaller() {
   // Delete the file if the client hasn't told us not to.
   if (!Keep && Filename != "-")
-    sys::Path(Filename).eraseFromDisk();
+    sys::fs::remove(Filename);
 
   // Ok, the file is successfully written and closed, or deleted. There's no
   // further need to clean it up on signals.
@@ -35,9 +35,8 @@ tool_output_file::CleanupInstaller::~CleanupInstaller() {
 }
 
 tool_output_file::tool_output_file(const char *filename, std::string &ErrorInfo,
-                                   unsigned Flags)
-  : Installer(filename),
-    OS(filename, ErrorInfo, Flags) {
+                                   sys::fs::OpenFlags Flags)
+    : Installer(filename), OS(filename, ErrorInfo, Flags) {
   // If open fails, no cleanup is needed.
   if (!ErrorInfo.empty())
     Installer.Keep = true;