diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst index 61805726a4ff0..a36848ebd24b4 100644 --- a/libcxx/docs/FeatureTestMacroTable.rst +++ b/libcxx/docs/FeatureTestMacroTable.rst @@ -432,7 +432,7 @@ Status ---------------------------------------------------------- ----------------- ``__cpp_lib_constexpr_queue`` ``202502L`` ---------------------------------------------------------- ----------------- - ``__cpp_lib_constrained_equality`` *unimplemented* + ``__cpp_lib_constrained_equality`` ``202411L`` ---------------------------------------------------------- ----------------- ``__cpp_lib_copyable_function`` *unimplemented* ---------------------------------------------------------- ----------------- diff --git a/libcxx/docs/ReleaseNotes/21.rst b/libcxx/docs/ReleaseNotes/21.rst index d31ca0130cb80..19138188d29a4 100644 --- a/libcxx/docs/ReleaseNotes/21.rst +++ b/libcxx/docs/ReleaseNotes/21.rst @@ -53,6 +53,8 @@ Implemented Papers - P2711R1: Making multi-param constructors of ``views`` ``explicit`` (`Github `__) - P2770R0: Stashing stashing ``iterators`` for proper flattening (`Github `__) - P2655R3: ``common_reference_t`` of ``reference_wrapper`` Should Be a Reference Type (`Github `__) +- P2944R3: Comparisons for ``reference_wrapper`` (`Github `__) +- P3379R0: Constrain ``std::expected equality`` operators (`Github `__) Improvements and New Features ----------------------------- diff --git a/libcxx/docs/Status/Cxx23Papers.csv b/libcxx/docs/Status/Cxx23Papers.csv index e4fa07d82289d..f1d8e9a2bd09c 100644 --- a/libcxx/docs/Status/Cxx23Papers.csv +++ b/libcxx/docs/Status/Cxx23Papers.csv @@ -60,7 +60,7 @@ "`P1642R11 `__","Freestanding ``[utilities]``, ``[ranges]``, and ``[iterators]``","2022-07 (Virtual)","","","" "`P1899R3 `__","``stride_view``","2022-07 (Virtual)","","","" "`P2093R14 `__","Formatted output","2022-07 (Virtual)","|Complete|","18","" -"`P2165R4 `__","Compatibility between ``tuple``, ``pair`` and ``tuple-like`` objects","2022-07 (Virtual)","|Partial|","","Only the part for ``zip_view`` is implemented." +"`P2165R4 `__","Compatibility between ``tuple``, ``pair`` and ``tuple-like`` objects","2022-07 (Virtual)","|Partial|","","Changes of ``tuple``, ``adjacent_view``, and ``cartesian_product_view`` are not yet implemented." "`P2278R4 `__","``cbegin`` should always return a constant iterator","2022-07 (Virtual)","","","" "`P2286R8 `__","Formatting Ranges","2022-07 (Virtual)","|Complete|","16","" "`P2291R3 `__","Add Constexpr Modifiers to Functions ``to_chars`` and ``from_chars`` for Integral Types in ```` Header","2022-07 (Virtual)","|Complete|","16","" diff --git a/libcxx/docs/Status/Cxx2cIssues.csv b/libcxx/docs/Status/Cxx2cIssues.csv index 6fcb2f3c78cfc..c6225127a74b9 100644 --- a/libcxx/docs/Status/Cxx2cIssues.csv +++ b/libcxx/docs/Status/Cxx2cIssues.csv @@ -149,4 +149,5 @@ "`LWG3343 `__","Ordering of calls to ``unlock()`` and ``notify_all()`` in Effects element of ``notify_all_at_thread_exit()`` should be reversed","Not Adopted Yet","|Complete|","16","" "`LWG4139 `__","ยง[time.zone.leap] recursive constraint in ``<=>``","Not Adopted Yet","|Complete|","20","" "`LWG3456 `__","Pattern used by ``std::from_chars`` is underspecified (option B)","Not Adopted Yet","|Complete|","20","" +"`LWG3882 `__","``tuple`` relational operators have confused friendships","Not Adopted Yet","|Complete|","21","The comparsion operators are constrained harder than the proposed resolution. libstdc++ and MSVC STL do the same." "","","","","","" diff --git a/libcxx/docs/Status/Cxx2cPapers.csv b/libcxx/docs/Status/Cxx2cPapers.csv index febb0c176f9c4..e8b0c9559f40b 100644 --- a/libcxx/docs/Status/Cxx2cPapers.csv +++ b/libcxx/docs/Status/Cxx2cPapers.csv @@ -59,7 +59,7 @@ "`P2248R8 `__","Enabling list-initialization for algorithms","2024-03 (Tokyo)","","","" "`P2810R4 `__","``is_debugger_present`` ``is_replaceable``","2024-03 (Tokyo)","","","" "`P1068R11 `__","Vector API for random number generation","2024-03 (Tokyo)","","","" -"`P2944R3 `__","Comparisons for ``reference_wrapper``","2024-03 (Tokyo)","|Partial|","","The changes to ``tuple``'s equality overload from P2165R4 are not yet implemented." +"`P2944R3 `__","Comparisons for ``reference_wrapper``","2024-03 (Tokyo)","|Complete|","21","" "`P2642R6 `__","Padded ``mdspan`` layouts","2024-03 (Tokyo)","","","" "`P3029R1 `__","Better ``mdspan``'s CTAD","2024-03 (Tokyo)","|Complete|","19","" "","","","","","" diff --git a/libcxx/include/tuple b/libcxx/include/tuple index 662d926ed35a2..71611e6bc67d3 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -106,6 +106,11 @@ public: void swap(tuple&) noexcept(AND(swap(declval(), declval())...)); // constexpr in C++20 constexpr void swap(const tuple&) const noexcept(see-below); // C++23 + + template + friend constexpr bool operator==(const tuple& t, const UTuple& u); // C++23 + template + friend constexpr auto operator<=>(const tuple& t, const UTuple& u); // C++23 }; @@ -220,6 +225,7 @@ template # include <__config> # include <__cstddef/size_t.h> # include <__fwd/array.h> +# include <__fwd/get.h> # include <__fwd/pair.h> # include <__fwd/tuple.h> # include <__memory/allocator_arg_t.h> @@ -229,6 +235,7 @@ template # include <__tuple/make_tuple_types.h> # include <__tuple/sfinae_helpers.h> # include <__tuple/tuple_element.h> +# include <__tuple/tuple_like.h> # include <__tuple/tuple_like_ext.h> # include <__tuple/tuple_size.h> # include <__tuple/tuple_types.h> @@ -287,6 +294,68 @@ _LIBCPP_BEGIN_NAMESPACE_STD # ifndef _LIBCPP_CXX03_LANG +template +_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool __tuple_compare_equal(const _Tp& __x, const _Up& __y) { + if constexpr (_Ip == 0) + return true; + else + return std::__tuple_compare_equal<_Ip - 1>(__x, __y) && std::get<_Ip - 1>(__x) == std::get<_Ip - 1>(__y); +} + +# if _LIBCPP_STD_VER >= 26 +template >> +inline constexpr bool __can_tuple_compare_equal = false; + +// TODO(LLVM 22): Remove `tuple_size_v<_Tp> == tuple_size_v<_Up>` here once once LLVM-20 support ends +// because the resolution of CWG2369 landed in LLVM-21. +template + requires(tuple_size_v<_Tp> == tuple_size_v<_Up>) +inline constexpr bool __can_tuple_compare_equal<_Tp, _Up, index_sequence<_Is...>> = + __all& __t, const tuple_element_t<_Is, _Up>& __u) { + { __t == __u } -> __boolean_testable; + }...>::value; +# endif // _LIBCPP_STD_VER >= 26 + +# if _LIBCPP_STD_VER >= 20 +template +_LIBCPP_HIDE_FROM_ABI constexpr _Ret __tuple_compare_three_way(const _Tp& __x, const _Up& __y, index_sequence<_Is...>) { + _Ret __result = strong_ordering::equal; + static_cast( + ((__result = std::__synth_three_way(std::get<_Is>(__x), std::get<_Is>(__y)), __result != 0) || ...)); + return __result; +} +# endif // _LIBCPP_STD_VER >= 20 + +# if _LIBCPP_STD_VER >= 23 +template +inline constexpr bool __is_tuple_v = false; + +template +inline constexpr bool __is_tuple_v> = true; + +template +concept __tuple_like_no_tuple = __tuple_like<_Tp> && !__is_tuple_v<_Tp>; + +template +struct __tuple_common_comparison_category_impl {}; + +// TODO(LLVM 22): Remove `tuple_size_v<_Tp> == tuple_size_v<_Up>` here once once LLVM-20 support ends +// because the resolution of CWG2369 landed in LLVM-21. +template + requires(tuple_size_v<_Tp> == tuple_size_v<_Up>) && requires { + typename common_comparison_category_t< + __synth_three_way_result, tuple_element_t<_Is, _Up>>...>; + } +struct __tuple_common_comparison_category_impl<_Tp, _Up, index_sequence<_Is...>> { + using type _LIBCPP_NODEBUG = + common_comparison_category_t<__synth_three_way_result, tuple_element_t<_Is, _Up>>...>; +}; + +template <__tuple_like _Tp, __tuple_like _Up> +using __tuple_common_comparison_category _LIBCPP_NODEBUG = + __tuple_common_comparison_category_impl<_Tp, _Up, make_index_sequence>>::type; +# endif // _LIBCPP_STD_VER >= 23 + // __tuple_leaf template ::value && !__libcpp_is_final<_Hp>::value > @@ -992,7 +1061,24 @@ public: noexcept(__all...>::value) { __base_.swap(__t.__base_); } -# endif // _LIBCPP_STD_VER >= 23 + + template <__tuple_like_no_tuple _UTuple> +# if _LIBCPP_STD_VER >= 26 + requires __can_tuple_compare_equal && (sizeof...(_Tp) == tuple_size_v<_UTuple>) +# endif // _LIBCPP_STD_VER >= 26 + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const tuple& __x, const _UTuple& __y) { + static_assert(sizeof...(_Tp) == tuple_size_v<_UTuple>, "Can't compare tuple-like values of different sizes"); + return std::__tuple_compare_equal(__x, __y); + } + + template <__tuple_like_no_tuple _UTuple> + requires(sizeof...(_Tp) == tuple_size_v<_UTuple>) + _LIBCPP_HIDE_FROM_ABI friend constexpr __tuple_common_comparison_category + operator<=>(const tuple& __x, const _UTuple& __y) { + return std::__tuple_compare_three_way<__tuple_common_comparison_category>( + __x, __y, index_sequence_for<_Tp...>{}); + } +# endif // _LIBCPP_STD_VER >= 23 }; _LIBCPP_DIAGNOSTIC_PUSH @@ -1014,6 +1100,21 @@ public: _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(tuple&) _NOEXCEPT {} # if _LIBCPP_STD_VER >= 23 _LIBCPP_HIDE_FROM_ABI constexpr void swap(const tuple&) const noexcept {} + + template <__tuple_like_no_tuple _UTuple> +# if _LIBCPP_STD_VER >= 26 + requires(tuple_size_v<_UTuple> == 0) +# endif // _LIBCPP_STD_VER >= 26 + _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const tuple&, const _UTuple&) { + static_assert(tuple_size_v<_UTuple> == 0, "Can't compare tuple-like values of different sizes"); + return true; + } + + template <__tuple_like_no_tuple _UTuple> + requires(tuple_size_v<_UTuple> == 0) + _LIBCPP_HIDE_FROM_ABI friend constexpr strong_ordering operator<=>(const tuple&, const _UTuple&) { + return strong_ordering::equal; + } # endif }; _LIBCPP_DIAGNOSTIC_POP @@ -1132,22 +1233,6 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 tuple<_Tp&&...> forwa return tuple<_Tp&&...>(std::forward<_Tp>(__t)...); } -template -struct __tuple_equal { - template - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator()(const _Tp& __x, const _Up& __y) { - return __tuple_equal<_Ip - 1>()(__x, __y) && std::get<_Ip - 1>(__x) == std::get<_Ip - 1>(__y); - } -}; - -template <> -struct __tuple_equal<0> { - template - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator()(const _Tp&, const _Up&) { - return true; - } -}; - template # if _LIBCPP_STD_VER >= 26 requires(__all inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) { static_assert(sizeof...(_Tp) == sizeof...(_Up), "Can't compare tuples of different sizes"); - return __tuple_equal()(__x, __y); + return std::__tuple_compare_equal(__x, __y); } # if _LIBCPP_STD_VER >= 20 // operator<=> -template -_LIBCPP_HIDE_FROM_ABI constexpr auto -__tuple_compare_three_way(const tuple<_Tp...>& __x, const tuple<_Up...>& __y, index_sequence<_Is...>) { - common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...> __result = strong_ordering::equal; - static_cast( - ((__result = std::__synth_three_way(std::get<_Is>(__x), std::get<_Is>(__y)), __result != 0) || ...)); - return __result; -} - template requires(sizeof...(_Tp) == sizeof...(_Up)) _LIBCPP_HIDE_FROM_ABI constexpr common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...> operator<=>(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) { - return std::__tuple_compare_three_way(__x, __y, index_sequence_for<_Tp...>{}); + return std::__tuple_compare_three_way...>>( + __x, __y, index_sequence_for<_Tp...>{}); } # else // _LIBCPP_STD_VER >= 20 diff --git a/libcxx/include/version b/libcxx/include/version index d98049bd57046..aae9277a7dfc6 100644 --- a/libcxx/include/version +++ b/libcxx/include/version @@ -555,7 +555,7 @@ __cpp_lib_void_t 201411L # define __cpp_lib_constexpr_new 202406L # endif # define __cpp_lib_constexpr_queue 202502L -// # define __cpp_lib_constrained_equality 202411L +# define __cpp_lib_constrained_equality 202411L // # define __cpp_lib_copyable_function 202306L // # define __cpp_lib_debugging 202311L // # define __cpp_lib_default_template_type_for_algorithm_values 202403L diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp index 74cf85ea9029f..4ec6c469dce4c 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/expected.version.compile.pass.cpp @@ -93,17 +93,11 @@ #elif TEST_STD_VER > 23 -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # ifndef __cpp_lib_expected diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.compile.pass.cpp index 148a6dbc0d3e4..ccdb1a8c11a0b 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.compile.pass.cpp @@ -119,17 +119,11 @@ #elif TEST_STD_VER > 23 -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # if !defined(_LIBCPP_VERSION) diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.compile.pass.cpp index b10441fee5eb9..ceb338d43da78 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.compile.pass.cpp @@ -270,17 +270,11 @@ # error "__cpp_lib_constexpr_tuple should have the value 201811L in c++26" # endif -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # ifndef __cpp_lib_make_from_tuple diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.compile.pass.cpp index 02e7febf5c5a1..b882a5df04ae3 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.compile.pass.cpp @@ -401,17 +401,11 @@ # error "__cpp_lib_constexpr_utility should have the value 201811L in c++26" # endif -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # ifndef __cpp_lib_exchange_function diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.compile.pass.cpp index dea2f293f4c49..ed0bb228d7701 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.compile.pass.cpp @@ -99,17 +99,11 @@ #elif TEST_STD_VER > 23 -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # if !defined(_LIBCPP_VERSION) diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp index 962688e06188a..7bd8e8979e6f3 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp @@ -6631,17 +6631,11 @@ # error "__cpp_lib_constexpr_vector should have the value 201907L in c++26" # endif -# if !defined(_LIBCPP_VERSION) -# ifndef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should be defined in c++26" -# endif -# if __cpp_lib_constrained_equality != 202411L -# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" -# endif -# else -# ifdef __cpp_lib_constrained_equality -# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!" -# endif +# ifndef __cpp_lib_constrained_equality +# error "__cpp_lib_constrained_equality should be defined in c++26" +# endif +# if __cpp_lib_constrained_equality != 202411L +# error "__cpp_lib_constrained_equality should have the value 202411L in c++26" # endif # ifndef __cpp_lib_containers_ranges diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp index 779a89b163f04..b0301f3ad93e7 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp @@ -13,6 +13,8 @@ // template // bool // operator==(const tuple& t, const tuple& u); +// template +// friend constexpr bool operator==(const tuple& t, const UTuple& u); // since C++23 // UNSUPPORTED: c++03 @@ -23,6 +25,13 @@ #include "test_comparisons.h" #include "test_macros.h" +#if TEST_STD_VER >= 23 +# include +#endif +#if TEST_STD_VER >= 26 +# include +#endif + #if TEST_STD_VER >= 26 // Test SFINAE. @@ -41,140 +50,249 @@ static_assert( static_assert( !std::equality_comparable_with, std::tuple>); +// Heterogeneous comparisons. +// TODO: Use equality_comparable_with once other changes of tuple introduced in P2165R4 are implemented. +template +concept can_eq_compare = requires(const T& t, const U& u) { t == u; }; + +static_assert(can_eq_compare, std::array>); +static_assert(!can_eq_compare, std::array>); + +static_assert(can_eq_compare, + std::pair>); +static_assert( + !can_eq_compare, std::pair>); + +static_assert(can_eq_compare, std::ranges::subrange>); +static_assert(!can_eq_compare, std::ranges::subrange>); +static_assert(can_eq_compare, std::complex>); +static_assert(!can_eq_compare, std::complex>); + +// Size mismatch in heterogeneous comparisons. +static_assert(!can_eq_compare, std::array>); +static_assert(!can_eq_compare, std::array>); +static_assert(!can_eq_compare, std::pair>); +static_assert(!can_eq_compare, std::pair>); +static_assert(!can_eq_compare, std::ranges::subrange>); +static_assert(!can_eq_compare, std::complex>); + #endif -int main(int, char**) -{ - { - typedef std::tuple<> T1; - typedef std::tuple<> T2; - const T1 t1; - const T2 t2; - assert(t1 == t2); - assert(!(t1 != t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1); - const T2 t2(1.1); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1); - const T2 t2(1); - assert(t1 == t2); - assert(!(t1 != t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1, 2); - assert(t1 == t2); - assert(!(t1 != t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1, 3); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1.1, 2); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1.1, 3); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 2, 3); - assert(t1 == t2); - assert(!(t1 != t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1.1, 2, 3); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 3, 3); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 2, 4); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 3, 2); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1.1, 2, 2); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1.1, 3, 3); - assert(!(t1 == t2)); - assert(t1 != t2); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1.1, 3, 2); - assert(!(t1 == t2)); - assert(t1 != t2); - } -#if TEST_STD_VER > 11 - { - typedef std::tuple T1; - typedef std::tuple T2; - constexpr T1 t1(1, 2, 3); - constexpr T2 t2(1.1, 3, 2); - static_assert(!(t1 == t2), ""); - static_assert(t1 != t2, ""); - } +TEST_CONSTEXPR_CXX14 bool test() { + { + typedef std::tuple<> T1; + typedef std::tuple<> T2; + const T1 t1; + const T2 t2; + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1); + const T2 t2(1.1); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1); + const T2 t2(1); + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1, 2); + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1, 3); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1.1, 2); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1.1, 3); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 2, 3); + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1.1, 2, 3); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 3, 3); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 2, 4); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 3, 2); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1.1, 2, 2); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1.1, 3, 3); + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1.1, 3, 2); + assert(!(t1 == t2)); + assert(t1 != t2); + } +#if TEST_STD_VER >= 14 + { + using T1 = std::tuple; + using T2 = std::tuple; + constexpr T1 t1(1, 2, 3); + constexpr T2 t2(1.1, 3, 2); + assert(!(t1 == t2)); + assert(t1 != t2); + } #endif +#if TEST_STD_VER >= 23 + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2}; + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3}; + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + + int arr[1]{}; + T1 t1{arr, arr + 1}; + T2 t2{arr}; + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + int arr[1]{}; + T1 t1{arr, arr}; + T2 t2{arr}; + assert(!(t1 == t2)); + assert(t1 != t2); + } + { + assert((std::tuple<>{} == std::array{})); + assert((std::tuple<>{} == std::array{})); + } +#endif +#if TEST_STD_VER >= 26 + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + assert(t1 == t2); + assert(!(t1 != t2)); + } + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + assert(!(t1 == t2)); + assert(t1 != t2); + } +#endif + + return true; +} + +int main(int, char**) { + test(); +#if TEST_STD_VER >= 14 + static_assert(test(), ""); +#endif return 0; } diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp index 0ece614a23e80..ef50454885a2b 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp @@ -28,186 +28,305 @@ // UNSUPPORTED: c++03 -#include -#include #include +#include #include "test_macros.h" -int main(int, char**) -{ - { - typedef std::tuple<> T1; - typedef std::tuple<> T2; - const T1 t1; - const T2 t2; - assert(!(t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1); - const T2 t2(1); - assert(!(t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1); - const T2 t2(0.9); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1); - const T2 t2(1.1); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1, 2); - assert(!(t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(0.9, 2); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1.1, 2); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1, 1); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2); - const T2 t2(1, 3); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 2, 3); - assert(!(t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(0.9, 2, 3); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1.1, 2, 3); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 1, 3); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 3, 3); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 2, 2); - assert(!(t1 < t2)); - assert(!(t1 <= t2)); - assert( (t1 > t2)); - assert( (t1 >= t2)); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - const T1 t1(1, 2, 3); - const T2 t2(1, 2, 4); - assert( (t1 < t2)); - assert( (t1 <= t2)); - assert(!(t1 > t2)); - assert(!(t1 >= t2)); - } -#if TEST_STD_VER > 11 - { - typedef std::tuple T1; - typedef std::tuple T2; - constexpr T1 t1(1, 2, 3); - constexpr T2 t2(1, 2, 4); - static_assert( (t1 < t2), ""); - static_assert( (t1 <= t2), ""); - static_assert(!(t1 > t2), ""); - static_assert(!(t1 >= t2), ""); - } +#if TEST_STD_VER >= 23 +# include +# include +# include +#endif +#if TEST_STD_VER >= 26 +# include +#endif + +TEST_CONSTEXPR_CXX14 bool test() { + { + typedef std::tuple<> T1; + typedef std::tuple<> T2; + const T1 t1; + const T2 t2; + assert(!(t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1); + const T2 t2(1); + assert(!(t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1); + const T2 t2(0.9); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1); + const T2 t2(1.1); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1, 2); + assert(!(t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(0.9, 2); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1.1, 2); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1, 1); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2); + const T2 t2(1, 3); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 2, 3); + assert(!(t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(0.9, 2, 3); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1.1, 2, 3); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 1, 3); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 3, 3); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 2, 2); + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert((t1 > t2)); + assert((t1 >= t2)); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + const T1 t1(1, 2, 3); + const T2 t2(1, 2, 4); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } +#if TEST_STD_VER >= 14 + { + using T1 = std::tuple; + using T2 = std::tuple; + constexpr T1 t1(1, 2, 3); + constexpr T2 t2(1, 2, 4); + assert((t1 < t2)); + assert((t1 <= t2)); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } +#endif +#if TEST_STD_VER >= 23 + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 3}; + assert(t1 < t2); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + assert(t1 < t2); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + + int arr[1]{}; + T1 t1{arr, arr + 1}; + T2 t2{arr}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + + int arr[1]{}; + T1 t1{arr + 1, arr + 1}; + T2 t2{arr}; + assert(!(t1 < t2)); + assert(!(t1 <= t2)); + assert(t1 > t2); + assert(t1 >= t2); + } + { + constexpr std::tuple<> t1{}; + constexpr std::array t2{}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } + { + constexpr std::tuple<> t1{}; + constexpr std::array t2{}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } +#endif +#if TEST_STD_VER >= 26 + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + assert(!(t1 < t2)); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(t1 >= t2); + } + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + assert(t1 < t2); + assert(t1 <= t2); + assert(!(t1 > t2)); + assert(!(t1 >= t2)); + } #endif + return true; +} + +int main(int, char**) { + test(); +#if TEST_STD_VER >= 14 + static_assert(test(), ""); +#endif return 0; } diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/size_incompatible_three_way.compile.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/size_incompatible_three_way.compile.pass.cpp index f9c72a1742e72..8eae8d675c0a5 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/size_incompatible_three_way.compile.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/size_incompatible_three_way.compile.pass.cpp @@ -13,16 +13,31 @@ // template // auto // operator<=>(const tuple& t, const tuple& u); +// template +// friend constexpr auto operator<=>(const tuple& t, const UTuple& u); // since C++23 // UNSUPPORTED: c++03, c++11, c++14, c++17 +#include +#include +#include #include +#include template concept can_compare = requires(T t, U u) { t <=> u; }; -typedef std::tuple T1; -typedef std::tuple T2; +using T1 = std::tuple; +using T2 = std::tuple; +using T1P = std::tuple; static_assert(!can_compare); static_assert(!can_compare); +static_assert(!can_compare>); +static_assert(!can_compare, T1>); +static_assert(!can_compare>); +static_assert(!can_compare, T1>); +static_assert(!can_compare>); +static_assert(!can_compare, T1>); +static_assert(!can_compare>); +static_assert(!can_compare, T1P>); diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/three_way.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/three_way.pass.cpp index d954314874c4f..697d0c03eefe2 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/three_way.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/three_way.pass.cpp @@ -13,6 +13,8 @@ // template // auto // operator<=>(const tuple& t, const tuple& u); +// template +// friend constexpr auto operator<=>(const tuple& t, const UTuple& u); // since C++23 // UNSUPPORTED: c++03, c++11, c++14, c++17 @@ -22,11 +24,15 @@ TEST_CLANG_DIAGNOSTIC_IGNORED("-Wsign-compare") TEST_GCC_DIAGNOSTIC_IGNORED("-Wsign-compare") TEST_MSVC_DIAGNOSTIC_IGNORED(4242 4244) +#include #include #include +#include #include +#include #include #include // std::is_constant_evaluated +#include // A custom three-way result type struct CustomEquality { @@ -36,6 +42,11 @@ struct CustomEquality { }; constexpr bool test() { + struct WeakSpaceship { + constexpr bool operator==(const WeakSpaceship&) const { return true; } + constexpr std::weak_ordering operator<=>(const WeakSpaceship&) const { return std::weak_ordering::equivalent; } + }; + // Empty tuple { typedef std::tuple<> T0; @@ -135,23 +146,17 @@ constexpr bool test() { ASSERT_SAME_TYPE(decltype(T1() <=> T2()), std::strong_ordering); } { - struct WeakSpaceship { - constexpr bool operator==(const WeakSpaceship&) const { return true; } - constexpr std::weak_ordering operator<=>(const WeakSpaceship&) const { return std::weak_ordering::equivalent; } - }; - { - typedef std::tuple T1; - typedef std::tuple T2; - // Strongly ordered members and a weakly ordered member yields weak ordering. - ASSERT_SAME_TYPE(decltype(T1() <=> T2()), std::weak_ordering); - } - { - typedef std::tuple T1; - typedef std::tuple T2; - // Doubles are partially ordered, so one partial, one strong, and one weak ordering - // yields partial ordering. - ASSERT_SAME_TYPE(decltype(T1() <=> T2()), std::partial_ordering); - } + typedef std::tuple T1; + typedef std::tuple T2; + // Strongly ordered members and a weakly ordered member yields weak ordering. + ASSERT_SAME_TYPE(decltype(T1() <=> T2()), std::weak_ordering); + } + { + typedef std::tuple T1; + typedef std::tuple T2; + // Doubles are partially ordered, so one partial, one strong, and one weak ordering + // yields partial ordering. + ASSERT_SAME_TYPE(decltype(T1() <=> T2()), std::partial_ordering); } { struct NoSpaceship { @@ -224,6 +229,134 @@ constexpr bool test() { } } +// Heterogeneous comparisons enabled by P2165R4. +#if TEST_STD_VER >= 23 + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1, 2}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::equal); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1, 0}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::greater); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::less); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::equivalent); + } + { + using T1 = std::tuple; + using T2 = std::pair; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::less); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::equivalent); + } + { + using T1 = std::tuple; + using T2 = std::array; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::less); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + + int arr[1]{}; + T1 t1{arr, arr + 1}; + T2 t2{arr}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::equal); + } + { + using T1 = std::tuple; + using T2 = std::ranges::subrange; + + int arr[1]{}; + T1 t1{arr + 1, arr + 1}; + T2 t2{arr}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::greater); + } + { + constexpr std::tuple t1{}; + constexpr std::pair t2{}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::weak_ordering); + assert((t1 <=> t2) == std::weak_ordering::equivalent); + } + { + constexpr std::tuple t1{}; + constexpr std::array t2{}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::weak_ordering); + assert((t1 <=> t2) == std::weak_ordering::equivalent); + } + { + constexpr std::tuple<> t1{}; + constexpr std::array t2{}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::equal); + } + { + constexpr std::tuple<> t1{}; + constexpr std::array t2{}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::equal); + } + { + constexpr std::tuple<> t1{}; + constexpr std::array t2{}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::strong_ordering); + assert((t1 <=> t2) == std::strong_ordering::equal); + } +#endif +#if TEST_STD_VER >= 26 + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.0, 2.0}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::equivalent); + } + { + using T1 = std::tuple; + using T2 = std::complex; + constexpr T1 t1{1, 2}; + constexpr T2 t2{1.1, 3.0}; + ASSERT_SAME_TYPE(decltype(t1 <=> t2), std::partial_ordering); + assert((t1 <=> t2) == std::partial_ordering::less); + } +#endif + return true; } diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py index fe175fd758726..d9317e00e3f4a 100644 --- a/libcxx/utils/generate_feature_test_macro_components.py +++ b/libcxx/utils/generate_feature_test_macro_components.py @@ -442,11 +442,9 @@ def add_version_header(tc): { "name": "__cpp_lib_constrained_equality", "values": { - # "c++26": 202403, # P2944R3: Comparisons for reference_wrapper "c++26": 202411, # P3379R0: Constrain std::expected equality operators }, "headers": ["expected", "optional", "tuple", "utility", "variant"], - "unimplemented": True, }, { "name": "__cpp_lib_containers_ranges",