This is an archive of the discontinued LLVM Phabricator instance.

Differential D65317

Fix macOS build after r358716
ClosedPublic

Authored by kongyi on Jul 25 2019, 9:55 PM.

Details

Reviewers
aprantl
JDevlieghere
davide
Commits
rG2a3980935ded: Merging r367084: --------------------------------------------------------------…
rL368848: Merging r367084:
rG1755abe1fb5c: Fix macOS build after r358716
rL367084: Fix macOS build after r358716
Summary

COPYFILE_CLONE is only defined on newer macOS versions, using it without check breaks build on build systems running legacy OS and toolchain.

Diff Detail

Repository
rL LLVM

Event Timeline

kongyi created this revision.Jul 25 2019, 9:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 25 2019, 9:55 PM
Herald added subscribers: llvm-commits, kristina, hiraditya. · View Herald Transcript
kongyi added subscribers: pirama, srhines.Jul 25 2019, 9:57 PM
JDevlieghere accepted this revision.Jul 25 2019, 10:03 PM

LGTM

This revision is now accepted and ready to land.Jul 25 2019, 10:03 PM
Closed by commit rL367084: Fix macOS build after r358716 (authored by kongyi). · Explain WhyJul 25 2019, 10:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Support/
Unix/
2 lines

Diff 211877

llvm/lib/Support/Unix/Path.inc

Show First 20 Lines • Show All 1,192 Lines • ▼ Show 20 Lines
#ifdef __APPLE__ #ifdef __APPLE__
/// This implementation tries to perform an APFS CoW clone of the file, /// This implementation tries to perform an APFS CoW clone of the file,
/// which can be much faster and uses less space. /// which can be much faster and uses less space.
/// Unfortunately fcopyfile(3) does not support COPYFILE_CLONE, so the /// Unfortunately fcopyfile(3) does not support COPYFILE_CLONE, so the
/// file descriptor variant of this function still uses the default /// file descriptor variant of this function still uses the default
/// implementation. /// implementation.
std::error_code copy_file(const Twine &From, const Twine &To) { std::error_code copy_file(const Twine &From, const Twine &To) {
uint32_t Flag = COPYFILE_DATA; uint32_t Flag = COPYFILE_DATA;
#if __has_builtin(__builtin_available) #if __has_builtin(__builtin_available) && defined(COPYFILE_CLONE)
if (__builtin_available(macos 10.12, *)) { if (__builtin_available(macos 10.12, *)) {
bool IsSymlink; bool IsSymlink;
if (std::error_code Error = is_symlink_file(From, IsSymlink)) if (std::error_code Error = is_symlink_file(From, IsSymlink))
return Error; return Error;
// COPYFILE_CLONE clones the symlink instead of following it // COPYFILE_CLONE clones the symlink instead of following it
// and returns EEXISTS if the target file already exists. // and returns EEXISTS if the target file already exists.
if (!IsSymlink && !exists(To)) if (!IsSymlink && !exists(To))
Flag = COPYFILE_CLONE; Flag = COPYFILE_CLONE;
Show All 15 Lines