diff mbox series

[committed] libstdc++: Simplify constraints on <=> for std::reference_wrapper

Message ID 20240419200834.1500201-1-jwakely@redhat.com
State New
Headers show
Series [committed] libstdc++: Simplify constraints on <=> for std::reference_wrapper | expand

Commit Message

Jonathan Wakely April 19, 2024, 8:08 p.m. UTC 
Tested x86_64-linux. Pushed to trunk.

-- >8 --

Instead of constraining these overloads in terms of synth-three-way we
can just check that the value_type is less-than-comparable, which is
what synth-three-way's constraints check.

The reason that I implemented these with constraints has now been filed
as LWG 4071, so add a comment about that too.

libstdc++-v3/ChangeLog:

	* include/bits/refwrap.h (operator<=>): Simplify constraints.
---
 libstdc++-v3/include/bits/refwrap.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/refwrap.h b/libstdc++-v3/include/bits/refwrap.h
index fd1cc2b63e6..71ec2b297b7 100644
--- a/libstdc++-v3/include/bits/refwrap.h
+++ b/libstdc++-v3/include/bits/refwrap.h
@@ -384,23 +384,29 @@  _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type)
 	&& requires { { __x.get() == __y.get() } -> convertible_to<bool>; }
       { return __x.get() == __y.get(); }
 
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 4071. reference_wrapper comparisons are not SFINAE-friendly
+
       [[nodiscard]]
       friend constexpr auto
-      operator<=>(reference_wrapper __x, reference_wrapper<_Tp> __y)
-      requires requires { __detail::__synth3way(__x.get(), __y.get()); }
+      operator<=>(reference_wrapper __x, reference_wrapper __y)
+      requires requires (const _Tp __t) {
+	{ __t < __t } -> __detail::__boolean_testable;
+      }
       { return __detail::__synth3way(__x.get(), __y.get()); }
 
       [[nodiscard]]
       friend constexpr auto
       operator<=>(reference_wrapper __x, const _Tp& __y)
-      requires requires { __detail::__synth3way(__x.get(), __y); }
+      requires requires { { __y < __y } -> __detail::__boolean_testable; }
       { return __detail::__synth3way(__x.get(), __y); }
 
       [[nodiscard]]
       friend constexpr auto
       operator<=>(reference_wrapper __x, reference_wrapper<const _Tp> __y)
-      requires (!is_const_v<_Tp>)
-	&& requires { __detail::__synth3way(__x.get(), __y.get()); }
+      requires (!is_const_v<_Tp>) && requires (const _Tp __t) {
+	{ __t < __t } -> __detail::__boolean_testable;
+      }
       { return __detail::__synth3way(__x.get(), __y.get()); }
 #endif
     };