[llvm] r359127 - Revert using fcopyfile(3) to implement sys::fs::copy_file(Twine, int) on macOS

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Wed Apr 24 12:08:43 2019
New Revision: 359127

URL: http://llvm.org/viewvc/llvm-project?rev=359127&view=rev
Log:
Revert using fcopyfile(3) to implement sys::fs::copy_file(Twine, int) on macOS

It turns out that I mesread the man page and fcopyfile(3) does not
actually support COPYFILE_CLONE for files.

<rdar://problem/50148757>

Modified:
    llvm/trunk/lib/Support/Path.cpp
    llvm/trunk/lib/Support/Unix/Path.inc

Modified: llvm/trunk/lib/Support/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Path.cpp?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Path.cpp (original)
+++ llvm/trunk/lib/Support/Path.cpp Wed Apr 24 12:08:43 2019
@@ -935,7 +935,6 @@ std::error_code create_directories(const
   return create_directory(P, IgnoreExisting, Perms);
 }
 
-#ifndef __APPLE__
 static std::error_code copy_file_internal(int ReadFD, int WriteFD) {
   const size_t BufSize = 4096;
   char *Buf = new char[BufSize];
@@ -960,6 +959,7 @@ static std::error_code copy_file_interna
   return std::error_code();
 }
 
+#ifndef __APPLE__
 std::error_code copy_file(const Twine &From, const Twine &To) {
   int ReadFD, WriteFD;
   if (std::error_code EC = openFileForRead(From, ReadFD, OF_None))
@@ -977,6 +977,7 @@ std::error_code copy_file(const Twine &F
 
   return EC;
 }
+#endif
 
 std::error_code copy_file(const Twine &From, int ToFD) {
   int ReadFD;
@@ -989,7 +990,6 @@ std::error_code copy_file(const Twine &F
 
   return EC;
 }
-#endif
 
 ErrorOr<MD5::MD5Result> md5_contents(int FD) {
   MD5 Hash;

Modified: llvm/trunk/lib/Support/Unix/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Path.inc?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/Path.inc (original)
+++ llvm/trunk/lib/Support/Unix/Path.inc Wed Apr 24 12:08:43 2019
@@ -1119,6 +1119,9 @@ namespace fs {
 #ifdef __APPLE__
 /// This implementation tries to perform an APFS CoW clone of the file,
 /// which can be much faster and uses less space.
+/// Unfortunately fcopyfile(3) does not support COPYFILE_CLONE, so the
+/// file descriptor variant of this function still uses the default
+/// implementation.
 std::error_code copy_file(const Twine &From, const Twine &To) {
   uint32_t Flag = COPYFILE_DATA;
   if (__builtin_available(macos 10.12, *)) {
@@ -1138,26 +1141,7 @@ std::error_code copy_file(const Twine &F
     return std::error_code();
   return std::error_code(errno, std::generic_category());
 }
-
-/// This implementation tries to perform an APFS CoW clone of the file,
-/// which can be much faster and uses less space.
-std::error_code copy_file(const Twine &From, int ToFD) {
-  int ReadFD;
-  if (std::error_code EC = openFileForRead(From, ReadFD, OF_None))
-    return EC;
-
-  uint32_t Flag = COPYFILE_DATA;
-  if (__builtin_available(macos 10.12, *))
-    Flag = COPYFILE_CLONE;
-
-  int Status = fcopyfile(ReadFD, ToFD, /*State*/ NULL, Flag);
-
-  close(ReadFD);
-  if (Status == 0)
-    return std::error_code();
-  return std::error_code(errno, std::generic_category());
-}
-#endif
+#endif // __APPLE__
 
 } // end namespace fs