[PATCH] D50048: [Windows FS] Allow moving files in TempFile::keep
Jeremy Morse via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 1 04:23:20 PDT 2018
jmorse updated this revision to Diff 158492.
jmorse retitled this revision from "[Windows FS] Fall back to MoveFileEx for rename across volumes" to "[Windows FS] Allow moving files in TempFile::keep".
jmorse added a comment.
This revision works just as well as the previous, but keeps "rename" behaving the same. Some future refactor could introduce a "move" function, this is the minimum change for now.
https://reviews.llvm.org/D50048
Files:
lib/Support/Path.cpp
lib/Support/Windows/Path.inc
Index: lib/Support/Windows/Path.inc
===================================================================
--- lib/Support/Windows/Path.inc
+++ lib/Support/Windows/Path.inc
@@ -450,7 +450,7 @@
if (std::error_code EC2 = realPathFromHandle(FromHandle, WideFrom))
return EC2;
if (::MoveFileExW(WideFrom.begin(), WideTo.begin(),
- MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED))
+ MOVEFILE_REPLACE_EXISTING))
return std::error_code();
return mapWindowsError(GetLastError());
}
Index: lib/Support/Path.cpp
===================================================================
--- lib/Support/Path.cpp
+++ lib/Support/Path.cpp
@@ -1150,8 +1150,16 @@
// If we can't cancel the delete don't rename.
auto H = reinterpret_cast<HANDLE>(_get_osfhandle(FD));
std::error_code RenameEC = setDeleteDisposition(H, false);
- if (!RenameEC)
+ if (!RenameEC) {
RenameEC = rename_fd(FD, Name);
+ // If rename failed because it's cross-device, copy instead
+ if (RenameEC ==
+ std::error_code(ERROR_NOT_SAME_DEVICE, std::system_category())) {
+ RenameEC = copy_file(TmpName, Name);
+ setDeleteDisposition(H, true);
+ }
+ }
+
// If we can't rename, discard the temporary file.
if (RenameEC)
setDeleteDisposition(H, true);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D50048.158492.patch
Type: text/x-patch
Size: 1340 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180801/d35169fd/attachment.bin>
More information about the llvm-commits
mailing list