This is an archive of the discontinued LLVM Phabricator instance.

Differential D79784

[libc++] Adjust how we guard the inclusion of unistd.h
ClosedPublic

Authored by john.brawn on May 12 2020, 6:58 AM.

Details

Reviewers
LittleFox94
ldionne
Group Reviewers
Restricted Project
Commits
rG4d25f4453d60: [libc++] Adjust how we guard the inclusion of unistd.h
Summary

unistd.h isn't guaranteed to exist when the target isn't Windows, in particular if the target is bare-metal (i.e. no operating system). Handle this by using __has_include instead, though in filesystem/operations.cpp we already unconditionally include it so just remove the extra include.

Diff Detail

Event Timeline

john.brawn created this revision.May 12 2020, 6:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 12 2020, 6:58 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: phosek, dexonsmith. · View Herald Transcript
ldionne requested changes to this revision.May 12 2020, 7:39 AM
ldionne added inline comments.
libcxx/include/__config
1556 ↗(On Diff #263423)

Naive question: why not use __has_include?

libcxx/src/filesystem/operations.cpp
40

You're not including it anymore?

This revision now requires changes to proceed.May 12 2020, 7:39 AM
LittleFox94 added inline comments.May 12 2020, 7:55 AM
libcxx/src/filesystem/operations.cpp
40

It's done unconditionally in line 22

Harbormaster failed remote builds in B56428: Diff 263423!May 12 2020, 8:34 AM
ldionne added inline comments.May 12 2020, 9:44 AM
libcxx/src/filesystem/operations.cpp
40

Good catch!

john.brawn marked an inline comment as done.May 13 2020, 5:26 AM
john.brawn added inline comments.
libcxx/include/__config
1556 ↗(On Diff #263423)

Because I didn't know about it. Looks like all the compiler version we support (in llvm/cmake/modules/CheckCompilerVersion.cmake) implement it, so it makes sense to use it.

john.brawn updated this revision to Diff 263678.May 13 2020, 5:27 AM
john.brawn edited the summary of this revision. (Show Details)
ldionne accepted this revision.May 13 2020, 9:55 AM
This revision is now accepted and ready to land.May 13 2020, 9:55 AM
Closed by commit rG4d25f4453d60: [libc++] Adjust how we guard the inclusion of unistd.h (authored by john.brawn). · Explain WhyMay 14 2020, 4:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
src/
2 lines
filesystem/
4 lines
6 lines

Diff 263969

libcxx/src/chrono.cpp

//===------------------------- chrono.cpp ---------------------------------===// //===------------------------- chrono.cpp ---------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "chrono" #include "chrono"
#include "cerrno" // errno #include "cerrno" // errno
#include "system_error" // __throw_system_error #include "system_error" // __throw_system_error
#include <time.h> // clock_gettime, CLOCK_MONOTONIC and CLOCK_REALTIME #include <time.h> // clock_gettime, CLOCK_MONOTONIC and CLOCK_REALTIME
#include "include/apple_availability.h" #include "include/apple_availability.h"
#if !defined(_WIN32) #if __has_include(<unistd.h>)
#include <unistd.h> #include <unistd.h>
#endif #endif
#if !defined(__APPLE__) && _POSIX_TIMERS > 0 #if !defined(__APPLE__) && _POSIX_TIMERS > 0
#define _LIBCPP_USE_CLOCK_GETTIME #define _LIBCPP_USE_CLOCK_GETTIME
#endif #endif
#if defined(_LIBCPP_WIN32API) #if defined(_LIBCPP_WIN32API)
▲ Show 20 Lines • Show All 214 Lines • Show Last 20 Lines

libcxx/src/filesystem/operations.cpp

Show All 30 Lines
#include <sys/sendfile.h> #include <sys/sendfile.h>
#define _LIBCPP_USE_SENDFILE #define _LIBCPP_USE_SENDFILE
#endif #endif
#elif defined(__APPLE__) || __has_include(<copyfile.h>) #elif defined(__APPLE__) || __has_include(<copyfile.h>)
#include <copyfile.h> #include <copyfile.h>
#define _LIBCPP_USE_COPYFILE #define _LIBCPP_USE_COPYFILE
#endif #endif
#if !defined(_WIN32)
#include <unistd.h>
ldionneUnsubmitted
Not Done
ReplyInline Actions

You're not including it anymore?

ldionne: You're not including it anymore?
LittleFox94Unsubmitted
Not Done
ReplyInline Actions

It's done unconditionally in line 22

LittleFox94: It's done unconditionally in line 22
ldionneUnsubmitted
Not Done
ReplyInline Actions

Good catch!

ldionne: Good catch!
#endif
#if !defined(__APPLE__) && _POSIX_TIMERS > 0 #if !defined(__APPLE__) && _POSIX_TIMERS > 0
#define _LIBCPP_USE_CLOCK_GETTIME #define _LIBCPP_USE_CLOCK_GETTIME
#endif #endif
#if !defined(CLOCK_REALTIME) || !defined(_LIBCPP_USE_CLOCK_GETTIME) #if !defined(CLOCK_REALTIME) || !defined(_LIBCPP_USE_CLOCK_GETTIME)
#include <sys/time.h> // for gettimeofday and timeval #include <sys/time.h> // for gettimeofday and timeval
#endif // !defined(CLOCK_REALTIME) #endif // !defined(CLOCK_REALTIME)
▲ Show 20 Lines • Show All 1,736 Lines • Show Last 20 Lines

libcxx/src/thread.cpp

Show All 17 Lines
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
# include <sys/param.h> # include <sys/param.h>
# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
# include <sys/sysctl.h> # include <sys/sysctl.h>
# endif # endif
#endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__CloudABI__) || defined(__Fuchsia__) || defined(__wasi__) #if __has_include(<unistd.h>)
# include <unistd.h> #include <unistd.h>
#endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__CloudABI__) || defined(__Fuchsia__) || defined(__wasi__) #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
#pragma weak pthread_create // Do not create libpthread dependency #pragma weak pthread_create // Do not create libpthread dependency
#endif #endif
#if defined(_LIBCPP_WIN32API) #if defined(_LIBCPP_WIN32API)
#include <windows.h> #include <windows.h>
#endif #endif
▲ Show 20 Lines • Show All 189 Lines • Show Last 20 Lines