Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-10-07 02:43:57 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[libc++] Module fixes for __synth_three_way.

Browse Source 
These changes make it possible to use __synth_three_way in modules. The
change from a lambda to a function is a Clang issue.

The change is list was needed since the compiler couldn't deduce the
comparison template argument.

Adds a few missing includes too.

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D146545
This commit is contained in:
Mark de Wever 2023-03-21 18:05:35 +01:00
parent f9b854bc8f
commit 9c0efc8a03
7 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libcxx/include/__compare/synth_three_way.h
View File

@ -25,21 +25,27 @@ _LIBCPP_BEGIN_NAMESPACE_STD
// [expos.only.func]
_LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way =
[]<class _Tp, class _Up>(const _Tp& __t, const _Up& __u)
requires requires {
{ __t < __u } -> __boolean_testable;
{ __u < __t } -> __boolean_testable;
}
{
if constexpr (three_way_comparable_with<_Tp, _Up>) {
return __t <=> __u;
} else {
if (__t < __u) return weak_ordering::less;
if (__u < __t) return weak_ordering::greater;
return weak_ordering::equivalent;
}
};
// TODO MODULES restore the lamba to match the Standard.
// See https://github.com/llvm/llvm-project/issues/57222
//_LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way =
// []<class _Tp, class _Up>(const _Tp& __t, const _Up& __u)
template <class _Tp, class _Up>
_LIBCPP_HIDE_FROM_ABI constexpr auto __synth_three_way(const _Tp& __t, const _Up& __u)
requires requires {
{ __t < __u } -> __boolean_testable;
{ __u < __t } -> __boolean_testable;
}
{
if constexpr (three_way_comparable_with<_Tp, _Up>) {
return __t <=> __u;
} else {
if (__t < __u)
return weak_ordering::less;
if (__u < __t)
return weak_ordering::greater;
return weak_ordering::equivalent;
}
}
template <class _Tp, class _Up = _Tp>
using __synth_three_way_result = decltype(std::__synth_three_way(std::declval<_Tp&>(), std::declval<_Up&>()));

1
libcxx/include/compare
View File

@ -151,6 +151,7 @@ namespace std {
#include <__compare/ordering.h>
#include <__compare/partial_order.h>
#include <__compare/strong_order.h>
#include <__compare/synth_three_way.h>
#include <__compare/three_way_comparable.h>
#include <__compare/weak_order.h>
#include <__config>

2
libcxx/include/deque
View File

@ -2399,7 +2399,7 @@ __synth_three_way_result<_Tp>
operator<=>(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
{
return std::lexicographical_compare_three_way(
__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way<_Tp, _Tp>);
}
#endif // _LIBCPP_STD_VER <= 17

2
libcxx/include/forward_list
View File

@ -1775,7 +1775,7 @@ operator<=>(const forward_list<_Tp, _Allocator>& __x,
const forward_list<_Tp, _Allocator>& __y)
{
return std::lexicographical_compare_three_way(
__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way<_Tp, _Tp>);
}
#endif // #if _LIBCPP_STD_VER <= 17

2
libcxx/include/list
View File

@ -2349,7 +2349,7 @@ __synth_three_way_result<_Tp>
operator<=>(const list<_Tp, _Allocator>& __x, const list<_Tp, _Allocator>& __y)
{
return std::lexicographical_compare_three_way(
__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way<_Tp, _Tp>);
}
#endif // _LIBCPP_STD_VER <= 17

12
libcxx/include/map
View File

@ -1744,7 +1744,11 @@ operator<=>(const map<_Key, _Tp, _Compare, _Allocator>& __x,
const map<_Key, _Tp, _Compare, _Allocator>& __y)
{
return std::lexicographical_compare_three_way(
__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
__x.begin(),
__x.end(),
__y.begin(),
__y.end(),
std::__synth_three_way<pair<const _Key, _Tp>, pair<const _Key, _Tp>>);
}
#endif // #if _LIBCPP_STD_VER <= 17
@ -2354,7 +2358,11 @@ operator<=>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
{
return std::lexicographical_compare_three_way(
__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
__x.begin(),
__x.end(),
__y.begin(),
__y.end(),
std::__synth_three_way<pair<const _Key, _Tp>, pair<const _Key, _Tp>>);
}
#endif // #if _LIBCPP_STD_VER <= 17

1
libcxx/utils/data/ignore_format.txt
View File

@ -271,7 +271,6 @@ libcxx/include/__compare/compare_weak_order_fallback.h
libcxx/include/__compare/ordering.h
libcxx/include/__compare/partial_order.h
libcxx/include/__compare/strong_order.h
libcxx/include/__compare/synth_three_way.h
libcxx/include/__compare/three_way_comparable.h
libcxx/include/__compare/weak_order.h
libcxx/include/complex