Skip to content

Fixed shared_ptr comparisons with nullptr_t when spaceship is unavailable. #76781

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 3 commits into from
Jan 9, 2024
Merged

Fixed shared_ptr comparisons with nullptr_t when spaceship is unavailable. #76781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ee1d8f
Fixed shared_ptr comparisons with nullptr_t when spaceship is unavail…
Bekenn Jan 3, 2024
5e6e73f
Don't test shared_ptr<T[]> in language modes earlier than C++17.
Bekenn Jan 3, 2024
66744b0
PR feedback
Bekenn Jan 7, 2024
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
4 changes: 2 additions & 2 deletions libcxx/include/__memory/shared_ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,12 +1166,12 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(nullptr_t, const shared_ptr<_Tp>& _

template <class _Tp>
inline _LIBCPP_HIDE_FROM_ABI bool operator<(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT {
return less<_Tp*>()(__x.get(), nullptr);
return less<typename shared_ptr<_Tp>::element_type*>()(__x.get(), nullptr);
}

template <class _Tp>
inline _LIBCPP_HIDE_FROM_ABI bool operator<(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT {
return less<_Tp*>()(nullptr, __x.get());
return less<typename shared_ptr<_Tp>::element_type*>()(nullptr, __x.get());
}

template <class _Tp>
Expand Down
41 changes: 38 additions & 3 deletions ...s/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main(int, char**)
AssertComparisonsAreNoexcept<nullptr_t, std::shared_ptr<int> >();
AssertComparisonsReturnBool<std::shared_ptr<int>, nullptr_t>();
AssertComparisonsReturnBool<nullptr_t, std::shared_ptr<int> >();
#if TEST_STD_VER > 17
#if TEST_STD_VER >= 20
AssertOrderAreNoexcept<std::shared_ptr<int>>();
AssertOrderReturn<std::strong_ordering, std::shared_ptr<int>>();
#endif
Expand All @@ -67,7 +67,7 @@ int main(int, char**)
assert(!(nullptr > p1));
assert((p1 >= nullptr));
assert(!(nullptr >= p1));
#if TEST_STD_VER > 17
#if TEST_STD_VER >= 20
assert((nullptr <=> p1) == std::strong_ordering::less);
assert((p1 <=> nullptr) == std::strong_ordering::greater);
#endif
Expand All @@ -83,9 +83,44 @@ int main(int, char**)
assert(!(nullptr > p2));
assert((p2 >= nullptr));
assert((nullptr >= p2));
#if TEST_STD_VER > 17
#if TEST_STD_VER >= 20
assert((p2 <=> nullptr) == std::strong_ordering::equivalent);
assert((nullptr <=> p2) == std::strong_ordering::equivalent);
#endif

#if TEST_STD_VER >= 17
const std::shared_ptr<int[]> p3(new int[1]);
assert(!(p3 == nullptr));
assert(!(nullptr == p3));
assert(!(p3 < nullptr));
assert((nullptr < p3));
assert(!(p3 <= nullptr));
assert((nullptr <= p3));
assert((p3 > nullptr));
assert(!(nullptr > p3));
assert((p3 >= nullptr));
assert(!(nullptr >= p3));
# if TEST_STD_VER >= 20
assert((p3 <=> nullptr) == std::strong_ordering::greater);
assert((nullptr <=> p3) == std::strong_ordering::less);
# endif

const std::shared_ptr<int[]> p4;
assert((p4 == nullptr));
assert((nullptr == p4));
assert(!(p4 < nullptr));
assert(!(nullptr < p4));
assert((p4 <= nullptr));
assert((nullptr <= p4));
assert(!(p4 > nullptr));
assert(!(nullptr > p4));
assert((p4 >= nullptr));
assert((nullptr >= p4));
# if TEST_STD_VER >= 20
assert((p4 <=> nullptr) == std::strong_ordering::equivalent);
assert((nullptr <=> p4) == std::strong_ordering::equivalent);
# endif
#endif

return 0;
}
44 changes: 40 additions & 4 deletions libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ TEST_CONSTEXPR_CXX23 bool test() {
AssertEqualityAreNoexcept<nullptr_t, std::unique_ptr<int> >();
AssertComparisonsReturnBool<std::unique_ptr<int>, nullptr_t>();
AssertComparisonsReturnBool<nullptr_t, std::unique_ptr<int> >();
#if TEST_STD_VER > 17
#if TEST_STD_VER >= 20
AssertOrderReturn<std::strong_ordering, std::unique_ptr<int>, nullptr_t>();
AssertOrderReturn<std::strong_ordering, nullptr_t, std::unique_ptr<int>>();
#endif
Expand All @@ -71,9 +71,9 @@ TEST_CONSTEXPR_CXX23 bool test() {
assert(!(nullptr > p1));
assert((p1 >= nullptr));
assert(!(nullptr >= p1));
#if TEST_STD_VER > 17
assert((nullptr <=> p1) == std::strong_ordering::less);
#if TEST_STD_VER >= 20
assert((p1 <=> nullptr) == std::strong_ordering::greater);
assert((nullptr <=> p1) == std::strong_ordering::less);
#endif
}

Expand All @@ -88,10 +88,46 @@ TEST_CONSTEXPR_CXX23 bool test() {
assert(!(nullptr > p2));
assert((p2 >= nullptr));
assert((nullptr >= p2));
#if TEST_STD_VER > 17
#if TEST_STD_VER >= 20
assert((p2 <=> nullptr) == std::strong_ordering::equivalent);
assert((nullptr <=> p2) == std::strong_ordering::equivalent);
#endif

const std::unique_ptr<int[]> p3(new int[1]);
assert(!(p3 == nullptr));
assert(!(nullptr == p3));
// A pointer to allocated storage and a nullptr can't be compared at compile-time
if (!TEST_IS_CONSTANT_EVALUATED) {
assert(!(p3 < nullptr));
assert((nullptr < p3));
assert(!(p3 <= nullptr));
assert((nullptr <= p3));
assert((p3 > nullptr));
assert(!(nullptr > p3));
assert((p3 >= nullptr));
assert(!(nullptr >= p3));
#if TEST_STD_VER >= 20
assert((nullptr <=> p3) == std::strong_ordering::less);
assert((p3 <=> nullptr) == std::strong_ordering::greater);
#endif
}

const std::unique_ptr<int[]> p4;
assert((p4 == nullptr));
assert((nullptr == p4));
assert(!(p4 < nullptr));
assert(!(nullptr < p4));
assert((p4 <= nullptr));
assert((nullptr <= p4));
assert(!(p4 > nullptr));
assert(!(nullptr > p4));
assert((p4 >= nullptr));
assert((nullptr >= p4));
#if TEST_STD_VER >= 20
assert((p4 <=> nullptr) == std::strong_ordering::equivalent);
assert((nullptr <=> p4) == std::strong_ordering::equivalent);
#endif

return true;
}

Expand Down