This is an archive of the discontinued LLVM Phabricator instance.

Differential D150421

[libc++][NFC] Use _LIBCPP_STD_VER instead of __cpp_lib_atomic_is_always_lock_free
ClosedPublic

Authored by philnik on May 11 2023, 8:24 PM.

Details

Reviewers
ldionne
Mordante
Group Reviewers
Restricted Project
Commits
rGc04bcadf30ee: [libc++][NFC] Use _LIBCPP_STD_VER instead of…

Diff Detail

Event Timeline

philnik created this revision.May 11 2023, 8:24 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 11 2023, 8:24 PM
philnik requested review of this revision.May 11 2023, 8:24 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 11 2023, 8:24 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B231521: Diff 521546.May 11 2023, 10:05 PM
ldionne accepted this revision.May 12 2023, 9:09 PM
This revision is now accepted and ready to land.May 12 2023, 9:09 PM
Mordante added a subscriber: Mordante.May 13 2023, 2:57 AM
Mordante added inline comments.
libcxx/include/__atomic/aliases.h
85

Does this affect utils/libcxx/test/features.py lines 69 and 78.

philnik marked an inline comment as done.May 13 2023, 7:16 AM
philnik added inline comments.
libcxx/include/__atomic/aliases.h
85

It shouldn't, since __cpp_lib_atomic_is_always_lock_free was just guarded behind _LIBCPP_STD_VER >= 17.

Mordante accepted this revision.May 13 2023, 8:10 AM
Closed by commit rGc04bcadf30ee: [libc++][NFC] Use _LIBCPP_STD_VER instead of… (authored by philnik). · Explain WhyMay 13 2023, 4:27 PM
This revision was automatically updated to reflect the committed changes.
philnik marked an inline comment as done.
philnik added a commit: rGc04bcadf30ee: [libc++][NFC] Use _LIBCPP_STD_VER instead of….

Revision Contents

PathSize
libcxx/
include/
__atomic/
2 lines
4 lines

Diff 521955

libcxx/include/__atomic/aliases.h

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines
using atomic_uintptr_t = atomic<uintptr_t>; using atomic_uintptr_t = atomic<uintptr_t>;
using atomic_size_t = atomic<size_t>; using atomic_size_t = atomic<size_t>;
using atomic_ptrdiff_t = atomic<ptrdiff_t>; using atomic_ptrdiff_t = atomic<ptrdiff_t>;
using atomic_intmax_t = atomic<intmax_t>; using atomic_intmax_t = atomic<intmax_t>;
using atomic_uintmax_t = atomic<uintmax_t>; using atomic_uintmax_t = atomic<uintmax_t>;
// atomic_*_lock_free : prefer the contention type most highly, then the largest lock-free type // atomic_*_lock_free : prefer the contention type most highly, then the largest lock-free type
#ifdef __cpp_lib_atomic_is_always_lock_free #if _LIBCPP_STD_VER >= 17
MordanteUnsubmitted
Done
ReplyInline Actions

Does this affect utils/libcxx/test/features.py lines 69 and 78.

Mordante: Does this affect utils/libcxx/test/features.py lines 69 and 78.
philnikAuthorUnsubmitted
Done
ReplyInline Actions

It shouldn't, since __cpp_lib_atomic_is_always_lock_free was just guarded behind _LIBCPP_STD_VER >= 17.

philnik: It shouldn't, since `__cpp_lib_atomic_is_always_lock_free` was just guarded behind…
# define _LIBCPP_CONTENTION_LOCK_FREE ::std::__libcpp_is_always_lock_free<__cxx_contention_t>::__value # define _LIBCPP_CONTENTION_LOCK_FREE ::std::__libcpp_is_always_lock_free<__cxx_contention_t>::__value
#else #else
# define _LIBCPP_CONTENTION_LOCK_FREE false # define _LIBCPP_CONTENTION_LOCK_FREE false
#endif #endif
#if ATOMIC_LLONG_LOCK_FREE == 2 #if ATOMIC_LLONG_LOCK_FREE == 2
using __libcpp_signed_lock_free = __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, long long>; using __libcpp_signed_lock_free = __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, long long>;
using __libcpp_unsigned_lock_free = using __libcpp_unsigned_lock_free =
Show All 23 Lines

libcxx/include/__atomic/atomic_base.h

Show All 27 Lines
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value> template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
struct __atomic_base // false struct __atomic_base // false
{ {
mutable __cxx_atomic_impl<_Tp> __a_; mutable __cxx_atomic_impl<_Tp> __a_;
#if defined(__cpp_lib_atomic_is_always_lock_free) #if _LIBCPP_STD_VER >= 17
static _LIBCPP_CONSTEXPR bool is_always_lock_free = __libcpp_is_always_lock_free<__cxx_atomic_impl<_Tp> >::__value; static _LIBCPP_CONSTEXPR bool is_always_lock_free = __libcpp_is_always_lock_free<__cxx_atomic_impl<_Tp> >::__value;
#endif #endif
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI
bool is_lock_free() const volatile _NOEXCEPT bool is_lock_free() const volatile _NOEXCEPT
{return __cxx_atomic_is_lock_free(sizeof(_Tp));} {return __cxx_atomic_is_lock_free(sizeof(_Tp));}
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI
bool is_lock_free() const _NOEXCEPT bool is_lock_free() const _NOEXCEPT
▲ Show 20 Lines • Show All 89 Lines • ▼ Show 20 Lines
#endif #endif
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
__atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {} __atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {}
__atomic_base(const __atomic_base&) = delete; __atomic_base(const __atomic_base&) = delete;
}; };
#if defined(__cpp_lib_atomic_is_always_lock_free) #if _LIBCPP_STD_VER >= 17
template <class _Tp, bool __b> template <class _Tp, bool __b>
_LIBCPP_CONSTEXPR bool __atomic_base<_Tp, __b>::is_always_lock_free; _LIBCPP_CONSTEXPR bool __atomic_base<_Tp, __b>::is_always_lock_free;
#endif #endif
// atomic<Integral> // atomic<Integral>
template <class _Tp> template <class _Tp>
struct __atomic_base<_Tp, true> struct __atomic_base<_Tp, true>
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines