Skip to content

[libc++] std::atomic primary template should not have a difference_type member type #123236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 21, 2025
Merged

[libc++] std::atomic primary template should not have a difference_type member type #123236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3695367
Apply clang-format
dalg24 Jan 16, 2025
857e15f
Fix tests for std::atomic member types
dalg24 Jan 16, 2025
c1ea966
Fix std::atomic primary template should not have difference_type
dalg24 Jan 16, 2025
af4d5f5
Update expected error for atomic_fetch_{add,sub}[_explicit] with poin…
dalg24 Jan 16, 2025
95a84d4
Add test with function pointer
dalg24 Jan 16, 2025
145d45a
Fixup for cxx03
dalg24 Jan 17, 2025
163a79a
Apply suggested changes from review
dalg24 Jan 21, 2025
64257b4
Add XFAIL directive for the frozen cxx03 tests per review
dalg24 Jan 21, 2025
fc2dc57
Merge branch 'main' of https://github.com/llvm/llvm-project into atom…
dalg24 Jan 29, 2025
f16cd7b
Fixup missing typename keyword
dalg24 Feb 8, 2025
bacb6bb
Fixup std::atomic<Floating>::difference_type was introduced in C++20
dalg24 Feb 9, 2025
fbaebba
Merge branch 'main' into atomic_difference_type
ldionne Feb 20, 2025
0e2b81f
XFAIL test in C++03 frozen
ldionne Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions libcxx/include/__atomic/atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ struct __atomic_base // false
{
mutable __cxx_atomic_impl<_Tp> __a_;

using value_type = _Tp;

#if _LIBCPP_STD_VER >= 17
static constexpr bool is_always_lock_free = __libcpp_is_always_lock_free<__cxx_atomic_impl<_Tp> >::__value;
#endif
Expand Down Expand Up @@ -145,6 +147,8 @@ template <class _Tp>
struct __atomic_base<_Tp, true> : public __atomic_base<_Tp, false> {
using __base _LIBCPP_NODEBUG = __atomic_base<_Tp, false>;

using difference_type = typename __base::value_type;

_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __atomic_base() _NOEXCEPT = default;

_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __base(__d) {}
Expand Down Expand Up @@ -229,8 +233,6 @@ struct __atomic_waitable_traits<__atomic_base<_Tp, _IsIntegral> > {
template <class _Tp>
struct atomic : public __atomic_base<_Tp> {
using __base _LIBCPP_NODEBUG = __atomic_base<_Tp>;
using value_type = _Tp;
using difference_type = value_type;

#if _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI atomic() = default;
Expand Down Expand Up @@ -258,8 +260,8 @@ struct atomic : public __atomic_base<_Tp> {
template <class _Tp>
struct atomic<_Tp*> : public __atomic_base<_Tp*> {
using __base _LIBCPP_NODEBUG = __atomic_base<_Tp*>;
using value_type = _Tp*;
using difference_type = ptrdiff_t;

using difference_type = ptrdiff_t;

_LIBCPP_HIDE_FROM_ABI atomic() _NOEXCEPT = default;

Expand Down
6 changes: 4 additions & 2 deletions ...atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//

// XFAIL: FROZEN-CXX03-HEADERS-FIXME

// <atomic>

// template <class T>
Expand Down Expand Up @@ -63,12 +65,12 @@ struct S {
void member_function_pointer() {
{
volatile std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_add' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_add'}}
std::atomic_fetch_add(&fun, 0);
}
{
std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_add' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_add'}}
std::atomic_fetch_add(&fun, 0);
}
}
6 changes: 4 additions & 2 deletions ...tomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//

// XFAIL: FROZEN-CXX03-HEADERS-FIXME

// <atomic>

// template <class T>
Expand Down Expand Up @@ -66,12 +68,12 @@ struct S {
void member_function_pointer() {
{
volatile std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_add' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_add_explicit'}}
std::atomic_fetch_add_explicit(&fun, 0, std::memory_order_relaxed);
}
{
std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_add' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_add_explicit'}}
std::atomic_fetch_add_explicit(&fun, 0, std::memory_order_relaxed);
}
}
6 changes: 4 additions & 2 deletions ...atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//

// XFAIL: FROZEN-CXX03-HEADERS-FIXME

// <atomic>

// template <class T>
Expand Down Expand Up @@ -63,12 +65,12 @@ struct S {
void member_function_pointer() {
{
volatile std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_sub' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_sub'}}
std::atomic_fetch_sub(&fun, 0);
}
{
std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_sub' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_sub'}}
std::atomic_fetch_sub(&fun, 0);
}
}
6 changes: 4 additions & 2 deletions ...tomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//

// XFAIL: FROZEN-CXX03-HEADERS-FIXME

// <atomic>

// template <class T>
Expand Down Expand Up @@ -66,12 +68,12 @@ struct S {
void member_function_pointer() {
{
volatile std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_sub' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_sub_explicit'}}
std::atomic_fetch_sub_explicit(&fun, 0, std::memory_order_relaxed);
}
{
std::atomic<void (S::*)(int)> fun;
// expected-error@*:* {{no member named 'fetch_sub' in}}
// expected-error@*:* {{no matching function for call to 'atomic_fetch_sub_explicit'}}
std::atomic_fetch_sub_explicit(&fun, 0, std::memory_order_relaxed);
}
}
Loading