Commit 1eaf180dd04efcf65ef981b1e1064658b5ec09c3 | zig

lib/libcxx/include/__algorithm/adjacent_find.h+4-5

 @@ -23,7 +23,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Iter, class _Sent, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter
 __adjacent_find(_Iter __first, _Sent __last, _BinaryPredicate&& __pred) {
   if (__first == __last)
     return __first;
 @@ -37,16 +37,15 @@ __adjacent_find(_Iter __first, _Sent __last, _BinaryPredicate&& __pred) {
 }
 template <class _ForwardIterator, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred) {
   return std::__adjacent_find(std::move(__first), std::move(__last), __pred);
 }
 template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 adjacent_find(_ForwardIterator __first, _ForwardIterator __last) {
-  typedef typename iterator_traits<_ForwardIterator>::value_type __v;
+  return std::adjacent_find(std::move(__first), std::move(__last), __equal_to());
-  return std::adjacent_find(std::move(__first), std::move(__last), __equal_to<__v>());
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/all_of.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Predicate>	21	template <class _InputIterator, class _Predicate>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
23	all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	23	all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (!__pred(*__first))	25	if (!__pred(*__first))

lib/libcxx/include/__algorithm/any_of.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Predicate>	21	template <class _InputIterator, class _Predicate>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
23	any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	23	any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (__pred(*__first))	25	if (__pred(*__first))

lib/libcxx/include/__algorithm/binary_search.h+3-4

 @@ -23,18 +23,17 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _ForwardIterator, class _Tp, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, _Compare __comp)
 {
-    using _Comp_ref = typename __comp_ref_type<_Compare>::type;
+    __first = std::lower_bound<_ForwardIterator, _Tp, __comp_ref_type<_Compare> >(__first, __last, __value, __comp);
-    __first = std::lower_bound<_ForwardIterator, _Tp, _Comp_ref>(__first, __last, __value, __comp);
     return __first != __last && !__comp(__value, *__first);
 }
 template <class _ForwardIterator, class _Tp>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
 {

lib/libcxx/include/__algorithm/comp.h+12-38

 @@ -17,73 +17,47 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-// I'd like to replace these with _VSTD::equal_to<void>, but can't because:
+struct __equal_to {
-//   * That only works with C++14 and later, and
+  template <class _T1, class _T2>
-//   * We haven't included <functional> here.
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator()(const _T1& __x, const _T2& __y) const {
-template <class _T1, class _T2 = _T1>
+    return __x == __y;
-struct __equal_to
+  }
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 bool operator()(const _T1& __x, const _T2& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 bool operator()(const _T2& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 bool operator()(const _T2& __x, const _T2& __y) const {return __x == __y;}
-};
-template <class _T1>
-struct __equal_to<_T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-template <class _T1>
-struct __equal_to<const _T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-template <class _T1>
-struct __equal_to<_T1, const _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
 };
 template <class _T1, class _T2 = _T1>
 struct __less
 {
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T1& __x, const _T2& __y) const {return __x < __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T2& __x, const _T1& __y) const {return __x < __y;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T2& __x, const _T2& __y) const {return __x < __y;}
 };
 template <class _T1>
 struct __less<_T1, _T1>
 {
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
 };
 template <class _T1>
 struct __less<const _T1, _T1>
 {
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
 };
 template <class _T1>
 struct __less<_T1, const _T1>
 {
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
 };

lib/libcxx/include/__algorithm/comp_ref_type.h+13-14

 @@ -23,11 +23,11 @@ template <class _Compare>
 struct __debug_less
 {
     _Compare &__comp_;
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_CONSTEXPR_SINCE_CXX14
     __debug_less(_Compare& __c) : __comp_(__c) {}
     template <class _Tp, class _Up>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(const _Tp& __x,  const _Up& __y)
     {
         bool __r = __comp_(__x, __y);
 @@ -37,7 +37,7 @@ struct __debug_less
     }
     template <class _Tp, class _Up>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_CONSTEXPR_SINCE_CXX14
     bool operator()(_Tp& __x,  _Up& __y)
     {
         bool __r = __comp_(__x, __y);
 @@ -47,10 +47,10 @@ struct __debug_less
     }
     template <class _LHS, class _RHS>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_CONSTEXPR_SINCE_CXX14
     inline _LIBCPP_INLINE_VISIBILITY
-    decltype((void)declval<_Compare&>()(
+    decltype((void)std::declval<_Compare&>()(
-        declval<_LHS &>(), declval<_RHS &>()))
+        std::declval<_LHS &>(), std::declval<_RHS &>()))
     __do_compare_assert(int, _LHS & __l, _RHS & __r) {
         _LIBCPP_DEBUG_ASSERT(!__comp_(__l, __r),
             "Comparator does not induce a strict weak ordering");
 @@ -59,21 +59,20 @@ struct __debug_less
     }
     template <class _LHS, class _RHS>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_CONSTEXPR_SINCE_CXX14
     inline _LIBCPP_INLINE_VISIBILITY
     void __do_compare_assert(long, _LHS &, _RHS &) {}
 };
-template <class _Comp>
+// Pass the comparator by lvalue reference. Or in debug mode, using a
-struct __comp_ref_type {
+// debugging wrapper that stores a reference.
-  // Pass the comparator by lvalue reference. Or in debug mode, using a
-  // debugging wrapper that stores a reference.
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
-  typedef __debug_less<_Comp> type;
+template <class _Comp>
+using __comp_ref_type = __debug_less<_Comp>;
 #else
-  typedef _Comp& type;
+template <class _Comp>
+using __comp_ref_type = _Comp&;
 #endif
-};
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/copy.h+90-72

...	@@ -9,100 +9,118 @@	...	@@ -9,100 +9,118 @@
9	#ifndef _LIBCPP___ALGORITHM_COPY_H	9	#ifndef _LIBCPP___ALGORITHM_COPY_H
10	#define _LIBCPP___ALGORITHM_COPY_H	10	#define _LIBCPP___ALGORITHM_COPY_H
11		11
12	#include <__algorithm/unwrap_iter.h>	12	#include <__algorithm/copy_move_common.h>
13	#include <__algorithm/unwrap_range.h>	13	#include <__algorithm/iterator_operations.h>
		14	#include <__algorithm/min.h>
14	#include <__config>	15	#include <__config>
15	#include <__iterator/iterator_traits.h>	16	#include <__iterator/segmented_iterator.h>
16	#include <__iterator/reverse_iterator.h>	17	#include <__type_traits/common_type.h>
17	#include <__utility/move.h>	18	#include <__utility/move.h>
18	#include <__utility/pair.h>	19	#include <__utility/pair.h>
19	#include <cstring>
20	#include <type_traits>
21		20
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	22	# pragma GCC system_header
24	#endif	23	#endif
25		24
		25	_LIBCPP_PUSH_MACROS
		26	#include <__undef_macros>
		27
26	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
27		29
28	// copy	30	template <class, class _InIter, class _Sent, class _OutIter>
		31	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter> __copy(_InIter, _Sent, _OutIter);
		32
		33	template <class _AlgPolicy>
		34	struct __copy_loop {
		35	template <class _InIter, class _Sent, class _OutIter>
		36	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
		37	operator()(_InIter __first, _Sent __last, _OutIter __result) const {
		38	while (__first != __last) {
		39	__result = __first;
		40	++__first;
		41	++__result;
		42	}
29		43
30	template <class _InIter, class _Sent, class _OutIter>	44	return std::make_pair(std::move(__first), std::move(__result));
31	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
32	pair<_InIter, _OutIter> __copy_impl(_InIter __first, _Sent __last, _OutIter __result) {
33	while (__first != __last) {
34	__result = __first;
35	++__first;
36	++__result;
37	}	45	}
38	return pair<_InIter, _OutIter>(std::move(__first), std::move(__result));
39	}
40		46
41	template <class _InValueT,	47	template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator<_InIter>::value, int> = 0>
42	class _OutValueT,	48	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
43	class = __enable_if_t<is_same<typename remove_const<_InValueT>::type, _OutValueT>::value	49	operator()(_InIter __first, _InIter __last, _OutIter __result) const {
44	&& is_trivially_copy_assignable<_OutValueT>::value> >	50	using _Traits = __segmented_iterator_traits<_InIter>;
45	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	51	auto __sfirst = _Traits::__segment(__first);
46	pair<_InValueT, _OutValueT> __copy_impl(_InValueT* __first, _InValueT* __last, _OutValueT* __result) {	52	auto __slast = _Traits::__segment(__last);
47	if (__libcpp_is_constant_evaluated()	53	if (__sfirst == __slast) {
48	// TODO: Remove this once GCC supports __builtin_memmove during constant evaluation	54	auto __iters = std::__copy<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
49	#ifndef _LIBCPP_COMPILER_GCC	55	return std::make_pair(__last, std::move(__iters.second));
50	&& !is_trivially_copyable<_InValueT>::value	56	}
51	#endif
52	)
53	return std::__copy_impl<_InValueT, _InValueT, _OutValueT*>(__first, __last, __result);
54	const size_t __n = static_cast<size_t>(__last - __first);
55	if (__n > 0)
56	::__builtin_memmove(__result, __first, __n * sizeof(_OutValueT));
57	return std::make_pair(__first + __n, __result + __n);
58	}
59		57
60	template <class _InIter, class _OutIter,	58	__result = std::__copy<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__sfirst), std::move(__result)).second;
61	__enable_if_t<is_same<typename remove_const<__iter_value_type<_InIter> >::type, __iter_value_type<_OutIter> >::value	59	++__sfirst;
62	&& __is_cpp17_contiguous_iterator<typename _InIter::iterator_type>::value	60	while (__sfirst != __slast) {
63	&& __is_cpp17_contiguous_iterator<typename _OutIter::iterator_type>::value	61	__result =
64	&& is_trivially_copy_assignable<__iter_value_type<_OutIter> >::value	62	std::__copy<_AlgPolicy>(_Traits::__begin(__sfirst), _Traits::__end(__sfirst), std::move(__result)).second;
65	&& __is_reverse_iterator<_InIter>::value	63	++__sfirst;
66	&& __is_reverse_iterator<_OutIter>::value, int> = 0>	64	}
67	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	65	__result =
68	pair<_InIter, _OutIter>	66	std::__copy<_AlgPolicy>(_Traits::__begin(__sfirst), _Traits::__local(__last), std::move(__result)).second;
69	__copy_impl(_InIter __first, _InIter __last, _OutIter __result) {	67	return std::make_pair(__last, std::move(__result));
70	auto __first_base = std::__unwrap_iter(__first.base());	68	}
71	auto __last_base = std::__unwrap_iter(__last.base());
72	auto __result_base = std::__unwrap_iter(__result.base());
73	auto __result_first = __result_base - (__first_base - __last_base);
74	std::__copy_impl(__last_base, __first_base, __result_first);
75	return std::make_pair(__last, _OutIter(std::__rewrap_iter(__result.base(), __result_first)));
76	}
77		69
78	template <class _InIter, class _Sent, class _OutIter,	70	template <class _InIter,
79	__enable_if_t<!(is_copy_constructible<_InIter>::value	71	class _OutIter,
80	&& is_copy_constructible<_Sent>::value	72	__enable_if_t<__is_cpp17_random_access_iterator<_InIter>::value &&
81	&& is_copy_constructible<_OutIter>::value), int> = 0 >	73	!__is_segmented_iterator<_InIter>::value && __is_segmented_iterator<_OutIter>::value,
82	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	74	int> = 0>
83	pair<_InIter, _OutIter> __copy(_InIter __first, _Sent __last, _OutIter __result) {	75	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
84	return std::__copy_impl(std::move(__first), std::move(__last), std::move(__result));	76	operator()(_InIter __first, _InIter __last, _OutIter __result) {
85	}	77	using _Traits = __segmented_iterator_traits<_OutIter>;
		78	using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
86		79
87	template <class _InIter, class _Sent, class _OutIter,	80	if (__first == __last)
88	__enable_if_t<is_copy_constructible<_InIter>::value	81	return std::make_pair(std::move(__first), std::move(__result));
89	&& is_copy_constructible<_Sent>::value	82
90	&& is_copy_constructible<_OutIter>::value, int> = 0>	83	auto __local_first = _Traits::__local(__result);
91	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	84	auto __segment_iterator = _Traits::__segment(__result);
92	pair<_InIter, _OutIter> __copy(_InIter __first, _Sent __last, _OutIter __result) {	85	while (true) {
93	auto __range = std::__unwrap_range(__first, __last);	86	auto __local_last = _Traits::__end(__segment_iterator);
94	auto __ret = std::__copy_impl(std::move(__range.first), std::move(__range.second), std::__unwrap_iter(__result));	87	auto __size = std::min<_DiffT>(__local_last - __local_first, __last - __first);
95	return std::make_pair(	88	auto __iters = std::__copy<_AlgPolicy>(__first, __first + __size, __local_first);
96	std::__rewrap_range<_Sent>(__first, __ret.first), std::__rewrap_iter(__result, __ret.second));	89	__first = std::move(__iters.first);
		90
		91	if (__first == __last)
		92	return std::make_pair(std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.second)));
		93
		94	__local_first = _Traits::__begin(++__segment_iterator);
		95	}
		96	}
		97	};
		98
		99	struct __copy_trivial {
		100	// At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
		101	template <class _In, class _Out,
		102	__enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
		103	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
		104	operator()(_In* __first, _In* __last, _Out* __result) const {
		105	return std::__copy_trivial_impl(__first, __last, __result);
		106	}
		107	};
		108
		109	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
		110	pair<_InIter, _OutIter> inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
		111	__copy(_InIter __first, _Sent __last, _OutIter __result) {
		112	return std::__dispatch_copy_or_move<_AlgPolicy, __copy_loop<_AlgPolicy>, __copy_trivial>(
		113	std::move(__first), std::move(__last), std::move(__result));
97	}	114	}
98		115
99	template <class _InputIterator, class _OutputIterator>	116	template <class _InputIterator, class _OutputIterator>
100	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	117	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
101	_OutputIterator
102	copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {	118	copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
103	return std::__copy(__first, __last, __result).second;	119	return std::__copy<_ClassicAlgPolicy>(__first, __last, __result).second;
104	}	120	}
105		121
106	_LIBCPP_END_NAMESPACE_STD	122	_LIBCPP_END_NAMESPACE_STD
107		123
		124	_LIBCPP_POP_MACROS
		125
108	#endif // _LIBCPP___ALGORITHM_COPY_H	126	#endif // _LIBCPP___ALGORITHM_COPY_H

lib/libcxx/include/__algorithm/copy_backward.h+112-30

...	@@ -9,53 +9,135 @@	...	@@ -9,53 +9,135 @@
9	#ifndef _LIBCPP___ALGORITHM_COPY_BACKWARD_H	9	#ifndef _LIBCPP___ALGORITHM_COPY_BACKWARD_H
10	#define _LIBCPP___ALGORITHM_COPY_BACKWARD_H	10	#define _LIBCPP___ALGORITHM_COPY_BACKWARD_H
11		11
12	#include <__algorithm/copy.h>	12	#include <__algorithm/copy_move_common.h>
13	#include <__algorithm/iterator_operations.h>	13	#include <__algorithm/iterator_operations.h>
14	#include <__algorithm/ranges_copy.h>	14	#include <__algorithm/min.h>
15	#include <__algorithm/unwrap_iter.h>
16	#include <__concepts/same_as.h>
17	#include <__config>	15	#include <__config>
18	#include <__iterator/iterator_traits.h>	16	#include <__iterator/segmented_iterator.h>
19	#include <__iterator/reverse_iterator.h>	17	#include <__type_traits/common_type.h>
20	#include <__ranges/subrange.h>	18	#include <__type_traits/is_copy_constructible.h>
21	#include <__utility/move.h>	19	#include <__utility/move.h>
22	#include <__utility/pair.h>	20	#include <__utility/pair.h>
23	#include <type_traits>
24		21
25	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
26	# pragma GCC system_header	23	# pragma GCC system_header
27	#endif	24	#endif
28		25
		26	_LIBCPP_PUSH_MACROS
		27	#include <__undef_macros>
		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
31	template <class _AlgPolicy, class _InputIterator, class _OutputIterator,	31	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
32	__enable_if_t<is_same<_AlgPolicy, _ClassicAlgPolicy>::value, int> = 0>	32	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InIter, _OutIter>
33	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 pair<_InputIterator, _OutputIterator>	33	__copy_backward(_InIter __first, _Sent __last, _OutIter __result);
34	__copy_backward(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {	34
35	auto __ret = std::__copy(	35	template <class _AlgPolicy>
36	__unconstrained_reverse_iterator<_InputIterator>(__last),	36	struct __copy_backward_loop {
37	__unconstrained_reverse_iterator<_InputIterator>(__first),	37	template <class _InIter, class _Sent, class _OutIter>
38	__unconstrained_reverse_iterator<_OutputIterator>(__result));	38	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
39	return pair<_InputIterator, _OutputIterator>(__ret.first.base(), __ret.second.base());	39	operator()(_InIter __first, _Sent __last, _OutIter __result) const {
40	}	40	auto __last_iter = _IterOps<_AlgPolicy>::next(__first, __last);
		41	auto __original_last_iter = __last_iter;
		42
		43	while (__first != __last_iter) {
		44	--__result = --__last_iter;
		45	}
		46
		47	return std::make_pair(std::move(__original_last_iter), std::move(__result));
		48	}
		49
		50	template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator<_InIter>::value, int> = 0>
		51	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
		52	operator()(_InIter __first, _InIter __last, _OutIter __result) const {
		53	using _Traits = __segmented_iterator_traits<_InIter>;
		54	auto __sfirst = _Traits::__segment(__first);
		55	auto __slast = _Traits::__segment(__last);
		56	if (__sfirst == __slast) {
		57	auto __iters =
		58	std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
		59	return std::make_pair(__last, __iters.second);
		60	}
		61
		62	__result =
		63	std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
		64	.second;
		65	--__slast;
		66	while (__sfirst != __slast) {
		67	__result =
		68	std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__end(__slast), std::move(__result))
		69	.second;
		70	--__slast;
		71	}
		72	__result = std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
		73	.second;
		74	return std::make_pair(__last, std::move(__result));
		75	}
		76
		77	template <class _InIter,
		78	class _OutIter,
		79	__enable_if_t<__is_cpp17_random_access_iterator<_InIter>::value &&
		80	!__is_segmented_iterator<_InIter>::value && __is_segmented_iterator<_OutIter>::value,
		81	int> = 0>
		82	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
		83	operator()(_InIter __first, _InIter __last, _OutIter __result) {
		84	using _Traits = __segmented_iterator_traits<_OutIter>;
		85	auto __orig_last = __last;
		86	auto __segment_iterator = _Traits::__segment(__result);
41		87
42	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	88	// When the range contains no elements, __result might not be a valid iterator
43	template <class _AlgPolicy, class _Iter1, class _Sent1, class _Iter2,	89	if (__first == __last)
44	__enable_if_t<is_same<_AlgPolicy, _RangeAlgPolicy>::value, int> = 0>	90	return std::make_pair(__first, __result);
45	_LIBCPP_HIDE_FROM_ABI constexpr pair<_Iter1, _Iter2> __copy_backward(_Iter1 __first, _Sent1 __last, _Iter2 __result) {	91
46	auto __last_iter = _IterOps<_AlgPolicy>::next(__first, std::move(__last));	92	auto __local_last = _Traits::__local(__result);
47	auto __reverse_range = std::__reverse_range(std::ranges::subrange(std::move(__first), __last_iter));	93	while (true) {
48	auto __ret = ranges::copy(std::move(__reverse_range), std::make_reverse_iterator(__result));	94	using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
49	return std::make_pair(__last_iter, __ret.out.base());	95
		96	auto __local_first = _Traits::__begin(__segment_iterator);
		97	auto __size = std::min<_DiffT>(__local_last - __local_first, __last - __first);
		98	auto __iter = std::__copy_backward<_AlgPolicy>(__last - __size, __last, __local_last).second;
		99	__last -= __size;
		100
		101	if (__first == __last)
		102	return std::make_pair(std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter)));
		103	--__segment_iterator;
		104	__local_last = _Traits::__end(__segment_iterator);
		105	}
		106	}
		107	};
		108
		109	struct __copy_backward_trivial {
		110	// At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
		111	template <class _In, class _Out,
		112	__enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
		113	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
		114	operator()(_In* __first, _In* __last, _Out* __result) const {
		115	return std::__copy_backward_trivial_impl(__first, __last, __result);
		116	}
		117	};
		118
		119	template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
		120	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
		121	__copy_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result) {
		122	return std::__dispatch_copy_or_move<_AlgPolicy, __copy_backward_loop<_AlgPolicy>, __copy_backward_trivial>(
		123	std::move(__first), std::move(__last), std::move(__result));
50	}	124	}
51	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
52		125
53	template <class _BidirectionalIterator1, class _BidirectionalIterator2>	126	template <class _BidirectionalIterator1, class _BidirectionalIterator2>
54	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _BidirectionalIterator2	127	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
55	copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last, _BidirectionalIterator2 __result) {	128	_BidirectionalIterator2
56	return std::__copy_backward<_ClassicAlgPolicy>(__first, __last, __result).second;	129	copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
		130	_BidirectionalIterator2 __result)
		131	{
		132	static_assert(std::is_copy_constructible<_BidirectionalIterator1>::value &&
		133	std::is_copy_constructible<_BidirectionalIterator1>::value, "Iterators must be copy constructible.");
		134
		135	return std::__copy_backward<_ClassicAlgPolicy>(
		136	std::move(__first), std::move(__last), std::move(__result)).second;
57	}	137	}
58		138
59	_LIBCPP_END_NAMESPACE_STD	139	_LIBCPP_END_NAMESPACE_STD
60		140
		141	_LIBCPP_POP_MACROS
		142
61	#endif // _LIBCPP___ALGORITHM_COPY_BACKWARD_H	143	#endif // _LIBCPP___ALGORITHM_COPY_BACKWARD_H

lib/libcxx/include/__algorithm/copy_if.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template<class _InputIterator, class _OutputIterator, class _Predicate>	20	template<class _InputIterator, class _OutputIterator, class _Predicate>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	copy_if(_InputIterator __first, _InputIterator __last,	23	copy_if(_InputIterator __first, _InputIterator __last,
24	_OutputIterator __result, _Predicate __pred)	24	_OutputIterator __result, _Predicate __pred)

lib/libcxx/include/__algorithm/copy_move_common.h created+163

...	@@ -0,0 +1,163 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
10	#define _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
11
12	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/unwrap_iter.h>
14	#include <__algorithm/unwrap_range.h>
15	#include <__config>
16	#include <__iterator/iterator_traits.h>
17	#include <__memory/pointer_traits.h>
18	#include <__type_traits/enable_if.h>
19	#include <__type_traits/is_always_bitcastable.h>
20	#include <__type_traits/is_constant_evaluated.h>
21	#include <__type_traits/is_copy_constructible.h>
22	#include <__type_traits/is_trivially_assignable.h>
23	#include <__type_traits/is_trivially_copyable.h>
24	#include <__type_traits/is_volatile.h>
25	#include <__utility/move.h>
26	#include <__utility/pair.h>
27	#include <cstddef>
28
29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
30	# pragma GCC system_header
31	#endif
32
33	_LIBCPP_BEGIN_NAMESPACE_STD
34
35	// Type traits.
36
37	template <class _From, class _To>
38	struct __can_lower_copy_assignment_to_memmove {
39	static const bool value =
40	// If the types are always bitcastable, it's valid to do a bitwise copy between them.
41	__is_always_bitcastable<_From, _To>::value &&
42	// Reject conversions that wouldn't be performed by the regular built-in assignment (e.g. between arrays).
43	is_trivially_assignable<_To&, const _From&>::value &&
44	// `memmove` doesn't accept `volatile` pointers, make sure the optimization SFINAEs away in that case.
45	!is_volatile<_From>::value &&
46	!is_volatile<_To>::value;
47	};
48
49	template <class _From, class _To>
50	struct __can_lower_move_assignment_to_memmove {
51	static const bool value =
52	__is_always_bitcastable<_From, _To>::value &&
53	is_trivially_assignable<_To&, _From&&>::value &&
54	!is_volatile<_From>::value &&
55	!is_volatile<_To>::value;
56	};
57
58	// `memmove` algorithms implementation.
59
60	template <class _In, class _Out>
61	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
62	__copy_trivial_impl(_In* __first, _In* __last, _Out* __result) {
63	const size_t __n = static_cast<size_t>(__last - __first);
64	::__builtin_memmove(__result, __first, __n * sizeof(_Out));
65
66	return std::make_pair(__last, __result + __n);
67	}
68
69	template <class _In, class _Out>
70	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
71	__copy_backward_trivial_impl(_In* __first, _In* __last, _Out* __result) {
72	const size_t __n = static_cast<size_t>(__last - __first);
73	__result -= __n;
74
75	::__builtin_memmove(__result, __first, __n * sizeof(_Out));
76
77	return std::make_pair(__last, __result);
78	}
79
80	// Iterator unwrapping and dispatching to the correct overload.
81
82	template <class _F1, class _F2>
83	struct __overload : _F1, _F2 {
84	using _F1::operator();
85	using _F2::operator();
86	};
87
88	template <class _InIter, class _Sent, class _OutIter, class = void>
89	struct __can_rewrap : false_type {};
90
91	template <class _InIter, class _Sent, class _OutIter>
92	struct __can_rewrap<_InIter,
93	_Sent,
94	_OutIter,
95	// Note that sentinels are always copy-constructible.
96	__enable_if_t< is_copy_constructible<_InIter>::value &&
97	is_copy_constructible<_OutIter>::value > > : true_type {};
98
99	template <class _Algorithm,
100	class _InIter,
101	class _Sent,
102	class _OutIter,
103	__enable_if_t<__can_rewrap<_InIter, _Sent, _OutIter>::value, int> = 0>
104	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 pair<_InIter, _OutIter>
105	__unwrap_and_dispatch(_InIter __first, _Sent __last, _OutIter __out_first) {
106	auto __range = std::__unwrap_range(__first, std::move(__last));
107	auto __result = _Algorithm()(std::move(__range.first), std::move(__range.second), std::__unwrap_iter(__out_first));
108	return std::make_pair(std::__rewrap_range<_Sent>(std::move(__first), std::move(__result.first)),
109	std::__rewrap_iter(std::move(__out_first), std::move(__result.second)));
110	}
111
112	template <class _Algorithm,
113	class _InIter,
114	class _Sent,
115	class _OutIter,
116	__enable_if_t<!__can_rewrap<_InIter, _Sent, _OutIter>::value, int> = 0>
117	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 pair<_InIter, _OutIter>
118	__unwrap_and_dispatch(_InIter __first, _Sent __last, _OutIter __out_first) {
119	return _Algorithm()(std::move(__first), std::move(__last), std::move(__out_first));
120	}
121
122	template <class _IterOps, class _InValue, class _OutIter, class = void>
123	struct __can_copy_without_conversion : false_type {};
124
125	template <class _IterOps, class _InValue, class _OutIter>
126	struct __can_copy_without_conversion<
127	_IterOps,
128	_InValue,
129	_OutIter,
130	__enable_if_t<is_same<_InValue, typename _IterOps::template __value_type<_OutIter> >::value> > : true_type {};
131
132	template <class _AlgPolicy,
133	class _NaiveAlgorithm,
134	class _OptimizedAlgorithm,
135	class _InIter,
136	class _Sent,
137	class _OutIter>
138	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 pair<_InIter, _OutIter>
139	__dispatch_copy_or_move(_InIter __first, _Sent __last, _OutIter __out_first) {
140	#ifdef _LIBCPP_COMPILER_GCC
141	// GCC doesn't support `__builtin_memmove` during constant evaluation.
142	if (__libcpp_is_constant_evaluated()) {
143	return std::__unwrap_and_dispatch<_NaiveAlgorithm>(std::move(__first), std::move(__last), std::move(__out_first));
144	}
145	#else
146	// In Clang, `__builtin_memmove` only supports fully trivially copyable types (just having trivial copy assignment is
147	// insufficient). Also, conversions are not supported.
148	if (__libcpp_is_constant_evaluated()) {
149	using _InValue = typename _IterOps<_AlgPolicy>::template __value_type<_InIter>;
150	if (!is_trivially_copyable<_InValue>::value \|\|
151	!__can_copy_without_conversion<_IterOps<_AlgPolicy>, _InValue, _OutIter>::value) {
152	return std::__unwrap_and_dispatch<_NaiveAlgorithm>(std::move(__first), std::move(__last), std::move(__out_first));
153	}
154	}
155	#endif // _LIBCPP_COMPILER_GCC
156
157	using _Algorithm = __overload<_NaiveAlgorithm, _OptimizedAlgorithm>;
158	return std::__unwrap_and_dispatch<_Algorithm>(std::move(__first), std::move(__last), std::move(__out_first));
159	}
160
161	_LIBCPP_END_NAMESPACE_STD
162
163	#endif // _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H

lib/libcxx/include/__algorithm/copy_n.h+3-2

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	#include <__algorithm/copy.h>	12	#include <__algorithm/copy.h>
13	#include <__config>	13	#include <__config>
14	#include <__iterator/iterator_traits.h>	14	#include <__iterator/iterator_traits.h>
		15	#include <__utility/convert_to_integral.h>
15	#include <type_traits>	16	#include <type_traits>
16		17
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -21,7 +22,7 @@	...	@@ -21,7 +22,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
22		23
23	template<class _InputIterator, class _Size, class _OutputIterator>	24	template<class _InputIterator, class _Size, class _OutputIterator>
24	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	25	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
25	typename enable_if	26	typename enable_if
26	<	27	<
27	__is_cpp17_input_iterator<_InputIterator>::value &&	28	__is_cpp17_input_iterator<_InputIterator>::value &&
...	@@ -47,7 +48,7 @@ copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)	...	@@ -47,7 +48,7 @@ copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
47	}	48	}
48		49
49	template<class _InputIterator, class _Size, class _OutputIterator>	50	template<class _InputIterator, class _Size, class _OutputIterator>
50	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	51	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
51	typename enable_if	52	typename enable_if
52	<	53	<
53	__is_cpp17_random_access_iterator<_InputIterator>::value,	54	__is_cpp17_random_access_iterator<_InputIterator>::value,

lib/libcxx/include/__algorithm/count.h+1-1

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _InputIterator, class _Tp>	22	template <class _InputIterator, class _Tp>
23	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	23	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
24	typename iterator_traits<_InputIterator>::difference_type	24	typename iterator_traits<_InputIterator>::difference_type
25	count(_InputIterator __first, _InputIterator __last, const _Tp& __value) {	25	count(_InputIterator __first, _InputIterator __last, const _Tp& __value) {
26	typename iterator_traits<_InputIterator>::difference_type __r(0);	26	typename iterator_traits<_InputIterator>::difference_type __r(0);

lib/libcxx/include/__algorithm/count_if.h+1-1

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _InputIterator, class _Predicate>	22	template <class _InputIterator, class _Predicate>
23	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	23	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
24	typename iterator_traits<_InputIterator>::difference_type	24	typename iterator_traits<_InputIterator>::difference_type
25	count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	25	count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
26	typename iterator_traits<_InputIterator>::difference_type __r(0);	26	typename iterator_traits<_InputIterator>::difference_type __r(0);

lib/libcxx/include/__algorithm/equal.h+15-14

 @@ -22,7 +22,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred) {
   for (; __first1 != __last1; ++__first1, (void)++__first2)
     if (!__pred(*__first1, *__first2))
 @@ -31,16 +31,14 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first
 }
 template <class _InputIterator1, class _InputIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2) {
-  typedef typename iterator_traits<_InputIterator1>::value_type __v1;
+  return std::equal(__first1, __last1, __first2, __equal_to());
-  typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-  return _VSTD::equal(__first1, __last1, __first2, __equal_to<__v1, __v2>());
 }
 #if _LIBCPP_STD_VER > 11
 template <class _BinaryPredicate, class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
         _BinaryPredicate __pred, input_iterator_tag, input_iterator_tag) {
   for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void)++__first2)
 @@ -50,7 +48,7 @@ __equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __fir
 }
 template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
         _RandomAccessIterator2 __last2, _BinaryPredicate __pred, random_access_iterator_tag,
         random_access_iterator_tag) {
 @@ -61,7 +59,7 @@ __equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _Random
 }
 template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
       _BinaryPredicate __pred) {
   return _VSTD::__equal<_BinaryPredicate&>(
 @@ -70,13 +68,16 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first
 }
 template <class _InputIterator1, class _InputIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2) {
-  typedef typename iterator_traits<_InputIterator1>::value_type __v1;
+  return std::__equal(
-  typedef typename iterator_traits<_InputIterator2>::value_type __v2;
+      __first1,
-  return _VSTD::__equal(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>(),
+      __last1,
-                        typename iterator_traits<_InputIterator1>::iterator_category(),
+      __first2,
-                        typename iterator_traits<_InputIterator2>::iterator_category());
+      __last2,
+      __equal_to(),
+      typename iterator_traits<_InputIterator1>::iterator_category(),
+      typename iterator_traits<_InputIterator2>::iterator_category());
 }
 #endif

lib/libcxx/include/__algorithm/equal_range.h+8-5

 @@ -34,7 +34,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _Iter, class _Sent, class _Tp, class _Proj>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_Iter, _Iter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_Iter, _Iter>
 __equal_range(_Iter __first, _Sent __last, const _Tp& __value, _Compare&& __comp, _Proj&& __proj) {
   auto __len  = _IterOps<_AlgPolicy>::distance(__first, __last);
   _Iter __end = _IterOps<_AlgPolicy>::next(__first, __last);
 @@ -58,19 +58,22 @@ __equal_range(_Iter __first, _Sent __last, const _Tp& __value, _Compare&& __comp
 }
 template <class _ForwardIterator, class _Tp, class _Compare>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_ForwardIterator, _ForwardIterator>
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator, _ForwardIterator>
 equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, _Compare __comp) {
   static_assert(__is_callable<_Compare, decltype(*__first), const _Tp&>::value,
                 "The comparator has to be callable");
   static_assert(is_copy_constructible<_ForwardIterator>::value,
                 "Iterator has to be copy constructible");
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
   return std::__equal_range<_ClassicAlgPolicy>(
-      std::move(__first), std::move(__last), __value, static_cast<_Comp_ref>(__comp), std::__identity());
+      std::move(__first),
+      std::move(__last),
+      __value,
+      static_cast<__comp_ref_type<_Compare> >(__comp),
+      std::__identity());
 }
 template <class _ForwardIterator, class _Tp>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_ForwardIterator, _ForwardIterator>
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator, _ForwardIterator>
 equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) {
   return std::equal_range(
       std::move(__first),

lib/libcxx/include/__algorithm/fill.h+3-3

...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
23	// fill isn't specialized for std::memset, because the compiler already optimizes the loop to a call to std::memset.	23	// fill isn't specialized for std::memset, because the compiler already optimizes the loop to a call to std::memset.
24		24
25	template <class _ForwardIterator, class _Tp>	25	template <class _ForwardIterator, class _Tp>
26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
27	void	27	void
28	__fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, forward_iterator_tag)	28	__fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, forward_iterator_tag)
29	{	29	{
...	@@ -32,7 +32,7 @@ __fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, fo	...	@@ -32,7 +32,7 @@ __fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, fo
32	}	32	}
33		33
34	template <class _RandomAccessIterator, class _Tp>	34	template <class _RandomAccessIterator, class _Tp>
35	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	35	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
36	void	36	void
37	__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value, random_access_iterator_tag)	37	__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value, random_access_iterator_tag)
38	{	38	{
...	@@ -40,7 +40,7 @@ __fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& _	...	@@ -40,7 +40,7 @@ __fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& _
40	}	40	}
41		41
42	template <class _ForwardIterator, class _Tp>	42	template <class _ForwardIterator, class _Tp>
43	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	43	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
44	void	44	void
45	fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)	45	fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
46	{	46	{

lib/libcxx/include/__algorithm/fill_n.h+3-2

lib/libcxx/include/__algorithm/find.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Tp>	21	template <class _InputIterator, class _Tp>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _InputIterator	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
23	find(_InputIterator __first, _InputIterator __last, const _Tp& __value) {	23	find(_InputIterator __first, _InputIterator __last, const _Tp& __value) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (*__first == __value)	25	if (*__first == __value)

lib/libcxx/include/__algorithm/find_end.h+7-9

...	@@ -37,7 +37,7 @@ template <	...	@@ -37,7 +37,7 @@ template <
37	class _Pred,	37	class _Pred,
38	class _Proj1,	38	class _Proj1,
39	class _Proj2>	39	class _Proj2>
40	_LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR_AFTER_CXX11 pair<_Iter1, _Iter1> __find_end_impl(	40	_LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_Iter1, _Iter1> __find_end_impl(
41	_Iter1 __first1,	41	_Iter1 __first1,
42	_Sent1 __last1,	42	_Sent1 __last1,
43	_Iter2 __first2,	43	_Iter2 __first2,
...	@@ -91,7 +91,7 @@ template <	...	@@ -91,7 +91,7 @@ template <
91	class _Sent2,	91	class _Sent2,
92	class _Proj1,	92	class _Proj1,
93	class _Proj2>	93	class _Proj2>
94	_LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter1 __find_end(	94	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter1 __find_end(
95	_Iter1 __first1,	95	_Iter1 __first1,
96	_Sent1 __sent1,	96	_Sent1 __sent1,
97	_Iter2 __first2,	97	_Iter2 __first2,
...	@@ -144,7 +144,7 @@ template <	...	@@ -144,7 +144,7 @@ template <
144	class _Sent2,	144	class _Sent2,
145	class _Proj1,	145	class _Proj1,
146	class _Proj2>	146	class _Proj2>
147	_LIBCPP_CONSTEXPR_AFTER_CXX11 _Iter1 __find_end(	147	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Iter1 __find_end(
148	_Iter1 __first1,	148	_Iter1 __first1,
149	_Sent1 __sent1,	149	_Sent1 __sent1,
150	_Iter2 __first2,	150	_Iter2 __first2,
...	@@ -189,7 +189,7 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 _Iter1 __find_end(	...	@@ -189,7 +189,7 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 _Iter1 __find_end(
189	}	189	}
190		190
191	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	191	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
192	_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	192	_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
193	_ForwardIterator1 __find_end_classic(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	193	_ForwardIterator1 __find_end_classic(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
194	_ForwardIterator2 __first2, _ForwardIterator2 __last2,	194	_ForwardIterator2 __first2, _ForwardIterator2 __last2,
195	_BinaryPredicate& __pred) {	195	_BinaryPredicate& __pred) {
...	@@ -208,7 +208,7 @@ _ForwardIterator1 __find_end_classic(_ForwardIterator1 __first1, _ForwardIterato	...	@@ -208,7 +208,7 @@ _ForwardIterator1 __find_end_classic(_ForwardIterator1 __first1, _ForwardIterato
208	}	208	}
209		209
210	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	210	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
211	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	211	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
212	_ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	212	_ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
213	_ForwardIterator2 __first2, _ForwardIterator2 __last2,	213	_ForwardIterator2 __first2, _ForwardIterator2 __last2,
214	_BinaryPredicate __pred) {	214	_BinaryPredicate __pred) {
...	@@ -216,12 +216,10 @@ _ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1	...	@@ -216,12 +216,10 @@ _ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1
216	}	216	}
217		217
218	template <class _ForwardIterator1, class _ForwardIterator2>	218	template <class _ForwardIterator1, class _ForwardIterator2>
219	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	219	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
220	_ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	220	_ForwardIterator1 find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
221	_ForwardIterator2 __first2, _ForwardIterator2 __last2) {	221	_ForwardIterator2 __first2, _ForwardIterator2 __last2) {
222	using __v1 = typename iterator_traits<_ForwardIterator1>::value_type;	222	return std::find_end(__first1, __last1, __first2, __last2, __equal_to());
223	using __v2 = typename iterator_traits<_ForwardIterator2>::value_type;
224	return std::find_end(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
225	}	223	}
226		224
227	_LIBCPP_END_NAMESPACE_STD	225	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/find_first_of.h+5-6

 @@ -21,7 +21,8 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator1 __find_first_of_ce(_ForwardIterator1 __first1,
+_LIBCPP_HIDE_FROM_ABI
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator1 __find_first_of_ce(_ForwardIterator1 __first1,
                                                                    _ForwardIterator1 __last1,
                                                                    _ForwardIterator2 __first2,
                                                                    _ForwardIterator2 __last2,
 @@ -34,18 +35,16 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator1 __find_first_of_ce(_ForwardItera
 }
 template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator1
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1
 find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
               _ForwardIterator2 __last2, _BinaryPredicate __pred) {
   return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
 }
 template <class _ForwardIterator1, class _ForwardIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator1 find_first_of(
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1 find_first_of(
     _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) {
-  typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
+  return std::__find_first_of_ce(__first1, __last1, __first2, __last2, __equal_to());
-  typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-  return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/find_if.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Predicate>	21	template <class _InputIterator, class _Predicate>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _InputIterator	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
23	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	23	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (__pred(*__first))	25	if (__pred(*__first))

lib/libcxx/include/__algorithm/find_if_not.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Predicate>	21	template <class _InputIterator, class _Predicate>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _InputIterator	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
23	find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	23	find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (!__pred(*__first))	25	if (!__pred(*__first))

lib/libcxx/include/__algorithm/for_each.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Function>	21	template <class _InputIterator, class _Function>
22	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _Function for_each(_InputIterator __first,	22	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _Function for_each(_InputIterator __first,
23	_InputIterator __last,	23	_InputIterator __last,
24	_Function __f) {	24	_Function __f) {
25	for (; __first != __last; ++__first)	25	for (; __first != __last; ++__first)

lib/libcxx/include/__algorithm/for_each_n.h+2-1

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11	#define _LIBCPP___ALGORITHM_FOR_EACH_N_H	11	#define _LIBCPP___ALGORITHM_FOR_EACH_N_H
12		12
13	#include <__config>	13	#include <__config>
		14	#include <__utility/convert_to_integral.h>
14	#include <type_traits>	15	#include <type_traits>
15		16
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -22,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22	#if _LIBCPP_STD_VER > 14	23	#if _LIBCPP_STD_VER > 14
23		24
24	template <class _InputIterator, class _Size, class _Function>	25	template <class _InputIterator, class _Size, class _Function>
25	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _InputIterator for_each_n(_InputIterator __first,	26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator for_each_n(_InputIterator __first,
26	_Size __orig_n,	27	_Size __orig_n,
27	_Function __f) {	28	_Function __f) {
28	typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;	29	typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;

lib/libcxx/include/__algorithm/generate.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _ForwardIterator, class _Generator>	20	template <class _ForwardIterator, class _Generator>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	void	22	void
23	generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)	23	generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
24	{	24	{

lib/libcxx/include/__algorithm/generate_n.h+2-1

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___ALGORITHM_GENERATE_N_H	10	#define _LIBCPP___ALGORITHM_GENERATE_N_H
11		11
12	#include <__config>	12	#include <__config>
		13	#include <__utility/convert_to_integral.h>
13	#include <type_traits>	14	#include <type_traits>
14		15
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -19,7 +20,7 @@	...	@@ -19,7 +20,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
20		21
21	template <class _OutputIterator, class _Size, class _Generator>	22	template <class _OutputIterator, class _Size, class _Generator>
22	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	23	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
23	_OutputIterator	24	_OutputIterator
24	generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)	25	generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)
25	{	26	{

lib/libcxx/include/__algorithm/half_positive.h+1-1

...	@@ -29,7 +29,7 @@ typename enable_if	...	@@ -29,7 +29,7 @@ typename enable_if
29	>::type	29	>::type
30	__half_positive(_Integral __value)	30	__half_positive(_Integral __value)
31	{	31	{
32	return static_cast<_Integral>(static_cast<typename make_unsigned<_Integral>::type>(__value) / 2);	32	return static_cast<_Integral>(static_cast<__make_unsigned_t<_Integral> >(__value) / 2);
33	}	33	}
34		34
35	template <typename _Tp>	35	template <typename _Tp>

lib/libcxx/include/__algorithm/in_found_result.h+2-2

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	# pragma GCC system_header	18	# pragma GCC system_header
19	#endif	19	#endif
20		20
21	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	21	#if _LIBCPP_STD_VER > 17
22		22
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
...	@@ -44,6 +44,6 @@ struct in_found_result {	...	@@ -44,6 +44,6 @@ struct in_found_result {
44		44
45	_LIBCPP_END_NAMESPACE_STD	45	_LIBCPP_END_NAMESPACE_STD
46		46
47	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	47	#endif // _LIBCPP_STD_VER > 17
48		48
49	#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H	49	#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H

lib/libcxx/include/__algorithm/in_fun_result.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	namespace ranges {	25	namespace ranges {
26	template <class _InIter1, class _Func1>	26	template <class _InIter1, class _Func1>
...	@@ -42,7 +42,7 @@ struct in_fun_result {	...	@@ -42,7 +42,7 @@ struct in_fun_result {
42	};	42	};
43	} // namespace ranges	43	} // namespace ranges
44		44
45	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	45	#endif // _LIBCPP_STD_VER > 17
46		46
47	_LIBCPP_END_NAMESPACE_STD	47	_LIBCPP_END_NAMESPACE_STD
48		48

lib/libcxx/include/__algorithm/in_in_out_result.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	namespace ranges {	25	namespace ranges {
26		26
...	@@ -49,7 +49,7 @@ struct in_in_out_result {	...	@@ -49,7 +49,7 @@ struct in_in_out_result {
49		49
50	} // namespace ranges	50	} // namespace ranges
51		51
52	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	52	#endif // _LIBCPP_STD_VER > 17
53		53
54	_LIBCPP_END_NAMESPACE_STD	54	_LIBCPP_END_NAMESPACE_STD
55		55

lib/libcxx/include/__algorithm/in_in_result.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	namespace ranges {	25	namespace ranges {
26		26
...	@@ -46,7 +46,7 @@ struct in_in_result {	...	@@ -46,7 +46,7 @@ struct in_in_result {
46		46
47	} // namespace ranges	47	} // namespace ranges
48		48
49	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	49	#endif // _LIBCPP_STD_VER > 17
50		50
51	_LIBCPP_END_NAMESPACE_STD	51	_LIBCPP_END_NAMESPACE_STD
52		52

lib/libcxx/include/__algorithm/in_out_out_result.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	namespace ranges {	25	namespace ranges {
26	template <class _InIter1, class _OutIter1, class _OutIter2>	26	template <class _InIter1, class _OutIter1, class _OutIter2>
...	@@ -47,7 +47,7 @@ struct in_out_out_result {	...	@@ -47,7 +47,7 @@ struct in_out_out_result {
47	};	47	};
48	} // namespace ranges	48	} // namespace ranges
49		49
50	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	50	#endif // _LIBCPP_STD_VER > 17
51		51
52	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD
53		53

lib/libcxx/include/__algorithm/in_out_result.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	namespace ranges {	25	namespace ranges {
26		26
...	@@ -46,7 +46,7 @@ struct in_out_result {	...	@@ -46,7 +46,7 @@ struct in_out_result {
46		46
47	} // namespace ranges	47	} // namespace ranges
48		48
49	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	49	#endif // _LIBCPP_STD_VER > 17
50		50
51	_LIBCPP_END_NAMESPACE_STD	51	_LIBCPP_END_NAMESPACE_STD
52		52

lib/libcxx/include/__algorithm/includes.h+10-6

 @@ -25,7 +25,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Iter1, class _Sent1, class _Iter2, class _Sent2, class _Comp, class _Proj1, class _Proj2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __includes(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
            _Comp&& __comp, _Proj1&& __proj1, _Proj2&& __proj2) {
   for (; __first2 != __last2; ++__first1) {
 @@ -39,7 +39,7 @@ __includes(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
 }
 template <class _InputIterator1, class _InputIterator2, class _Compare>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool includes(
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool includes(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
 @@ -48,14 +48,18 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
   static_assert(__is_callable<_Compare, decltype(*__first1), decltype(*__first2)>::value,
       "Comparator has to be callable");
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
   return std::__includes(
-      std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2),
+      std::move(__first1),
-      static_cast<_Comp_ref>(__comp), __identity(), __identity());
+      std::move(__last1),
+      std::move(__first2),
+      std::move(__last2),
+      static_cast<__comp_ref_type<_Compare> >(__comp),
+      __identity(),
+      __identity());
 }
 template <class _InputIterator1, class _InputIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2) {
   return std::includes(
       std::move(__first1),

lib/libcxx/include/__algorithm/inplace_merge.h+8-3

lib/libcxx/include/__algorithm/is_heap.h+3-4

 @@ -23,17 +23,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _RandomAccessIterator, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return std::__is_heap_until(__first, __last, static_cast<__comp_ref_type<_Compare> >(__comp)) == __last;
-    return std::__is_heap_until(__first, __last, static_cast<_Comp_ref>(__comp)) == __last;
 }
 template<class _RandomAccessIterator>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
 {

lib/libcxx/include/__algorithm/is_heap_until.h+4-5

 @@ -21,7 +21,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Compare, class _RandomAccessIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator
 __is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare&& __comp)
 {
     typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
 @@ -48,15 +48,14 @@ __is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Co
 }
 template <class _RandomAccessIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator
 is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return std::__is_heap_until(__first, __last, static_cast<__comp_ref_type<_Compare> >(__comp));
-    return std::__is_heap_until(__first, __last, static_cast<_Comp_ref>(__comp));
 }
 template<class _RandomAccessIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator
 is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
 {
     return _VSTD::__is_heap_until(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());

lib/libcxx/include/__algorithm/is_partitioned.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _Predicate>	20	template <class _InputIterator, class _Predicate>
21	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 bool	21	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
22	is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)	22	is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
23	{	23	{
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)

lib/libcxx/include/__algorithm/is_permutation.h+18-19

 @@ -55,7 +55,7 @@ struct _ConstTimeDistance<_Iter1, _Iter1, _Iter2, _Iter2, __enable_if_t<
 template <class _AlgPolicy,
           class _Iter1, class _Sent1, class _Iter2, class _Sent2,
           class _Proj1, class _Proj2, class _Pred>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __is_permutation_impl(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
                       _Pred&& __pred, _Proj1&& __proj1, _Proj2&& __proj2) {
   using _D1 = __iter_diff_t<_Iter1>;
 @@ -94,7 +94,7 @@ __is_permutation_impl(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 _
 // 2+1 iterators, predicate. Not used by range algorithms.
 template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __is_permutation(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2,
                  _BinaryPredicate&& __pred) {
   // Shorten sequences as much as possible by lopping of any equal prefix.
 @@ -122,7 +122,7 @@ __is_permutation(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterato
 template <class _AlgPolicy,
           class _Iter1, class _Sent1, class _Iter2, class _Sent2,
           class _Proj1, class _Proj2, class _Pred>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
                  _Pred&& __pred, _Proj1&& __proj1, _Proj2&& __proj2,
                  /*_ConstTimeDistance=*/false_type) {
 @@ -156,7 +156,7 @@ __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last
 template <class _AlgPolicy,
           class _Iter1, class _Sent1, class _Iter2, class _Sent2,
           class _Proj1, class _Proj2, class _Pred>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
                  _Pred&& __pred, _Proj1&& __proj1, _Proj2&& __proj2,
                  /*_ConstTimeDistance=*/true_type) {
 @@ -172,7 +172,7 @@ __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last
 template <class _AlgPolicy,
           class _Iter1, class _Sent1, class _Iter2, class _Sent2,
           class _Proj1, class _Proj2, class _Pred>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2,
                  _Pred&& __pred, _Proj1&& __proj1, _Proj2&& __proj2) {
   return std::__is_permutation<_AlgPolicy>(
 @@ -185,7 +185,7 @@ __is_permutation(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last
 // 2+1 iterators, predicate
 template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
                _BinaryPredicate __pred) {
   static_assert(__is_callable<_BinaryPredicate, decltype(*__first1), decltype(*__first2)>::value,
 @@ -197,31 +197,30 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIt
 // 2+1 iterators
 template <class _ForwardIterator1, class _ForwardIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) {
-  using __v1 = __iter_value_type<_ForwardIterator1>;
+  return std::is_permutation(__first1, __last1, __first2, __equal_to());
-  using __v2 = __iter_value_type<_ForwardIterator2>;
-  return std::is_permutation(__first1, __last1, __first2, __equal_to<__v1, __v2>());
 }
 #if _LIBCPP_STD_VER > 11
 // 2+2 iterators
 template <class _ForwardIterator1, class _ForwardIterator2>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool is_permutation(
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
+    _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) {
-               _ForwardIterator2 __last2) {
-  using __v1 = __iter_value_type<_ForwardIterator1>;
-  using __v2 = __iter_value_type<_ForwardIterator2>;
   return std::__is_permutation<_ClassicAlgPolicy>(
-      std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2),
+      std::move(__first1),
-      __equal_to<__v1, __v2>(), __identity(), __identity());
+      std::move(__last1),
+      std::move(__first2),
+      std::move(__last2),
+      __equal_to(),
+      __identity(),
+      __identity());
 }
 // 2+2 iterators, predicate
 template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
                _ForwardIterator2 __last2, _BinaryPredicate __pred) {
   static_assert(__is_callable<_BinaryPredicate, decltype(*__first1), decltype(*__first2)>::value,

lib/libcxx/include/__algorithm/is_sorted.h+3-4

 @@ -23,17 +23,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _ForwardIterator, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp) == __last;
-    return _VSTD::__is_sorted_until<_Comp_ref>(__first, __last, __comp) == __last;
 }
 template<class _ForwardIterator>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 is_sorted(_ForwardIterator __first, _ForwardIterator __last)
 {

lib/libcxx/include/__algorithm/is_sorted_until.h+4-5

 @@ -21,7 +21,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Compare, class _ForwardIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 __is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
     if (__first != __last)
 @@ -38,15 +38,14 @@ __is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __
 }
 template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp);
-    return _VSTD::__is_sorted_until<_Comp_ref>(__first, __last, __comp);
 }
 template<class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
 {
     return _VSTD::is_sorted_until(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());

lib/libcxx/include/__algorithm/iter_swap.h+2-2

...	@@ -20,10 +20,10 @@	...	@@ -20,10 +20,10 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _ForwardIterator1, class _ForwardIterator2>	22	template <class _ForwardIterator1, class _ForwardIterator2>
23	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 void iter_swap(_ForwardIterator1 __a,	23	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void iter_swap(_ForwardIterator1 __a,
24	_ForwardIterator2 __b)	24	_ForwardIterator2 __b)
25	// _NOEXCEPT_(_NOEXCEPT_(swap(__a, __b)))	25	// _NOEXCEPT_(_NOEXCEPT_(swap(__a, __b)))
26	_NOEXCEPT_(_NOEXCEPT_(swap(declval<_ForwardIterator1>(), declval<_ForwardIterator2>()))) {	26	_NOEXCEPT_(_NOEXCEPT_(swap(std::declval<_ForwardIterator1>(), std::declval<_ForwardIterator2>()))) {
27	swap(__a, __b);	27	swap(__a, __b);
28	}	28	}
29		29

lib/libcxx/include/__algorithm/iterator_operations.h+20-17

 @@ -21,10 +21,13 @@
 #include <__iterator/next.h>
 #include <__iterator/prev.h>
 #include <__iterator/readable_traits.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/declval.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -34,7 +37,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy> struct _IterOps;
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 struct _RangeAlgPolicy {};
 template <>
 @@ -76,14 +79,14 @@ struct _IterOps<_ClassicAlgPolicy> {
   // advance
   template <class _Iter, class _Distance>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   static void advance(_Iter& __iter, _Distance __count) {
     std::advance(__iter, __count);
   }
   // distance
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   static typename iterator_traits<_Iter>::difference_type distance(_Iter __first, _Iter __last) {
     return std::distance(__first, __last);
   }
 @@ -95,9 +98,9 @@ struct _IterOps<_ClassicAlgPolicy> {
   using __move_t = decltype(std::move(*std::declval<_Iter&>()));
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   static void __validate_iter_reference() {
-    static_assert(is_same<__deref_t<_Iter>, typename iterator_traits<__uncvref_t<_Iter> >::reference>::value,
+    static_assert(is_same<__deref_t<_Iter>, typename iterator_traits<__remove_cvref_t<_Iter> >::reference>::value,
         "It looks like your iterator's `iterator_traits<It>::reference` does not match the return type of "
         "dereferencing the iterator, i.e., calling `*it`. This is undefined behavior according to [input.iterators] "
         "and can lead to dangling reference issues at runtime, so we are flagging this.");
 @@ -105,7 +108,7 @@ struct _IterOps<_ClassicAlgPolicy> {
   // iter_move
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 static
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static
   // If the result of dereferencing `_Iter` is a reference type, deduce the result of calling `std::move` on it. Note
   // that the C++03 mode doesn't support `decltype(auto)` as the return type.
   __enable_if_t<
 @@ -118,7 +121,7 @@ struct _IterOps<_ClassicAlgPolicy> {
   }
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 static
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static
   // If the result of dereferencing `_Iter` is a value type, deduce the return value of this function to also be a
   // value -- otherwise, after `operator*` returns a temporary, this function would return a dangling reference to that
   // temporary. Note that the C++03 mode doesn't support `auto` as the return type.
 @@ -133,35 +136,35 @@ struct _IterOps<_ClassicAlgPolicy> {
   // iter_swap
   template <class _Iter1, class _Iter2>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   static void iter_swap(_Iter1&& __a, _Iter2&& __b) {
     std::iter_swap(std::forward<_Iter1>(__a), std::forward<_Iter2>(__b));
   }
   // next
   template <class _Iterator>
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX14
   _Iterator next(_Iterator, _Iterator __last) {
     return __last;
   }
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX14
-  __uncvref_t<_Iter> next(_Iter&& __it,
+  __remove_cvref_t<_Iter> next(_Iter&& __it,
-                          typename iterator_traits<__uncvref_t<_Iter> >::difference_type __n = 1) {
+                          typename iterator_traits<__remove_cvref_t<_Iter> >::difference_type __n = 1) {
     return std::next(std::forward<_Iter>(__it), __n);
   }
   // prev
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX14
-  __uncvref_t<_Iter> prev(_Iter&& __iter,
+  __remove_cvref_t<_Iter> prev(_Iter&& __iter,
-                 typename iterator_traits<__uncvref_t<_Iter> >::difference_type __n = 1) {
+                 typename iterator_traits<__remove_cvref_t<_Iter> >::difference_type __n = 1) {
     return std::prev(std::forward<_Iter>(__iter), __n);
   }
   template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX14
   void __advance_to(_Iter& __first, _Iter __last) {
     __first = __last;
   }

lib/libcxx/include/__algorithm/lexicographical_compare.h+4-5

 @@ -21,7 +21,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Compare, class _InputIterator1, class _InputIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 __lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
                           _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
 {
 @@ -37,18 +37,17 @@ __lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
 template <class _InputIterator1, class _InputIterator2, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
                         _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__lexicographical_compare<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __comp);
-    return _VSTD::__lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
 }
 template <class _InputIterator1, class _InputIterator2>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
                         _InputIterator2 __first2, _InputIterator2 __last2)

lib/libcxx/include/__algorithm/lower_bound.h+3-3

lib/libcxx/include/__algorithm/make_heap.h+4-5

 @@ -24,10 +24,9 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 void __make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare&& __comp) {
-  using _CompRef = typename __comp_ref_type<_Compare>::type;
+  __comp_ref_type<_Compare> __comp_ref = __comp;
-  _CompRef __comp_ref = __comp;
   using difference_type = typename iterator_traits<_RandomAccessIterator>::difference_type;
   difference_type __n = __last - __first;
 @@ -40,13 +39,13 @@ void __make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
 }
 template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
   std::__make_heap<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __comp);
 }
 template <class _RandomAccessIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
   std::make_heap(std::move(__first), std::move(__last),
       __less<typename iterator_traits<_RandomAccessIterator>::value_type>());

lib/libcxx/include/__algorithm/make_projected.h+2-2

...	@@ -93,7 +93,7 @@ __make_projected(_Pred& __pred, _Proj&) {	...	@@ -93,7 +93,7 @@ __make_projected(_Pred& __pred, _Proj&) {
93		93
94	_LIBCPP_END_NAMESPACE_STD	94	_LIBCPP_END_NAMESPACE_STD
95		95
96	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	96	#if _LIBCPP_STD_VER > 17
97		97
98	_LIBCPP_BEGIN_NAMESPACE_STD	98	_LIBCPP_BEGIN_NAMESPACE_STD
99		99
...	@@ -121,6 +121,6 @@ decltype(auto) __make_projected_comp(_Comp& __comp, _Proj1& __proj1, _Proj2& __p	...	@@ -121,6 +121,6 @@ decltype(auto) __make_projected_comp(_Comp& __comp, _Proj1& __proj1, _Proj2& __p
121		121
122	_LIBCPP_END_NAMESPACE_STD	122	_LIBCPP_END_NAMESPACE_STD
123		123
124	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	124	#endif // _LIBCPP_STD_VER > 17
125		125
126	#endif // _LIBCPP___ALGORITHM_MAKE_PROJECTED_H	126	#endif // _LIBCPP___ALGORITHM_MAKE_PROJECTED_H

lib/libcxx/include/__algorithm/max.h+5-6

 @@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&
 max(const _Tp& __a, const _Tp& __b, _Compare __comp)
 {
 @@ -35,7 +35,7 @@ max(const _Tp& __a, const _Tp& __b, _Compare __comp)
 template <class _Tp>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&
 max(const _Tp& __a, const _Tp& __b)
 {
 @@ -46,17 +46,16 @@ max(const _Tp& __a, const _Tp& __b)
 template<class _Tp, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 max(initializer_list<_Tp> __t, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return *_VSTD::__max_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
-    return *_VSTD::__max_element<_Comp_ref>(__t.begin(), __t.end(), __comp);
 }
 template<class _Tp>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 max(initializer_list<_Tp> __t)
 {

lib/libcxx/include/__algorithm/max_element.h+4-5

 @@ -21,7 +21,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Compare, class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
 __max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
     static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,
 @@ -37,16 +37,15 @@ __max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp
 }
 template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
 max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__max_element<__comp_ref_type<_Compare> >(__first, __last, __comp);
-    return _VSTD::__max_element<_Comp_ref>(__first, __last, __comp);
 }
 template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
 max_element(_ForwardIterator __first, _ForwardIterator __last)
 {
     return _VSTD::max_element(__first, __last,

lib/libcxx/include/__algorithm/merge.h+4-5

 @@ -22,7 +22,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 _OutputIterator
 __merge(_InputIterator1 __first1, _InputIterator1 __last1,
         _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
 @@ -46,17 +46,16 @@ __merge(_InputIterator1 __first1, _InputIterator1 __last1,
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _OutputIterator
 merge(_InputIterator1 __first1, _InputIterator1 __last1,
       _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__merge<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __result, __comp);
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _OutputIterator
 merge(_InputIterator1 __first1, _InputIterator1 __last1,
       _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)

lib/libcxx/include/__algorithm/min.h+5-6

 @@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&
 min(const _Tp& __a, const _Tp& __b, _Compare __comp)
 {
 @@ -35,7 +35,7 @@ min(const _Tp& __a, const _Tp& __b, _Compare __comp)
 template <class _Tp>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&
 min(const _Tp& __a, const _Tp& __b)
 {
 @@ -46,17 +46,16 @@ min(const _Tp& __a, const _Tp& __b)
 template<class _Tp, class _Compare>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 min(initializer_list<_Tp> __t, _Compare __comp)
 {
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return *_VSTD::__min_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
-    return *_VSTD::__min_element<_Comp_ref>(__t.begin(), __t.end(), __comp);
 }
 template<class _Tp>
 _LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 min(initializer_list<_Tp> __t)
 {

lib/libcxx/include/__algorithm/min_element.h+5-6

 @@ -25,7 +25,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Comp, class _Iter, class _Sent, class _Proj>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Iter __min_element(_Iter __first, _Sent __last, _Comp __comp, _Proj& __proj) {
   if (__first == __last)
     return __first;
 @@ -39,14 +39,14 @@ _Iter __min_element(_Iter __first, _Sent __last, _Comp __comp, _Proj& __proj) {
 }
 template <class _Comp, class _Iter, class _Sent>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Iter __min_element(_Iter __first, _Sent __last, _Comp __comp) {
   auto __proj = __identity();
   return std::__min_element<_Comp>(std::move(__first), std::move(__last), __comp, __proj);
 }
 template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
 min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
   static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,
 @@ -54,12 +54,11 @@ min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
   static_assert(__is_callable<_Compare, decltype(*__first), decltype(*__first)>::value,
               "The comparator has to be callable");
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+  return std::__min_element<__comp_ref_type<_Compare> >(std::move(__first), std::move(__last), __comp);
-  return std::__min_element<_Comp_ref>(std::move(__first), std::move(__last), __comp);
 }
 template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
 min_element(_ForwardIterator __first, _ForwardIterator __last)
 {
     return _VSTD::min_element(__first, __last,

lib/libcxx/include/__algorithm/min_max_result.h+2-2

...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
25		25
26	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	26	#if _LIBCPP_STD_VER > 17
27		27
28	namespace ranges {	28	namespace ranges {
29		29
...	@@ -47,7 +47,7 @@ struct min_max_result {	...	@@ -47,7 +47,7 @@ struct min_max_result {
47		47
48	} // namespace ranges	48	} // namespace ranges
49		49
50	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	50	#endif // _LIBCPP_STD_VER > 17
51		51
52	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD
53		53

lib/libcxx/include/__algorithm/minmax.h+4-4

lib/libcxx/include/__algorithm/minmax_element.h+4-4

lib/libcxx/include/__algorithm/mismatch.h+6-10

 @@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_InputIterator1, _InputIterator2>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator1, _InputIterator2>
     mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred) {
   for (; __first1 != __last1; ++__first1, (void)++__first2)
     if (!__pred(*__first1, *__first2))
 @@ -33,17 +33,15 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
 template <class _InputIterator1, class _InputIterator2>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_InputIterator1, _InputIterator2>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator1, _InputIterator2>
     mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2) {
-  typedef typename iterator_traits<_InputIterator1>::value_type __v1;
+  return std::mismatch(__first1, __last1, __first2, __equal_to());
-  typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-  return _VSTD::mismatch(__first1, __last1, __first2, __equal_to<__v1, __v2>());
 }
 #if _LIBCPP_STD_VER > 11
 template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_InputIterator1, _InputIterator2>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator1, _InputIterator2>
     mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
              _BinaryPredicate __pred) {
   for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void)++__first2)
 @@ -54,11 +52,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
 template <class _InputIterator1, class _InputIterator2>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_InputIterator1, _InputIterator2>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator1, _InputIterator2>
     mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2) {
-  typedef typename iterator_traits<_InputIterator1>::value_type __v1;
+  return std::mismatch(__first1, __last1, __first2, __last2, __equal_to());
-  typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-  return _VSTD::mismatch(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
 }
 #endif

lib/libcxx/include/__algorithm/move.h+93-82

...	@@ -9,111 +9,122 @@	...	@@ -9,111 +9,122 @@
9	#ifndef _LIBCPP___ALGORITHM_MOVE_H	9	#ifndef _LIBCPP___ALGORITHM_MOVE_H
10	#define _LIBCPP___ALGORITHM_MOVE_H	10	#define _LIBCPP___ALGORITHM_MOVE_H
11		11
		12	#include <__algorithm/copy_move_common.h>
12	#include <__algorithm/iterator_operations.h>	13	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/unwrap_iter.h>	14	#include <__algorithm/min.h>
14	#include <__config>	15	#include <__config>
15	#include <__iterator/iterator_traits.h>	16	#include <__iterator/segmented_iterator.h>
16	#include <__iterator/reverse_iterator.h>	17	#include <__type_traits/common_type.h>
		18	#include <__type_traits/is_copy_constructible.h>
17	#include <__utility/move.h>	19	#include <__utility/move.h>
18	#include <__utility/pair.h>	20	#include <__utility/pair.h>
19	#include <cstring>
20	#include <type_traits>
21		21
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	23	# pragma GCC system_header
24	#endif	24	#endif
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_PUSH_MACROS
		27	#include <__undef_macros>
27		28
28	// move	29	_LIBCPP_BEGIN_NAMESPACE_STD
29		30
30	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>	31	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
31	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	32	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
32	pair<_InIter, _OutIter> __move_impl(_InIter __first, _Sent __last, _OutIter __result) {	33	__move(_InIter __first, _Sent __last, _OutIter __result);
33	while (__first != __last) {	34
34	*__result = _IterOps<_AlgPolicy>::__iter_move(__first);	35	template <class _AlgPolicy>
35	++__first;	36	struct __move_loop {
36	++__result;	37	template <class _InIter, class _Sent, class _OutIter>
		38	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
		39	operator()(_InIter __first, _Sent __last, _OutIter __result) const {
		40	while (__first != __last) {
		41	*__result = _IterOps<_AlgPolicy>::__iter_move(__first);
		42	++__first;
		43	++__result;
		44	}
		45	return std::make_pair(std::move(__first), std::move(__result));
37	}	46	}
38	return std::make_pair(std::move(__first), std::move(__result));
39	}
40
41	template <class _AlgPolicy,
42	class _InType,
43	class _OutType,
44	class = __enable_if_t<is_same<typename remove_const<_InType>::type, _OutType>::value
45	&& is_trivially_move_assignable<_OutType>::value> >
46	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
47	pair<_InType, _OutType> __move_impl(_InType* __first, _InType* __last, _OutType* __result) {
48	if (__libcpp_is_constant_evaluated()
49	// TODO: Remove this once GCC supports __builtin_memmove during constant evaluation
50	#ifndef _LIBCPP_COMPILER_GCC
51	&& !is_trivially_copyable<_InType>::value
52	#endif
53	)
54	return std::__move_impl<_AlgPolicy, _InType, _InType, _OutType*>(__first, __last, __result);
55	const size_t __n = static_cast<size_t>(__last - __first);
56	::__builtin_memmove(__result, __first, __n * sizeof(_OutType));
57	return std::make_pair(__first + __n, __result + __n);
58	}
59		47
60	template <class>	48	template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator<_InIter>::value, int> = 0>
61	struct __is_trivially_move_assignable_unwrapped_impl : false_type {};	49	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
62		50	operator()(_InIter __first, _InIter __last, _OutIter __result) const {
63	template <class _Type>	51	using _Traits = __segmented_iterator_traits<_InIter>;
64	struct __is_trivially_move_assignable_unwrapped_impl<_Type*> : is_trivially_move_assignable<_Type> {};	52	auto __sfirst = _Traits::__segment(__first);
65		53	auto __slast = _Traits::__segment(__last);
66	template <class _Iter>	54	if (__sfirst == __slast) {
67	struct __is_trivially_move_assignable_unwrapped	55	auto __iters = std::__move<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
68	: __is_trivially_move_assignable_unwrapped_impl<decltype(std::__unwrap_iter<_Iter>(std::declval<_Iter>()))> {};	56	return std::make_pair(__last, std::move(__iters.second));
69		57	}
70	template <class _AlgPolicy,	58
71	class _InIter,	59	__result = std::__move<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__sfirst), std::move(__result)).second;
72	class _OutIter,	60	++__sfirst;
73	__enable_if_t<is_same<typename remove_const<typename iterator_traits<_InIter>::value_type>::type,	61	while (__sfirst != __slast) {
74	typename iterator_traits<_OutIter>::value_type>::value	62	__result =
75	&& __is_cpp17_contiguous_iterator<_InIter>::value	63	std::__move<_AlgPolicy>(_Traits::__begin(__sfirst), _Traits::__end(__sfirst), std::move(__result)).second;
76	&& __is_cpp17_contiguous_iterator<_OutIter>::value	64	++__sfirst;
77	&& is_trivially_move_assignable<__iter_value_type<_OutIter> >::value, int> = 0>	65	}
78	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14	66	__result =
79	pair<reverse_iterator<_InIter>, reverse_iterator<_OutIter> >	67	std::__move<_AlgPolicy>(_Traits::__begin(__sfirst), _Traits::__local(__last), std::move(__result)).second;
80	__move_impl(reverse_iterator<_InIter> __first,	68	return std::make_pair(__last, std::move(__result));
81	reverse_iterator<_InIter> __last,	69	}
82	reverse_iterator<_OutIter> __result) {
83	auto __first_base = std::__unwrap_iter(__first.base());
84	auto __last_base = std::__unwrap_iter(__last.base());
85	auto __result_base = std::__unwrap_iter(__result.base());
86	auto __result_first = __result_base - (__first_base - __last_base);
87	std::__move_impl<_AlgPolicy>(__last_base, __first_base, __result_first);
88	return std::make_pair(__last, reverse_iterator<_OutIter>(std::__rewrap_iter(__result.base(), __result_first)));
89	}
90		70
91	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>	71	template <class _InIter,
92	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	72	class _OutIter,
93	__enable_if_t<is_copy_constructible<_InIter>::value	73	__enable_if_t<__is_cpp17_random_access_iterator<_InIter>::value &&
94	&& is_copy_constructible<_Sent>::value	74	!__is_segmented_iterator<_InIter>::value && __is_segmented_iterator<_OutIter>::value,
95	&& is_copy_constructible<_OutIter>::value, pair<_InIter, _OutIter> >	75	int> = 0>
96	__move(_InIter __first, _Sent __last, _OutIter __result) {	76	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
97	auto __ret = std::__move_impl<_AlgPolicy>(	77	operator()(_InIter __first, _InIter __last, _OutIter __result) {
98	std::__unwrap_iter(__first), std::__unwrap_iter(__last), std::__unwrap_iter(__result));	78	using _Traits = __segmented_iterator_traits<_OutIter>;
99	return std::make_pair(std::__rewrap_iter(__first, __ret.first), std::__rewrap_iter(__result, __ret.second));	79	using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
100	}	80
		81	if (__first == __last)
		82	return std::make_pair(std::move(__first), std::move(__result));
		83
		84	auto __local_first = _Traits::__local(__result);
		85	auto __segment_iterator = _Traits::__segment(__result);
		86	while (true) {
		87	auto __local_last = _Traits::__end(__segment_iterator);
		88	auto __size = std::min<_DiffT>(__local_last - __local_first, __last - __first);
		89	auto __iters = std::__move<_AlgPolicy>(__first, __first + __size, __local_first);
		90	__first = std::move(__iters.first);
		91
		92	if (__first == __last)
		93	return std::make_pair(std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.second)));
		94
		95	__local_first = _Traits::__begin(++__segment_iterator);
		96	}
		97	}
		98	};
		99
		100	struct __move_trivial {
		101	// At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
		102	template <class _In, class _Out,
		103	__enable_if_t<__can_lower_move_assignment_to_memmove<_In, _Out>::value, int> = 0>
		104	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
		105	operator()(_In* __first, _In* __last, _Out* __result) const {
		106	return std::__copy_trivial_impl(__first, __last, __result);
		107	}
		108	};
101		109
102	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>	110	template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
103	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	111	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
104	__enable_if_t<!is_copy_constructible<_InIter>::value
105	\|\| !is_copy_constructible<_Sent>::value
106	\|\| !is_copy_constructible<_OutIter>::value, pair<_InIter, _OutIter> >
107	__move(_InIter __first, _Sent __last, _OutIter __result) {	112	__move(_InIter __first, _Sent __last, _OutIter __result) {
108	return std::__move_impl<_AlgPolicy>(std::move(__first), std::move(__last), std::move(__result));	113	return std::__dispatch_copy_or_move<_AlgPolicy, __move_loop<_AlgPolicy>, __move_trivial>(
		114	std::move(__first), std::move(__last), std::move(__result));
109	}	115	}
110		116
111	template <class _InputIterator, class _OutputIterator>	117	template <class _InputIterator, class _OutputIterator>
112	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	118	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
113	_OutputIterator move(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {	119	move(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
114	return std::__move<_ClassicAlgPolicy>(__first, __last, __result).second;	120	static_assert(is_copy_constructible<_InputIterator>::value, "Iterators has to be copy constructible.");
		121	static_assert(is_copy_constructible<_OutputIterator>::value, "The output iterator has to be copy constructible.");
		122
		123	return std::__move<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
115	}	124	}
116		125
117	_LIBCPP_END_NAMESPACE_STD	126	_LIBCPP_END_NAMESPACE_STD
118		127
		128	_LIBCPP_POP_MACROS
		129
119	#endif // _LIBCPP___ALGORITHM_MOVE_H	130	#endif // _LIBCPP___ALGORITHM_MOVE_H

lib/libcxx/include/__algorithm/move_backward.h+105-55

...	@@ -9,81 +9,131 @@	...	@@ -9,81 +9,131 @@
9	#ifndef _LIBCPP___ALGORITHM_MOVE_BACKWARD_H	9	#ifndef _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
10	#define _LIBCPP___ALGORITHM_MOVE_BACKWARD_H	10	#define _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
11		11
		12	#include <__algorithm/copy_move_common.h>
12	#include <__algorithm/iterator_operations.h>	13	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/unwrap_iter.h>	14	#include <__algorithm/min.h>
14	#include <__config>	15	#include <__config>
		16	#include <__iterator/segmented_iterator.h>
		17	#include <__type_traits/common_type.h>
		18	#include <__type_traits/is_copy_constructible.h>
15	#include <__utility/move.h>	19	#include <__utility/move.h>
16	#include <cstring>	20	#include <__utility/pair.h>
17	#include <type_traits>
18		21
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header	23	# pragma GCC system_header
21	#endif	24	#endif
22		25
		26	_LIBCPP_PUSH_MACROS
		27	#include <__undef_macros>
		28
23	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
24		30
25	template <class _AlgPolicy, class _InputIterator, class _OutputIterator>	31	template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	32	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
27	_OutputIterator	33	__move_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result);
28	__move_backward_constexpr(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
29	{
30	while (__first != __last)
31	*--__result = _IterOps<_AlgPolicy>::__iter_move(--__last);
32	return __result;
33	}
34		34
35	template <class _AlgPolicy, class _InputIterator, class _OutputIterator>	35	template <class _AlgPolicy>
36	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	36	struct __move_backward_loop {
37	_OutputIterator	37	template <class _InIter, class _Sent, class _OutIter>
38	__move_backward_impl(_InputIterator __first, _InputIterator __last, _OutputIterator __result)	38	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
39	{	39	operator()(_InIter __first, _Sent __last, _OutIter __result) const {
40	return _VSTD::__move_backward_constexpr<_AlgPolicy>(__first, __last, __result);	40	auto __last_iter = _IterOps<_AlgPolicy>::next(__first, __last);
41	}	41	auto __original_last_iter = __last_iter;
42		42
43	template <class _AlgPolicy, class _Tp, class _Up>	43	while (__first != __last_iter) {
44	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	44	*--__result = _IterOps<_AlgPolicy>::__iter_move(--__last_iter);
45	typename enable_if
46	<
47	is_same<typename remove_const<_Tp>::type, _Up>::value &&
48	is_trivially_move_assignable<_Up>::value,
49	_Up*
50	>::type
51	__move_backward_impl(_Tp* __first, _Tp* __last, _Up* __result)
52	{
53	const size_t __n = static_cast<size_t>(__last - __first);
54	if (__n > 0)
55	{
56	__result -= __n;
57	_VSTD::memmove(__result, __first, __n * sizeof(_Up));
58	}	45	}
59	return __result;
60	}
61		46
62	template <class _AlgPolicy, class _BidirectionalIterator1, class _BidirectionalIterator2>	47	return std::make_pair(std::move(__original_last_iter), std::move(__result));
63	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	48	}
64	_BidirectionalIterator2	49
65	__move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,	50	template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator<_InIter>::value, int> = 0>
66	_BidirectionalIterator2 __result)	51	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
67	{	52	operator()(_InIter __first, _InIter __last, _OutIter __result) const {
68	if (__libcpp_is_constant_evaluated()) {	53	using _Traits = __segmented_iterator_traits<_InIter>;
69	return _VSTD::__move_backward_constexpr<_AlgPolicy>(__first, __last, __result);	54	auto __sfirst = _Traits::__segment(__first);
70	} else {	55	auto __slast = _Traits::__segment(__last);
71	return _VSTD::__rewrap_iter(__result,	56	if (__sfirst == __slast) {
72	_VSTD::__move_backward_impl<_AlgPolicy>(_VSTD::__unwrap_iter(__first),	57	auto __iters =
73	_VSTD::__unwrap_iter(__last),	58	std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
74	_VSTD::__unwrap_iter(__result)));	59	return std::make_pair(__last, __iters.second);
		60	}
		61
		62	__result =
		63	std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
		64	.second;
		65	--__slast;
		66	while (__sfirst != __slast) {
		67	__result =
		68	std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__end(__slast), std::move(__result))
		69	.second;
		70	--__slast;
		71	}
		72	__result = std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
		73	.second;
		74	return std::make_pair(__last, std::move(__result));
		75	}
		76
		77	template <class _InIter,
		78	class _OutIter,
		79	__enable_if_t<__is_cpp17_random_access_iterator<_InIter>::value &&
		80	!__is_segmented_iterator<_InIter>::value && __is_segmented_iterator<_OutIter>::value,
		81	int> = 0>
		82	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
		83	operator()(_InIter __first, _InIter __last, _OutIter __result) {
		84	using _Traits = __segmented_iterator_traits<_OutIter>;
		85	using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
		86
		87	// When the range contains no elements, __result might not be a valid iterator
		88	if (__first == __last)
		89	return std::make_pair(__first, __result);
		90
		91	auto __orig_last = __last;
		92
		93	auto __local_last = _Traits::__local(__result);
		94	auto __segment_iterator = _Traits::__segment(__result);
		95	while (true) {
		96	auto __local_first = _Traits::__begin(__segment_iterator);
		97	auto __size = std::min<_DiffT>(__local_last - __local_first, __last - __first);
		98	auto __iter = std::__move_backward<_AlgPolicy>(__last - __size, __last, __local_last).second;
		99	__last -= __size;
		100
		101	if (__first == __last)
		102	return std::make_pair(std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter)));
		103
		104	__local_last = _Traits::__end(--__segment_iterator);
75	}	105	}
		106	}
		107	};
		108
		109	struct __move_backward_trivial {
		110	// At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
		111	template <class _In, class _Out,
		112	__enable_if_t<__can_lower_move_assignment_to_memmove<_In, _Out>::value, int> = 0>
		113	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In, _Out>
		114	operator()(_In* __first, _In* __last, _Out* __result) const {
		115	return std::__copy_backward_trivial_impl(__first, __last, __result);
		116	}
		117	};
		118
		119	template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
		120	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
		121	__move_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result) {
		122	static_assert(std::is_copy_constructible<_BidirectionalIterator1>::value &&
		123	std::is_copy_constructible<_BidirectionalIterator1>::value, "Iterators must be copy constructible.");
		124
		125	return std::__dispatch_copy_or_move<_AlgPolicy, __move_backward_loop<_AlgPolicy>, __move_backward_trivial>(
		126	std::move(__first), std::move(__last), std::move(__result));
76	}	127	}
77		128
78	template <class _BidirectionalIterator1, class _BidirectionalIterator2>	129	template <class _BidirectionalIterator1, class _BidirectionalIterator2>
79	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	130	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _BidirectionalIterator2
80	_BidirectionalIterator2	131	move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last, _BidirectionalIterator2 __result) {
81	move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,	132	return std::__move_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
82	_BidirectionalIterator2 __result)
83	{
84	return std::__move_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
85	}	133	}
86		134
87	_LIBCPP_END_NAMESPACE_STD	135	_LIBCPP_END_NAMESPACE_STD
88		136
		137	_LIBCPP_POP_MACROS
		138
89	#endif // _LIBCPP___ALGORITHM_MOVE_BACKWARD_H	139	#endif // _LIBCPP___ALGORITHM_MOVE_BACKWARD_H

lib/libcxx/include/__algorithm/next_permutation.h+4-6

 @@ -25,8 +25,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _BidirectionalIterator, class _Sentinel>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator, bool>
-pair<_BidirectionalIterator, bool>
 __next_permutation(_BidirectionalIterator __first, _Sentinel __last, _Compare&& __comp)
 {
     using _Result = pair<_BidirectionalIterator, bool>;
 @@ -57,17 +56,16 @@ __next_permutation(_BidirectionalIterator __first, _Sentinel __last, _Compare&&
 }
 template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
 {
-  using _Comp_ref = typename __comp_ref_type<_Compare>::type;
   return std::__next_permutation<_ClassicAlgPolicy>(
-      std::move(__first), std::move(__last), static_cast<_Comp_ref>(__comp)).second;
+      std::move(__first), std::move(__last), static_cast<__comp_ref_type<_Compare> >(__comp)).second;
 }
 template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
 {

lib/libcxx/include/__algorithm/none_of.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _InputIterator, class _Predicate>	21	template <class _InputIterator, class _Predicate>
22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool	22	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
23	none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	23	none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	24	for (; __first != __last; ++__first)
25	if (__pred(*__first))	25	if (__pred(*__first))

lib/libcxx/include/__algorithm/nth_element.h+6-7

lib/libcxx/include/__algorithm/partial_sort.h+6-7

lib/libcxx/include/__algorithm/partial_sort_copy.h+4-5

 @@ -33,7 +33,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare,
           class _InputIterator, class _Sentinel1, class _RandomAccessIterator, class _Sentinel2,
           class _Proj1, class _Proj2>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_InputIterator, _RandomAccessIterator>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator, _RandomAccessIterator>
 __partial_sort_copy(_InputIterator __first, _Sentinel1 __last,
                     _RandomAccessIterator __result_first, _Sentinel2 __result_last,
                     _Compare&& __comp, _Proj1&& __proj1, _Proj2&& __proj2)
 @@ -60,7 +60,7 @@ __partial_sort_copy(_InputIterator __first, _Sentinel1 __last,
 }
 template <class _InputIterator, class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _RandomAccessIterator
 partial_sort_copy(_InputIterator __first, _InputIterator __last,
                   _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
 @@ -68,14 +68,13 @@ partial_sort_copy(_InputIterator __first, _InputIterator __last,
   static_assert(__is_callable<_Compare, decltype(*__first), decltype(*__result_first)>::value,
                 "Comparator has to be callable");
-  using _Comp_ref = typename __comp_ref_type<_Compare>::type;
   auto __result = std::__partial_sort_copy<_ClassicAlgPolicy>(__first, __last, __result_first, __result_last,
-      static_cast<_Comp_ref>(__comp), __identity(), __identity());
+      static_cast<__comp_ref_type<_Compare> >(__comp), __identity(), __identity());
   return __result.second;
 }
 template <class _InputIterator, class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _RandomAccessIterator
 partial_sort_copy(_InputIterator __first, _InputIterator __last,
                   _RandomAccessIterator __result_first, _RandomAccessIterator __result_last)

lib/libcxx/include/__algorithm/partition.h+5-5

lib/libcxx/include/__algorithm/partition_copy.h+1-1

...	@@ -21,7 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -21,7 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _InputIterator, class _OutputIterator1,	22	template <class _InputIterator, class _OutputIterator1,
23	class _OutputIterator2, class _Predicate>	23	class _OutputIterator2, class _Predicate>
24	_LIBCPP_CONSTEXPR_AFTER_CXX17 pair<_OutputIterator1, _OutputIterator2>	24	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_OutputIterator1, _OutputIterator2>
25	partition_copy(_InputIterator __first, _InputIterator __last,	25	partition_copy(_InputIterator __first, _InputIterator __last,
26	_OutputIterator1 __out_true, _OutputIterator2 __out_false,	26	_OutputIterator1 __out_true, _OutputIterator2 __out_false,
27	_Predicate __pred)	27	_Predicate __pred)

lib/libcxx/include/__algorithm/partition_point.h+1-1

...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
23		23
24	template<class _ForwardIterator, class _Predicate>	24	template<class _ForwardIterator, class _Predicate>
25	_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
26	partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)	26	partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
27	{	27	{
28	typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;	28	typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;

lib/libcxx/include/__algorithm/pop_heap.h+4-5

 @@ -27,13 +27,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 void __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare& __comp,
     typename iterator_traits<_RandomAccessIterator>::difference_type __len) {
   _LIBCPP_ASSERT(__len > 0, "The heap given to pop_heap must be non-empty");
-  using _CompRef = typename __comp_ref_type<_Compare>::type;
+  __comp_ref_type<_Compare> __comp_ref = __comp;
-  _CompRef __comp_ref = __comp;
   using value_type = typename iterator_traits<_RandomAccessIterator>::value_type;
   if (__len > 1) {
 @@ -53,7 +52,7 @@ void __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Co
 }
 template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
   static_assert(std::is_copy_constructible<_RandomAccessIterator>::value, "Iterators must be copy constructible.");
   static_assert(std::is_copy_assignable<_RandomAccessIterator>::value, "Iterators must be copy assignable.");
 @@ -63,7 +62,7 @@ void pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp
 }
 template <class _RandomAccessIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
   std::pop_heap(std::move(__first), std::move(__last),
       __less<typename iterator_traits<_RandomAccessIterator>::value_type>());

lib/libcxx/include/__algorithm/prev_permutation.h+4-5

 @@ -25,7 +25,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _BidirectionalIterator, class _Sentinel>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 pair<_BidirectionalIterator, bool>
 __prev_permutation(_BidirectionalIterator __first, _Sentinel __last, _Compare&& __comp)
 {
 @@ -57,17 +57,16 @@ __prev_permutation(_BidirectionalIterator __first, _Sentinel __last, _Compare&&
 }
 template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
 {
-  using _Comp_ref = typename __comp_ref_type<_Compare>::type;
   return std::__prev_permutation<_ClassicAlgPolicy>(
-      std::move(__first), std::move(__last), static_cast<_Comp_ref>(__comp)).second;
+      std::move(__first), std::move(__last), static_cast<__comp_ref_type<_Compare> >(__comp)).second;
 }
 template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
 {

lib/libcxx/include/__algorithm/push_heap.h+5-6

 @@ -24,7 +24,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 void __sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare&& __comp,
         typename iterator_traits<_RandomAccessIterator>::difference_type __len) {
   using value_type = typename iterator_traits<_RandomAccessIterator>::value_type;
 @@ -50,15 +50,14 @@ void __sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Com
 }
 template <class _AlgPolicy, class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 void __push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare& __comp) {
-  using _CompRef = typename __comp_ref_type<_Compare>::type;
   typename iterator_traits<_RandomAccessIterator>::difference_type __len = __last - __first;
-  std::__sift_up<_AlgPolicy, _CompRef>(std::move(__first), std::move(__last), __comp, __len);
+  std::__sift_up<_AlgPolicy, __comp_ref_type<_Compare> >(std::move(__first), std::move(__last), __comp, __len);
 }
 template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
   static_assert(std::is_copy_constructible<_RandomAccessIterator>::value, "Iterators must be copy constructible.");
   static_assert(std::is_copy_assignable<_RandomAccessIterator>::value, "Iterators must be copy assignable.");
 @@ -67,7 +66,7 @@ void push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Com
 }
 template <class _RandomAccessIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
   std::push_heap(std::move(__first), std::move(__last),
       __less<typename iterator_traits<_RandomAccessIterator>::value_type>());

lib/libcxx/include/__algorithm/ranges_adjacent_find.h+4-4

lib/libcxx/include/__algorithm/ranges_all_of.h+4-4

lib/libcxx/include/__algorithm/ranges_any_of.h+4-4

lib/libcxx/include/__algorithm/ranges_binary_search.h+4-4

lib/libcxx/include/__algorithm/ranges_clamp.h+3-3

...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22	# pragma GCC system_header	22	# pragma GCC system_header
23	#endif	23	#endif
24		24
25	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	25	#if _LIBCPP_STD_VER > 17
26		26
27	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
28		28
...	@@ -33,7 +33,7 @@ struct __fn {	...	@@ -33,7 +33,7 @@ struct __fn {
33	template <class _Type,	33	template <class _Type,
34	class _Proj = identity,	34	class _Proj = identity,
35	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>	35	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>
36	_LIBCPP_HIDE_FROM_ABI constexpr	36	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
37	const _Type& operator()(const _Type& __value,	37	const _Type& operator()(const _Type& __value,
38	const _Type& __low,	38	const _Type& __low,
39	const _Type& __high,	39	const _Type& __high,
...	@@ -60,6 +60,6 @@ inline namespace __cpo {	...	@@ -60,6 +60,6 @@ inline namespace __cpo {
60		60
61	_LIBCPP_END_NAMESPACE_STD	61	_LIBCPP_END_NAMESPACE_STD
62		62
63	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	63	#endif // _LIBCPP_STD_VER > 17
64		64
65	#endif // _LIBCPP___ALGORITHM_RANGES_CLAMP_H	65	#endif // _LIBCPP___ALGORITHM_RANGES_CLAMP_H

lib/libcxx/include/__algorithm/ranges_copy.h+6-4

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11		11
12	#include <__algorithm/copy.h>	12	#include <__algorithm/copy.h>
13	#include <__algorithm/in_out_result.h>	13	#include <__algorithm/in_out_result.h>
		14	#include <__algorithm/iterator_operations.h>
14	#include <__config>	15	#include <__config>
15	#include <__functional/identity.h>	16	#include <__functional/identity.h>
16	#include <__iterator/concepts.h>	17	#include <__iterator/concepts.h>
...	@@ -18,12 +19,13 @@	...	@@ -18,12 +19,13 @@
18	#include <__ranges/concepts.h>	19	#include <__ranges/concepts.h>
19	#include <__ranges/dangling.h>	20	#include <__ranges/dangling.h>
20	#include <__utility/move.h>	21	#include <__utility/move.h>
		22	#include <__utility/pair.h>
21		23
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	25	# pragma GCC system_header
24	#endif	26	#endif
25		27
26	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	28	#if _LIBCPP_STD_VER > 17
27		29
28	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
29		31
...	@@ -39,7 +41,7 @@ struct __fn {	...	@@ -39,7 +41,7 @@ struct __fn {
39	requires indirectly_copyable<_InIter, _OutIter>	41	requires indirectly_copyable<_InIter, _OutIter>
40	_LIBCPP_HIDE_FROM_ABI constexpr	42	_LIBCPP_HIDE_FROM_ABI constexpr
41	copy_result<_InIter, _OutIter> operator()(_InIter __first, _Sent __last, _OutIter __result) const {	43	copy_result<_InIter, _OutIter> operator()(_InIter __first, _Sent __last, _OutIter __result) const {
42	auto __ret = std::__copy(std::move(__first), std::move(__last), std::move(__result));	44	auto __ret = std::__copy<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
43	return {std::move(__ret.first), std::move(__ret.second)};	45	return {std::move(__ret.first), std::move(__ret.second)};
44	}	46	}
45		47
...	@@ -47,7 +49,7 @@ struct __fn {	...	@@ -47,7 +49,7 @@ struct __fn {
47	requires indirectly_copyable<iterator_t<_Range>, _OutIter>	49	requires indirectly_copyable<iterator_t<_Range>, _OutIter>
48	_LIBCPP_HIDE_FROM_ABI constexpr	50	_LIBCPP_HIDE_FROM_ABI constexpr
49	copy_result<borrowed_iterator_t<_Range>, _OutIter> operator()(_Range&& __r, _OutIter __result) const {	51	copy_result<borrowed_iterator_t<_Range>, _OutIter> operator()(_Range&& __r, _OutIter __result) const {
50	auto __ret = std::__copy(ranges::begin(__r), ranges::end(__r), std::move(__result));	52	auto __ret = std::__copy<_RangeAlgPolicy>(ranges::begin(__r), ranges::end(__r), std::move(__result));
51	return {std::move(__ret.first), std::move(__ret.second)};	53	return {std::move(__ret.first), std::move(__ret.second)};
52	}	54	}
53	};	55	};
...	@@ -60,6 +62,6 @@ inline namespace __cpo {	...	@@ -60,6 +62,6 @@ inline namespace __cpo {
60		62
61	_LIBCPP_END_NAMESPACE_STD	63	_LIBCPP_END_NAMESPACE_STD
62		64
63	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	65	#endif // _LIBCPP_STD_VER > 17
64		66
65	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_H	67	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_H

lib/libcxx/include/__algorithm/ranges_copy_backward.h+2-3

...	@@ -14,7 +14,6 @@	...	@@ -14,7 +14,6 @@
14	#include <__algorithm/iterator_operations.h>	14	#include <__algorithm/iterator_operations.h>
15	#include <__config>	15	#include <__config>
16	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
17	#include <__iterator/reverse_iterator.h>
18	#include <__ranges/access.h>	17	#include <__ranges/access.h>
19	#include <__ranges/concepts.h>	18	#include <__ranges/concepts.h>
20	#include <__ranges/dangling.h>	19	#include <__ranges/dangling.h>
...	@@ -24,7 +23,7 @@	...	@@ -24,7 +23,7 @@
24	# pragma GCC system_header	23	# pragma GCC system_header
25	#endif	24	#endif
26		25
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	26	#if _LIBCPP_STD_VER > 17
28		27
29	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
30		29
...	@@ -61,6 +60,6 @@ inline namespace __cpo {	...	@@ -61,6 +60,6 @@ inline namespace __cpo {
61		60
62	_LIBCPP_END_NAMESPACE_STD	61	_LIBCPP_END_NAMESPACE_STD
63		62
64	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	63	#endif // _LIBCPP_STD_VER > 17
65		64
66	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H	65	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H

lib/libcxx/include/__algorithm/ranges_copy_if.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -76,6 +76,6 @@ inline namespace __cpo {	...	@@ -76,6 +76,6 @@ inline namespace __cpo {
76		76
77	_LIBCPP_END_NAMESPACE_STD	77	_LIBCPP_END_NAMESPACE_STD
78		78
79	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	79	#endif // _LIBCPP_STD_VER > 17
80		80
81	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_IF_H	81	#endif // _LIBCPP___ALGORITHM_RANGES_COPY_IF_H

lib/libcxx/include/__algorithm/ranges_copy_n.h+4-3

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11		11
12	#include <__algorithm/copy.h>	12	#include <__algorithm/copy.h>
13	#include <__algorithm/in_out_result.h>	13	#include <__algorithm/in_out_result.h>
		14	#include <__algorithm/iterator_operations.h>
14	#include <__algorithm/ranges_copy.h>	15	#include <__algorithm/ranges_copy.h>
15	#include <__config>	16	#include <__config>
16	#include <__functional/identity.h>	17	#include <__functional/identity.h>
...	@@ -26,7 +27,7 @@	...	@@ -26,7 +27,7 @@
26		27
27	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
28		29
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
30		31
31	namespace ranges {	32	namespace ranges {
32		33
...	@@ -51,7 +52,7 @@ struct __fn {	...	@@ -51,7 +52,7 @@ struct __fn {
51	template <random_access_iterator _InIter, class _DiffType, random_access_iterator _OutIter>	52	template <random_access_iterator _InIter, class _DiffType, random_access_iterator _OutIter>
52	_LIBCPP_HIDE_FROM_ABI constexpr static	53	_LIBCPP_HIDE_FROM_ABI constexpr static
53	copy_n_result<_InIter, _OutIter> __go(_InIter __first, _DiffType __n, _OutIter __result) {	54	copy_n_result<_InIter, _OutIter> __go(_InIter __first, _DiffType __n, _OutIter __result) {
54	auto __ret = std::__copy(__first, __first + __n, __result);	55	auto __ret = std::__copy<_RangeAlgPolicy>(__first, __first + __n, __result);
55	return {__ret.first, __ret.second};	56	return {__ret.first, __ret.second};
56	}	57	}
57		58
...	@@ -69,7 +70,7 @@ inline namespace __cpo {	...	@@ -69,7 +70,7 @@ inline namespace __cpo {
69	} // namespace __cpo	70	} // namespace __cpo
70	} // namespace ranges	71	} // namespace ranges
71		72
72	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	73	#endif // _LIBCPP_STD_VER > 17
73		74
74	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
75		76

lib/libcxx/include/__algorithm/ranges_count.h+4-4

lib/libcxx/include/__algorithm/ranges_count_if.h+4-4

lib/libcxx/include/__algorithm/ranges_equal.h+4-4

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -60,7 +60,7 @@ public:	...	@@ -60,7 +60,7 @@ public:
60	class _Proj1 = identity,	60	class _Proj1 = identity,
61	class _Proj2 = identity>	61	class _Proj2 = identity>
62	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>	62	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
63	_LIBCPP_HIDE_FROM_ABI constexpr	63	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
64	bool operator()(_Iter1 __first1, _Sent1 __last1,	64	bool operator()(_Iter1 __first1, _Sent1 __last1,
65	_Iter2 __first2, _Sent2 __last2,	65	_Iter2 __first2, _Sent2 __last2,
66	_Pred __pred = {},	66	_Pred __pred = {},
...	@@ -83,7 +83,7 @@ public:	...	@@ -83,7 +83,7 @@ public:
83	class _Proj1 = identity,	83	class _Proj1 = identity,
84	class _Proj2 = identity>	84	class _Proj2 = identity>
85	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>	85	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
86	_LIBCPP_HIDE_FROM_ABI constexpr	86	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
87	bool operator()(_Range1&& __range1,	87	bool operator()(_Range1&& __range1,
88	_Range2&& __range2,	88	_Range2&& __range2,
89	_Pred __pred = {},	89	_Pred __pred = {},
...	@@ -110,6 +110,6 @@ inline namespace __cpo {	...	@@ -110,6 +110,6 @@ inline namespace __cpo {
110		110
111	_LIBCPP_END_NAMESPACE_STD	111	_LIBCPP_END_NAMESPACE_STD
112		112
113	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	113	#endif // _LIBCPP_STD_VER > 17
114		114
115	#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_H	115	#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_H

lib/libcxx/include/__algorithm/ranges_equal_range.h+5-4

...	@@ -24,12 +24,13 @@	...	@@ -24,12 +24,13 @@
24	#include <__ranges/subrange.h>	24	#include <__ranges/subrange.h>
25	#include <__utility/forward.h>	25	#include <__utility/forward.h>
26	#include <__utility/move.h>	26	#include <__utility/move.h>
		27	#include <__utility/pair.h>
27		28
28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
29	# pragma GCC system_header	30	# pragma GCC system_header
30	#endif	31	#endif
31		32
32	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	33	#if _LIBCPP_STD_VER > 17
33		34
34	_LIBCPP_BEGIN_NAMESPACE_STD	35	_LIBCPP_BEGIN_NAMESPACE_STD
35		36
...	@@ -43,7 +44,7 @@ struct __fn {	...	@@ -43,7 +44,7 @@ struct __fn {
43	class _Tp,	44	class _Tp,
44	class _Proj = identity,	45	class _Proj = identity,
45	indirect_strict_weak_order<const _Tp*, projected<_Iter, _Proj>> _Comp = ranges::less>	46	indirect_strict_weak_order<const _Tp*, projected<_Iter, _Proj>> _Comp = ranges::less>
46	_LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>	47	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>
47	operator()(_Iter __first, _Sent __last, const _Tp& __value, _Comp __comp = {}, _Proj __proj = {}) const {	48	operator()(_Iter __first, _Sent __last, const _Tp& __value, _Comp __comp = {}, _Proj __proj = {}) const {
48	auto __ret = std::__equal_range<_RangeAlgPolicy>(	49	auto __ret = std::__equal_range<_RangeAlgPolicy>(
49	std::move(__first), std::move(__last), __value, __comp, __proj);	50	std::move(__first), std::move(__last), __value, __comp, __proj);
...	@@ -55,7 +56,7 @@ struct __fn {	...	@@ -55,7 +56,7 @@ struct __fn {
55	class _Tp,	56	class _Tp,
56	class _Proj = identity,	57	class _Proj = identity,
57	indirect_strict_weak_order<const _Tp*, projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>	58	indirect_strict_weak_order<const _Tp*, projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>
58	_LIBCPP_HIDE_FROM_ABI constexpr borrowed_subrange_t<_Range>	59	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr borrowed_subrange_t<_Range>
59	operator()(_Range&& __range, const _Tp& __value, _Comp __comp = {}, _Proj __proj = {}) const {	60	operator()(_Range&& __range, const _Tp& __value, _Comp __comp = {}, _Proj __proj = {}) const {
60	auto __ret = std::__equal_range<_RangeAlgPolicy>(	61	auto __ret = std::__equal_range<_RangeAlgPolicy>(
61	ranges::begin(__range), ranges::end(__range), __value, __comp, __proj);	62	ranges::begin(__range), ranges::end(__range), __value, __comp, __proj);
...	@@ -72,6 +73,6 @@ inline namespace __cpo {	...	@@ -72,6 +73,6 @@ inline namespace __cpo {
72		73
73	_LIBCPP_END_NAMESPACE_STD	74	_LIBCPP_END_NAMESPACE_STD
74		75
75	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	76	#endif // _LIBCPP_STD_VER > 17
76		77
77	#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H	78	#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H

lib/libcxx/include/__algorithm/ranges_fill.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	# pragma GCC system_header	20	# pragma GCC system_header
21	#endif	21	#endif
22		22
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	23	#if _LIBCPP_STD_VER > 17
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
...	@@ -54,6 +54,6 @@ inline namespace __cpo {	...	@@ -54,6 +54,6 @@ inline namespace __cpo {
54		54
55	_LIBCPP_END_NAMESPACE_STD	55	_LIBCPP_END_NAMESPACE_STD
56		56
57	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	57	#endif // _LIBCPP_STD_VER > 17
58		58
59	#endif // _LIBCPP___ALGORITHM_RANGES_FILL_H	59	#endif // _LIBCPP___ALGORITHM_RANGES_FILL_H

lib/libcxx/include/__algorithm/ranges_fill_n.h+2-2

...	@@ -17,7 +17,7 @@	...	@@ -17,7 +17,7 @@
17	# pragma GCC system_header	17	# pragma GCC system_header
18	#endif	18	#endif
19		19
20	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	20	#if _LIBCPP_STD_VER > 17
21		21
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
23		23
...	@@ -43,6 +43,6 @@ inline namespace __cpo {	...	@@ -43,6 +43,6 @@ inline namespace __cpo {
43		43
44	_LIBCPP_END_NAMESPACE_STD	44	_LIBCPP_END_NAMESPACE_STD
45		45
46	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	46	#endif // _LIBCPP_STD_VER > 17
47		47
48	#endif // _LIBCPP___ALGORITHM_RANGES_FILL_N_H	48	#endif // _LIBCPP___ALGORITHM_RANGES_FILL_N_H

lib/libcxx/include/__algorithm/ranges_find.h+4-4

lib/libcxx/include/__algorithm/ranges_find_end.h+5-4

...	@@ -21,12 +21,13 @@	...	@@ -21,12 +21,13 @@
21	#include <__ranges/access.h>	21	#include <__ranges/access.h>
22	#include <__ranges/concepts.h>	22	#include <__ranges/concepts.h>
23	#include <__ranges/subrange.h>	23	#include <__ranges/subrange.h>
		24	#include <__utility/pair.h>
24		25
25	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
26	# pragma GCC system_header	27	# pragma GCC system_header
27	#endif	28	#endif
28		29
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
30		31
31	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
32		33
...	@@ -39,7 +40,7 @@ struct __fn {	...	@@ -39,7 +40,7 @@ struct __fn {
39	class _Proj1 = identity,	40	class _Proj1 = identity,
40	class _Proj2 = identity>	41	class _Proj2 = identity>
41	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>	42	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
42	_LIBCPP_HIDE_FROM_ABI constexpr	43	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
43	subrange<_Iter1> operator()(_Iter1 __first1, _Sent1 __last1,	44	subrange<_Iter1> operator()(_Iter1 __first1, _Sent1 __last1,
44	_Iter2 __first2, _Sent2 __last2,	45	_Iter2 __first2, _Sent2 __last2,
45	_Pred __pred = {},	46	_Pred __pred = {},
...	@@ -64,7 +65,7 @@ struct __fn {	...	@@ -64,7 +65,7 @@ struct __fn {
64	class _Proj1 = identity,	65	class _Proj1 = identity,
65	class _Proj2 = identity>	66	class _Proj2 = identity>
66	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>	67	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
67	_LIBCPP_HIDE_FROM_ABI constexpr	68	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
68	borrowed_subrange_t<_Range1> operator()(_Range1&& __range1,	69	borrowed_subrange_t<_Range1> operator()(_Range1&& __range1,
69	_Range2&& __range2,	70	_Range2&& __range2,
70	_Pred __pred = {},	71	_Pred __pred = {},
...	@@ -92,6 +93,6 @@ inline namespace __cpo {	...	@@ -92,6 +93,6 @@ inline namespace __cpo {
92		93
93	_LIBCPP_END_NAMESPACE_STD	94	_LIBCPP_END_NAMESPACE_STD
94		95
95	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	96	#endif // _LIBCPP_STD_VER > 17
96		97
97	#endif // _LIBCPP___ALGORITHM_RANGES_FIND_END_H	98	#endif // _LIBCPP___ALGORITHM_RANGES_FIND_END_H

lib/libcxx/include/__algorithm/ranges_find_first_of.h+4-4

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -54,7 +54,7 @@ struct __fn {	...	@@ -54,7 +54,7 @@ struct __fn {
54	class _Proj1 = identity,	54	class _Proj1 = identity,
55	class _Proj2 = identity>	55	class _Proj2 = identity>
56	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>	56	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
57	_LIBCPP_HIDE_FROM_ABI constexpr	57	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
58	_Iter1 operator()(_Iter1 __first1, _Sent1 __last1,	58	_Iter1 operator()(_Iter1 __first1, _Sent1 __last1,
59	_Iter2 __first2, _Sent2 __last2,	59	_Iter2 __first2, _Sent2 __last2,
60	_Pred __pred = {},	60	_Pred __pred = {},
...	@@ -73,7 +73,7 @@ struct __fn {	...	@@ -73,7 +73,7 @@ struct __fn {
73	class _Proj1 = identity,	73	class _Proj1 = identity,
74	class _Proj2 = identity>	74	class _Proj2 = identity>
75	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>	75	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
76	_LIBCPP_HIDE_FROM_ABI constexpr	76	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
77	borrowed_iterator_t<_Range1> operator()(_Range1&& __range1,	77	borrowed_iterator_t<_Range1> operator()(_Range1&& __range1,
78	_Range2&& __range2,	78	_Range2&& __range2,
79	_Pred __pred = {},	79	_Pred __pred = {},
...	@@ -96,6 +96,6 @@ inline namespace __cpo {	...	@@ -96,6 +96,6 @@ inline namespace __cpo {
96		96
97	_LIBCPP_END_NAMESPACE_STD	97	_LIBCPP_END_NAMESPACE_STD
98		98
99	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	99	#endif // _LIBCPP_STD_VER > 17
100		100
101	#endif // _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H	101	#endif // _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H

lib/libcxx/include/__algorithm/ranges_find_if.h+4-4

lib/libcxx/include/__algorithm/ranges_find_if_not.h+4-4

lib/libcxx/include/__algorithm/ranges_for_each.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -73,6 +73,6 @@ inline namespace __cpo {	...	@@ -73,6 +73,6 @@ inline namespace __cpo {
73		73
74	_LIBCPP_END_NAMESPACE_STD	74	_LIBCPP_END_NAMESPACE_STD
75		75
76	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	76	#endif // _LIBCPP_STD_VER > 17
77		77
78	#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H	78	#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H

lib/libcxx/include/__algorithm/ranges_for_each_n.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -61,6 +61,6 @@ inline namespace __cpo {	...	@@ -61,6 +61,6 @@ inline namespace __cpo {
61		61
62	_LIBCPP_END_NAMESPACE_STD	62	_LIBCPP_END_NAMESPACE_STD
63		63
64	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	64	#endif // _LIBCPP_STD_VER > 17
65		65
66	#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H	66	#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H

lib/libcxx/include/__algorithm/ranges_generate.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -68,6 +68,6 @@ inline namespace __cpo {	...	@@ -68,6 +68,6 @@ inline namespace __cpo {
68		68
69	_LIBCPP_END_NAMESPACE_STD	69	_LIBCPP_END_NAMESPACE_STD
70		70
71	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	71	#endif // _LIBCPP_STD_VER > 17
72		72
73	#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_H	73	#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_H

lib/libcxx/include/__algorithm/ranges_generate_n.h+2-2

...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	# pragma GCC system_header	25	# pragma GCC system_header
26	#endif	26	#endif
27		27
28	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	28	#if _LIBCPP_STD_VER > 17
29		29
30	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
31		31
...	@@ -57,6 +57,6 @@ inline namespace __cpo {	...	@@ -57,6 +57,6 @@ inline namespace __cpo {
57		57
58	_LIBCPP_END_NAMESPACE_STD	58	_LIBCPP_END_NAMESPACE_STD
59		59
60	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	60	#endif // _LIBCPP_STD_VER > 17
61		61
62	#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H	62	#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H

lib/libcxx/include/__algorithm/ranges_includes.h+4-4

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	# pragma GCC system_header	27	# pragma GCC system_header
28	#endif	28	#endif
29		29
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
31		31
32	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
33		33
...	@@ -43,7 +43,7 @@ struct __fn {	...	@@ -43,7 +43,7 @@ struct __fn {
43	class _Proj1 = identity,	43	class _Proj1 = identity,
44	class _Proj2 = identity,	44	class _Proj2 = identity,
45	indirect_strict_weak_order<projected<_Iter1, _Proj1>, projected<_Iter2, _Proj2>> _Comp = ranges::less>	45	indirect_strict_weak_order<projected<_Iter1, _Proj1>, projected<_Iter2, _Proj2>> _Comp = ranges::less>
46	_LIBCPP_HIDE_FROM_ABI constexpr bool operator()(	46	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr bool operator()(
47	_Iter1 __first1,	47	_Iter1 __first1,
48	_Sent1 __last1,	48	_Sent1 __last1,
49	_Iter2 __first2,	49	_Iter2 __first2,
...	@@ -68,7 +68,7 @@ struct __fn {	...	@@ -68,7 +68,7 @@ struct __fn {
68	class _Proj2 = identity,	68	class _Proj2 = identity,
69	indirect_strict_weak_order<projected<iterator_t<_Range1>, _Proj1>, projected<iterator_t<_Range2>, _Proj2>>	69	indirect_strict_weak_order<projected<iterator_t<_Range1>, _Proj1>, projected<iterator_t<_Range2>, _Proj2>>
70	_Comp = ranges::less>	70	_Comp = ranges::less>
71	_LIBCPP_HIDE_FROM_ABI constexpr bool operator()(	71	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr bool operator()(
72	_Range1&& __range1, _Range2&& __range2, _Comp __comp = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {	72	_Range1&& __range1, _Range2&& __range2, _Comp __comp = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {
73	return std::__includes(	73	return std::__includes(
74	ranges::begin(__range1),	74	ranges::begin(__range1),
...	@@ -90,6 +90,6 @@ inline namespace __cpo {	...	@@ -90,6 +90,6 @@ inline namespace __cpo {
90		90
91	_LIBCPP_END_NAMESPACE_STD	91	_LIBCPP_END_NAMESPACE_STD
92		92
93	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	93	#endif // _LIBCPP_STD_VER > 17
94		94
95	#endif // _LIBCPP___ALGORITHM_RANGES_INCLUDES_H	95	#endif // _LIBCPP___ALGORITHM_RANGES_INCLUDES_H

lib/libcxx/include/__algorithm/ranges_inplace_merge.h+2-2

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
35		35
36	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
37		37
...	@@ -80,6 +80,6 @@ inline namespace __cpo {	...	@@ -80,6 +80,6 @@ inline namespace __cpo {
80		80
81	_LIBCPP_END_NAMESPACE_STD	81	_LIBCPP_END_NAMESPACE_STD
82		82
83	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	83	#endif // _LIBCPP_STD_VER > 17
84		84
85	#endif // _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H	85	#endif // _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H

lib/libcxx/include/__algorithm/ranges_is_heap.h+4-4

lib/libcxx/include/__algorithm/ranges_is_heap_until.h+4-4

lib/libcxx/include/__algorithm/ranges_is_partitioned.h+4-4

lib/libcxx/include/__algorithm/ranges_is_permutation.h+4-4

lib/libcxx/include/__algorithm/ranges_is_sorted.h+4-4

lib/libcxx/include/__algorithm/ranges_is_sorted_until.h+4-4

lib/libcxx/include/__algorithm/ranges_iterator_concept.h+4-4

...	@@ -12,13 +12,13 @@	...	@@ -12,13 +12,13 @@
12	#include <__config>	12	#include <__config>
13	#include <__iterator/concepts.h>	13	#include <__iterator/concepts.h>
14	#include <__iterator/iterator_traits.h>	14	#include <__iterator/iterator_traits.h>
15	#include <type_traits>	15	#include <__type_traits/remove_cvref.h>
16		16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	18	# pragma GCC system_header
19	#endif	19	#endif
20		20
21	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	21	#if _LIBCPP_STD_VER > 17
22		22
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
...	@@ -26,7 +26,7 @@ namespace ranges {	...	@@ -26,7 +26,7 @@ namespace ranges {
26		26
27	template <class _IterMaybeQualified>	27	template <class _IterMaybeQualified>
28	consteval auto __get_iterator_concept() {	28	consteval auto __get_iterator_concept() {
29	using _Iter = __uncvref_t<_IterMaybeQualified>;	29	using _Iter = __remove_cvref_t<_IterMaybeQualified>;
30		30
31	if constexpr (contiguous_iterator<_Iter>)	31	if constexpr (contiguous_iterator<_Iter>)
32	return contiguous_iterator_tag();	32	return contiguous_iterator_tag();
...	@@ -46,6 +46,6 @@ using __iterator_concept = decltype(__get_iterator_concept<_Iter>());	...	@@ -46,6 +46,6 @@ using __iterator_concept = decltype(__get_iterator_concept<_Iter>());
46	} // namespace ranges	46	} // namespace ranges
47	_LIBCPP_END_NAMESPACE_STD	47	_LIBCPP_END_NAMESPACE_STD
48		48
49	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	49	#endif // _LIBCPP_STD_VER > 17
50		50
51	#endif // _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H	51	#endif // _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H

lib/libcxx/include/__algorithm/ranges_lexicographical_compare.h+4-4

lib/libcxx/include/__algorithm/ranges_lower_bound.h+4-4

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	# pragma GCC system_header	27	# pragma GCC system_header
28	#endif	28	#endif
29		29
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
31		31
32	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
33		33
...	@@ -37,14 +37,14 @@ namespace __lower_bound {	...	@@ -37,14 +37,14 @@ namespace __lower_bound {
37	struct __fn {	37	struct __fn {
38	template <forward_iterator _Iter, sentinel_for<_Iter> _Sent, class _Type, class _Proj = identity,	38	template <forward_iterator _Iter, sentinel_for<_Iter> _Sent, class _Type, class _Proj = identity,
39	indirect_strict_weak_order<const _Type*, projected<_Iter, _Proj>> _Comp = ranges::less>	39	indirect_strict_weak_order<const _Type*, projected<_Iter, _Proj>> _Comp = ranges::less>
40	_LIBCPP_HIDE_FROM_ABI constexpr	40	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
41	_Iter operator()(_Iter __first, _Sent __last, const _Type& __value, _Comp __comp = {}, _Proj __proj = {}) const {	41	_Iter operator()(_Iter __first, _Sent __last, const _Type& __value, _Comp __comp = {}, _Proj __proj = {}) const {
42	return std::__lower_bound_impl<_RangeAlgPolicy>(__first, __last, __value, __comp, __proj);	42	return std::__lower_bound_impl<_RangeAlgPolicy>(__first, __last, __value, __comp, __proj);
43	}	43	}
44		44
45	template <forward_range _Range, class _Type, class _Proj = identity,	45	template <forward_range _Range, class _Type, class _Proj = identity,
46	indirect_strict_weak_order<const _Type*, projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>	46	indirect_strict_weak_order<const _Type*, projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>
47	_LIBCPP_HIDE_FROM_ABI constexpr	47	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
48	borrowed_iterator_t<_Range> operator()(_Range&& __r,	48	borrowed_iterator_t<_Range> operator()(_Range&& __r,
49	const _Type& __value,	49	const _Type& __value,
50	_Comp __comp = {},	50	_Comp __comp = {},
...	@@ -61,6 +61,6 @@ inline namespace __cpo {	...	@@ -61,6 +61,6 @@ inline namespace __cpo {
61		61
62	_LIBCPP_END_NAMESPACE_STD	62	_LIBCPP_END_NAMESPACE_STD
63		63
64	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	64	#endif // _LIBCPP_STD_VER > 17
65		65
66	#endif // _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H	66	#endif // _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H

lib/libcxx/include/__algorithm/ranges_make_heap.h+2-2

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32	# pragma GCC system_header	32	# pragma GCC system_header
33	#endif	33	#endif
34		34
35	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
36		36
37	_LIBCPP_BEGIN_NAMESPACE_STD	37	_LIBCPP_BEGIN_NAMESPACE_STD
38		38
...	@@ -75,6 +75,6 @@ inline namespace __cpo {	...	@@ -75,6 +75,6 @@ inline namespace __cpo {
75		75
76	_LIBCPP_END_NAMESPACE_STD	76	_LIBCPP_END_NAMESPACE_STD
77		77
78	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
79		79
80	#endif // _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H	80	#endif // _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H

lib/libcxx/include/__algorithm/ranges_max.h+5-5

lib/libcxx/include/__algorithm/ranges_max_element.h+4-4

lib/libcxx/include/__algorithm/ranges_merge.h+4-4

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	# pragma GCC system_header	27	# pragma GCC system_header
28	#endif	28	#endif
29		29
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
31		31
32	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
33		33
...	@@ -47,7 +47,7 @@ template <	...	@@ -47,7 +47,7 @@ template <
47	class _Comp,	47	class _Comp,
48	class _Proj1,	48	class _Proj1,
49	class _Proj2>	49	class _Proj2>
50	_LIBCPP_HIDE_FROM_ABI constexpr merge_result<__uncvref_t<_InIter1>, __uncvref_t<_InIter2>, __uncvref_t<_OutIter>>	50	_LIBCPP_HIDE_FROM_ABI constexpr merge_result<__remove_cvref_t<_InIter1>, __remove_cvref_t<_InIter2>, __remove_cvref_t<_OutIter>>
51	__merge_impl(	51	__merge_impl(
52	_InIter1&& __first1,	52	_InIter1&& __first1,
53	_Sent1&& __last1,	53	_Sent1&& __last1,
...	@@ -107,7 +107,7 @@ struct __fn {	...	@@ -107,7 +107,7 @@ struct __fn {
107	_OutIter,	107	_OutIter,
108	_Comp,	108	_Comp,
109	_Proj1,	109	_Proj1,
110	_Proj2>	110	_Proj2>
111	_LIBCPP_HIDE_FROM_ABI constexpr merge_result<borrowed_iterator_t<_Range1>, borrowed_iterator_t<_Range2>, _OutIter>	111	_LIBCPP_HIDE_FROM_ABI constexpr merge_result<borrowed_iterator_t<_Range1>, borrowed_iterator_t<_Range2>, _OutIter>
112	operator()(	112	operator()(
113	_Range1&& __range1,	113	_Range1&& __range1,
...	@@ -137,6 +137,6 @@ inline namespace __cpo {	...	@@ -137,6 +137,6 @@ inline namespace __cpo {
137		137
138	_LIBCPP_END_NAMESPACE_STD	138	_LIBCPP_END_NAMESPACE_STD
139		139
140	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	140	#endif // _LIBCPP_STD_VER > 17
141		141
142	#endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H	142	#endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H

lib/libcxx/include/__algorithm/ranges_min.h+5-5

lib/libcxx/include/__algorithm/ranges_min_element.h+4-4

lib/libcxx/include/__algorithm/ranges_minmax.h+6-5

lib/libcxx/include/__algorithm/ranges_minmax_element.h+4-4

lib/libcxx/include/__algorithm/ranges_mismatch.h+4-4

lib/libcxx/include/__algorithm/ranges_move.h+2-3

...	@@ -14,7 +14,6 @@	...	@@ -14,7 +14,6 @@
14	#include <__algorithm/move.h>	14	#include <__algorithm/move.h>
15	#include <__config>	15	#include <__config>
16	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
17	#include <__iterator/iter_move.h>
18	#include <__ranges/access.h>	17	#include <__ranges/access.h>
19	#include <__ranges/concepts.h>	18	#include <__ranges/concepts.h>
20	#include <__ranges/dangling.h>	19	#include <__ranges/dangling.h>
...	@@ -24,7 +23,7 @@	...	@@ -24,7 +23,7 @@
24	# pragma GCC system_header	23	# pragma GCC system_header
25	#endif	24	#endif
26		25
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	26	#if _LIBCPP_STD_VER > 17
28		27
29	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
30		29
...	@@ -67,6 +66,6 @@ inline namespace __cpo {	...	@@ -67,6 +66,6 @@ inline namespace __cpo {
67		66
68	_LIBCPP_END_NAMESPACE_STD	67	_LIBCPP_END_NAMESPACE_STD
69		68
70	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	69	#endif // _LIBCPP_STD_VER > 17
71		70
72	#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_H	71	#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_H

lib/libcxx/include/__algorithm/ranges_move_backward.h+6-9

 @@ -10,12 +10,12 @@
 #define _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H
 #include <__algorithm/in_out_result.h>
-#include <__algorithm/ranges_move.h>
+#include <__algorithm/iterator_operations.h>
+#include <__algorithm/move_backward.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/iter_move.h>
 #include <__iterator/next.h>
-#include <__iterator/reverse_iterator.h>
 #include <__ranges/access.h>
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
 @@ -25,7 +25,7 @@
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -40,11 +40,8 @@ struct __fn {
   template <class _InIter, class _Sent, class _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr static
   move_backward_result<_InIter, _OutIter> __move_backward_impl(_InIter __first, _Sent __last, _OutIter __result) {
-    auto __last_iter = ranges::next(__first, std::move(__last));
+    auto __ret = std::__move_backward<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
-    auto __ret = ranges::move(std::make_reverse_iterator(__last_iter),
+    return {std::move(__ret.first), std::move(__ret.second)};
-                              std::make_reverse_iterator(__first),
-                              std::make_reverse_iterator(__result));
-    return {std::move(__last_iter), std::move(__ret.out.base())};
   }
   template <bidirectional_iterator _InIter, sentinel_for<_InIter> _Sent, bidirectional_iterator _OutIter>
 @@ -71,6 +68,6 @@ inline namespace __cpo {
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H

lib/libcxx/include/__algorithm/ranges_next_permutation.h+3-2

 @@ -22,12 +22,13 @@
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -67,6 +68,6 @@ constexpr inline auto next_permutation = __next_permutation::__fn{};
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_NEXT_PERMUTATION_H

lib/libcxx/include/__algorithm/ranges_none_of.h+4-4

lib/libcxx/include/__algorithm/ranges_nth_element.h+2-2

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
35		35
36	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
37		37
...	@@ -75,6 +75,6 @@ inline namespace __cpo {	...	@@ -75,6 +75,6 @@ inline namespace __cpo {
75		75
76	_LIBCPP_END_NAMESPACE_STD	76	_LIBCPP_END_NAMESPACE_STD
77		77
78	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
79		79
80	#endif // _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H	80	#endif // _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H

lib/libcxx/include/__algorithm/ranges_partial_sort.h+3-2

 @@ -27,12 +27,13 @@
 #include <__ranges/dangling.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -72,6 +73,6 @@ inline namespace __cpo {
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_H

lib/libcxx/include/__algorithm/ranges_partial_sort_copy.h+3-2

 @@ -24,12 +24,13 @@
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -86,6 +87,6 @@ inline namespace __cpo {
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H

lib/libcxx/include/__algorithm/ranges_partition.h+4-3

 @@ -26,13 +26,14 @@
 #include <__ranges/subrange.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -43,7 +44,7 @@ struct __fn {
   template <class _Iter, class _Sent, class _Proj, class _Pred>
   _LIBCPP_HIDE_FROM_ABI static constexpr
-  subrange<__uncvref_t<_Iter>> __partition_fn_impl(_Iter&& __first, _Sent&& __last, _Pred&& __pred, _Proj&& __proj) {
+  subrange<__remove_cvref_t<_Iter>> __partition_fn_impl(_Iter&& __first, _Sent&& __last, _Pred&& __pred, _Proj&& __proj) {
     auto&& __projected_pred = std::__make_projected(__pred, __proj);
     auto __result = std::__partition<_RangeAlgPolicy>(
         std::move(__first), std::move(__last), __projected_pred, __iterator_concept<_Iter>());
 @@ -77,6 +78,6 @@ inline namespace __cpo {
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_H

lib/libcxx/include/__algorithm/ranges_partition_copy.h+3-3

...	@@ -26,7 +26,7 @@	...	@@ -26,7 +26,7 @@
26	# pragma GCC system_header	26	# pragma GCC system_header
27	#endif	27	#endif
28		28
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
30		30
31	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
32		32
...	@@ -43,7 +43,7 @@ struct __fn {	...	@@ -43,7 +43,7 @@ struct __fn {
43	template <class _InIter, class _Sent, class _OutIter1, class _OutIter2, class _Proj, class _Pred>	43	template <class _InIter, class _Sent, class _OutIter1, class _OutIter2, class _Proj, class _Pred>
44	_LIBCPP_HIDE_FROM_ABI constexpr	44	_LIBCPP_HIDE_FROM_ABI constexpr
45	static partition_copy_result<	45	static partition_copy_result<
46	__uncvref_t<_InIter>, __uncvref_t<_OutIter1>, __uncvref_t<_OutIter2>	46	__remove_cvref_t<_InIter>, __remove_cvref_t<_OutIter1>, __remove_cvref_t<_OutIter2>
47	> __partition_copy_fn_impl( _InIter&& __first, _Sent&& __last, _OutIter1&& __out_true, _OutIter2&& __out_false,	47	> __partition_copy_fn_impl( _InIter&& __first, _Sent&& __last, _OutIter1&& __out_true, _OutIter2&& __out_false,
48	_Pred& __pred, _Proj& __proj) {	48	_Pred& __pred, _Proj& __proj) {
49	for (; __first != __last; ++__first) {	49	for (; __first != __last; ++__first) {
...	@@ -93,6 +93,6 @@ inline namespace __cpo {	...	@@ -93,6 +93,6 @@ inline namespace __cpo {
93		93
94	_LIBCPP_END_NAMESPACE_STD	94	_LIBCPP_END_NAMESPACE_STD
95		95
96	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	96	#endif // _LIBCPP_STD_VER > 17
97		97
98	#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H	98	#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H

lib/libcxx/include/__algorithm/ranges_partition_point.h+2-2

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	# pragma GCC system_header	27	# pragma GCC system_header
28	#endif	28	#endif
29		29
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
31		31
32	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
33		33
...	@@ -83,6 +83,6 @@ inline namespace __cpo {	...	@@ -83,6 +83,6 @@ inline namespace __cpo {
83		83
84	_LIBCPP_END_NAMESPACE_STD	84	_LIBCPP_END_NAMESPACE_STD
85		85
86	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	86	#endif // _LIBCPP_STD_VER > 17
87		87
88	#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H	88	#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H

lib/libcxx/include/__algorithm/ranges_pop_heap.h+2-2

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32	# pragma GCC system_header	32	# pragma GCC system_header
33	#endif	33	#endif
34		34
35	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
36		36
37	_LIBCPP_BEGIN_NAMESPACE_STD	37	_LIBCPP_BEGIN_NAMESPACE_STD
38		38
...	@@ -76,6 +76,6 @@ inline namespace __cpo {	...	@@ -76,6 +76,6 @@ inline namespace __cpo {
76		76
77	_LIBCPP_END_NAMESPACE_STD	77	_LIBCPP_END_NAMESPACE_STD
78		78
79	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	79	#endif // _LIBCPP_STD_VER > 17
80		80
81	#endif // _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H	81	#endif // _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H

lib/libcxx/include/__algorithm/ranges_prev_permutation.h+3-2

 @@ -22,12 +22,13 @@
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -71,6 +72,6 @@ constexpr inline auto prev_permutation = __prev_permutation::__fn{};
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_PREV_PERMUTATION_H

lib/libcxx/include/__algorithm/ranges_push_heap.h+2-2

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32	# pragma GCC system_header	32	# pragma GCC system_header
33	#endif	33	#endif
34		34
35	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
36		36
37	_LIBCPP_BEGIN_NAMESPACE_STD	37	_LIBCPP_BEGIN_NAMESPACE_STD
38		38
...	@@ -75,6 +75,6 @@ inline namespace __cpo {	...	@@ -75,6 +75,6 @@ inline namespace __cpo {
75		75
76	_LIBCPP_END_NAMESPACE_STD	76	_LIBCPP_END_NAMESPACE_STD
77		77
78	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
79		79
80	#endif // _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H	80	#endif // _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H

lib/libcxx/include/__algorithm/ranges_remove.h+4-4

lib/libcxx/include/__algorithm/ranges_remove_copy.h+2-2

...	@@ -26,7 +26,7 @@	...	@@ -26,7 +26,7 @@
26	# pragma GCC system_header	26	# pragma GCC system_header
27	#endif	27	#endif
28		28
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
30		30
31	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
32		32
...	@@ -71,6 +71,6 @@ inline namespace __cpo {	...	@@ -71,6 +71,6 @@ inline namespace __cpo {
71		71
72	_LIBCPP_END_NAMESPACE_STD	72	_LIBCPP_END_NAMESPACE_STD
73		73
74	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	74	#endif // _LIBCPP_STD_VER > 17
75		75
76	#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H	76	#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H

lib/libcxx/include/__algorithm/ranges_remove_copy_if.h+2-2

...	@@ -29,7 +29,7 @@	...	@@ -29,7 +29,7 @@
29	# pragma GCC system_header	29	# pragma GCC system_header
30	#endif	30	#endif
31		31
32	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	32	#if _LIBCPP_STD_VER > 17
33		33
34	_LIBCPP_BEGIN_NAMESPACE_STD	34	_LIBCPP_BEGIN_NAMESPACE_STD
35		35
...	@@ -85,6 +85,6 @@ inline namespace __cpo {	...	@@ -85,6 +85,6 @@ inline namespace __cpo {
85		85
86	_LIBCPP_END_NAMESPACE_STD	86	_LIBCPP_END_NAMESPACE_STD
87		87
88	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	88	#endif // _LIBCPP_STD_VER > 17
89		89
90	#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H	90	#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H

lib/libcxx/include/__algorithm/ranges_remove_if.h+4-4

lib/libcxx/include/__algorithm/ranges_replace.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined (_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -69,6 +69,6 @@ inline namespace __cpo {	...	@@ -69,6 +69,6 @@ inline namespace __cpo {
69		69
70	_LIBCPP_END_NAMESPACE_STD	70	_LIBCPP_END_NAMESPACE_STD
71		71
72	#endif // _LIBCPP_STD_VER > 17 && !defined (_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	72	#endif // _LIBCPP_STD_VER > 17
73		73
74	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_H	74	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_H

lib/libcxx/include/__algorithm/ranges_replace_copy.h+2-2

...	@@ -26,7 +26,7 @@	...	@@ -26,7 +26,7 @@
26	# pragma GCC system_header	26	# pragma GCC system_header
27	#endif	27	#endif
28		28
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
30		30
31	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
32		32
...	@@ -86,6 +86,6 @@ inline namespace __cpo {	...	@@ -86,6 +86,6 @@ inline namespace __cpo {
86		86
87	_LIBCPP_END_NAMESPACE_STD	87	_LIBCPP_END_NAMESPACE_STD
88		88
89	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	89	#endif // _LIBCPP_STD_VER > 17
90		90
91	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H	91	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H

lib/libcxx/include/__algorithm/ranges_replace_copy_if.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -88,6 +88,6 @@ inline namespace __cpo {	...	@@ -88,6 +88,6 @@ inline namespace __cpo {
88		88
89	_LIBCPP_END_NAMESPACE_STD	89	_LIBCPP_END_NAMESPACE_STD
90		90
91	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	91	#endif // _LIBCPP_STD_VER > 17
92		92
93	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H	93	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H

lib/libcxx/include/__algorithm/ranges_replace_if.h+2-2

...	@@ -23,7 +23,7 @@	...	@@ -23,7 +23,7 @@
23	# pragma GCC system_header	23	# pragma GCC system_header
24	#endif	24	#endif
25		25
26	#if _LIBCPP_STD_VER > 17 && !defined (_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	26	#if _LIBCPP_STD_VER > 17
27		27
28	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
29		29
...	@@ -72,6 +72,6 @@ inline namespace __cpo {	...	@@ -72,6 +72,6 @@ inline namespace __cpo {
72		72
73	_LIBCPP_END_NAMESPACE_STD	73	_LIBCPP_END_NAMESPACE_STD
74		74
75	#endif // _LIBCPP_STD_VER > 17 && !defined (_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	75	#endif // _LIBCPP_STD_VER > 17
76		76
77	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H	77	#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H

lib/libcxx/include/__algorithm/ranges_reverse.h+2-2

...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22	# pragma GCC system_header	22	# pragma GCC system_header
23	#endif	23	#endif
24		24
25	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	25	#if _LIBCPP_STD_VER > 17
26		26
27	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
28		28
...	@@ -78,6 +78,6 @@ inline namespace __cpo {	...	@@ -78,6 +78,6 @@ inline namespace __cpo {
78		78
79	_LIBCPP_END_NAMESPACE_STD	79	_LIBCPP_END_NAMESPACE_STD
80		80
81	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	81	#endif // _LIBCPP_STD_VER > 17
82		82
83	#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_H	83	#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_H

lib/libcxx/include/__algorithm/ranges_reverse_copy.h+2-2

...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	# pragma GCC system_header	25	# pragma GCC system_header
26	#endif	26	#endif
27		27
28	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	28	#if _LIBCPP_STD_VER > 17
29		29
30	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
31		31
...	@@ -62,6 +62,6 @@ inline namespace __cpo {	...	@@ -62,6 +62,6 @@ inline namespace __cpo {
62		62
63	_LIBCPP_END_NAMESPACE_STD	63	_LIBCPP_END_NAMESPACE_STD
64		64
65	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	65	#endif // _LIBCPP_STD_VER > 17
66		66
67	#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H	67	#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H

lib/libcxx/include/__algorithm/ranges_rotate.h+2-2

...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	# pragma GCC system_header	25	# pragma GCC system_header
26	#endif	26	#endif
27		27
28	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	28	#if _LIBCPP_STD_VER > 17
29		29
30	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
31		31
...	@@ -66,6 +66,6 @@ inline namespace __cpo {	...	@@ -66,6 +66,6 @@ inline namespace __cpo {
66		66
67	_LIBCPP_END_NAMESPACE_STD	67	_LIBCPP_END_NAMESPACE_STD
68		68
69	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	69	#endif // _LIBCPP_STD_VER > 17
70		70
71	#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_H	71	#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_H

lib/libcxx/include/__algorithm/ranges_rotate_copy.h+2-2

...	@@ -23,7 +23,7 @@	...	@@ -23,7 +23,7 @@
23	# pragma GCC system_header	23	# pragma GCC system_header
24	#endif	24	#endif
25		25
26	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	26	#if _LIBCPP_STD_VER > 17
27		27
28	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
29		29
...	@@ -63,6 +63,6 @@ inline namespace __cpo {	...	@@ -63,6 +63,6 @@ inline namespace __cpo {
63		63
64	_LIBCPP_END_NAMESPACE_STD	64	_LIBCPP_END_NAMESPACE_STD
65		65
66	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	66	#endif // _LIBCPP_STD_VER > 17
67		67
68	#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H	68	#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H

lib/libcxx/include/__algorithm/ranges_sample.h+2-2

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	# pragma GCC system_header	27	# pragma GCC system_header
28	#endif	28	#endif
29		29
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
31		31
32	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
33		33
...	@@ -69,6 +69,6 @@ inline namespace __cpo {	...	@@ -69,6 +69,6 @@ inline namespace __cpo {
69		69
70	_LIBCPP_END_NAMESPACE_STD	70	_LIBCPP_END_NAMESPACE_STD
71		71
72	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	72	#endif // _LIBCPP_STD_VER > 17
73		73
74	#endif // _LIBCPP___ALGORITHM_RANGES_SAMPLE_H	74	#endif // _LIBCPP___ALGORITHM_RANGES_SAMPLE_H

lib/libcxx/include/__algorithm/ranges_search.h+5-4

...	@@ -22,12 +22,13 @@	...	@@ -22,12 +22,13 @@
22	#include <__ranges/concepts.h>	22	#include <__ranges/concepts.h>
23	#include <__ranges/size.h>	23	#include <__ranges/size.h>
24	#include <__ranges/subrange.h>	24	#include <__ranges/subrange.h>
		25	#include <__utility/pair.h>
25		26
26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
27	# pragma GCC system_header	28	# pragma GCC system_header
28	#endif	29	#endif
29		30
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	31	#if _LIBCPP_STD_VER > 17
31		32
32	_LIBCPP_BEGIN_NAMESPACE_STD	33	_LIBCPP_BEGIN_NAMESPACE_STD
33		34
...	@@ -74,7 +75,7 @@ struct __fn {	...	@@ -74,7 +75,7 @@ struct __fn {
74	class _Proj1 = identity,	75	class _Proj1 = identity,
75	class _Proj2 = identity>	76	class _Proj2 = identity>
76	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>	77	requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
77	_LIBCPP_HIDE_FROM_ABI constexpr	78	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
78	subrange<_Iter1> operator()(_Iter1 __first1, _Sent1 __last1,	79	subrange<_Iter1> operator()(_Iter1 __first1, _Sent1 __last1,
79	_Iter2 __first2, _Sent2 __last2,	80	_Iter2 __first2, _Sent2 __last2,
80	_Pred __pred = {},	81	_Pred __pred = {},
...	@@ -89,7 +90,7 @@ struct __fn {	...	@@ -89,7 +90,7 @@ struct __fn {
89	class _Proj1 = identity,	90	class _Proj1 = identity,
90	class _Proj2 = identity>	91	class _Proj2 = identity>
91	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>	92	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
92	_LIBCPP_HIDE_FROM_ABI constexpr	93	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
93	borrowed_subrange_t<_Range1> operator()(_Range1&& __range1,	94	borrowed_subrange_t<_Range1> operator()(_Range1&& __range1,
94	_Range2&& __range2,	95	_Range2&& __range2,
95	_Pred __pred = {},	96	_Pred __pred = {},
...	@@ -129,6 +130,6 @@ inline namespace __cpo {	...	@@ -129,6 +130,6 @@ inline namespace __cpo {
129		130
130	_LIBCPP_END_NAMESPACE_STD	131	_LIBCPP_END_NAMESPACE_STD
131		132
132	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	133	#endif // _LIBCPP_STD_VER > 17
133		134
134	#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_H	135	#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_H

lib/libcxx/include/__algorithm/ranges_search_n.h+7-10

 @@ -25,12 +25,13 @@
 #include <__ranges/size.h>
 #include <__ranges/subrange.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -52,12 +53,8 @@ struct __fn {
       }
       if constexpr (random_access_iterator<_Iter1>) {
-        auto __ret = __search_n_random_access_impl<_RangeAlgPolicy>(__first, __last,
+        auto __ret = std::__search_n_random_access_impl<_RangeAlgPolicy>(
-                                                                    __count,
+            __first, __last, __count, __value, __pred, __proj, __size);
-                                                                    __value,
-                                                                    __pred,
-                                                                    __proj,
-                                                                    __size);
         return {std::move(__ret.first), std::move(__ret.second)};
       }
     }
 @@ -75,7 +72,7 @@ struct __fn {
             class _Pred = ranges::equal_to,
             class _Proj = identity>
     requires indirectly_comparable<_Iter, const _Type*, _Pred, _Proj>
-  _LIBCPP_HIDE_FROM_ABI constexpr
+  _LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
   subrange<_Iter> operator()(_Iter __first, _Sent __last,
                              iter_difference_t<_Iter> __count,
                              const _Type& __value,
 @@ -86,7 +83,7 @@ struct __fn {
   template <forward_range _Range, class _Type, class _Pred = ranges::equal_to, class _Proj = identity>
     requires indirectly_comparable<iterator_t<_Range>, const _Type*, _Pred, _Proj>
-  _LIBCPP_HIDE_FROM_ABI constexpr
+  _LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
   borrowed_subrange_t<_Range> operator()(_Range&& __range,
                                          range_difference_t<_Range> __count,
                                          const _Type& __value,
 @@ -115,6 +112,6 @@ inline namespace __cpo {
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_N_H

lib/libcxx/include/__algorithm/ranges_set_difference.h+7-5

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H	10	#define _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H
11		11
12	#include <__algorithm/in_out_result.h>	12	#include <__algorithm/in_out_result.h>
		13	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/make_projected.h>	14	#include <__algorithm/make_projected.h>
14	#include <__algorithm/set_difference.h>	15	#include <__algorithm/set_difference.h>
15	#include <__config>	16	#include <__config>
...	@@ -23,12 +24,13 @@	...	@@ -23,12 +24,13 @@
23	#include <__ranges/dangling.h>	24	#include <__ranges/dangling.h>
24	#include <__type_traits/decay.h>	25	#include <__type_traits/decay.h>
25	#include <__utility/move.h>	26	#include <__utility/move.h>
		27	#include <__utility/pair.h>
26		28
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header	30	# pragma GCC system_header
29	#endif	31	#endif
30		32
31	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	33	#if _LIBCPP_STD_VER > 17
32		34
33	_LIBCPP_BEGIN_NAMESPACE_STD	35	_LIBCPP_BEGIN_NAMESPACE_STD
34		36
...	@@ -59,7 +61,7 @@ struct __fn {	...	@@ -59,7 +61,7 @@ struct __fn {
59	_Comp __comp = {},	61	_Comp __comp = {},
60	_Proj1 __proj1 = {},	62	_Proj1 __proj1 = {},
61	_Proj2 __proj2 = {}) const {	63	_Proj2 __proj2 = {}) const {
62	auto __ret = std::__set_difference(	64	auto __ret = std::__set_difference<_RangeAlgPolicy>(
63	__first1, __last1, __first2, __last2, __result, ranges::__make_projected_comp(__comp, __proj1, __proj2));	65	__first1, __last1, __first2, __last2, __result, ranges::__make_projected_comp(__comp, __proj1, __proj2));
64	return {std::move(__ret.first), std::move(__ret.second)};	66	return {std::move(__ret.first), std::move(__ret.second)};
65	}	67	}
...	@@ -71,7 +73,7 @@ struct __fn {	...	@@ -71,7 +73,7 @@ struct __fn {
71	class _Comp = less,	73	class _Comp = less,
72	class _Proj1 = identity,	74	class _Proj1 = identity,
73	class _Proj2 = identity>	75	class _Proj2 = identity>
74	requires mergeable<iterator_t<_Range1>, iterator_t<_Range2>, _OutIter, _Comp, _Proj1, _Proj2>	76	requires mergeable<iterator_t<_Range1>, iterator_t<_Range2>, _OutIter, _Comp, _Proj1, _Proj2>
75	_LIBCPP_HIDE_FROM_ABI constexpr set_difference_result<borrowed_iterator_t<_Range1>, _OutIter>	77	_LIBCPP_HIDE_FROM_ABI constexpr set_difference_result<borrowed_iterator_t<_Range1>, _OutIter>
76	operator()(	78	operator()(
77	_Range1&& __range1,	79	_Range1&& __range1,
...	@@ -80,7 +82,7 @@ struct __fn {	...	@@ -80,7 +82,7 @@ struct __fn {
80	_Comp __comp = {},	82	_Comp __comp = {},
81	_Proj1 __proj1 = {},	83	_Proj1 __proj1 = {},
82	_Proj2 __proj2 = {}) const {	84	_Proj2 __proj2 = {}) const {
83	auto __ret = std::__set_difference(	85	auto __ret = std::__set_difference<_RangeAlgPolicy>(
84	ranges::begin(__range1),	86	ranges::begin(__range1),
85	ranges::end(__range1),	87	ranges::end(__range1),
86	ranges::begin(__range2),	88	ranges::begin(__range2),
...	@@ -100,5 +102,5 @@ inline namespace __cpo {	...	@@ -100,5 +102,5 @@ inline namespace __cpo {
100		102
101	_LIBCPP_END_NAMESPACE_STD	103	_LIBCPP_END_NAMESPACE_STD
102		104
103	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	105	#endif // _LIBCPP_STD_VER > 17
104	#endif // _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H	106	#endif // _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H

lib/libcxx/include/__algorithm/ranges_set_intersection.h+3-3

...	@@ -28,7 +28,7 @@	...	@@ -28,7 +28,7 @@
28	# pragma GCC system_header	28	# pragma GCC system_header
29	#endif	29	#endif
30		30
31	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	31	#if _LIBCPP_STD_VER > 17
32		32
33	_LIBCPP_BEGIN_NAMESPACE_STD	33	_LIBCPP_BEGIN_NAMESPACE_STD
34		34
...	@@ -82,7 +82,7 @@ struct __fn {	...	@@ -82,7 +82,7 @@ struct __fn {
82	_OutIter,	82	_OutIter,
83	_Comp,	83	_Comp,
84	_Proj1,	84	_Proj1,
85	_Proj2>	85	_Proj2>
86	_LIBCPP_HIDE_FROM_ABI constexpr set_intersection_result<borrowed_iterator_t<_Range1>,	86	_LIBCPP_HIDE_FROM_ABI constexpr set_intersection_result<borrowed_iterator_t<_Range1>,
87	borrowed_iterator_t<_Range2>,	87	borrowed_iterator_t<_Range2>,
88	_OutIter>	88	_OutIter>
...	@@ -113,5 +113,5 @@ inline namespace __cpo {	...	@@ -113,5 +113,5 @@ inline namespace __cpo {
113		113
114	_LIBCPP_END_NAMESPACE_STD	114	_LIBCPP_END_NAMESPACE_STD
115		115
116	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	116	#endif // _LIBCPP_STD_VER > 17
117	#endif // _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H	117	#endif // _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H

lib/libcxx/include/__algorithm/ranges_set_symmetric_difference.h+6-5

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H	10	#define _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
11		11
12	#include <__algorithm/in_in_out_result.h>	12	#include <__algorithm/in_in_out_result.h>
		13	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/make_projected.h>	14	#include <__algorithm/make_projected.h>
14	#include <__algorithm/set_symmetric_difference.h>	15	#include <__algorithm/set_symmetric_difference.h>
15	#include <__config>	16	#include <__config>
...	@@ -27,7 +28,7 @@	...	@@ -27,7 +28,7 @@
27	# pragma GCC system_header	28	# pragma GCC system_header
28	#endif	29	#endif
29		30
30	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	31	#if _LIBCPP_STD_VER > 17
31		32
32	_LIBCPP_BEGIN_NAMESPACE_STD	33	_LIBCPP_BEGIN_NAMESPACE_STD
33		34
...	@@ -58,7 +59,7 @@ struct __fn {	...	@@ -58,7 +59,7 @@ struct __fn {
58	_Comp __comp = {},	59	_Comp __comp = {},
59	_Proj1 __proj1 = {},	60	_Proj1 __proj1 = {},
60	_Proj2 __proj2 = {}) const {	61	_Proj2 __proj2 = {}) const {
61	auto __ret = std::__set_symmetric_difference(	62	auto __ret = std::__set_symmetric_difference<_RangeAlgPolicy>(
62	std::move(__first1),	63	std::move(__first1),
63	std::move(__last1),	64	std::move(__last1),
64	std::move(__first2),	65	std::move(__first2),
...	@@ -81,7 +82,7 @@ struct __fn {	...	@@ -81,7 +82,7 @@ struct __fn {
81	_OutIter,	82	_OutIter,
82	_Comp,	83	_Comp,
83	_Proj1,	84	_Proj1,
84	_Proj2>	85	_Proj2>
85	_LIBCPP_HIDE_FROM_ABI constexpr set_symmetric_difference_result<borrowed_iterator_t<_Range1>,	86	_LIBCPP_HIDE_FROM_ABI constexpr set_symmetric_difference_result<borrowed_iterator_t<_Range1>,
86	borrowed_iterator_t<_Range2>,	87	borrowed_iterator_t<_Range2>,
87	_OutIter>	88	_OutIter>
...	@@ -92,7 +93,7 @@ struct __fn {	...	@@ -92,7 +93,7 @@ struct __fn {
92	_Comp __comp = {},	93	_Comp __comp = {},
93	_Proj1 __proj1 = {},	94	_Proj1 __proj1 = {},
94	_Proj2 __proj2 = {}) const {	95	_Proj2 __proj2 = {}) const {
95	auto __ret = std::__set_symmetric_difference(	96	auto __ret = std::__set_symmetric_difference<_RangeAlgPolicy>(
96	ranges::begin(__range1),	97	ranges::begin(__range1),
97	ranges::end(__range1),	98	ranges::end(__range1),
98	ranges::begin(__range2),	99	ranges::begin(__range2),
...	@@ -112,5 +113,5 @@ inline namespace __cpo {	...	@@ -112,5 +113,5 @@ inline namespace __cpo {
112		113
113	_LIBCPP_END_NAMESPACE_STD	114	_LIBCPP_END_NAMESPACE_STD
114		115
115	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	116	#endif // _LIBCPP_STD_VER > 17
116	#endif // _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H	117	#endif // _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H

lib/libcxx/include/__algorithm/ranges_set_union.h+6-5

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___ALGORITHM_RANGES_SET_UNION_H	10	#define _LIBCPP___ALGORITHM_RANGES_SET_UNION_H
11		11
12	#include <__algorithm/in_in_out_result.h>	12	#include <__algorithm/in_in_out_result.h>
		13	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/make_projected.h>	14	#include <__algorithm/make_projected.h>
14	#include <__algorithm/set_union.h>	15	#include <__algorithm/set_union.h>
15	#include <__config>	16	#include <__config>
...	@@ -30,7 +31,7 @@	...	@@ -30,7 +31,7 @@
30	# pragma GCC system_header	31	# pragma GCC system_header
31	#endif	32	#endif
32		33
33	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
34		35
35	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
36		37
...	@@ -61,7 +62,7 @@ struct __fn {	...	@@ -61,7 +62,7 @@ struct __fn {
61	_Comp __comp = {},	62	_Comp __comp = {},
62	_Proj1 __proj1 = {},	63	_Proj1 __proj1 = {},
63	_Proj2 __proj2 = {}) const {	64	_Proj2 __proj2 = {}) const {
64	auto __ret = std::__set_union(	65	auto __ret = std::__set_union<_RangeAlgPolicy>(
65	std::move(__first1),	66	std::move(__first1),
66	std::move(__last1),	67	std::move(__last1),
67	std::move(__first2),	68	std::move(__first2),
...	@@ -84,7 +85,7 @@ struct __fn {	...	@@ -84,7 +85,7 @@ struct __fn {
84	_OutIter,	85	_OutIter,
85	_Comp,	86	_Comp,
86	_Proj1,	87	_Proj1,
87	_Proj2>	88	_Proj2>
88	_LIBCPP_HIDE_FROM_ABI constexpr set_union_result<borrowed_iterator_t<_Range1>,	89	_LIBCPP_HIDE_FROM_ABI constexpr set_union_result<borrowed_iterator_t<_Range1>,
89	borrowed_iterator_t<_Range2>,	90	borrowed_iterator_t<_Range2>,
90	_OutIter>	91	_OutIter>
...	@@ -95,7 +96,7 @@ struct __fn {	...	@@ -95,7 +96,7 @@ struct __fn {
95	_Comp __comp = {},	96	_Comp __comp = {},
96	_Proj1 __proj1 = {},	97	_Proj1 __proj1 = {},
97	_Proj2 __proj2 = {}) const {	98	_Proj2 __proj2 = {}) const {
98	auto __ret = std::__set_union(	99	auto __ret = std::__set_union<_RangeAlgPolicy>(
99	ranges::begin(__range1),	100	ranges::begin(__range1),
100	ranges::end(__range1),	101	ranges::end(__range1),
101	ranges::begin(__range2),	102	ranges::begin(__range2),
...	@@ -115,6 +116,6 @@ inline namespace __cpo {	...	@@ -115,6 +116,6 @@ inline namespace __cpo {
115		116
116	_LIBCPP_END_NAMESPACE_STD	117	_LIBCPP_END_NAMESPACE_STD
117		118
118	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	119	#endif // _LIBCPP_STD_VER > 17
119		120
120	#endif // _LIBCPP___ALGORITHM_RANGES_SET_UNION_H	121	#endif // _LIBCPP___ALGORITHM_RANGES_SET_UNION_H

lib/libcxx/include/__algorithm/ranges_shuffle.h+2-2

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
35		35
36	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
37		37
...	@@ -66,6 +66,6 @@ inline namespace __cpo {	...	@@ -66,6 +66,6 @@ inline namespace __cpo {
66		66
67	_LIBCPP_END_NAMESPACE_STD	67	_LIBCPP_END_NAMESPACE_STD
68		68
69	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	69	#endif // _LIBCPP_STD_VER > 17
70		70
71	#endif // _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H	71	#endif // _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H

lib/libcxx/include/__algorithm/ranges_sort.h+2-2

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
35		35
36	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
37		37
...	@@ -74,6 +74,6 @@ inline namespace __cpo {	...	@@ -74,6 +74,6 @@ inline namespace __cpo {
74		74
75	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
76		76
77	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	77	#endif // _LIBCPP_STD_VER > 17
78		78
79	#endif // _LIBCPP___ALGORITHM_RANGES_SORT_H	79	#endif // _LIBCPP___ALGORITHM_RANGES_SORT_H

lib/libcxx/include/__algorithm/ranges_sort_heap.h+2-2

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32	# pragma GCC system_header	32	# pragma GCC system_header
33	#endif	33	#endif
34		34
35	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
36		36
37	_LIBCPP_BEGIN_NAMESPACE_STD	37	_LIBCPP_BEGIN_NAMESPACE_STD
38		38
...	@@ -75,6 +75,6 @@ inline namespace __cpo {	...	@@ -75,6 +75,6 @@ inline namespace __cpo {
75		75
76	_LIBCPP_END_NAMESPACE_STD	76	_LIBCPP_END_NAMESPACE_STD
77		77
78	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
79		79
80	#endif // _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H	80	#endif // _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H

lib/libcxx/include/__algorithm/ranges_stable_partition.h+3-3

...	@@ -34,7 +34,7 @@	...	@@ -34,7 +34,7 @@
34	# pragma GCC system_header	34	# pragma GCC system_header
35	#endif	35	#endif
36		36
37	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	37	#if _LIBCPP_STD_VER > 17
38		38
39	_LIBCPP_BEGIN_NAMESPACE_STD	39	_LIBCPP_BEGIN_NAMESPACE_STD
40		40
...	@@ -45,7 +45,7 @@ struct __fn {	...	@@ -45,7 +45,7 @@ struct __fn {
45		45
46	template <class _Iter, class _Sent, class _Proj, class _Pred>	46	template <class _Iter, class _Sent, class _Proj, class _Pred>
47	_LIBCPP_HIDE_FROM_ABI static	47	_LIBCPP_HIDE_FROM_ABI static
48	subrange<__uncvref_t<_Iter>> __stable_partition_fn_impl(	48	subrange<__remove_cvref_t<_Iter>> __stable_partition_fn_impl(
49	_Iter&& __first, _Sent&& __last, _Pred&& __pred, _Proj&& __proj) {	49	_Iter&& __first, _Sent&& __last, _Pred&& __pred, _Proj&& __proj) {
50	auto __last_iter = ranges::next(__first, __last);	50	auto __last_iter = ranges::next(__first, __last);
51		51
...	@@ -83,6 +83,6 @@ inline namespace __cpo {	...	@@ -83,6 +83,6 @@ inline namespace __cpo {
83		83
84	_LIBCPP_END_NAMESPACE_STD	84	_LIBCPP_END_NAMESPACE_STD
85		85
86	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	86	#endif // _LIBCPP_STD_VER > 17
87		87
88	#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H	88	#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H

lib/libcxx/include/__algorithm/ranges_stable_sort.h+2-2

...	@@ -31,7 +31,7 @@	...	@@ -31,7 +31,7 @@
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
35		35
36	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
37		37
...	@@ -74,6 +74,6 @@ inline namespace __cpo {	...	@@ -74,6 +74,6 @@ inline namespace __cpo {
74		74
75	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
76		76
77	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	77	#endif // _LIBCPP_STD_VER > 17
78		78
79	#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H	79	#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H

lib/libcxx/include/__algorithm/ranges_swap_ranges.h+2-2

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
...	@@ -63,6 +63,6 @@ inline namespace __cpo {	...	@@ -63,6 +63,6 @@ inline namespace __cpo {
63		63
64	_LIBCPP_END_NAMESPACE_STD	64	_LIBCPP_END_NAMESPACE_STD
65		65
66	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	66	#endif // _LIBCPP_STD_VER > 17
67		67
68	#endif // _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H	68	#endif // _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H

lib/libcxx/include/__algorithm/ranges_transform.h+2-2

...	@@ -26,7 +26,7 @@	...	@@ -26,7 +26,7 @@
26	# pragma GCC system_header	26	# pragma GCC system_header
27	#endif	27	#endif
28		28
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
30		30
31	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
32		32
...	@@ -165,6 +165,6 @@ inline namespace __cpo {	...	@@ -165,6 +165,6 @@ inline namespace __cpo {
165		165
166	_LIBCPP_END_NAMESPACE_STD	166	_LIBCPP_END_NAMESPACE_STD
167		167
168	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	168	#endif // _LIBCPP_STD_VER > 17
169		169
170	#endif // _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H	170	#endif // _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H

lib/libcxx/include/__algorithm/ranges_unique.h+5-4

...	@@ -26,12 +26,13 @@	...	@@ -26,12 +26,13 @@
26	#include <__ranges/subrange.h>	26	#include <__ranges/subrange.h>
27	#include <__utility/forward.h>	27	#include <__utility/forward.h>
28	#include <__utility/move.h>	28	#include <__utility/move.h>
		29	#include <__utility/pair.h>
29		30
30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	31	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
31	# pragma GCC system_header	32	# pragma GCC system_header
32	#endif	33	#endif
33		34
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
35		36
36	_LIBCPP_BEGIN_NAMESPACE_STD	37	_LIBCPP_BEGIN_NAMESPACE_STD
37		38
...	@@ -44,7 +45,7 @@ namespace __unique {	...	@@ -44,7 +45,7 @@ namespace __unique {
44	sentinel_for<_Iter> _Sent,	45	sentinel_for<_Iter> _Sent,
45	class _Proj = identity,	46	class _Proj = identity,
46	indirect_equivalence_relation<projected<_Iter, _Proj>> _Comp = ranges::equal_to>	47	indirect_equivalence_relation<projected<_Iter, _Proj>> _Comp = ranges::equal_to>
47	_LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>	48	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>
48	operator()(_Iter __first, _Sent __last, _Comp __comp = {}, _Proj __proj = {}) const {	49	operator()(_Iter __first, _Sent __last, _Comp __comp = {}, _Proj __proj = {}) const {
49	auto __ret = std::__unique<_RangeAlgPolicy>(	50	auto __ret = std::__unique<_RangeAlgPolicy>(
50	std::move(__first), std::move(__last), std::__make_projected(__comp, __proj));	51	std::move(__first), std::move(__last), std::__make_projected(__comp, __proj));
...	@@ -56,7 +57,7 @@ namespace __unique {	...	@@ -56,7 +57,7 @@ namespace __unique {
56	class _Proj = identity,	57	class _Proj = identity,
57	indirect_equivalence_relation<projected<iterator_t<_Range>, _Proj>> _Comp = ranges::equal_to>	58	indirect_equivalence_relation<projected<iterator_t<_Range>, _Proj>> _Comp = ranges::equal_to>
58	requires permutable<iterator_t<_Range>>	59	requires permutable<iterator_t<_Range>>
59	_LIBCPP_HIDE_FROM_ABI constexpr borrowed_subrange_t<_Range>	60	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr borrowed_subrange_t<_Range>
60	operator()(_Range&& __range, _Comp __comp = {}, _Proj __proj = {}) const {	61	operator()(_Range&& __range, _Comp __comp = {}, _Proj __proj = {}) const {
61	auto __ret = std::__unique<_RangeAlgPolicy>(	62	auto __ret = std::__unique<_RangeAlgPolicy>(
62	ranges::begin(__range), ranges::end(__range), std::__make_projected(__comp, __proj));	63	ranges::begin(__range), ranges::end(__range), std::__make_projected(__comp, __proj));
...	@@ -73,6 +74,6 @@ inline namespace __cpo {	...	@@ -73,6 +74,6 @@ inline namespace __cpo {
73		74
74	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
75		76
76	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	77	#endif // _LIBCPP_STD_VER > 17
77		78
78	#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_H	79	#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_H

lib/libcxx/include/__algorithm/ranges_unique_copy.h+3-2

 @@ -27,12 +27,13 @@
 #include <__ranges/dangling.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -110,6 +111,6 @@ inline constexpr auto unique_copy = __unique_copy::__fn{};
 _LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 #endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_COPY_H

lib/libcxx/include/__algorithm/ranges_upper_bound.h+4-4

lib/libcxx/include/__algorithm/remove.h+1-1

...	@@ -21,7 +21,7 @@	...	@@ -21,7 +21,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	template <class _ForwardIterator, class _Tp>	23	template <class _ForwardIterator, class _Tp>
24	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	24	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
25	remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)	25	remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
26	{	26	{
27	__first = _VSTD::find(__first, __last, __value);	27	__first = _VSTD::find(__first, __last, __value);

lib/libcxx/include/__algorithm/remove_copy.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _OutputIterator, class _Tp>	20	template <class _InputIterator, class _OutputIterator, class _Tp>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	remove_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, const _Tp& __value)	23	remove_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, const _Tp& __value)
24	{	24	{

lib/libcxx/include/__algorithm/remove_copy_if.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _OutputIterator, class _Predicate>	20	template <class _InputIterator, class _OutputIterator, class _Predicate>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred)	23	remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred)
24	{	24	{

lib/libcxx/include/__algorithm/remove_if.h+1-1

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _ForwardIterator, class _Predicate>	22	template <class _ForwardIterator, class _Predicate>
23	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	23	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
24	remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)	24	remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
25	{	25	{
26	__first = _VSTD::find_if<_ForwardIterator, _Predicate&>(__first, __last, __pred);	26	__first = _VSTD::find_if<_ForwardIterator, _Predicate&>(__first, __last, __pred);

lib/libcxx/include/__algorithm/replace.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _ForwardIterator, class _Tp>	20	template <class _ForwardIterator, class _Tp>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	void	22	void
23	replace(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value)	23	replace(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value)
24	{	24	{

lib/libcxx/include/__algorithm/replace_copy.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _OutputIterator, class _Tp>	20	template <class _InputIterator, class _OutputIterator, class _Tp>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	replace_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result,	23	replace_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
24	const _Tp& __old_value, const _Tp& __new_value)	24	const _Tp& __old_value, const _Tp& __new_value)

lib/libcxx/include/__algorithm/replace_copy_if.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _OutputIterator, class _Predicate, class _Tp>	20	template <class _InputIterator, class _OutputIterator, class _Predicate, class _Tp>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	replace_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result,	23	replace_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
24	_Predicate __pred, const _Tp& __new_value)	24	_Predicate __pred, const _Tp& __new_value)

lib/libcxx/include/__algorithm/replace_if.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _ForwardIterator, class _Predicate, class _Tp>	20	template <class _ForwardIterator, class _Predicate, class _Tp>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	void	22	void
23	replace_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, const _Tp& __new_value)	23	replace_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, const _Tp& __new_value)
24	{	24	{

lib/libcxx/include/__algorithm/reverse.h+4-4

lib/libcxx/include/__algorithm/reverse_copy.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _BidirectionalIterator, class _OutputIterator>	20	template <class _BidirectionalIterator, class _OutputIterator>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)	23	reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
24	{	24	{

lib/libcxx/include/__algorithm/rotate.h+11-11

lib/libcxx/include/__algorithm/rotate_copy.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _ForwardIterator, class _OutputIterator>	21	template <class _ForwardIterator, class _OutputIterator>
22	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	22	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
23	_OutputIterator	23	_OutputIterator
24	rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _OutputIterator __result)	24	rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _OutputIterator __result)
25	{	25	{

lib/libcxx/include/__algorithm/search.h+8-10

...	@@ -33,7 +33,7 @@ template <class _AlgPolicy,	...	@@ -33,7 +33,7 @@ template <class _AlgPolicy,
33	class _Pred,	33	class _Pred,
34	class _Proj1,	34	class _Proj1,
35	class _Proj2>	35	class _Proj2>
36	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	36	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
37	pair<_Iter1, _Iter1> __search_forward_impl(_Iter1 __first1, _Sent1 __last1,	37	pair<_Iter1, _Iter1> __search_forward_impl(_Iter1 __first1, _Sent1 __last1,
38	_Iter2 __first2, _Sent2 __last2,	38	_Iter2 __first2, _Sent2 __last2,
39	_Pred& __pred,	39	_Pred& __pred,
...	@@ -80,7 +80,7 @@ template <class _AlgPolicy,	...	@@ -80,7 +80,7 @@ template <class _AlgPolicy,
80	class _Proj2,	80	class _Proj2,
81	class _DiffT1,	81	class _DiffT1,
82	class _DiffT2>	82	class _DiffT2>
83	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	83	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
84	pair<_Iter1, _Iter1> __search_random_access_impl(_Iter1 __first1, _Sent1 __last1,	84	pair<_Iter1, _Iter1> __search_random_access_impl(_Iter1 __first1, _Sent1 __last1,
85	_Iter2 __first2, _Sent2 __last2,	85	_Iter2 __first2, _Sent2 __last2,
86	_Pred& __pred,	86	_Pred& __pred,
...	@@ -120,7 +120,7 @@ template <class _Iter1, class _Sent1,	...	@@ -120,7 +120,7 @@ template <class _Iter1, class _Sent1,
120	class _Pred,	120	class _Pred,
121	class _Proj1,	121	class _Proj1,
122	class _Proj2>	122	class _Proj2>
123	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	123	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
124	pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,	124	pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,
125	_Iter2 __first2, _Sent2 __last2,	125	_Iter2 __first2, _Sent2 __last2,
126	_Pred& __pred,	126	_Pred& __pred,
...	@@ -152,7 +152,7 @@ template <class _Iter1, class _Sent1,	...	@@ -152,7 +152,7 @@ template <class _Iter1, class _Sent1,
152	class _Pred,	152	class _Pred,
153	class _Proj1,	153	class _Proj1,
154	class _Proj2>	154	class _Proj2>
155	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	155	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
156	pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,	156	pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,
157	_Iter2 __first2, _Sent2 __last2,	157	_Iter2 __first2, _Sent2 __last2,
158	_Pred& __pred,	158	_Pred& __pred,
...	@@ -170,7 +170,7 @@ pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,	...	@@ -170,7 +170,7 @@ pair<_Iter1, _Iter1> __search_impl(_Iter1 __first1, _Sent1 __last1,
170	}	170	}
171		171
172	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	172	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
173	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	173	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
174	_ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	174	_ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
175	_ForwardIterator2 __first2, _ForwardIterator2 __last2,	175	_ForwardIterator2 __first2, _ForwardIterator2 __last2,
176	_BinaryPredicate __pred) {	176	_BinaryPredicate __pred) {
...	@@ -181,17 +181,15 @@ _ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -181,17 +181,15 @@ _ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
181	}	181	}
182		182
183	template <class _ForwardIterator1, class _ForwardIterator2>	183	template <class _ForwardIterator1, class _ForwardIterator2>
184	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	184	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
185	_ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	185	_ForwardIterator1 search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
186	_ForwardIterator2 __first2, _ForwardIterator2 __last2) {	186	_ForwardIterator2 __first2, _ForwardIterator2 __last2) {
187	using __v1 = typename iterator_traits<_ForwardIterator1>::value_type;	187	return std::search(__first1, __last1, __first2, __last2, __equal_to());
188	using __v2 = typename iterator_traits<_ForwardIterator2>::value_type;
189	return std::search(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
190	}	188	}
191		189
192	#if _LIBCPP_STD_VER > 14	190	#if _LIBCPP_STD_VER > 14
193	template <class _ForwardIterator, class _Searcher>	191	template <class _ForwardIterator, class _Searcher>
194	_LIBCPP_NODISCARD_EXT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	192	_LIBCPP_NODISCARD_EXT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
195	search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher& __s) {	193	search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher& __s) {
196	return __s(__f, __l).first;	194	return __s(__f, __l).first;
197	}	195	}

lib/libcxx/include/__algorithm/search_n.h+8-8

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#include <__iterator/distance.h>	19	#include <__iterator/distance.h>
20	#include <__iterator/iterator_traits.h>	20	#include <__iterator/iterator_traits.h>
21	#include <__ranges/concepts.h>	21	#include <__ranges/concepts.h>
		22	#include <__utility/convert_to_integral.h>
22	#include <__utility/pair.h>	23	#include <__utility/pair.h>
23	#include <type_traits> // __convert_to_integral	24	#include <type_traits> // __convert_to_integral
24		25
...	@@ -29,7 +30,7 @@	...	@@ -29,7 +30,7 @@
29	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
30		31
31	template <class _AlgPolicy, class _Pred, class _Iter, class _Sent, class _SizeT, class _Type, class _Proj>	32	template <class _AlgPolicy, class _Pred, class _Iter, class _Sent, class _SizeT, class _Type, class _Proj>
32	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	33	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
33	pair<_Iter, _Iter> __search_n_forward_impl(_Iter __first, _Sent __last,	34	pair<_Iter, _Iter> __search_n_forward_impl(_Iter __first, _Sent __last,
34	_SizeT __count,	35	_SizeT __count,
35	const _Type& __value,	36	const _Type& __value,
...	@@ -71,7 +72,7 @@ pair<_Iter, _Iter> __search_n_forward_impl(_Iter __first, _Sent __last,	...	@@ -71,7 +72,7 @@ pair<_Iter, _Iter> __search_n_forward_impl(_Iter __first, _Sent __last,
71	}	72	}
72		73
73	template <class _AlgPolicy, class _Pred, class _Iter, class _Sent, class _SizeT, class _Type, class _Proj, class _DiffT>	74	template <class _AlgPolicy, class _Pred, class _Iter, class _Sent, class _SizeT, class _Type, class _Proj, class _DiffT>
74	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	75	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
75	std::pair<_Iter, _Iter> __search_n_random_access_impl(_Iter __first, _Sent __last,	76	std::pair<_Iter, _Iter> __search_n_random_access_impl(_Iter __first, _Sent __last,
76	_SizeT __count,	77	_SizeT __count,
77	const _Type& __value,	78	const _Type& __value,
...	@@ -122,7 +123,7 @@ template <class _Iter, class _Sent,	...	@@ -122,7 +123,7 @@ template <class _Iter, class _Sent,
122	class _Type,	123	class _Type,
123	class _Pred,	124	class _Pred,
124	class _Proj>	125	class _Proj>
125	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	126	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
126	pair<_Iter, _Iter> __search_n_impl(_Iter __first, _Sent __last,	127	pair<_Iter, _Iter> __search_n_impl(_Iter __first, _Sent __last,
127	_DiffT __count,	128	_DiffT __count,
128	const _Type& __value,	129	const _Type& __value,
...	@@ -142,7 +143,7 @@ template <class _Iter1, class _Sent1,	...	@@ -142,7 +143,7 @@ template <class _Iter1, class _Sent1,
142	class _Type,	143	class _Type,
143	class _Pred,	144	class _Pred,
144	class _Proj>	145	class _Proj>
145	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	146	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
146	pair<_Iter1, _Iter1> __search_n_impl(_Iter1 __first, _Sent1 __last,	147	pair<_Iter1, _Iter1> __search_n_impl(_Iter1 __first, _Sent1 __last,
147	_DiffT __count,	148	_DiffT __count,
148	const _Type& __value,	149	const _Type& __value,
...	@@ -158,7 +159,7 @@ pair<_Iter1, _Iter1> __search_n_impl(_Iter1 __first, _Sent1 __last,	...	@@ -158,7 +159,7 @@ pair<_Iter1, _Iter1> __search_n_impl(_Iter1 __first, _Sent1 __last,
158	}	159	}
159		160
160	template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>	161	template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
161	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	162	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
162	_ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last,	163	_ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last,
163	_Size __count,	164	_Size __count,
164	const _Tp& __value,	165	const _Tp& __value,
...	@@ -170,10 +171,9 @@ _ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last,	...	@@ -170,10 +171,9 @@ _ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last,
170	}	171	}
171		172
172	template <class _ForwardIterator, class _Size, class _Tp>	173	template <class _ForwardIterator, class _Size, class _Tp>
173	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	174	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
174	_ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value) {	175	_ForwardIterator search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value) {
175	typedef typename iterator_traits<_ForwardIterator>::value_type __v;	176	return std::search_n(__first, __last, std::__convert_to_integral(__count), __value, __equal_to());
176	return std::search_n(__first, __last, std::__convert_to_integral(__count), __value, __equal_to<__v, _Tp>());
177	}	177	}
178		178
179	_LIBCPP_END_NAMESPACE_STD	179	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/set_difference.h+10-8

 @@ -12,6 +12,7 @@
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
 #include <__algorithm/copy.h>
+#include <__algorithm/iterator_operations.h>
 #include <__config>
 #include <__functional/identity.h>
 #include <__functional/invoke.h>
 @@ -26,8 +27,8 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template < class _Comp, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
+template <class _AlgPolicy, class _Comp, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 pair<__uncvref_t<_InIter1>, __uncvref_t<_OutIter> >
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__remove_cvref_t<_InIter1>, __remove_cvref_t<_OutIter> >
 __set_difference(
     _InIter1&& __first1, _Sent1&& __last1, _InIter2&& __first2, _Sent2&& __last2, _OutIter&& __result, _Comp&& __comp) {
   while (__first1 != __last1 && __first2 != __last2) {
 @@ -42,29 +43,30 @@ __set_difference(
       ++__first2;
     }
   }
-  return std::__copy(std::move(__first1), std::move(__last1), std::move(__result));
+  return std::__copy<_AlgPolicy>(std::move(__first1), std::move(__last1), std::move(__result));
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_difference(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_difference(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
     _InputIterator2 __last2,
     _OutputIterator __result,
     _Compare __comp) {
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+  return std::__set_difference<_ClassicAlgPolicy, __comp_ref_type<_Compare> >(
-  return std::__set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp).second;
+      __first1, __last1, __first2, __last2, __result, __comp)
+      .second;
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_difference(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_difference(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
     _InputIterator2 __last2,
     _OutputIterator __result) {
-  return std::__set_difference(
+  return std::__set_difference<_ClassicAlgPolicy>(
       __first1,
       __last1,
       __first2,

lib/libcxx/include/__algorithm/set_intersection.h+5-6

 @@ -30,13 +30,13 @@ struct __set_intersection_result {
   _OutIter __out_;
   // need a constructor as C++03 aggregate init is hard
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
   __set_intersection_result(_InIter1&& __in_iter1, _InIter2&& __in_iter2, _OutIter&& __out_iter)
       : __in1_(std::move(__in_iter1)), __in2_(std::move(__in_iter2)), __out_(std::move(__out_iter)) {}
 };
 template <class _AlgPolicy, class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 __set_intersection_result<_InIter1, _InIter2, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_intersection_result<_InIter1, _InIter2, _OutIter>
 __set_intersection(
     _InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Sent2 __last2, _OutIter __result, _Compare&& __comp) {
   while (__first1 != __last1 && __first2 != __last2) {
 @@ -59,15 +59,14 @@ __set_intersection(
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_intersection(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_intersection(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
     _InputIterator2 __last2,
     _OutputIterator __result,
     _Compare __comp) {
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+  return std::__set_intersection<_ClassicAlgPolicy, __comp_ref_type<_Compare> >(
-  return std::__set_intersection<_ClassicAlgPolicy, _Comp_ref>(
              std::move(__first1),
              std::move(__last1),
              std::move(__first2),
 @@ -78,7 +77,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_i
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_intersection(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_intersection(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,

lib/libcxx/include/__algorithm/set_symmetric_difference.h+10-9

 @@ -12,9 +12,11 @@
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
 #include <__algorithm/copy.h>
+#include <__algorithm/iterator_operations.h>
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -29,18 +31,18 @@ struct __set_symmetric_difference_result {
   _OutIter __out_;
   // need a constructor as C++03 aggregate init is hard
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
   __set_symmetric_difference_result(_InIter1&& __in_iter1, _InIter2&& __in_iter2, _OutIter&& __out_iter)
       : __in1_(std::move(__in_iter1)), __in2_(std::move(__in_iter2)), __out_(std::move(__out_iter)) {}
 };
-template <class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
+template <class _AlgPolicy, class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>
 __set_symmetric_difference(
     _InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Sent2 __last2, _OutIter __result, _Compare&& __comp) {
   while (__first1 != __last1) {
     if (__first2 == __last2) {
-      auto __ret1 = std::__copy_impl(std::move(__first1), std::move(__last1), std::move(__result));
+      auto __ret1 = std::__copy<_AlgPolicy>(std::move(__first1), std::move(__last1), std::move(__result));
       return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(
           std::move(__ret1.first), std::move(__first2), std::move((__ret1.second)));
     }
 @@ -58,21 +60,20 @@ __set_symmetric_difference(
       ++__first2;
     }
   }
-  auto __ret2 = std::__copy_impl(std::move(__first2), std::move(__last2), std::move(__result));
+  auto __ret2 = std::__copy<_AlgPolicy>(std::move(__first2), std::move(__last2), std::move(__result));
   return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(
       std::move(__first1), std::move(__ret2.first), std::move((__ret2.second)));
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_symmetric_difference(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_symmetric_difference(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
     _InputIterator2 __last2,
     _OutputIterator __result,
     _Compare __comp) {
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+  return std::__set_symmetric_difference<_ClassicAlgPolicy, __comp_ref_type<_Compare> >(
-  return std::__set_symmetric_difference<_Comp_ref>(
              std::move(__first1),
              std::move(__last1),
              std::move(__first2),
 @@ -83,7 +84,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_symmetri
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_symmetric_difference(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_symmetric_difference(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,

lib/libcxx/include/__algorithm/set_union.h+10-9

 @@ -12,9 +12,11 @@
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
 #include <__algorithm/copy.h>
+#include <__algorithm/iterator_operations.h>
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -29,17 +31,17 @@ struct __set_union_result {
   _OutIter __out_;
   // need a constructor as C++03 aggregate init is hard
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
   __set_union_result(_InIter1&& __in_iter1, _InIter2&& __in_iter2, _OutIter&& __out_iter)
       : __in1_(std::move(__in_iter1)), __in2_(std::move(__in_iter2)), __out_(std::move(__out_iter)) {}
 };
-template <class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
+template <class _AlgPolicy, class _Compare, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 __set_union_result<_InIter1, _InIter2, _OutIter> __set_union(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_union_result<_InIter1, _InIter2, _OutIter> __set_union(
     _InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Sent2 __last2, _OutIter __result, _Compare&& __comp) {
   for (; __first1 != __last1; ++__result) {
     if (__first2 == __last2) {
-      auto __ret1 = std::__copy_impl(std::move(__first1), std::move(__last1), std::move(__result));
+      auto __ret1 = std::__copy<_AlgPolicy>(std::move(__first1), std::move(__last1), std::move(__result));
       return __set_union_result<_InIter1, _InIter2, _OutIter>(
           std::move(__ret1.first), std::move(__first2), std::move((__ret1.second)));
     }
 @@ -54,21 +56,20 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 __set_union_result<_InIter1,
       ++__first1;
     }
   }
-  auto __ret2 = std::__copy_impl(std::move(__first2), std::move(__last2), std::move(__result));
+  auto __ret2 = std::__copy<_AlgPolicy>(std::move(__first2), std::move(__last2), std::move(__result));
   return __set_union_result<_InIter1, _InIter2, _OutIter>(
       std::move(__first1), std::move(__ret2.first), std::move((__ret2.second)));
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_union(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_union(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
     _InputIterator2 __last2,
     _OutputIterator __result,
     _Compare __comp) {
-  typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+  return std::__set_union<_ClassicAlgPolicy, __comp_ref_type<_Compare> >(
-  return std::__set_union<_Comp_ref>(
              std::move(__first1),
              std::move(__last1),
              std::move(__first2),
 @@ -79,7 +80,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_union(
 }
 template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator set_union(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_union(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,

lib/libcxx/include/__algorithm/shuffle.h+13-12

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include <__random/uniform_int_distribution.h>	16	#include <__random/uniform_int_distribution.h>
17	#include <__utility/forward.h>	17	#include <__utility/forward.h>
18	#include <__utility/move.h>	18	#include <__utility/move.h>
		19	#include <__utility/swap.h>
19	#include <cstddef>	20	#include <cstddef>
20	#include <cstdint>	21	#include <cstdint>
21		22
...	@@ -31,9 +32,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -31,9 +32,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
31	class _LIBCPP_TYPE_VIS __libcpp_debug_randomizer {	32	class _LIBCPP_TYPE_VIS __libcpp_debug_randomizer {
32	public:	33	public:
33	__libcpp_debug_randomizer() {	34	__libcpp_debug_randomizer() {
34	__state = __seed();	35	__state_ = __seed();
35	__inc = __state + 0xda3e39cb94b95bdbULL;	36	__inc_ = __state_ + 0xda3e39cb94b95bdbULL;
36	__inc = (__inc << 1) \| 1;	37	__inc_ = (__inc_ << 1) \| 1;
37	}	38	}
38	typedef uint_fast32_t result_type;	39	typedef uint_fast32_t result_type;
39		40
...	@@ -41,8 +42,8 @@ public:	...	@@ -41,8 +42,8 @@ public:
41	static const result_type _Max = 0xFFFFFFFF;	42	static const result_type _Max = 0xFFFFFFFF;
42		43
43	_LIBCPP_HIDE_FROM_ABI result_type operator()() {	44	_LIBCPP_HIDE_FROM_ABI result_type operator()() {
44	uint_fast64_t __oldstate = __state;	45	uint_fast64_t __oldstate = __state_;
45	__state = __oldstate * 6364136223846793005ULL + __inc;	46	__state_ = __oldstate * 6364136223846793005ULL + __inc_;
46	return __oldstate >> 32;	47	return __oldstate >> 32;
47	}	48	}
48		49
...	@@ -50,8 +51,8 @@ public:	...	@@ -50,8 +51,8 @@ public:
50	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR result_type max() { return _Max; }	51	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR result_type max() { return _Max; }
51		52
52	private:	53	private:
53	uint_fast64_t __state;	54	uint_fast64_t __state_;
54	uint_fast64_t __inc;	55	uint_fast64_t __inc_;
55	_LIBCPP_HIDE_FROM_ABI static uint_fast64_t __seed() {	56	_LIBCPP_HIDE_FROM_ABI static uint_fast64_t __seed() {
56	#ifdef _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY_SEED	57	#ifdef _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY_SEED
57	return _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY_SEED;	58	return _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY_SEED;
...	@@ -93,7 +94,7 @@ public:	...	@@ -93,7 +94,7 @@ public:
93	_LIBCPP_FUNC_VIS __rs_default __rs_get();	94	_LIBCPP_FUNC_VIS __rs_default __rs_get();
94		95
95	template <class _RandomAccessIterator>	96	template <class _RandomAccessIterator>
96	_LIBCPP_DEPRECATED_IN_CXX14 void	97	_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_IN_CXX14 void
97	random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)	98	random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
98	{	99	{
99	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	100	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
...	@@ -114,7 +115,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)	...	@@ -114,7 +115,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
114	}	115	}
115		116
116	template <class _RandomAccessIterator, class _RandomNumberGenerator>	117	template <class _RandomAccessIterator, class _RandomNumberGenerator>
117	_LIBCPP_DEPRECATED_IN_CXX14 void	118	_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_IN_CXX14 void
118	random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,	119	random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
119	#ifndef _LIBCPP_CXX03_LANG	120	#ifndef _LIBCPP_CXX03_LANG
120	_RandomNumberGenerator&& __rand)	121	_RandomNumberGenerator&& __rand)
...	@@ -137,7 +138,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,	...	@@ -137,7 +138,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
137	#endif	138	#endif
138		139
139	template <class _AlgPolicy, class _RandomAccessIterator, class _Sentinel, class _UniformRandomNumberGenerator>	140	template <class _AlgPolicy, class _RandomAccessIterator, class _Sentinel, class _UniformRandomNumberGenerator>
140	_RandomAccessIterator __shuffle(	141	_LIBCPP_HIDE_FROM_ABI _RandomAccessIterator __shuffle(
141	_RandomAccessIterator __first, _Sentinel __last_sentinel, _UniformRandomNumberGenerator&& __g) {	142	_RandomAccessIterator __first, _Sentinel __last_sentinel, _UniformRandomNumberGenerator&& __g) {
142	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	143	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
143	typedef uniform_int_distribution<ptrdiff_t> _Dp;	144	typedef uniform_int_distribution<ptrdiff_t> _Dp;
...	@@ -161,8 +162,8 @@ _RandomAccessIterator __shuffle(	...	@@ -161,8 +162,8 @@ _RandomAccessIterator __shuffle(
161	}	162	}
162		163
163	template <class _RandomAccessIterator, class _UniformRandomNumberGenerator>	164	template <class _RandomAccessIterator, class _UniformRandomNumberGenerator>
164	void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,	165	_LIBCPP_HIDE_FROM_ABI void
165	_UniformRandomNumberGenerator&& __g) {	166	shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, _UniformRandomNumberGenerator&& __g) {
166	(void)std::__shuffle<_ClassicAlgPolicy>(	167	(void)std::__shuffle<_ClassicAlgPolicy>(
167	std::move(__first), std::move(__last), std::forward<_UniformRandomNumberGenerator>(__g));	168	std::move(__first), std::move(__last), std::forward<_UniformRandomNumberGenerator>(__g));
168	}	169	}

lib/libcxx/include/__algorithm/sift_down.h+2-2

...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
23		23
24	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	24	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
25	_LIBCPP_CONSTEXPR_AFTER_CXX11 void	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void
26	__sift_down(_RandomAccessIterator __first, _Compare&& __comp,	26	__sift_down(_RandomAccessIterator __first, _Compare&& __comp,
27	typename iterator_traits<_RandomAccessIterator>::difference_type __len,	27	typename iterator_traits<_RandomAccessIterator>::difference_type __len,
28	_RandomAccessIterator __start)	28	_RandomAccessIterator __start)
...	@@ -78,7 +78,7 @@ __sift_down(_RandomAccessIterator __first, _Compare&& __comp,	...	@@ -78,7 +78,7 @@ __sift_down(_RandomAccessIterator __first, _Compare&& __comp,
78	}	78	}
79		79
80	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	80	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
81	_LIBCPP_CONSTEXPR_AFTER_CXX11 _RandomAccessIterator	81	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _RandomAccessIterator
82	__floyd_sift_down(_RandomAccessIterator __first, _Compare&& __comp,	82	__floyd_sift_down(_RandomAccessIterator __first, _Compare&& __comp,
83	typename iterator_traits<_RandomAccessIterator>::difference_type __len)	83	typename iterator_traits<_RandomAccessIterator>::difference_type __len)
84	{	84	{

lib/libcxx/include/__algorithm/sort.h+470-174

...	@@ -11,19 +11,29 @@	...	@@ -11,19 +11,29 @@
11		11
12	#include <__algorithm/comp.h>	12	#include <__algorithm/comp.h>
13	#include <__algorithm/comp_ref_type.h>	13	#include <__algorithm/comp_ref_type.h>
		14	#include <__algorithm/iter_swap.h>
14	#include <__algorithm/iterator_operations.h>	15	#include <__algorithm/iterator_operations.h>
15	#include <__algorithm/min_element.h>	16	#include <__algorithm/min_element.h>
16	#include <__algorithm/partial_sort.h>	17	#include <__algorithm/partial_sort.h>
17	#include <__algorithm/unwrap_iter.h>	18	#include <__algorithm/unwrap_iter.h>
18	#include <__bits>	19	#include <__assert>
		20	#include <__bit/blsr.h>
		21	#include <__bit/countl.h>
		22	#include <__bit/countr.h>
19	#include <__config>	23	#include <__config>
20	#include <__debug>	24	#include <__debug>
21	#include <__debug_utils/randomize_range.h>	25	#include <__debug_utils/randomize_range.h>
22	#include <__functional/operations.h>	26	#include <__functional/operations.h>
23	#include <__functional/ranges_operations.h>	27	#include <__functional/ranges_operations.h>
24	#include <__iterator/iterator_traits.h>	28	#include <__iterator/iterator_traits.h>
		29	#include <__memory/destruct_n.h>
		30	#include <__memory/unique_ptr.h>
		31	#include <__type_traits/conditional.h>
		32	#include <__type_traits/is_arithmetic.h>
		33	#include <__utility/move.h>
		34	#include <__utility/pair.h>
25	#include <climits>	35	#include <climits>
26	#include <memory>	36	#include <cstdint>
27		37
28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	38	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
29	# pragma GCC system_header	39	# pragma GCC system_header
...	@@ -43,7 +53,7 @@ struct _WrapAlgPolicy {	...	@@ -43,7 +53,7 @@ struct _WrapAlgPolicy {
43	using _Comp = _CompT;	53	using _Comp = _CompT;
44	_Comp& __comp;	54	_Comp& __comp;
45		55
46	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	56	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
47	_WrapAlgPolicy(_Comp& __c) : __comp(__c) {}	57	_WrapAlgPolicy(_Comp& __c) : __comp(__c) {}
48	};	58	};
49		59
...	@@ -62,7 +72,7 @@ struct _UnwrapAlgPolicy {	...	@@ -62,7 +72,7 @@ struct _UnwrapAlgPolicy {
62	using _AlgPolicy = _ClassicAlgPolicy;	72	using _AlgPolicy = _ClassicAlgPolicy;
63	using _Comp = _CompT;	73	using _Comp = _CompT;
64		74
65	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 static	75	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static
66	_Comp __get_comp(_Comp __comp) { return __comp; }	76	_Comp __get_comp(_Comp __comp) { return __comp; }
67	};	77	};
68		78
...	@@ -73,14 +83,15 @@ struct _UnwrapAlgPolicy<_WrapAlgPolicy<_Ts...> > {	...	@@ -73,14 +83,15 @@ struct _UnwrapAlgPolicy<_WrapAlgPolicy<_Ts...> > {
73	using _AlgPolicy = typename _Wrapped::_AlgPolicy;	83	using _AlgPolicy = typename _Wrapped::_AlgPolicy;
74	using _Comp = typename _Wrapped::_Comp;	84	using _Comp = typename _Wrapped::_Comp;
75		85
76	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 static	86	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static
77	_Comp __get_comp(_Wrapped& __w) { return __w.__comp; }	87	_Comp __get_comp(_Wrapped& __w) { return __w.__comp; }
78	};	88	};
79		89
80	// stable, 2-3 compares, 0-2 swaps	90	// stable, 2-3 compares, 0-2 swaps
81		91
82	template <class _AlgPolicy, class _Compare, class _ForwardIterator>	92	template <class _AlgPolicy, class _Compare, class _ForwardIterator>
83	_LIBCPP_CONSTEXPR_AFTER_CXX11 unsigned __sort3(_ForwardIterator __x, _ForwardIterator __y, _ForwardIterator __z,	93	_LIBCPP_HIDE_FROM_ABI
		94	_LIBCPP_CONSTEXPR_SINCE_CXX14 unsigned __sort3(_ForwardIterator __x, _ForwardIterator __y, _ForwardIterator __z,
84	_Compare __c) {	95	_Compare __c) {
85	using _Ops = _IterOps<_AlgPolicy>;	96	using _Ops = _IterOps<_AlgPolicy>;
86		97
...	@@ -118,10 +129,10 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 unsigned __sort3(_ForwardIterator __x, _ForwardIte	...	@@ -118,10 +129,10 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 unsigned __sort3(_ForwardIterator __x, _ForwardIte
118	// stable, 3-6 compares, 0-5 swaps	129	// stable, 3-6 compares, 0-5 swaps
119		130
120	template <class _AlgPolicy, class _Compare, class _ForwardIterator>	131	template <class _AlgPolicy, class _Compare, class _ForwardIterator>
		132	_LIBCPP_HIDE_FROM_ABI
121	unsigned __sort4(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3, _ForwardIterator __x4,	133	unsigned __sort4(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3, _ForwardIterator __x4,
122	_Compare __c) {	134	_Compare __c) {
123	using _Ops = _IterOps<_AlgPolicy>;	135	using _Ops = _IterOps<_AlgPolicy>;
124
125	unsigned __r = std::__sort3<_AlgPolicy, _Compare>(__x1, __x2, __x3, __c);	136	unsigned __r = std::__sort3<_AlgPolicy, _Compare>(__x1, __x2, __x3, __c);
126	if (__c(__x4, __x3)) {	137	if (__c(__x4, __x3)) {
127	_Ops::iter_swap(__x3, __x4);	138	_Ops::iter_swap(__x3, __x4);
...	@@ -171,12 +182,12 @@ _LIBCPP_HIDDEN unsigned __sort5(_ForwardIterator __x1, _ForwardIterator __x2, _F	...	@@ -171,12 +182,12 @@ _LIBCPP_HIDDEN unsigned __sort5(_ForwardIterator __x1, _ForwardIterator __x2, _F
171	}	182	}
172		183
173	template <class _AlgPolicy, class _Compare, class _ForwardIterator>	184	template <class _AlgPolicy, class _Compare, class _ForwardIterator>
174	_LIBCPP_HIDDEN unsigned __sort5_wrap_policy(	185	_LIBCPP_HIDE_FROM_ABI unsigned __sort5_wrap_policy(
175	_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3, _ForwardIterator __x4, _ForwardIterator __x5,	186	_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3, _ForwardIterator __x4, _ForwardIterator __x5,
176	_Compare __c) {	187	_Compare __c) {
177	using _WrappedComp = typename _WrapAlgPolicy<_AlgPolicy, _Compare>::type;	188	using _WrappedComp = typename _WrapAlgPolicy<_AlgPolicy, _Compare>::type;
178	_WrappedComp __wrapped_comp(__c);	189	_WrappedComp __wrapped_comp(__c);
179	return std::__sort5<_WrappedComp>(	190	return std::__sort5<_WrappedComp, _ForwardIterator>(
180	std::move(__x1), std::move(__x2), std::move(__x3), std::move(__x4), std::move(__x5), __wrapped_comp);	191	std::move(__x1), std::move(__x2), std::move(__x3), std::move(__x4), std::move(__x5), __wrapped_comp);
181	}	192	}
182		193
...	@@ -201,6 +212,13 @@ using __use_branchless_sort =	...	@@ -201,6 +212,13 @@ using __use_branchless_sort =
201	integral_constant<bool, __is_cpp17_contiguous_iterator<_Iter>::value && sizeof(_Tp) <= sizeof(void*) &&	212	integral_constant<bool, __is_cpp17_contiguous_iterator<_Iter>::value && sizeof(_Tp) <= sizeof(void*) &&
202	is_arithmetic<_Tp>::value && __is_simple_comparator<_Compare>::value>;	213	is_arithmetic<_Tp>::value && __is_simple_comparator<_Compare>::value>;
203		214
		215	namespace __detail {
		216
		217	// Size in bits for the bitset in use.
		218	enum { __block_size = sizeof(uint64_t) * 8 };
		219
		220	} // namespace __detail
		221
204	// Ensures that __c(__x, __y) is true by swapping __x and __y if necessary.	222	// Ensures that __c(__x, __y) is true by swapping __x and __y if necessary.
205	template <class _Compare, class _RandomAccessIterator>	223	template <class _Compare, class _RandomAccessIterator>
206	inline _LIBCPP_HIDE_FROM_ABI void __cond_swap(_RandomAccessIterator __x, _RandomAccessIterator __y, _Compare __c) {	224	inline _LIBCPP_HIDE_FROM_ABI void __cond_swap(_RandomAccessIterator __x, _RandomAccessIterator __y, _Compare __c) {
...	@@ -231,8 +249,8 @@ template <class, class _Compare, class _RandomAccessIterator>	...	@@ -231,8 +249,8 @@ template <class, class _Compare, class _RandomAccessIterator>
231	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>	249	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>
232	__sort3_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2, _RandomAccessIterator __x3,	250	__sort3_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2, _RandomAccessIterator __x3,
233	_Compare __c) {	251	_Compare __c) {
234	_VSTD::__cond_swap<_Compare>(__x2, __x3, __c);	252	std::__cond_swap<_Compare>(__x2, __x3, __c);
235	_VSTD::__partially_sorted_swap<_Compare>(__x1, __x2, __x3, __c);	253	std::__partially_sorted_swap<_Compare>(__x1, __x2, __x3, __c);
236	}	254	}
237		255
238	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	256	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
...	@@ -246,11 +264,11 @@ template <class, class _Compare, class _RandomAccessIterator>	...	@@ -246,11 +264,11 @@ template <class, class _Compare, class _RandomAccessIterator>
246	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>	264	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>
247	__sort4_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2, _RandomAccessIterator __x3,	265	__sort4_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2, _RandomAccessIterator __x3,
248	_RandomAccessIterator __x4, _Compare __c) {	266	_RandomAccessIterator __x4, _Compare __c) {
249	_VSTD::__cond_swap<_Compare>(__x1, __x3, __c);	267	std::__cond_swap<_Compare>(__x1, __x3, __c);
250	_VSTD::__cond_swap<_Compare>(__x2, __x4, __c);	268	std::__cond_swap<_Compare>(__x2, __x4, __c);
251	_VSTD::__cond_swap<_Compare>(__x1, __x2, __c);	269	std::__cond_swap<_Compare>(__x1, __x2, __c);
252	_VSTD::__cond_swap<_Compare>(__x3, __x4, __c);	270	std::__cond_swap<_Compare>(__x3, __x4, __c);
253	_VSTD::__cond_swap<_Compare>(__x2, __x3, __c);	271	std::__cond_swap<_Compare>(__x2, __x3, __c);
254	}	272	}
255		273
256	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	274	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
...	@@ -260,16 +278,21 @@ __sort4_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2,	...	@@ -260,16 +278,21 @@ __sort4_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2,
260	std::__sort4<_AlgPolicy, _Compare>(__x1, __x2, __x3, __x4, __c);	278	std::__sort4<_AlgPolicy, _Compare>(__x1, __x2, __x3, __x4, __c);
261	}	279	}
262		280
263	template <class, class _Compare, class _RandomAccessIterator>	281	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
264	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>	282	inline _LIBCPP_HIDE_FROM_ABI __enable_if_t<__use_branchless_sort<_Compare, _RandomAccessIterator>::value, void>
265	__sort5_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2, _RandomAccessIterator __x3,	283	__sort5_maybe_branchless(
266	_RandomAccessIterator __x4, _RandomAccessIterator __x5, _Compare __c) {	284	_RandomAccessIterator __x1,
267	_VSTD::__cond_swap<_Compare>(__x1, __x2, __c);	285	_RandomAccessIterator __x2,
268	_VSTD::__cond_swap<_Compare>(__x4, __x5, __c);	286	_RandomAccessIterator __x3,
269	_VSTD::__partially_sorted_swap<_Compare>(__x3, __x4, __x5, __c);	287	_RandomAccessIterator __x4,
270	_VSTD::__cond_swap<_Compare>(__x2, __x5, __c);	288	_RandomAccessIterator __x5,
271	_VSTD::__partially_sorted_swap<_Compare>(__x1, __x3, __x4, __c);	289	_Compare __c) {
272	_VSTD::__partially_sorted_swap<_Compare>(__x2, __x3, __x4, __c);	290	std::__cond_swap<_Compare>(__x1, __x2, __c);
		291	std::__cond_swap<_Compare>(__x4, __x5, __c);
		292	std::__partially_sorted_swap<_Compare>(__x3, __x4, __x5, __c);
		293	std::__cond_swap<_Compare>(__x2, __x5, __c);
		294	std::__partially_sorted_swap<_Compare>(__x1, __x3, __x4, __c);
		295	std::__partially_sorted_swap<_Compare>(__x2, __x3, __x4, __c);
273	}	296	}
274		297
275	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	298	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
...	@@ -281,7 +304,8 @@ __sort5_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2,	...	@@ -281,7 +304,8 @@ __sort5_maybe_branchless(_RandomAccessIterator __x1, _RandomAccessIterator __x2,
281		304
282	// Assumes size > 0	305	// Assumes size > 0
283	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>	306	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>
284	_LIBCPP_CONSTEXPR_AFTER_CXX11 void __selection_sort(_BidirectionalIterator __first, _BidirectionalIterator __last,	307	_LIBCPP_HIDE_FROM_ABI
		308	_LIBCPP_CONSTEXPR_SINCE_CXX14 void __selection_sort(_BidirectionalIterator __first, _BidirectionalIterator __last,
285	_Compare __comp) {	309	_Compare __comp) {
286	_BidirectionalIterator __lm1 = __last;	310	_BidirectionalIterator __lm1 = __last;
287	for (--__lm1; __first != __lm1; ++__first) {	311	for (--__lm1; __first != __lm1; ++__first) {
...	@@ -291,32 +315,48 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 void __selection_sort(_BidirectionalIterator __fir	...	@@ -291,32 +315,48 @@ _LIBCPP_CONSTEXPR_AFTER_CXX11 void __selection_sort(_BidirectionalIterator __fir
291	}	315	}
292	}	316	}
293		317
		318	// Sort the iterator range [__first, __last) using the comparator __comp using
		319	// the insertion sort algorithm.
294	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>	320	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>
		321	_LIBCPP_HIDE_FROM_ABI
295	void __insertion_sort(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp) {	322	void __insertion_sort(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp) {
296	using _Ops = _IterOps<_AlgPolicy>;	323	using _Ops = _IterOps<_AlgPolicy>;
297		324
298	typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;	325	typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
299	if (__first != __last) {	326	if (__first == __last)
300	_BidirectionalIterator __i = __first;	327	return;
301	for (++__i; __i != __last; ++__i) {	328	_BidirectionalIterator __i = __first;
302	_BidirectionalIterator __j = __i;	329	for (++__i; __i != __last; ++__i) {
303	value_type __t(_Ops::__iter_move(__j));	330	_BidirectionalIterator __j = __i;
304	for (_BidirectionalIterator __k = __i; __k != __first && __comp(__t, *--__k); --__j)	331	--__j;
		332	if (__comp(__i, __j)) {
		333	value_type __t(_Ops::__iter_move(__i));
		334	_BidirectionalIterator __k = __j;
		335	__j = __i;
		336	do {
305	*__j = _Ops::__iter_move(__k);	337	*__j = _Ops::__iter_move(__k);
306	*__j = _VSTD::move(__t);	338	__j = __k;
		339	} while (__j != __first && __comp(__t, *--__k));
		340	*__j = std::move(__t);
307	}	341	}
308	}	342	}
309	}	343	}
310		344
		345	// Sort the iterator range [__first, __last) using the comparator __comp using
		346	// the insertion sort algorithm. Insertion sort has two loops, outer and inner.
		347	// The implementation below has not bounds check (unguarded) for the inner loop.
		348	// Assumes that there is an element in the position (__first - 1) and that each
		349	// element in the input range is greater or equal to the element at __first - 1.
311	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	350	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
312	void __insertion_sort_3(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {	351	_LIBCPP_HIDE_FROM_ABI void
		352	__insertion_sort_unguarded(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
313	using _Ops = _IterOps<_AlgPolicy>;	353	using _Ops = _IterOps<_AlgPolicy>;
314
315	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	354	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
316	typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;	355	typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
317	_RandomAccessIterator __j = __first + difference_type(2);	356	if (__first == __last)
318	std::__sort3_maybe_branchless<_AlgPolicy, _Compare>(__first, __first + difference_type(1), __j, __comp);	357	return;
319	for (_RandomAccessIterator __i = __j + difference_type(1); __i != __last; ++__i) {	358	for (_RandomAccessIterator __i = __first + difference_type(1); __i != __last; ++__i) {
		359	_RandomAccessIterator __j = __i - difference_type(1);
320	if (__comp(__i, __j)) {	360	if (__comp(__i, __j)) {
321	value_type __t(_Ops::__iter_move(__i));	361	value_type __t(_Ops::__iter_move(__i));
322	_RandomAccessIterator __k = __j;	362	_RandomAccessIterator __k = __j;
...	@@ -324,15 +364,14 @@ void __insertion_sort_3(_RandomAccessIterator __first, _RandomAccessIterator __l	...	@@ -324,15 +364,14 @@ void __insertion_sort_3(_RandomAccessIterator __first, _RandomAccessIterator __l
324	do {	364	do {
325	*__j = _Ops::__iter_move(__k);	365	*__j = _Ops::__iter_move(__k);
326	__j = __k;	366	__j = __k;
327	} while (__j != __first && __comp(__t, *--__k));	367	} while (__comp(__t, *--__k)); // No need for bounds check due to the assumption stated above.
328	*__j = _VSTD::move(__t);	368	*__j = std::move(__t);
329	}	369	}
330	__j = __i;
331	}	370	}
332	}	371	}
333		372
334	template <class _WrappedComp, class _RandomAccessIterator>	373	template <class _WrappedComp, class _RandomAccessIterator>
335	bool __insertion_sort_incomplete(	374	_LIBCPP_HIDDEN bool __insertion_sort_incomplete(
336	_RandomAccessIterator __first, _RandomAccessIterator __last, _WrappedComp __wrapped_comp) {	375	_RandomAccessIterator __first, _RandomAccessIterator __last, _WrappedComp __wrapped_comp) {
337	using _Unwrap = _UnwrapAlgPolicy<_WrappedComp>;	376	using _Unwrap = _UnwrapAlgPolicy<_WrappedComp>;
338	using _AlgPolicy = typename _Unwrap::_AlgPolicy;	377	using _AlgPolicy = typename _Unwrap::_AlgPolicy;
...	@@ -348,7 +387,7 @@ bool __insertion_sort_incomplete(	...	@@ -348,7 +387,7 @@ bool __insertion_sort_incomplete(
348	return true;	387	return true;
349	case 2:	388	case 2:
350	if (__comp(--__last, __first))	389	if (__comp(--__last, __first))
351	_IterOps<_AlgPolicy>::iter_swap(__first, __last);	390	_Ops::iter_swap(__first, __last);
352	return true;	391	return true;
353	case 3:	392	case 3:
354	std::__sort3_maybe_branchless<_AlgPolicy, _Compare>(__first, __first + difference_type(1), --__last, __comp);	393	std::__sort3_maybe_branchless<_AlgPolicy, _Compare>(__first, __first + difference_type(1), --__last, __comp);
...	@@ -377,7 +416,7 @@ bool __insertion_sort_incomplete(	...	@@ -377,7 +416,7 @@ bool __insertion_sort_incomplete(
377	*__j = _Ops::__iter_move(__k);	416	*__j = _Ops::__iter_move(__k);
378	__j = __k;	417	__j = __k;
379	} while (__j != __first && __comp(__t, *--__k));	418	} while (__j != __first && __comp(__t, *--__k));
380	*__j = _VSTD::move(__t);	419	*__j = std::move(__t);
381	if (++__count == __limit)	420	if (++__count == __limit)
382	return ++__i == __last;	421	return ++__i == __last;
383	}	422	}
...	@@ -387,6 +426,7 @@ bool __insertion_sort_incomplete(	...	@@ -387,6 +426,7 @@ bool __insertion_sort_incomplete(
387	}	426	}
388		427
389	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>	428	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>
		429	_LIBCPP_HIDE_FROM_ABI
390	void __insertion_sort_move(_BidirectionalIterator __first1, _BidirectionalIterator __last1,	430	void __insertion_sort_move(_BidirectionalIterator __first1, _BidirectionalIterator __last1,
391	typename iterator_traits<_BidirectionalIterator>::value_type* __first2, _Compare __comp) {	431	typename iterator_traits<_BidirectionalIterator>::value_type* __first2, _Compare __comp) {
392	using _Ops = _IterOps<_AlgPolicy>;	432	using _Ops = _IterOps<_AlgPolicy>;
...	@@ -416,17 +456,336 @@ void __insertion_sort_move(_BidirectionalIterator __first1, _BidirectionalIterat	...	@@ -416,17 +456,336 @@ void __insertion_sort_move(_BidirectionalIterator __first1, _BidirectionalIterat
416	}	456	}
417	}	457	}
418		458
419	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	459	template <class _AlgPolicy, class _RandomAccessIterator>
420	void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,	460	inline _LIBCPP_HIDE_FROM_ABI void __swap_bitmap_pos(
421	typename iterator_traits<_RandomAccessIterator>::difference_type __depth) {	461	_RandomAccessIterator __first, _RandomAccessIterator __last, uint64_t& __left_bitset, uint64_t& __right_bitset) {
		462	using _Ops = _IterOps<_AlgPolicy>;
		463	typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		464	// Swap one pair on each iteration as long as both bitsets have at least one
		465	// element for swapping.
		466	while (__left_bitset != 0 && __right_bitset != 0) {
		467	difference_type tz_left = __libcpp_ctz(__left_bitset);
		468	__left_bitset = __libcpp_blsr(__left_bitset);
		469	difference_type tz_right = __libcpp_ctz(__right_bitset);
		470	__right_bitset = __libcpp_blsr(__right_bitset);
		471	_Ops::iter_swap(__first + tz_left, __last - tz_right);
		472	}
		473	}
		474
		475	template <class _Compare,
		476	class _RandomAccessIterator,
		477	class _ValueType = typename iterator_traits<_RandomAccessIterator>::value_type>
		478	inline _LIBCPP_HIDE_FROM_ABI void
		479	__populate_left_bitset(_RandomAccessIterator __first, _Compare __comp, _ValueType& __pivot, uint64_t& __left_bitset) {
		480	// Possible vectorization. With a proper "-march" flag, the following loop
		481	// will be compiled into a set of SIMD instructions.
		482	_RandomAccessIterator __iter = __first;
		483	for (int __j = 0; __j < __detail::__block_size;) {
		484	bool __comp_result = !__comp(*__iter, __pivot);
		485	__left_bitset \|= (static_cast<uint64_t>(__comp_result) << __j);
		486	__j++;
		487	++__iter;
		488	}
		489	}
		490
		491	template <class _Compare,
		492	class _RandomAccessIterator,
		493	class _ValueType = typename iterator_traits<_RandomAccessIterator>::value_type>
		494	inline _LIBCPP_HIDE_FROM_ABI void
		495	__populate_right_bitset(_RandomAccessIterator __lm1, _Compare __comp, _ValueType& __pivot, uint64_t& __right_bitset) {
		496	// Possible vectorization. With a proper "-march" flag, the following loop
		497	// will be compiled into a set of SIMD instructions.
		498	_RandomAccessIterator __iter = __lm1;
		499	for (int __j = 0; __j < __detail::__block_size;) {
		500	bool __comp_result = __comp(*__iter, __pivot);
		501	__right_bitset \|= (static_cast<uint64_t>(__comp_result) << __j);
		502	__j++;
		503	--__iter;
		504	}
		505	}
		506
		507	template <class _AlgPolicy,
		508	class _Compare,
		509	class _RandomAccessIterator,
		510	class _ValueType = typename iterator_traits<_RandomAccessIterator>::value_type>
		511	inline _LIBCPP_HIDE_FROM_ABI void __bitset_partition_partial_blocks(
		512	_RandomAccessIterator& __first,
		513	_RandomAccessIterator& __lm1,
		514	_Compare __comp,
		515	_ValueType& __pivot,
		516	uint64_t& __left_bitset,
		517	uint64_t& __right_bitset) {
		518	typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		519	difference_type __remaining_len = __lm1 - __first + 1;
		520	difference_type __l_size;
		521	difference_type __r_size;
		522	if (__left_bitset == 0 && __right_bitset == 0) {
		523	__l_size = __remaining_len / 2;
		524	__r_size = __remaining_len - __l_size;
		525	} else if (__left_bitset == 0) {
		526	// We know at least one side is a full block.
		527	__l_size = __remaining_len - __detail::__block_size;
		528	__r_size = __detail::__block_size;
		529	} else { // if (__right_bitset == 0)
		530	__l_size = __detail::__block_size;
		531	__r_size = __remaining_len - __detail::__block_size;
		532	}
		533	// Record the comparison outcomes for the elements currently on the left side.
		534	if (__left_bitset == 0) {
		535	_RandomAccessIterator __iter = __first;
		536	for (int j = 0; j < __l_size; j++) {
		537	bool __comp_result = !__comp(*__iter, __pivot);
		538	__left_bitset \|= (static_cast<uint64_t>(__comp_result) << j);
		539	++__iter;
		540	}
		541	}
		542	// Record the comparison outcomes for the elements currently on the right
		543	// side.
		544	if (__right_bitset == 0) {
		545	_RandomAccessIterator __iter = __lm1;
		546	for (int j = 0; j < __r_size; j++) {
		547	bool __comp_result = __comp(*__iter, __pivot);
		548	__right_bitset \|= (static_cast<uint64_t>(__comp_result) << j);
		549	--__iter;
		550	}
		551	}
		552	std::__swap_bitmap_pos<_AlgPolicy, _RandomAccessIterator>(__first, __lm1, __left_bitset, __right_bitset);
		553	__first += (__left_bitset == 0) ? __l_size : 0;
		554	__lm1 -= (__right_bitset == 0) ? __r_size : 0;
		555	}
		556
		557	template <class _AlgPolicy, class _RandomAccessIterator>
		558	inline _LIBCPP_HIDE_FROM_ABI void __swap_bitmap_pos_within(
		559	_RandomAccessIterator& __first, _RandomAccessIterator& __lm1, uint64_t& __left_bitset, uint64_t& __right_bitset) {
		560	using _Ops = _IterOps<_AlgPolicy>;
		561	typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		562	if (__left_bitset) {
		563	// Swap within the left side. Need to find set positions in the reverse
		564	// order.
		565	while (__left_bitset != 0) {
		566	difference_type __tz_left = __detail::__block_size - 1 - __libcpp_clz(__left_bitset);
		567	__left_bitset &= (static_cast<uint64_t>(1) << __tz_left) - 1;
		568	_RandomAccessIterator it = __first + __tz_left;
		569	if (it != __lm1) {
		570	_Ops::iter_swap(it, __lm1);
		571	}
		572	--__lm1;
		573	}
		574	__first = __lm1 + difference_type(1);
		575	} else if (__right_bitset) {
		576	// Swap within the right side. Need to find set positions in the reverse
		577	// order.
		578	while (__right_bitset != 0) {
		579	difference_type __tz_right = __detail::__block_size - 1 - __libcpp_clz(__right_bitset);
		580	__right_bitset &= (static_cast<uint64_t>(1) << __tz_right) - 1;
		581	_RandomAccessIterator it = __lm1 - __tz_right;
		582	if (it != __first) {
		583	_Ops::iter_swap(it, __first);
		584	}
		585	++__first;
		586	}
		587	}
		588	}
		589
		590	// Partition [__first, __last) using the comparator __comp. *__first has the
		591	// chosen pivot. Elements that are equivalent are kept to the left of the
		592	// pivot. Returns the iterator for the pivot and a bool value which is true if
		593	// the provided range is already sorted, false otherwise. We assume that the
		594	// length of the range is at least three elements.
		595	//
		596	// __bitset_partition uses bitsets for storing outcomes of the comparisons
		597	// between the pivot and other elements.
		598	template <class _AlgPolicy, class _RandomAccessIterator, class _Compare>
		599	_LIBCPP_HIDE_FROM_ABI std::pair<_RandomAccessIterator, bool>
		600	__bitset_partition(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
422	using _Ops = _IterOps<_AlgPolicy>;	601	using _Ops = _IterOps<_AlgPolicy>;
		602	typedef typename std::iterator_traits<_RandomAccessIterator>::value_type value_type;
		603	typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		604	_LIBCPP_ASSERT(__last - __first >= difference_type(3), "");
		605
		606	_RandomAccessIterator __begin = __first;
		607	value_type __pivot(_Ops::__iter_move(__first));
		608	// Find the first element greater than the pivot.
		609	if (__comp(__pivot, *(__last - difference_type(1)))) {
		610	// Not guarded since we know the last element is greater than the pivot.
		611	while (!__comp(__pivot, *++__first)) {
		612	}
		613	} else {
		614	while (++__first < __last && !__comp(__pivot, *__first)) {
		615	}
		616	}
		617	// Find the last element less than or equal to the pivot.
		618	if (__first < __last) {
		619	// It will be always guarded because __introsort will do the median-of-three
		620	// before calling this.
		621	while (__comp(__pivot, *--__last)) {
		622	}
		623	}
		624	// If the first element greater than the pivot is at or after the
		625	// last element less than or equal to the pivot, then we have covered the
		626	// entire range without swapping elements. This implies the range is already
		627	// partitioned.
		628	bool __already_partitioned = __first >= __last;
		629	if (!__already_partitioned) {
		630	_Ops::iter_swap(__first, __last);
		631	++__first;
		632	}
		633
		634	// In [__first, __last) __last is not inclusive. From now on, it uses last
		635	// minus one to be inclusive on both sides.
		636	_RandomAccessIterator __lm1 = __last - difference_type(1);
		637	uint64_t __left_bitset = 0;
		638	uint64_t __right_bitset = 0;
		639
		640	// Reminder: length = __lm1 - __first + 1.
		641	while (__lm1 - __first >= 2 * __detail::__block_size - 1) {
		642	// Record the comparison outcomes for the elements currently on the left
		643	// side.
		644	if (__left_bitset == 0)
		645	std::__populate_left_bitset<_Compare>(__first, __comp, __pivot, __left_bitset);
		646	// Record the comparison outcomes for the elements currently on the right
		647	// side.
		648	if (__right_bitset == 0)
		649	std::__populate_right_bitset<_Compare>(__lm1, __comp, __pivot, __right_bitset);
		650	// Swap the elements recorded to be the candidates for swapping in the
		651	// bitsets.
		652	std::__swap_bitmap_pos<_AlgPolicy, _RandomAccessIterator>(__first, __lm1, __left_bitset, __right_bitset);
		653	// Only advance the iterator if all the elements that need to be moved to
		654	// other side were moved.
		655	__first += (__left_bitset == 0) ? difference_type(__detail::__block_size) : difference_type(0);
		656	__lm1 -= (__right_bitset == 0) ? difference_type(__detail::__block_size) : difference_type(0);
		657	}
		658	// Now, we have a less-than a block worth of elements on at least one of the
		659	// sides.
		660	std::__bitset_partition_partial_blocks<_AlgPolicy, _Compare>(
		661	__first, __lm1, __comp, __pivot, __left_bitset, __right_bitset);
		662	// At least one the bitsets would be empty. For the non-empty one, we need to
		663	// properly partition the elements that appear within that bitset.
		664	std::__swap_bitmap_pos_within<_AlgPolicy>(__first, __lm1, __left_bitset, __right_bitset);
		665
		666	// Move the pivot to its correct position.
		667	_RandomAccessIterator __pivot_pos = __first - difference_type(1);
		668	if (__begin != __pivot_pos) {
		669	*__begin = _Ops::__iter_move(__pivot_pos);
		670	}
		671	*__pivot_pos = std::move(__pivot);
		672	return std::make_pair(__pivot_pos, __already_partitioned);
		673	}
423		674
		675	// Partition [__first, __last) using the comparator __comp. *__first has the
		676	// chosen pivot. Elements that are equivalent are kept to the right of the
		677	// pivot. Returns the iterator for the pivot and a bool value which is true if
		678	// the provided range is already sorted, false otherwise. We assume that the
		679	// length of the range is at least three elements.
		680	template <class _AlgPolicy, class _RandomAccessIterator, class _Compare>
		681	_LIBCPP_HIDE_FROM_ABI std::pair<_RandomAccessIterator, bool>
		682	__partition_with_equals_on_right(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
		683	using _Ops = _IterOps<_AlgPolicy>;
424	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	684	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
425	typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;	685	typedef typename std::iterator_traits<_RandomAccessIterator>::value_type value_type;
426	const difference_type __limit =	686	_LIBCPP_ASSERT(__last - __first >= difference_type(3), "");
427	is_trivially_copy_constructible<value_type>::value && is_trivially_copy_assignable<value_type>::value ? 30 : 6;	687	_RandomAccessIterator __begin = __first;
		688	value_type __pivot(_Ops::__iter_move(__first));
		689	// Find the first element greater or equal to the pivot. It will be always
		690	// guarded because __introsort will do the median-of-three before calling
		691	// this.
		692	while (__comp(*++__first, __pivot))
		693	;
		694
		695	// Find the last element less than the pivot.
		696	if (__begin == __first - difference_type(1)) {
		697	while (__first < __last && !__comp(*--__last, __pivot))
		698	;
		699	} else {
		700	// Guarded.
		701	while (!__comp(*--__last, __pivot))
		702	;
		703	}
		704
		705	// If the first element greater than or equal to the pivot is at or after the
		706	// last element less than the pivot, then we have covered the entire range
		707	// without swapping elements. This implies the range is already partitioned.
		708	bool __already_partitioned = __first >= __last;
		709	// Go through the remaining elements. Swap pairs of elements (one to the
		710	// right of the pivot and the other to left of the pivot) that are not on the
		711	// correct side of the pivot.
		712	while (__first < __last) {
		713	_Ops::iter_swap(__first, __last);
		714	while (__comp(*++__first, __pivot))
		715	;
		716	while (!__comp(*--__last, __pivot))
		717	;
		718	}
		719	// Move the pivot to its correct position.
		720	_RandomAccessIterator __pivot_pos = __first - difference_type(1);
		721	if (__begin != __pivot_pos) {
		722	*__begin = _Ops::__iter_move(__pivot_pos);
		723	}
		724	*__pivot_pos = std::move(__pivot);
		725	return std::make_pair(__pivot_pos, __already_partitioned);
		726	}
		727
		728	// Similar to the above function. Elements equivalent to the pivot are put to
		729	// the left of the pivot. Returns the iterator to the pivot element.
		730	template <class _AlgPolicy, class _RandomAccessIterator, class _Compare>
		731	_LIBCPP_HIDE_FROM_ABI _RandomAccessIterator
		732	__partition_with_equals_on_left(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
		733	using _Ops = _IterOps<_AlgPolicy>;
		734	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		735	typedef typename std::iterator_traits<_RandomAccessIterator>::value_type value_type;
		736	_RandomAccessIterator __begin = __first;
		737	value_type __pivot(_Ops::__iter_move(__first));
		738	if (__comp(__pivot, *(__last - difference_type(1)))) {
		739	// Guarded.
		740	while (!__comp(__pivot, *++__first)) {
		741	}
		742	} else {
		743	while (++__first < __last && !__comp(__pivot, *__first)) {
		744	}
		745	}
		746
		747	if (__first < __last) {
		748	// It will be always guarded because __introsort will do the
		749	// median-of-three before calling this.
		750	while (__comp(__pivot, *--__last)) {
		751	}
		752	}
		753	while (__first < __last) {
		754	_Ops::iter_swap(__first, __last);
		755	while (!__comp(__pivot, *++__first))
		756	;
		757	while (__comp(__pivot, *--__last))
		758	;
		759	}
		760	_RandomAccessIterator __pivot_pos = __first - difference_type(1);
		761	if (__begin != __pivot_pos) {
		762	*__begin = _Ops::__iter_move(__pivot_pos);
		763	}
		764	*__pivot_pos = std::move(__pivot);
		765	return __first;
		766	}
		767
		768	// The main sorting function. Implements introsort combined with other ideas:
		769	// - option of using block quick sort for partitioning,
		770	// - guarded and unguarded insertion sort for small lengths,
		771	// - Tuckey's ninther technique for computing the pivot,
		772	// - check on whether partition was not required.
		773	// The implementation is partly based on Orson Peters' pattern-defeating
		774	// quicksort, published at: <https://github.com/orlp/pdqsort>.
		775	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator, bool _UseBitSetPartition>
		776	void __introsort(_RandomAccessIterator __first,
		777	_RandomAccessIterator __last,
		778	_Compare __comp,
		779	typename iterator_traits<_RandomAccessIterator>::difference_type __depth,
		780	bool __leftmost = true) {
		781	using _Ops = _IterOps<_AlgPolicy>;
		782	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
		783	using _Comp_ref = __comp_ref_type<_Compare>;
		784	// Upper bound for using insertion sort for sorting.
		785	_LIBCPP_CONSTEXPR difference_type __limit = 24;
		786	// Lower bound for using Tuckey's ninther technique for median computation.
		787	_LIBCPP_CONSTEXPR difference_type __ninther_threshold = 128;
428	while (true) {	788	while (true) {
429	__restart:
430	difference_type __len = __last - __first;	789	difference_type __len = __last - __first;
431	switch (__len) {	790	switch (__len) {
432	case 0:	791	case 0:
...	@@ -434,7 +793,7 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C	...	@@ -434,7 +793,7 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
434	return;	793	return;
435	case 2:	794	case 2:
436	if (__comp(--__last, __first))	795	if (__comp(--__last, __first))
437	_IterOps<_AlgPolicy>::iter_swap(__first, __last);	796	_Ops::iter_swap(__first, __last);
438	return;	797	return;
439	case 3:	798	case 3:
440	std::__sort3_maybe_branchless<_AlgPolicy, _Compare>(__first, __first + difference_type(1), --__last, __comp);	799	std::__sort3_maybe_branchless<_AlgPolicy, _Compare>(__first, __first + difference_type(1), --__last, __comp);
...	@@ -449,127 +808,60 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C	...	@@ -449,127 +808,60 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
449	--__last, __comp);	808	--__last, __comp);
450	return;	809	return;
451	}	810	}
452	if (__len <= __limit) {	811	// Use insertion sort if the length of the range is below the specified limit.
453	std::__insertion_sort_3<_AlgPolicy, _Compare>(__first, __last, __comp);	812	if (__len < __limit) {
		813	if (__leftmost) {
		814	std::__insertion_sort<_AlgPolicy, _Compare>(__first, __last, __comp);
		815	} else {
		816	std::__insertion_sort_unguarded<_AlgPolicy, _Compare>(__first, __last, __comp);
		817	}
454	return;	818	return;
455	}	819	}
456	// __len > 5
457	if (__depth == 0) {	820	if (__depth == 0) {
458	// Fallback to heap sort as Introsort suggests.	821	// Fallback to heap sort as Introsort suggests.
459	std::__partial_sort<_AlgPolicy, _Compare>(__first, __last, __last, __comp);	822	std::__partial_sort<_AlgPolicy, _Compare>(__first, __last, __last, __comp);
460	return;	823	return;
461	}	824	}
462	--__depth;	825	--__depth;
463	_RandomAccessIterator __m = __first;
464	_RandomAccessIterator __lm1 = __last;
465	--__lm1;
466	unsigned __n_swaps;
467	{	826	{
468	difference_type __delta;	827	difference_type __half_len = __len / 2;
469	if (__len >= 1000) {	828	// Use Tuckey's ninther technique or median of 3 for pivot selection
470	__delta = __len / 2;	829	// depending on the length of the range being sorted.
471	__m += __delta;	830	if (__len > __ninther_threshold) {
472	__delta /= 2;	831	std::__sort3<_AlgPolicy, _Compare>(__first, __first + __half_len, __last - difference_type(1), __comp);
473	__n_swaps = std::__sort5_wrap_policy<_AlgPolicy, _Compare>(	832	std::__sort3<_AlgPolicy, _Compare>(
474	__first, __first + __delta, __m, __m + __delta, __lm1, __comp);	833	__first + difference_type(1), __first + (__half_len - 1), __last - difference_type(2), __comp);
		834	std::__sort3<_AlgPolicy, _Compare>(
		835	__first + difference_type(2), __first + (__half_len + 1), __last - difference_type(3), __comp);
		836	std::__sort3<_AlgPolicy, _Compare>(
		837	__first + (__half_len - 1), __first + __half_len, __first + (__half_len + 1), __comp);
		838	_Ops::iter_swap(__first, __first + __half_len);
475	} else {	839	} else {
476	__delta = __len / 2;	840	std::__sort3<_AlgPolicy, _Compare>(__first + __half_len, __first, __last - difference_type(1), __comp);
477	__m += __delta;
478	__n_swaps = std::__sort3<_AlgPolicy, _Compare>(__first, __m, __lm1, __comp);
479	}	841	}
480	}	842	}
481	// *__m is median	843	// The elements to the left of the current iterator range are already
482	// partition [__first, __m) < __m and __m <= [__m, __last)	844	// sorted. If the current iterator range to be sorted is not the
483	// (this inhibits tossing elements equivalent to __m around unnecessarily)	845	// leftmost part of the entire iterator range and the pivot is same as
484	_RandomAccessIterator __i = __first;	846	// the highest element in the range to the left, then we know that all
485	_RandomAccessIterator __j = __lm1;	847	// the elements in the range [first, pivot] would be equal to the pivot,
486	// j points beyond range to be tested, __m is known to be <= __lm1	848	// assuming the equal elements are put on the left side when
487	// The search going up is known to be guarded but the search coming down isn't.	849	// partitioned. This also means that we do not need to sort the left
488	// Prime the downward search with a guard.	850	// side of the partition.
489	if (!__comp(__i, __m)) // if __first == __m	851	if (!__leftmost && !__comp((__first - difference_type(1)), __first)) {
490	{	852	__first = std::__partition_with_equals_on_left<_AlgPolicy, _RandomAccessIterator, _Comp_ref>(
491	// __first == __m, *__first doesn't go in first part	853	__first, __last, _Comp_ref(__comp));
492	// manually guard downward moving __j against __i	854	continue;
493	while (true) {
494	if (__i == --__j) {
495	// __first == __m, *__m <= all other elements
496	// Parition instead into [__first, __i) == __first and __first < [__i, __last)
497	++__i; // __first + 1
498	__j = __last;
499	if (!__comp(__first, --__j)) // we need a guard if __first == (__last-1)
500	{
501	while (true) {
502	if (__i == __j)
503	return; // [__first, __last) all equivalent elements
504	if (__comp(__first, __i)) {
505	_Ops::iter_swap(__i, __j);
506	++__n_swaps;
507	++__i;
508	break;
509	}
510	++__i;
511	}
512	}
513	// [__first, __i) == __first and __first < [__j, __last) and __j == __last - 1
514	if (__i == __j)
515	return;
516	while (true) {
517	while (!__comp(__first, __i))
518	++__i;
519	while (__comp(__first, --__j))
520	;
521	if (__i >= __j)
522	break;
523	_Ops::iter_swap(__i, __j);
524	++__n_swaps;
525	++__i;
526	}
527	// [__first, __i) == __first and __first < [__i, __last)
528	// The first part is sorted, sort the second part
529	// _VSTD::__sort<_Compare>(__i, __last, __comp);
530	__first = __i;
531	goto __restart;
532	}
533	if (__comp(__j, __m)) {
534	_Ops::iter_swap(__i, __j);
535	++__n_swaps;
536	break; // found guard for downward moving __j, now use unguarded partition
537	}
538	}
539	}
540	// It is known that __i < __m
541	++__i;
542	// j points beyond range to be tested, __m is known to be <= __lm1
543	// if not yet partitioned...
544	if (__i < __j) {
545	// known that (__i - 1) < __m
546	// known that __i <= __m
547	while (true) {
548	// __m still guards upward moving __i
549	while (__comp(__i, __m))
550	++__i;
551	// It is now known that a guard exists for downward moving __j
552	while (!__comp(--__j, __m))
553	;
554	if (__i > __j)
555	break;
556	_Ops::iter_swap(__i, __j);
557	++__n_swaps;
558	// It is known that __m != __j
559	// If __m just moved, follow it
560	if (__m == __i)
561	__m = __j;
562	++__i;
563	}
564	}
565	// [__first, __i) < __m and __m <= [__i, __last)
566	if (__i != __m && __comp(__m, __i)) {
567	_Ops::iter_swap(__i, __m);
568	++__n_swaps;
569	}	855	}
		856	// Use bitset partition only if asked for.
		857	auto __ret =
		858	_UseBitSetPartition
		859	? std::__bitset_partition<_AlgPolicy, _RandomAccessIterator, _Compare>(__first, __last, __comp)
		860	: std::__partition_with_equals_on_right<_AlgPolicy, _RandomAccessIterator, _Compare>(__first, __last, __comp);
		861	_RandomAccessIterator __i = __ret.first;
570	// [__first, __i) < __i and __i <= [__i+1, __last)	862	// [__first, __i) < __i and __i <= [__i+1, __last)
571	// If we were given a perfect partition, see if insertion sort is quick...	863	// If we were given a perfect partition, see if insertion sort is quick...
572	if (__n_swaps == 0) {	864	if (__ret.second) {
573	using _WrappedComp = typename _WrapAlgPolicy<_AlgPolicy, _Compare>::type;	865	using _WrappedComp = typename _WrapAlgPolicy<_AlgPolicy, _Compare>::type;
574	_WrappedComp __wrapped_comp(__comp);	866	_WrappedComp __wrapped_comp(__comp);
575	bool __fs = std::__insertion_sort_incomplete<_WrappedComp>(__first, __i, __wrapped_comp);	867	bool __fs = std::__insertion_sort_incomplete<_WrappedComp>(__first, __i, __wrapped_comp);
...	@@ -585,14 +877,11 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C	...	@@ -585,14 +877,11 @@ void __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
585	}	877	}
586	}	878	}
587	}	879	}
588	// sort smaller range with recursive call and larger with tail recursion elimination	880	// Sort the left partiton recursively and the right partition with tail recursion elimination.
589	if (__i - __first < __last - __i) {	881	std::__introsort<_AlgPolicy, _Compare, _RandomAccessIterator, _UseBitSetPartition>(
590	std::__introsort<_AlgPolicy, _Compare>(__first, __i, __comp, __depth);	882	__first, __i, __comp, __depth, __leftmost);
591	__first = ++__i;	883	__leftmost = false;
592	} else {	884	__first = ++__i;
593	std::__introsort<_AlgPolicy, _Compare>(__i + difference_type(1), __last, __comp, __depth);
594	__last = __i;
595	}
596	}	885	}
597	}	886	}
598		887
...	@@ -616,15 +905,22 @@ inline _LIBCPP_HIDE_FROM_ABI _Number __log2i(_Number __n) {	...	@@ -616,15 +905,22 @@ inline _LIBCPP_HIDE_FROM_ABI _Number __log2i(_Number __n) {
616	}	905	}
617		906
618	template <class _WrappedComp, class _RandomAccessIterator>	907	template <class _WrappedComp, class _RandomAccessIterator>
619	void __sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _WrappedComp __wrapped_comp) {	908	_LIBCPP_HIDDEN void __sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _WrappedComp __wrapped_comp) {
620	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	909	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
621	difference_type __depth_limit = 2 * __log2i(__last - __first);	910	difference_type __depth_limit = 2 * std::__log2i(__last - __first);
622		911
623	using _Unwrap = _UnwrapAlgPolicy<_WrappedComp>;	912	using _Unwrap = _UnwrapAlgPolicy<_WrappedComp>;
624	using _AlgPolicy = typename _Unwrap::_AlgPolicy;	913	using _AlgPolicy = typename _Unwrap::_AlgPolicy;
625	using _Compare = typename _Unwrap::_Comp;	914	using _Compare = typename _Unwrap::_Comp;
626	_Compare __comp = _Unwrap::__get_comp(__wrapped_comp);	915	_Compare __comp = _Unwrap::__get_comp(__wrapped_comp);
627	std::__introsort<_AlgPolicy, _Compare>(__first, __last, __comp, __depth_limit);	916	// Only use bitset partitioning for arithmetic types. We should also check
		917	// that the default comparator is in use so that we are sure that there are no
		918	// branches in the comparator.
		919	std::__introsort<_AlgPolicy,
		920	_Compare,
		921	_RandomAccessIterator,
		922	__use_branchless_sort<_Compare, _RandomAccessIterator>::value>(
		923	__first, __last, __comp, __depth_limit);
628	}	924	}
629		925
630	template <class _Compare, class _Tp>	926	template <class _Compare, class _Tp>
...	@@ -672,11 +968,11 @@ extern template _LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long do	...	@@ -672,11 +968,11 @@ extern template _LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long do
672	extern template _LIBCPP_FUNC_VIS unsigned __sort5<__less<long double>&, long double>(long double, long double, long double, long double, long double, __less<long double>&);	968	extern template _LIBCPP_FUNC_VIS unsigned __sort5<__less<long double>&, long double>(long double, long double, long double, long double, long double, __less<long double>&);
673		969
674	template <class _AlgPolicy, class _RandomAccessIterator, class _Comp>	970	template <class _AlgPolicy, class _RandomAccessIterator, class _Comp>
675	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	971	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
676	void __sort_impl(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp& __comp) {	972	void __sort_impl(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp& __comp) {
677	std::__debug_randomize_range<_AlgPolicy>(__first, __last);	973	std::__debug_randomize_range<_AlgPolicy>(__first, __last);
678		974
679	using _Comp_ref = typename __comp_ref_type<_Comp>::type;	975	using _Comp_ref = __comp_ref_type<_Comp>;
680	if (__libcpp_is_constant_evaluated()) {	976	if (__libcpp_is_constant_evaluated()) {
681	std::__partial_sort<_AlgPolicy>(__first, __last, __last, __comp);	977	std::__partial_sort<_AlgPolicy>(__first, __last, __last, __comp);
682		978
...	@@ -689,13 +985,13 @@ void __sort_impl(_RandomAccessIterator __first, _RandomAccessIterator __last, _C	...	@@ -689,13 +985,13 @@ void __sort_impl(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
689	}	985	}
690		986
691	template <class _RandomAccessIterator, class _Comp>	987	template <class _RandomAccessIterator, class _Comp>
692	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	988	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
693	void sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp __comp) {	989	void sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp __comp) {
694	std::__sort_impl<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __comp);	990	std::__sort_impl<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __comp);
695	}	991	}
696		992
697	template <class _RandomAccessIterator>	993	template <class _RandomAccessIterator>
698	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	994	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
699	void sort(_RandomAccessIterator __first, _RandomAccessIterator __last) {	995	void sort(_RandomAccessIterator __first, _RandomAccessIterator __last) {
700	std::sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());	996	std::sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
701	}	997	}

lib/libcxx/include/__algorithm/sort_heap.h+4-5

lib/libcxx/include/__algorithm/stable_partition.h+10-5

...	@@ -15,7 +15,12 @@	...	@@ -15,7 +15,12 @@
15	#include <__iterator/advance.h>	15	#include <__iterator/advance.h>
16	#include <__iterator/distance.h>	16	#include <__iterator/distance.h>
17	#include <__iterator/iterator_traits.h>	17	#include <__iterator/iterator_traits.h>
18	#include <memory>	18	#include <__memory/destruct_n.h>
		19	#include <__memory/temporary_buffer.h>
		20	#include <__memory/unique_ptr.h>
		21	#include <__utility/move.h>
		22	#include <__utility/pair.h>
		23	#include <new>
19	#include <type_traits>	24	#include <type_traits>
20		25
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -25,7 +30,7 @@	...	@@ -25,7 +30,7 @@
25	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
26		31
27	template <class _AlgPolicy, class _Predicate, class _ForwardIterator, class _Distance, class _Pair>	32	template <class _AlgPolicy, class _Predicate, class _ForwardIterator, class _Distance, class _Pair>
28	_ForwardIterator	33	_LIBCPP_HIDE_FROM_ABI _ForwardIterator
29	__stable_partition_impl(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,	34	__stable_partition_impl(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
30	_Distance __len, _Pair __p, forward_iterator_tag __fit)	35	_Distance __len, _Pair __p, forward_iterator_tag __fit)
31	{	36	{
...	@@ -114,7 +119,7 @@ __second_half_done:	...	@@ -114,7 +119,7 @@ __second_half_done:
114	}	119	}
115		120
116	template <class _AlgPolicy, class _Predicate, class _ForwardIterator>	121	template <class _AlgPolicy, class _Predicate, class _ForwardIterator>
117	_ForwardIterator	122	_LIBCPP_HIDE_FROM_ABI _ForwardIterator
118	__stable_partition_impl(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,	123	__stable_partition_impl(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
119	forward_iterator_tag)	124	forward_iterator_tag)
120	{	125	{
...	@@ -259,7 +264,7 @@ __second_half_done:	...	@@ -259,7 +264,7 @@ __second_half_done:
259	}	264	}
260		265
261	template <class _AlgPolicy, class _Predicate, class _BidirectionalIterator>	266	template <class _AlgPolicy, class _Predicate, class _BidirectionalIterator>
262	_BidirectionalIterator	267	_LIBCPP_HIDE_FROM_ABI _BidirectionalIterator
263	__stable_partition_impl(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,	268	__stable_partition_impl(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
264	bidirectional_iterator_tag)	269	bidirectional_iterator_tag)
265	{	270	{
...	@@ -305,7 +310,7 @@ template <class _AlgPolicy, class _Predicate, class _ForwardIterator, class _Ite	...	@@ -305,7 +310,7 @@ template <class _AlgPolicy, class _Predicate, class _ForwardIterator, class _Ite
305	_LIBCPP_HIDE_FROM_ABI	310	_LIBCPP_HIDE_FROM_ABI
306	_ForwardIterator __stable_partition(	311	_ForwardIterator __stable_partition(
307	_ForwardIterator __first, _ForwardIterator __last, _Predicate&& __pred, _IterCategory __iter_category) {	312	_ForwardIterator __first, _ForwardIterator __last, _Predicate&& __pred, _IterCategory __iter_category) {
308	return std::__stable_partition_impl<_AlgPolicy, __uncvref_t<_Predicate>&>(	313	return std::__stable_partition_impl<_AlgPolicy, __remove_cvref_t<_Predicate>&>(
309	std::move(__first), std::move(__last), __pred, __iter_category);	314	std::move(__first), std::move(__last), __pred, __iter_category);
310	}	315	}
311		316

lib/libcxx/include/__algorithm/stable_sort.h+8-5

...	@@ -16,8 +16,12 @@	...	@@ -16,8 +16,12 @@
16	#include <__algorithm/sort.h>	16	#include <__algorithm/sort.h>
17	#include <__config>	17	#include <__config>
18	#include <__iterator/iterator_traits.h>	18	#include <__iterator/iterator_traits.h>
		19	#include <__memory/destruct_n.h>
		20	#include <__memory/temporary_buffer.h>
		21	#include <__memory/unique_ptr.h>
19	#include <__utility/move.h>	22	#include <__utility/move.h>
20	#include <memory>	23	#include <__utility/pair.h>
		24	#include <new>
21	#include <type_traits>	25	#include <type_traits>
22		26
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -27,7 +31,7 @@	...	@@ -27,7 +31,7 @@
27	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
28		32
29	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _InputIterator2>	33	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _InputIterator2>
30	void	34	_LIBCPP_HIDE_FROM_ABI void
31	__merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,	35	__merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,
32	_InputIterator2 __first2, _InputIterator2 __last2,	36	_InputIterator2 __first2, _InputIterator2 __last2,
33	typename iterator_traits<_InputIterator1>::value_type* __result, _Compare __comp)	37	typename iterator_traits<_InputIterator1>::value_type* __result, _Compare __comp)
...	@@ -69,7 +73,7 @@ __merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -69,7 +73,7 @@ __merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,
69	}	73	}
70		74
71	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>	75	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
72	void	76	_LIBCPP_HIDE_FROM_ABI void
73	__merge_move_assign(_InputIterator1 __first1, _InputIterator1 __last1,	77	__merge_move_assign(_InputIterator1 __first1, _InputIterator1 __last1,
74	_InputIterator2 __first2, _InputIterator2 __last2,	78	_InputIterator2 __first2, _InputIterator2 __last2,
75	_OutputIterator __result, _Compare __comp)	79	_OutputIterator __result, _Compare __comp)
...	@@ -223,8 +227,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -223,8 +227,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
223	__h.reset(__buf.first);	227	__h.reset(__buf.first);
224	}	228	}
225		229
226	using _Comp_ref = typename __comp_ref_type<_Compare>::type;	230	std::__stable_sort<_AlgPolicy, __comp_ref_type<_Compare> >(__first, __last, __comp, __len, __buf.first, __buf.second);
227	std::__stable_sort<_AlgPolicy, _Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second);
228	}	231	}
229		232
230	template <class _RandomAccessIterator, class _Compare>	233	template <class _RandomAccessIterator, class _Compare>

lib/libcxx/include/__algorithm/swap_ranges.h+3-3

lib/libcxx/include/__algorithm/transform.h+2-2

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	template <class _InputIterator, class _OutputIterator, class _UnaryOperation>	20	template <class _InputIterator, class _OutputIterator, class _UnaryOperation>
21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	21	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
22	_OutputIterator	22	_OutputIterator
23	transform(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _UnaryOperation __op)	23	transform(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _UnaryOperation __op)
24	{	24	{
...	@@ -28,7 +28,7 @@ transform(_InputIterator __first, _InputIterator __last, _OutputIterator __resul	...	@@ -28,7 +28,7 @@ transform(_InputIterator __first, _InputIterator __last, _OutputIterator __resul
28	}	28	}
29		29
30	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _BinaryOperation>	30	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _BinaryOperation>
31	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	31	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
32	_OutputIterator	32	_OutputIterator
33	transform(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,	33	transform(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
34	_OutputIterator __result, _BinaryOperation __binary_op)	34	_OutputIterator __result, _BinaryOperation __binary_op)

lib/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h+5-5

...	@@ -36,21 +36,21 @@ template <class _Gen>	...	@@ -36,21 +36,21 @@ template <class _Gen>
36	class _ClassicGenAdaptor {	36	class _ClassicGenAdaptor {
37	private:	37	private:
38	// The generator is not required to be copyable or movable, so it has to be stored as a reference.	38	// The generator is not required to be copyable or movable, so it has to be stored as a reference.
39	_Gen& __gen;	39	_Gen& __gen_;
40		40
41	public:	41	public:
42	using result_type = invoke_result_t<_Gen&>;	42	using result_type = invoke_result_t<_Gen&>;
43		43
44	_LIBCPP_HIDE_FROM_ABI	44	_LIBCPP_HIDE_FROM_ABI
45	static constexpr auto min() { return __uncvref_t<_Gen>::min(); }	45	static constexpr auto min() { return __remove_cvref_t<_Gen>::min(); }
46	_LIBCPP_HIDE_FROM_ABI	46	_LIBCPP_HIDE_FROM_ABI
47	static constexpr auto max() { return __uncvref_t<_Gen>::max(); }	47	static constexpr auto max() { return __remove_cvref_t<_Gen>::max(); }
48		48
49	_LIBCPP_HIDE_FROM_ABI	49	_LIBCPP_HIDE_FROM_ABI
50	constexpr explicit _ClassicGenAdaptor(_Gen& __g) : __gen(__g) {}	50	constexpr explicit _ClassicGenAdaptor(_Gen& __g) : __gen_(__g) {}
51		51
52	_LIBCPP_HIDE_FROM_ABI	52	_LIBCPP_HIDE_FROM_ABI
53	constexpr auto operator()() const { return __gen(); }	53	constexpr auto operator()() const { return __gen_(); }
54	};	54	};
55		55
56	_LIBCPP_END_NAMESPACE_STD	56	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/unique.h+4-5

 @@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // unique
 template <class _AlgPolicy, class _Iter, class _Sent, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 std::pair<_Iter, _Iter>
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 std::pair<_Iter, _Iter>
 __unique(_Iter __first, _Sent __last, _BinaryPredicate&& __pred) {
   __first = std::__adjacent_find(__first, __last, __pred);
   if (__first != __last) {
 @@ -43,16 +43,15 @@ __unique(_Iter __first, _Sent __last, _BinaryPredicate&& __pred) {
 }
 template <class _ForwardIterator, class _BinaryPredicate>
-_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred) {
   return std::__unique<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __pred).first;
 }
 template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
 unique(_ForwardIterator __first, _ForwardIterator __last) {
-  typedef typename iterator_traits<_ForwardIterator>::value_type __v;
+  return std::unique(__first, __last, __equal_to());
-  return std::unique(__first, __last, __equal_to<__v>());
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/unique_copy.h+9-10

 @@ -34,7 +34,7 @@ struct __read_from_tmp_value_tag {};
 } // namespace __unique_copy_tags
 template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _OutputIterator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _OutputIterator>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _OutputIterator>
 __unique_copy(_InputIterator __first,
               _Sent __last,
               _OutputIterator __result,
 @@ -56,7 +56,7 @@ __unique_copy(_InputIterator __first,
 }
 template <class _AlgPolicy, class _BinaryPredicate, class _ForwardIterator, class _Sent, class _OutputIterator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI pair<_ForwardIterator, _OutputIterator>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_ForwardIterator, _OutputIterator>
 __unique_copy(_ForwardIterator __first,
               _Sent __last,
               _OutputIterator __result,
 @@ -78,7 +78,7 @@ __unique_copy(_ForwardIterator __first,
 }
 template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _InputAndOutputIterator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _InputAndOutputIterator>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _InputAndOutputIterator>
 __unique_copy(_InputIterator __first,
               _Sent __last,
               _InputAndOutputIterator __result,
 @@ -95,27 +95,26 @@ __unique_copy(_InputIterator __first,
 }
 template <class _InputIterator, class _OutputIterator, class _BinaryPredicate>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryPredicate __pred) {
-  using __algo_tag = typename conditional<
+  using __algo_tag = __conditional_t<
       is_base_of<forward_iterator_tag, typename iterator_traits<_InputIterator>::iterator_category>::value,
       __unique_copy_tags::__reread_from_input_tag,
-      typename conditional<
+      __conditional_t<
           is_base_of<forward_iterator_tag, typename iterator_traits<_OutputIterator>::iterator_category>::value &&
               is_same< typename iterator_traits<_InputIterator>::value_type,
                        typename iterator_traits<_OutputIterator>::value_type>::value,
           __unique_copy_tags::__reread_from_output_tag,
-          __unique_copy_tags::__read_from_tmp_value_tag>::type >::type;
+          __unique_copy_tags::__read_from_tmp_value_tag> >;
   return std::__unique_copy<_ClassicAlgPolicy>(
              std::move(__first), std::move(__last), std::move(__result), __pred, __algo_tag())
       .second;
 }
 template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
-  typedef typename iterator_traits<_InputIterator>::value_type __v;
+  return std::unique_copy(std::move(__first), std::move(__last), std::move(__result), __equal_to());
-  return std::unique_copy(std::move(__first), std::move(__last), std::move(__result), __equal_to<__v>());
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/unwrap_iter.h+4-2

 @@ -12,8 +12,10 @@
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__memory/pointer_traits.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_copy_constructible.h>
+#include <__utility/declval.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -57,7 +59,7 @@ struct __unwrap_iter_impl<_Iter, true> {
 template<class _Iter,
          class _Impl = __unwrap_iter_impl<_Iter>,
          __enable_if_t<is_copy_constructible<_Iter>::value, int> = 0>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 decltype(_Impl::__unwrap(std::declval<_Iter>())) __unwrap_iter(_Iter __i) _NOEXCEPT {
   return _Impl::__unwrap(__i);
 }

lib/libcxx/include/__algorithm/unwrap_range.h+1-1

...	@@ -28,7 +28,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -28,7 +28,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
28	// __unwrap_iter and __rewrap_iter don't work for this, because they assume that the iterator and sentinel have	28	// __unwrap_iter and __rewrap_iter don't work for this, because they assume that the iterator and sentinel have
29	// the same type. __unwrap_range tries to get two iterators and then forward to __unwrap_iter.	29	// the same type. __unwrap_range tries to get two iterators and then forward to __unwrap_iter.
30		30
31	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	31	#if _LIBCPP_STD_VER > 17
32	template <class _Iter, class _Sent>	32	template <class _Iter, class _Sent>
33	struct __unwrap_range_impl {	33	struct __unwrap_range_impl {
34	_LIBCPP_HIDE_FROM_ABI static constexpr auto __unwrap(_Iter __first, _Sent __sent)	34	_LIBCPP_HIDE_FROM_ABI static constexpr auto __unwrap(_Iter __first, _Sent __sent)

lib/libcxx/include/__algorithm/upper_bound.h+3-3

lib/libcxx/include/__assert+3-7

 @@ -17,13 +17,9 @@
 #  pragma GCC system_header
 #endif
-// This is for backwards compatibility with code that might have been enabling
+// TODO: Remove in LLVM 17.
-// assertions through the Debug mode previously.
-// TODO: In LLVM 16, make it an error to define _LIBCPP_DEBUG
 #if defined(_LIBCPP_DEBUG)
-# ifndef _LIBCPP_ENABLE_ASSERTIONS
+#   error "Defining _LIBCPP_DEBUG is not supported anymore. Please use _LIBCPP_ENABLE_DEBUG_MODE instead."
-#   define _LIBCPP_ENABLE_ASSERTIONS 1
-# endif
 #endif
 // Automatically enable assertions when the debug mode is enabled.
 @@ -45,7 +41,7 @@
 # define _LIBCPP_ASSERT(expression, message)                                        \
     (__builtin_expect(static_cast<bool>(expression), 1) ?                           \
       (void)0 :                                                                     \
-      ::std::__libcpp_verbose_abort("%s:%d: assertion %s failed: %s", __FILE__, __LINE__, #expression, message))
+      _LIBCPP_VERBOSE_ABORT("%s:%d: assertion %s failed: %s", __FILE__, __LINE__, #expression, message))
 #elif !defined(_LIBCPP_ASSERTIONS_DISABLE_ASSUME) && __has_builtin(__builtin_assume)
 # define _LIBCPP_ASSERT(expression, message)                                        \
     (_LIBCPP_DIAGNOSTIC_PUSH                                                        \

lib/libcxx/include/__availability+3-14

...	@@ -156,20 +156,9 @@	...	@@ -156,20 +156,9 @@
156	# define _LIBCPP_AVAILABILITY_FORMAT	156	# define _LIBCPP_AVAILABILITY_FORMAT
157	// # define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_format	157	// # define _LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_format
158		158
159	// This controls whether the default verbose termination function is	159	// This controls whether the library claims to provide a default verbose
160	// provided by the library.	160	// termination function, and consequently whether the headers will try
161	//	161	// to use it when the mechanism isn't overriden at compile-time.
162	// Note that when users provide their own custom function, it doesn't
163	// matter whether the dylib provides a default function, and the
164	// availability markup can actually give a false positive diagnostic
165	// (it will think that no function is provided, when in reality the
166	// user has provided their own).
167	//
168	// Users can pass -D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED
169	// to the compiler to tell the library not to define its own verbose abort.
170	// Note that defining this macro but failing to define a custom function
171	// will lead to a load-time error on back-deployment targets, so it should
172	// be avoided.
173	// # define _LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY	162	// # define _LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY
174		163
175	#elif defined(__APPLE__)	164	#elif defined(__APPLE__)

lib/libcxx/include/__bit/bit_cast.h+1-1

...	@@ -11,7 +11,7 @@	...	@@ -11,7 +11,7 @@
11	#define _LIBCPP___BIT_BIT_CAST_H	11	#define _LIBCPP___BIT_BIT_CAST_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <type_traits>	14	#include <__type_traits/is_trivially_copyable.h>
15		15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__bit/bit_ceil.h created+46

...	@@ -0,0 +1,46 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_BIT_CEIL_H
10	#define _LIBCPP___BIT_BIT_CEIL_H
11
12	#include <__assert>
13	#include <__bit/countl.h>
14	#include <__concepts/arithmetic.h>
15	#include <__config>
16	#include <limits>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	#if _LIBCPP_STD_VER >= 20
25
26	template <__libcpp_unsigned_integer _Tp>
27	_LIBCPP_HIDE_FROM_ABI constexpr _Tp bit_ceil(_Tp __t) noexcept {
28	if (__t < 2)
29	return 1;
30	const unsigned __n = numeric_limits<_Tp>::digits - std::countl_zero((_Tp)(__t - 1u));
31	_LIBCPP_ASSERT(__n != numeric_limits<_Tp>::digits, "Bad input to bit_ceil");
32
33	if constexpr (sizeof(_Tp) >= sizeof(unsigned))
34	return _Tp{1} << __n;
35	else {
36	const unsigned __extra = numeric_limits<unsigned>::digits - numeric_limits<_Tp>::digits;
37	const unsigned __retVal = 1u << (__n + __extra);
38	return (_Tp)(__retVal >> __extra);
39	}
40	}
41
42	#endif // _LIBCPP_STD_VER >= 20
43
44	_LIBCPP_END_NAMESPACE_STD
45
46	#endif // _LIBCPP___BIT_BIT_CEIL_H

lib/libcxx/include/__bit/bit_floor.h created+34

...	@@ -0,0 +1,34 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_BIT_FLOOR_H
10	#define _LIBCPP___BIT_BIT_FLOOR_H
11
12	#include <__bit/bit_log2.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15	#include <limits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	#if _LIBCPP_STD_VER >= 20
24
25	template <__libcpp_unsigned_integer _Tp>
26	_LIBCPP_HIDE_FROM_ABI constexpr _Tp bit_floor(_Tp __t) noexcept {
27	return __t == 0 ? 0 : _Tp{1} << std::__bit_log2(__t);
28	}
29
30	#endif // _LIBCPP_STD_VER >= 20
31
32	_LIBCPP_END_NAMESPACE_STD
33
34	#endif // _LIBCPP___BIT_BIT_FLOOR_H

lib/libcxx/include/__bit/bit_log2.h created+34

...	@@ -0,0 +1,34 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_BIT_LOG2_H
10	#define _LIBCPP___BIT_BIT_LOG2_H
11
12	#include <__bit/countl.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15	#include <limits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	#if _LIBCPP_STD_VER >= 20
24
25	template <__libcpp_unsigned_integer _Tp>
26	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __bit_log2(_Tp __t) noexcept {
27	return numeric_limits<_Tp>::digits - 1 - std::countl_zero(__t);
28	}
29
30	#endif // _LIBCPP_STD_VER >= 20
31
32	_LIBCPP_END_NAMESPACE_STD
33
34	#endif // _LIBCPP___BIT_BIT_LOG2_H

lib/libcxx/include/__bit/bit_width.h created+33

...	@@ -0,0 +1,33 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_BIT_WIDTH_H
10	#define _LIBCPP___BIT_BIT_WIDTH_H
11
12	#include <__bit/bit_log2.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	#if _LIBCPP_STD_VER >= 20
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template <__libcpp_unsigned_integer _Tp>
25	_LIBCPP_HIDE_FROM_ABI constexpr int bit_width(_Tp __t) noexcept {
26	return __t == 0 ? 0 : std::__bit_log2(__t) + 1;
27	}
28
29	_LIBCPP_END_NAMESPACE_STD
30
31	#endif // _LIBCPP_STD_VER >= 20
32
33	#endif // _LIBCPP___BIT_BIT_WIDTH_H

lib/libcxx/include/__bit/blsr.h created+34

...	@@ -0,0 +1,34 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_BLSR_H
10	#define _LIBCPP___BIT_BLSR_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unsigned __libcpp_blsr(unsigned __x) _NOEXCEPT {
21	return __x ^ (__x & -__x);
22	}
23
24	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unsigned long __libcpp_blsr(unsigned long __x) _NOEXCEPT {
25	return __x ^ (__x & -__x);
26	}
27
28	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unsigned long long __libcpp_blsr(unsigned long long __x) _NOEXCEPT {
29	return __x ^ (__x & -__x);
30	}
31
32	_LIBCPP_END_NAMESPACE_STD
33
34	#endif // _LIBCPP___BIT_BLSR_H

lib/libcxx/include/__bit/countl.h created+104

...	@@ -0,0 +1,104 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_COUNTL_H
10	#define _LIBCPP___BIT_COUNTL_H
11
12	#include <__bit/rotate.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15	#include <__type_traits/is_unsigned_integer.h>
16	#include <limits>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_PUSH_MACROS
23	#include <__undef_macros>
24
25	_LIBCPP_BEGIN_NAMESPACE_STD
26
27	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
28	int __libcpp_clz(unsigned __x) _NOEXCEPT { return __builtin_clz(__x); }
29
30	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
31	int __libcpp_clz(unsigned long __x) _NOEXCEPT { return __builtin_clzl(__x); }
32
33	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
34	int __libcpp_clz(unsigned long long __x) _NOEXCEPT { return __builtin_clzll(__x); }
35
36	# ifndef _LIBCPP_HAS_NO_INT128
37	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
38	int __libcpp_clz(__uint128_t __x) _NOEXCEPT {
39	// The function is written in this form due to C++ constexpr limitations.
40	// The algorithm:
41	// - Test whether any bit in the high 64-bits is set
42	// - No bits set:
43	// - The high 64-bits contain 64 leading zeros,
44	// - Add the result of the low 64-bits.
45	// - Any bits set:
46	// - The number of leading zeros of the input is the number of leading
47	// zeros in the high 64-bits.
48	return ((__x >> 64) == 0)
49	? (64 + __builtin_clzll(static_cast<unsigned long long>(__x)))
50	: __builtin_clzll(static_cast<unsigned long long>(__x >> 64));
51	}
52	# endif // _LIBCPP_HAS_NO_INT128
53
54	template<class _Tp>
55	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
56	int __countl_zero(_Tp __t) _NOEXCEPT
57	{
58	static_assert(__libcpp_is_unsigned_integer<_Tp>::value, "__countl_zero requires an unsigned integer type");
59	if (__t == 0)
60	return numeric_limits<_Tp>::digits;
61
62	if (sizeof(_Tp) <= sizeof(unsigned int))
63	return std::__libcpp_clz(static_cast<unsigned int>(__t))
64	- (numeric_limits<unsigned int>::digits - numeric_limits<_Tp>::digits);
65	else if (sizeof(_Tp) <= sizeof(unsigned long))
66	return std::__libcpp_clz(static_cast<unsigned long>(__t))
67	- (numeric_limits<unsigned long>::digits - numeric_limits<_Tp>::digits);
68	else if (sizeof(_Tp) <= sizeof(unsigned long long))
69	return std::__libcpp_clz(static_cast<unsigned long long>(__t))
70	- (numeric_limits<unsigned long long>::digits - numeric_limits<_Tp>::digits);
71	else
72	{
73	int __ret = 0;
74	int __iter = 0;
75	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
76	while (true) {
77	__t = std::__rotr(__t, __ulldigits);
78	if ((__iter = std::__countl_zero(static_cast<unsigned long long>(__t))) != __ulldigits)
79	break;
80	__ret += __iter;
81	}
82	return __ret + __iter;
83	}
84	}
85
86	#if _LIBCPP_STD_VER >= 20
87
88	template <__libcpp_unsigned_integer _Tp>
89	_LIBCPP_HIDE_FROM_ABI constexpr int countl_zero(_Tp __t) noexcept {
90	return std::__countl_zero(__t);
91	}
92
93	template <__libcpp_unsigned_integer _Tp>
94	_LIBCPP_HIDE_FROM_ABI constexpr int countl_one(_Tp __t) noexcept {
95	return __t != numeric_limits<_Tp>::max() ? std::countl_zero(static_cast<_Tp>(~__t)) : numeric_limits<_Tp>::digits;
96	}
97
98	#endif // _LIBCPP_STD_VER >= 20
99
100	_LIBCPP_END_NAMESPACE_STD
101
102	_LIBCPP_POP_MACROS
103
104	#endif // _LIBCPP___BIT_COUNTL_H

lib/libcxx/include/__bit/countr.h created+70

...	@@ -0,0 +1,70 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_COUNTR_H
10	#define _LIBCPP___BIT_COUNTR_H
11
12	#include <__bit/rotate.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15	#include <limits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_PUSH_MACROS
22	#include <__undef_macros>
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
27	int __libcpp_ctz(unsigned __x) _NOEXCEPT { return __builtin_ctz(__x); }
28
29	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
30	int __libcpp_ctz(unsigned long __x) _NOEXCEPT { return __builtin_ctzl(__x); }
31
32	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
33	int __libcpp_ctz(unsigned long long __x) _NOEXCEPT { return __builtin_ctzll(__x); }
34
35	#if _LIBCPP_STD_VER >= 20
36
37	template <__libcpp_unsigned_integer _Tp>
38	_LIBCPP_HIDE_FROM_ABI constexpr int countr_zero(_Tp __t) noexcept {
39	if (__t == 0)
40	return numeric_limits<_Tp>::digits;
41
42	if (sizeof(_Tp) <= sizeof(unsigned int))
43	return std::__libcpp_ctz(static_cast<unsigned int>(__t));
44	else if (sizeof(_Tp) <= sizeof(unsigned long))
45	return std::__libcpp_ctz(static_cast<unsigned long>(__t));
46	else if (sizeof(_Tp) <= sizeof(unsigned long long))
47	return std::__libcpp_ctz(static_cast<unsigned long long>(__t));
48	else {
49	int __ret = 0;
50	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
51	while (static_cast<unsigned long long>(__t) == 0uLL) {
52	__ret += __ulldigits;
53	__t >>= __ulldigits;
54	}
55	return __ret + std::__libcpp_ctz(static_cast<unsigned long long>(__t));
56	}
57	}
58
59	template <__libcpp_unsigned_integer _Tp>
60	_LIBCPP_HIDE_FROM_ABI constexpr int countr_one(_Tp __t) noexcept {
61	return __t != numeric_limits<_Tp>::max() ? std::countr_zero(static_cast<_Tp>(~__t)) : numeric_limits<_Tp>::digits;
62	}
63
64	#endif // _LIBCPP_STD_VER >= 20
65
66	_LIBCPP_END_NAMESPACE_STD
67
68	_LIBCPP_POP_MACROS
69
70	#endif // _LIBCPP___BIT_COUNTR_H

lib/libcxx/include/__bit/endian.h created+38

...	@@ -0,0 +1,38 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_ENDIAN_H
10	#define _LIBCPP___BIT_ENDIAN_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	#if _LIBCPP_STD_VER >= 20
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	enum class endian {
23	little = 0xDEAD,
24	big = 0xFACE,
25	# if defined(_LIBCPP_LITTLE_ENDIAN)
26	native = little
27	# elif defined(_LIBCPP_BIG_ENDIAN)
28	native = big
29	# else
30	native = 0xCAFE
31	# endif
32	};
33
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP_STD_VER >= 20
37
38	#endif // _LIBCPP___BIT_ENDIAN_H

lib/libcxx/include/__bit/has_single_bit.h created+37

...	@@ -0,0 +1,37 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_HAS_SINGLE_BIT_H
10	#define _LIBCPP___BIT_HAS_SINGLE_BIT_H
11
12	#include <__concepts/arithmetic.h>
13	#include <__config>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_PUSH_MACROS
20	#include <__undef_macros>
21
22	#if _LIBCPP_STD_VER >= 20
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	template <__libcpp_unsigned_integer _Tp>
27	_LIBCPP_HIDE_FROM_ABI constexpr bool has_single_bit(_Tp __t) noexcept {
28	return __t != 0 && (((__t & (__t - 1)) == 0));
29	}
30
31	_LIBCPP_END_NAMESPACE_STD
32
33	#endif // _LIBCPP_STD_VER >= 20
34
35	_LIBCPP_POP_MACROS
36
37	#endif // _LIBCPP___BIT_HAS_SINGLE_BIT_H

lib/libcxx/include/__bit/popcount.h created+61

...	@@ -0,0 +1,61 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_POPCOUNT_H
10	#define _LIBCPP___BIT_POPCOUNT_H
11
12	#include <__bit/rotate.h>
13	#include <__concepts/arithmetic.h>
14	#include <__config>
15	#include <limits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_PUSH_MACROS
22	#include <__undef_macros>
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
27	int __libcpp_popcount(unsigned __x) _NOEXCEPT { return __builtin_popcount(__x); }
28
29	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
30	int __libcpp_popcount(unsigned long __x) _NOEXCEPT { return __builtin_popcountl(__x); }
31
32	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
33	int __libcpp_popcount(unsigned long long __x) _NOEXCEPT { return __builtin_popcountll(__x); }
34
35	#if _LIBCPP_STD_VER >= 20
36
37	template <__libcpp_unsigned_integer _Tp>
38	_LIBCPP_HIDE_FROM_ABI constexpr int popcount(_Tp __t) noexcept {
39	if (sizeof(_Tp) <= sizeof(unsigned int))
40	return std::__libcpp_popcount(static_cast<unsigned int>(__t));
41	else if (sizeof(_Tp) <= sizeof(unsigned long))
42	return std::__libcpp_popcount(static_cast<unsigned long>(__t));
43	else if (sizeof(_Tp) <= sizeof(unsigned long long))
44	return std::__libcpp_popcount(static_cast<unsigned long long>(__t));
45	else {
46	int __ret = 0;
47	while (__t != 0) {
48	__ret += std::__libcpp_popcount(static_cast<unsigned long long>(__t));
49	__t >>= numeric_limits<unsigned long long>::digits;
50	}
51	return __ret;
52	}
53	}
54
55	#endif // _LIBCPP_STD_VER >= 20
56
57	_LIBCPP_END_NAMESPACE_STD
58
59	_LIBCPP_POP_MACROS
60
61	#endif // _LIBCPP___BIT_POPCOUNT_H

lib/libcxx/include/__bit/rotate.h created+53

...	@@ -0,0 +1,53 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___BIT_ROTATE_H
10	#define _LIBCPP___BIT_ROTATE_H
11
12	#include <__concepts/arithmetic.h>
13	#include <__config>
14	#include <__type_traits/is_unsigned_integer.h>
15	#include <limits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template<class _Tp>
24	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
25	_Tp __rotr(_Tp __t, unsigned int __cnt) _NOEXCEPT
26	{
27	static_assert(__libcpp_is_unsigned_integer<_Tp>::value, "__rotr requires an unsigned integer type");
28	const unsigned int __dig = numeric_limits<_Tp>::digits;
29	if ((__cnt % __dig) == 0)
30	return __t;
31	return (__t >> (__cnt % __dig)) \| (__t << (__dig - (__cnt % __dig)));
32	}
33
34	#if _LIBCPP_STD_VER >= 20
35
36	template <__libcpp_unsigned_integer _Tp>
37	_LIBCPP_HIDE_FROM_ABI constexpr _Tp rotl(_Tp __t, unsigned int __cnt) noexcept {
38	const unsigned int __dig = numeric_limits<_Tp>::digits;
39	if ((__cnt % __dig) == 0)
40	return __t;
41	return (__t << (__cnt % __dig)) \| (__t >> (__dig - (__cnt % __dig)));
42	}
43
44	template <__libcpp_unsigned_integer _Tp>
45	_LIBCPP_HIDE_FROM_ABI constexpr _Tp rotr(_Tp __t, unsigned int __cnt) noexcept {
46	return std::__rotr(__t, __cnt);
47	}
48
49	#endif // _LIBCPP_STD_VER >= 20
50
51	_LIBCPP_END_NAMESPACE_STD
52
53	#endif // _LIBCPP___BIT_ROTATE_H

lib/libcxx/include/__bit_reference+88-86

 @@ -13,7 +13,8 @@
 #include <__algorithm/copy_n.h>
 #include <__algorithm/fill_n.h>
 #include <__algorithm/min.h>
-#include <__bits>
+#include <__bit/countr.h>
+#include <__bit/popcount.h>
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__memory/construct_at.h>
 @@ -54,15 +55,17 @@ class __bit_reference
     friend class __bit_const_reference<_Cp>;
     friend class __bit_iterator<_Cp, false>;
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    using __container = typename _Cp::__self;
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_reference(const __bit_reference&) = default;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 operator bool() const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 operator bool() const _NOEXCEPT
         {return static_cast<bool>(*__seg_ & __mask_);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 bool operator ~() const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 bool operator ~() const _NOEXCEPT
         {return !static_cast<bool>(*this);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_reference& operator=(bool __x) _NOEXCEPT
     {
         if (__x)
 @@ -82,15 +85,15 @@ public:
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_reference& operator=(const __bit_reference& __x) _NOEXCEPT
         {return operator=(static_cast<bool>(__x));}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
+        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(std::__libcpp_ctz(__mask_)));}
 private:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     explicit __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
         : __seg_(__s), __mask_(__m) {}
 };
 @@ -101,7 +104,7 @@ class __bit_reference<_Cp, false>
 };
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
 {
 @@ -111,7 +114,7 @@ swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
 }
 template <class _Cp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
 {
 @@ -121,7 +124,7 @@ swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
 {
 @@ -131,7 +134,7 @@ swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT
 {
 @@ -155,15 +158,15 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     __bit_const_reference(const __bit_const_reference&) = default;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT
         : __seg_(__x.__seg_), __mask_(__x.__mask_) {}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR operator bool() const _NOEXCEPT
         {return static_cast<bool>(*__seg_ & __mask_);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
+        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(std::__libcpp_ctz(__mask_)));}
 private:
     _LIBCPP_INLINE_VISIBILITY
     _LIBCPP_CONSTEXPR
 @@ -176,7 +179,7 @@ private:
 // find
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, _IsConst>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, _IsConst>
 __find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, _IsConst> _It;
 @@ -212,7 +215,7 @@ __find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
 }
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, _IsConst>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, _IsConst>
 __find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, _IsConst> _It;
 @@ -251,7 +254,7 @@ __find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
 }
 template <class _Cp, bool _IsConst, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 __bit_iterator<_Cp, _IsConst>
 find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value)
 {
 @@ -263,7 +266,7 @@ find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last
 // count
 template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 typename __bit_iterator<_Cp, _IsConst>::difference_type
 __count_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, _IsConst> _It;
 @@ -294,7 +297,7 @@ __count_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
 }
 template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
+_LIBCPP_HIDE_FROM_ABI typename __bit_iterator<_Cp, _IsConst>::difference_type
 __count_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, _IsConst> _It;
 @@ -337,7 +340,7 @@ count(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __las
 // fill_n
 template <class _Cp>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 void
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
 __fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, false> _It;
 @@ -367,7 +370,7 @@ __fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
 }
 template <class _Cp>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 void
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
 __fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
 {
     typedef __bit_iterator<_Cp, false> _It;
 @@ -398,7 +401,7 @@ __fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __value)
 {
 @@ -414,7 +417,7 @@ fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __v
 // fill
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value)
 {
 @@ -424,8 +427,7 @@ fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool
 // copy
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false>
-__bit_iterator<_Cp, false>
 __copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
                                                      __bit_iterator<_Cp, false> __result)
 {
 @@ -472,8 +474,7 @@ __copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsCon
 }
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false>
-__bit_iterator<_Cp, false>
 __copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
                                                        __bit_iterator<_Cp, false> __result)
 {
 @@ -551,7 +552,7 @@ __copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsC
 }
 template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 __bit_iterator<_Cp, false>
 copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
 {
 @@ -563,7 +564,7 @@ copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last
 // copy_backward
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, false>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false>
 __copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
                                                      __bit_iterator<_Cp, false> __result)
 {
 @@ -610,7 +611,7 @@ __copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_C
 }
 template <class _Cp, bool _IsConst>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, false>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false>
 __copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
                                                        __bit_iterator<_Cp, false> __result)
 {
 @@ -696,7 +697,7 @@ __copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<
 }
 template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 __bit_iterator<_Cp, false>
 copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
 {
 @@ -728,7 +729,7 @@ move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsCons
 // swap_ranges
 template <class __C1, class __C2>
-__bit_iterator<__C2, false>
+_LIBCPP_HIDE_FROM_ABI __bit_iterator<__C2, false>
 __swap_ranges_aligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
                       __bit_iterator<__C2, false> __result)
 {
 @@ -778,7 +779,7 @@ __swap_ranges_aligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1,
 }
 template <class __C1, class __C2>
-__bit_iterator<__C2, false>
+_LIBCPP_HIDE_FROM_ABI __bit_iterator<__C2, false>
 __swap_ranges_unaligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
                         __bit_iterator<__C2, false> __result)
 {
 @@ -903,19 +904,19 @@ struct __bit_array
     difference_type __size_;
     __storage_type __word_[_Np];
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 static difference_type capacity()
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 static difference_type capacity()
         {return static_cast<difference_type>(_Np * __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit __bit_array(difference_type __s) : __size_(__s) {
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __bit_array(difference_type __s) : __size_(__s) {
         if (__libcpp_is_constant_evaluated()) {
             for (size_t __i = 0; __i != __bit_array<_Cp>::_Np; ++__i)
                 std::__construct_at(__word_ + __i, 0);
         }
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 iterator begin()
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator begin()
     {
         return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]), 0);
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 iterator end()
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator end()
     {
         return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]) + __size_ / __bits_per_word,
                                                   static_cast<unsigned>(__size_ % __bits_per_word));
 @@ -923,7 +924,7 @@ struct __bit_array
 };
 template <class _Cp>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator<_Cp, false>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false>
 rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle, __bit_iterator<_Cp, false> __last)
 {
     typedef __bit_iterator<_Cp, false> _I1;
 @@ -974,7 +975,7 @@ rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle,
 // equal
 template <class _Cp, bool _IC1, bool _IC2>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool
 __equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
                   __bit_iterator<_Cp, _IC2> __first2)
 {
 @@ -1056,7 +1057,7 @@ __equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1>
 }
 template <class _Cp, bool _IC1, bool _IC2>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool
 __equal_aligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
                 __bit_iterator<_Cp, _IC2> __first2)
 {
 @@ -1099,7 +1100,7 @@ __equal_aligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __
 }
 template <class _Cp, bool _IC1, bool _IC2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2)
 {
 @@ -1117,23 +1118,23 @@ public:
     typedef bool                                                                                  value_type;
     typedef __bit_iterator                                                                        pointer;
 #ifndef _LIBCPP_ABI_BITSET_VECTOR_BOOL_CONST_SUBSCRIPT_RETURN_BOOL
-    typedef typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >::type reference;
+    typedef __conditional_t<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> > reference;
 #else
-    using reference = typename conditional<_IsConst, bool, __bit_reference<_Cp> >::type;
+    using reference = __conditional_t<_IsConst, bool, __bit_reference<_Cp> >;
 #endif
     typedef random_access_iterator_tag                                                            iterator_category;
 private:
     typedef typename _Cp::__storage_type                                           __storage_type;
-    typedef typename conditional<_IsConst, typename _Cp::__const_storage_pointer,
+    typedef __conditional_t<_IsConst, typename _Cp::__const_storage_pointer, typename _Cp::__storage_pointer>
-                                           typename _Cp::__storage_pointer>::type  __storage_pointer;
+        __storage_pointer;
     static const unsigned __bits_per_word = _Cp::__bits_per_word;
     __storage_pointer __seg_;
     unsigned          __ctz_;
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator() _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator() _NOEXCEPT
 #if _LIBCPP_STD_VER > 11
     : __seg_(nullptr), __ctz_(0)
 #endif
 @@ -1144,7 +1145,7 @@ public:
     // When _IsConst=true, this is a converting constructor;
     // the copy and move constructors are implicitly generated
     // and trivial.
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_iterator(const __bit_iterator<_Cp, false>& __it) _NOEXCEPT
         : __seg_(__it.__seg_), __ctz_(__it.__ctz_) {}
 @@ -1153,19 +1154,19 @@ public:
     // the implicit generation of a defaulted one is deprecated.
     // When _IsConst=true, the assignment operators are
     // implicitly generated and trivial.
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __bit_iterator& operator=(const _If<_IsConst, struct __private_nat, __bit_iterator>& __it) {
         __seg_ = __it.__seg_;
         __ctz_ = __it.__ctz_;
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference operator*() const _NOEXCEPT {
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator*() const _NOEXCEPT {
-        return typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >
+        return __conditional_t<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >(
-                ::type(__seg_, __storage_type(1) << __ctz_);
+            __seg_, __storage_type(1) << __ctz_);
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator& operator++()
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator& operator++()
     {
         if (__ctz_ != __bits_per_word-1)
             ++__ctz_;
 @@ -1177,14 +1178,14 @@ public:
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator operator++(int)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator++(int)
     {
         __bit_iterator __tmp = *this;
         ++(*this);
         return __tmp;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator& operator--()
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator& operator--()
     {
         if (__ctz_ != 0)
             --__ctz_;
 @@ -1196,14 +1197,14 @@ public:
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator operator--(int)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator--(int)
     {
         __bit_iterator __tmp = *this;
         --(*this);
         return __tmp;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator& operator+=(difference_type __n)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator& operator+=(difference_type __n)
     {
         if (__n >= 0)
             __seg_ += (__n + __ctz_) / __bits_per_word;
 @@ -1215,54 +1216,54 @@ public:
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator& operator-=(difference_type __n)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator& operator-=(difference_type __n)
     {
         return *this += -__n;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator operator+(difference_type __n) const
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator+(difference_type __n) const
     {
         __bit_iterator __t(*this);
         __t += __n;
         return __t;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 __bit_iterator operator-(difference_type __n) const
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator-(difference_type __n) const
     {
         __bit_iterator __t(*this);
         __t -= __n;
         return __t;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator operator+(difference_type __n, const __bit_iterator& __it) {return __it + __n;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend difference_type operator-(const __bit_iterator& __x, const __bit_iterator& __y)
         {return (__x.__seg_ - __y.__seg_) * __bits_per_word + __x.__ctz_ - __y.__ctz_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference operator[](difference_type __n) const {return *(*this + __n);}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator[](difference_type __n) const {return *(*this + __n);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator==(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator==(const __bit_iterator& __x, const __bit_iterator& __y)
         {return __x.__seg_ == __y.__seg_ && __x.__ctz_ == __y.__ctz_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator!=(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator!=(const __bit_iterator& __x, const __bit_iterator& __y)
         {return !(__x == __y);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator<(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator<(const __bit_iterator& __x, const __bit_iterator& __y)
         {return __x.__seg_ < __y.__seg_ || (__x.__seg_ == __y.__seg_ && __x.__ctz_ < __y.__ctz_);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator>(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator>(const __bit_iterator& __x, const __bit_iterator& __y)
         {return __y < __x;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator<=(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator<=(const __bit_iterator& __x, const __bit_iterator& __y)
         {return !(__y < __x);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 friend bool operator>=(const __bit_iterator& __x, const __bit_iterator& __y)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 friend bool operator>=(const __bit_iterator& __x, const __bit_iterator& __y)
         {return !(__x < __y);}
 private:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     explicit __bit_iterator(__storage_pointer __s, unsigned __ctz) _NOEXCEPT
         : __seg_(__s), __ctz_(__ctz) {}
 @@ -1273,40 +1274,40 @@ private:
     friend class __bit_iterator<_Cp, true>;
     template <class _Dp> friend struct __bit_array;
     template <class _Dp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend void __fill_n_false(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
     template <class _Dp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend void __fill_n_true(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> __copy_aligned(__bit_iterator<_Dp, _IC> __first,
                                                      __bit_iterator<_Dp, _IC> __last,
                                                      __bit_iterator<_Dp, false> __result);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> __copy_unaligned(__bit_iterator<_Dp, _IC> __first,
                                                        __bit_iterator<_Dp, _IC> __last,
                                                        __bit_iterator<_Dp, false> __result);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> copy(__bit_iterator<_Dp, _IC> __first,
                                            __bit_iterator<_Dp, _IC> __last,
                                            __bit_iterator<_Dp, false> __result);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> __copy_backward_aligned(__bit_iterator<_Dp, _IC> __first,
                                                               __bit_iterator<_Dp, _IC> __last,
                                                               __bit_iterator<_Dp, false> __result);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> __copy_backward_unaligned(__bit_iterator<_Dp, _IC> __first,
                                                                 __bit_iterator<_Dp, _IC> __last,
                                                                 __bit_iterator<_Dp, false> __result);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> copy_backward(__bit_iterator<_Dp, _IC> __first,
                                                     __bit_iterator<_Dp, _IC> __last,
                                                     __bit_iterator<_Dp, false> __result);
 @@ -1320,32 +1321,33 @@ private:
                                                                                  __bit_iterator<__C1, false>,
                                                                                  __bit_iterator<__C2, false>);
     template <class _Dp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, false> rotate(__bit_iterator<_Dp, false>,
                                              __bit_iterator<_Dp, false>,
                                              __bit_iterator<_Dp, false>);
     template <class _Dp, bool _IC1, bool _IC2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend bool __equal_aligned(__bit_iterator<_Dp, _IC1>,
                                 __bit_iterator<_Dp, _IC1>,
                                 __bit_iterator<_Dp, _IC2>);
     template <class _Dp, bool _IC1, bool _IC2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend bool __equal_unaligned(__bit_iterator<_Dp, _IC1>,
                                   __bit_iterator<_Dp, _IC1>,
                                   __bit_iterator<_Dp, _IC2>);
     template <class _Dp, bool _IC1, bool _IC2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend bool equal(__bit_iterator<_Dp, _IC1>,
                       __bit_iterator<_Dp, _IC1>,
                       __bit_iterator<_Dp, _IC2>);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, _IC> __find_bool_true(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
     template <class _Dp, bool _IC>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_CONSTEXPR_SINCE_CXX20
     friend __bit_iterator<_Dp, _IC> __find_bool_false(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
     template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
                    __count_bool_true(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
     template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
                    __count_bool_false(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);

lib/libcxx/include/__bits deleted-162

...	@@ -1,162 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___BITS
11	#define _LIBCPP___BITS
12
13	#include <__config>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_PUSH_MACROS
20	#include <__undef_macros>
21
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	#ifndef _LIBCPP_COMPILER_MSVC
26
27	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
28	int __libcpp_ctz(unsigned __x) _NOEXCEPT { return __builtin_ctz(__x); }
29
30	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
31	int __libcpp_ctz(unsigned long __x) _NOEXCEPT { return __builtin_ctzl(__x); }
32
33	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
34	int __libcpp_ctz(unsigned long long __x) _NOEXCEPT { return __builtin_ctzll(__x); }
35
36
37	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
38	int __libcpp_clz(unsigned __x) _NOEXCEPT { return __builtin_clz(__x); }
39
40	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
41	int __libcpp_clz(unsigned long __x) _NOEXCEPT { return __builtin_clzl(__x); }
42
43	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
44	int __libcpp_clz(unsigned long long __x) _NOEXCEPT { return __builtin_clzll(__x); }
45
46	# ifndef _LIBCPP_HAS_NO_INT128
47	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
48	int __libcpp_clz(__uint128_t __x) _NOEXCEPT {
49	// The function is written in this form due to C++ constexpr limitations.
50	// The algorithm:
51	// - Test whether any bit in the high 64-bits is set
52	// - No bits set:
53	// - The high 64-bits contain 64 leading zeros,
54	// - Add the result of the low 64-bits.
55	// - Any bits set:
56	// - The number of leading zeros of the input is the number of leading
57	// zeros in the high 64-bits.
58	return ((__x >> 64) == 0)
59	? (64 + __builtin_clzll(static_cast<unsigned long long>(__x)))
60	: __builtin_clzll(static_cast<unsigned long long>(__x >> 64));
61	}
62	# endif
63
64	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
65	int __libcpp_popcount(unsigned __x) _NOEXCEPT { return __builtin_popcount(__x); }
66
67	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
68	int __libcpp_popcount(unsigned long __x) _NOEXCEPT { return __builtin_popcountl(__x); }
69
70	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
71	int __libcpp_popcount(unsigned long long __x) _NOEXCEPT { return __builtin_popcountll(__x); }
72
73	#else // _LIBCPP_COMPILER_MSVC
74
75	// Precondition: __x != 0
76	inline _LIBCPP_INLINE_VISIBILITY
77	int __libcpp_ctz(unsigned __x) {
78	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
79	static_assert(sizeof(unsigned long) == 4, "");
80	unsigned long __where;
81	if (_BitScanForward(&__where, __x))
82	return static_cast<int>(__where);
83	return 32;
84	}
85
86	inline _LIBCPP_INLINE_VISIBILITY
87	int __libcpp_ctz(unsigned long __x) {
88	static_assert(sizeof(unsigned long) == sizeof(unsigned), "");
89	return __ctz(static_cast<unsigned>(__x));
90	}
91
92	inline _LIBCPP_INLINE_VISIBILITY
93	int __libcpp_ctz(unsigned long long __x) {
94	unsigned long __where;
95	#if defined(_LIBCPP_HAS_BITSCAN64)
96	if (_BitScanForward64(&__where, __x))
97	return static_cast<int>(__where);
98	#else
99	// Win32 doesn't have _BitScanForward64 so emulate it with two 32 bit calls.
100	if (_BitScanForward(&__where, static_cast<unsigned long>(__x)))
101	return static_cast<int>(__where);
102	if (_BitScanForward(&__where, static_cast<unsigned long>(__x >> 32)))
103	return static_cast<int>(__where + 32);
104	#endif
105	return 64;
106	}
107
108	// Precondition: __x != 0
109	inline _LIBCPP_INLINE_VISIBILITY
110	int __libcpp_clz(unsigned __x) {
111	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
112	static_assert(sizeof(unsigned long) == 4, "");
113	unsigned long __where;
114	if (_BitScanReverse(&__where, __x))
115	return static_cast<int>(31 - __where);
116	return 32; // Undefined Behavior.
117	}
118
119	inline _LIBCPP_INLINE_VISIBILITY
120	int __libcpp_clz(unsigned long __x) {
121	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
122	return __libcpp_clz(static_cast<unsigned>(__x));
123	}
124
125	inline _LIBCPP_INLINE_VISIBILITY
126	int __libcpp_clz(unsigned long long __x) {
127	unsigned long __where;
128	#if defined(_LIBCPP_HAS_BITSCAN64)
129	if (_BitScanReverse64(&__where, __x))
130	return static_cast<int>(63 - __where);
131	#else
132	// Win32 doesn't have _BitScanReverse64 so emulate it with two 32 bit calls.
133	if (_BitScanReverse(&__where, static_cast<unsigned long>(__x >> 32)))
134	return static_cast<int>(63 - (__where + 32));
135	if (_BitScanReverse(&__where, static_cast<unsigned long>(__x)))
136	return static_cast<int>(63 - __where);
137	#endif
138	return 64; // Undefined Behavior.
139	}
140
141	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned __x) {
142	static_assert(sizeof(unsigned) == 4, "");
143	return __popcnt(__x);
144	}
145
146	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned long __x) {
147	static_assert(sizeof(unsigned long) == 4, "");
148	return __popcnt(__x);
149	}
150
151	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned long long __x) {
152	static_assert(sizeof(unsigned long long) == 8, "");
153	return __popcnt64(__x);
154	}
155
156	#endif // _LIBCPP_COMPILER_MSVC
157
158	_LIBCPP_END_NAMESPACE_STD
159
160	_LIBCPP_POP_MACROS
161
162	#endif // _LIBCPP___BITS

lib/libcxx/include/__bsd_locale_fallbacks.h-1

...	@@ -13,7 +13,6 @@	...	@@ -13,7 +13,6 @@
13	#ifndef _LIBCPP___BSD_LOCALE_FALLBACKS_H	13	#ifndef _LIBCPP___BSD_LOCALE_FALLBACKS_H
14	#define _LIBCPP___BSD_LOCALE_FALLBACKS_H	14	#define _LIBCPP___BSD_LOCALE_FALLBACKS_H
15		15
16	#include <memory>
17	#include <stdarg.h>	16	#include <stdarg.h>
18	#include <stdlib.h>	17	#include <stdlib.h>
19		18

lib/libcxx/include/__charconv/chars_format.h+5-5

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	#ifndef _LIBCPP_CXX03_LANG	22	#if _LIBCPP_STD_VER > 14
23		23
24	enum class _LIBCPP_ENUM_VIS chars_format	24	enum class _LIBCPP_ENUM_VIS chars_format
25	{	25	{
...	@@ -52,25 +52,25 @@ operator^(chars_format __x, chars_format __y) {	...	@@ -52,25 +52,25 @@ operator^(chars_format __x, chars_format __y) {
52	_VSTD::__to_underlying(__y));	52	_VSTD::__to_underlying(__y));
53	}	53	}
54		54
55	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 chars_format&	55	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 chars_format&
56	operator&=(chars_format& __x, chars_format __y) {	56	operator&=(chars_format& __x, chars_format __y) {
57	__x = __x & __y;	57	__x = __x & __y;
58	return __x;	58	return __x;
59	}	59	}
60		60
61	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 chars_format&	61	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 chars_format&
62	operator\|=(chars_format& __x, chars_format __y) {	62	operator\|=(chars_format& __x, chars_format __y) {
63	__x = __x \| __y;	63	__x = __x \| __y;
64	return __x;	64	return __x;
65	}	65	}
66		66
67	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 chars_format&	67	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 chars_format&
68	operator^=(chars_format& __x, chars_format __y) {	68	operator^=(chars_format& __x, chars_format __y) {
69	__x = __x ^ __y;	69	__x = __x ^ __y;
70	return __x;	70	return __x;
71	}	71	}
72		72
73	#endif // _LIBCPP_CXX03_LANG	73	#endif // _LIBCPP_STD_VER > 14
74		74
75	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
76		76

lib/libcxx/include/__charconv/from_chars_result.h+2-2

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	#ifndef _LIBCPP_CXX03_LANG	22	#if _LIBCPP_STD_VER > 14
23		23
24	struct _LIBCPP_TYPE_VIS from_chars_result	24	struct _LIBCPP_TYPE_VIS from_chars_result
25	{	25	{
...	@@ -30,7 +30,7 @@ struct _LIBCPP_TYPE_VIS from_chars_result	...	@@ -30,7 +30,7 @@ struct _LIBCPP_TYPE_VIS from_chars_result
30	# endif	30	# endif
31	};	31	};
32		32
33	#endif // _LIBCPP_CXX03_LANG	33	#endif // _LIBCPP_STD_VER > 14
34		34
35	_LIBCPP_END_NAMESPACE_STD	35	_LIBCPP_END_NAMESPACE_STD
36		36

lib/libcxx/include/__charconv/tables.h+10-36

 @@ -19,38 +19,16 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#ifndef _LIBCPP_CXX03_LANG
+#if _LIBCPP_STD_VER > 14
 namespace __itoa {
-/// Contains the charconv helper tables.
+inline constexpr char __base_2_lut[64] = {
-///
-/// In C++17 these could be inline constexpr variable, but libc++ supports
-/// charconv for integrals in C++11 mode.
-template <class = void>
-struct __table {
-  static const char __base_2_lut[64];
-  static const char __base_8_lut[128];
-  static const char __base_16_lut[512];
-  static const uint32_t __pow10_32[10];
-  static const uint64_t __pow10_64[20];
-#  ifndef _LIBCPP_HAS_NO_INT128
-  // TODO FMT Reduce the number of entries in this table.
-  static const __uint128_t __pow10_128[40];
-  static const int __pow10_128_offset = 0;
-#  endif
-  static const char __digits_base_10[200];
-};
-template <class _Tp>
-const char __table<_Tp>::__base_2_lut[64] = {
     '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '1', '0', '0', '0', '1', '1', '0', '1', '0', '0', '0', '1',
     '0', '1', '0', '1', '1', '0', '0', '1', '1', '1', '1', '0', '0', '0', '1', '0', '0', '1', '1', '0', '1', '0',
     '1', '0', '1', '1', '1', '1', '0', '0', '1', '1', '0', '1', '1', '1', '1', '0', '1', '1', '1', '1'};
-template <class _Tp>
+inline constexpr char __base_8_lut[128] = {
-const char __table<_Tp>::__base_8_lut[128] = {
     '0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6', '0', '7', '1', '0', '1', '1', '1', '2',
     '1', '3', '1', '4', '1', '5', '1', '6', '1', '7', '2', '0', '2', '1', '2', '2', '2', '3', '2', '4', '2', '5',
     '2', '6', '2', '7', '3', '0', '3', '1', '3', '2', '3', '3', '3', '4', '3', '5', '3', '6', '3', '7', '4', '0',
 @@ -58,8 +36,7 @@ const char __table<_Tp>::__base_8_lut[128] = {
     '5', '4', '5', '5', '5', '6', '5', '7', '6', '0', '6', '1', '6', '2', '6', '3', '6', '4', '6', '5', '6', '6',
     '6', '7', '7', '0', '7', '1', '7', '2', '7', '3', '7', '4', '7', '5', '7', '6', '7', '7'};
-template <class _Tp>
+inline constexpr char __base_16_lut[512] = {
-const char __table<_Tp>::__base_16_lut[512] = {
     '0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6', '0', '7', '0', '8', '0', '9', '0', 'a', '0',
     'b', '0', 'c', '0', 'd', '0', 'e', '0', 'f', '1', '0', '1', '1', '1', '2', '1', '3', '1', '4', '1', '5', '1', '6',
     '1', '7', '1', '8', '1', '9', '1', 'a', '1', 'b', '1', 'c', '1', 'd', '1', 'e', '1', 'f', '2', '0', '2', '1', '2',
 @@ -84,13 +61,11 @@ const char __table<_Tp>::__base_16_lut[512] = {
     '1', 'f', '2', 'f', '3', 'f', '4', 'f', '5', 'f', '6', 'f', '7', 'f', '8', 'f', '9', 'f', 'a', 'f', 'b', 'f', 'c',
     'f', 'd', 'f', 'e', 'f', 'f'};
-template <class _Tp>
+inline constexpr uint32_t __pow10_32[10] = {
-const uint32_t __table<_Tp>::__pow10_32[10] = {
     UINT32_C(0),      UINT32_C(10),      UINT32_C(100),      UINT32_C(1000),      UINT32_C(10000),
     UINT32_C(100000), UINT32_C(1000000), UINT32_C(10000000), UINT32_C(100000000), UINT32_C(1000000000)};
-template <class _Tp>
+inline constexpr uint64_t __pow10_64[20] = {UINT64_C(0),
-const uint64_t __table<_Tp>::__pow10_64[20] = {UINT64_C(0),
                                                UINT64_C(10),
                                                UINT64_C(100),
                                                UINT64_C(1000),
 @@ -112,8 +87,8 @@ const uint64_t __table<_Tp>::__pow10_64[20] = {UINT64_C(0),
                                                UINT64_C(10000000000000000000)};
 #  ifndef _LIBCPP_HAS_NO_INT128
-template <class _Tp>
+inline constexpr int __pow10_128_offset = 0;
-const __uint128_t __table<_Tp>::__pow10_128[40] = {
+inline constexpr __uint128_t __pow10_128[40] = {
     UINT64_C(0),
     UINT64_C(10),
     UINT64_C(100),
 @@ -156,8 +131,7 @@ const __uint128_t __table<_Tp>::__pow10_128[40] = {
     (__uint128_t(UINT64_C(10000000000000000000)) * UINT64_C(10000000000000000000)) * 10};
 #  endif
-template <class _Tp>
+inline constexpr char __digits_base_10[200] = {
-const char __table<_Tp>::__digits_base_10[200] = {
     // clang-format off
     '0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6', '0', '7', '0', '8', '0', '9',
     '1', '0', '1', '1', '1', '2', '1', '3', '1', '4', '1', '5', '1', '6', '1', '7', '1', '8', '1', '9',
 @@ -173,7 +147,7 @@ const char __table<_Tp>::__digits_base_10[200] = {
 } // namespace __itoa
-#endif // _LIBCPP_CXX03_LANG
+#endif // _LIBCPP_STD_VER > 14
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__charconv/to_chars_base_10.h+19-19

lib/libcxx/include/__charconv/to_chars_result.h+2-2

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	#ifndef _LIBCPP_CXX03_LANG	22	#if _LIBCPP_STD_VER > 14
23		23
24	struct _LIBCPP_TYPE_VIS to_chars_result	24	struct _LIBCPP_TYPE_VIS to_chars_result
25	{	25	{
...	@@ -30,7 +30,7 @@ struct _LIBCPP_TYPE_VIS to_chars_result	...	@@ -30,7 +30,7 @@ struct _LIBCPP_TYPE_VIS to_chars_result
30	# endif	30	# endif
31	};	31	};
32		32
33	#endif // _LIBCPP_CXX03_LANG	33	#endif // _LIBCPP_STD_VER > 14
34		34
35	_LIBCPP_END_NAMESPACE_STD	35	_LIBCPP_END_NAMESPACE_STD
36		36

lib/libcxx/include/__chrono/convert_to_timespec.h+1

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H	10	#ifndef _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
10	#define _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H	11	#define _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
11		12

lib/libcxx/include/__chrono/convert_to_tm.h created+127

...	@@ -0,0 +1,127 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CHRONO_CONVERT_TO_TM_H
11	#define _LIBCPP___CHRONO_CONVERT_TO_TM_H
12
13	#include <__chrono/day.h>
14	#include <__chrono/duration.h>
15	#include <__chrono/hh_mm_ss.h>
16	#include <__chrono/month.h>
17	#include <__chrono/month_weekday.h>
18	#include <__chrono/monthday.h>
19	#include <__chrono/statically_widen.h>
20	#include <__chrono/system_clock.h>
21	#include <__chrono/time_point.h>
22	#include <__chrono/weekday.h>
23	#include <__chrono/year.h>
24	#include <__chrono/year_month.h>
25	#include <__chrono/year_month_day.h>
26	#include <__chrono/year_month_weekday.h>
27	#include <__concepts/same_as.h>
28	#include <__config>
29	#include <__memory/addressof.h>
30	#include <cstdint>
31	#include <ctime>
32
33	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
34	# pragma GCC system_header
35	#endif
36
37	_LIBCPP_BEGIN_NAMESPACE_STD
38
39	#if _LIBCPP_STD_VER > 17
40
41	// Conerts a chrono date and weekday to a given _Tm type.
42	//
43	// This is an implementation detail for the function
44	// template <class _Tm, class _ChronoT>
45	// _Tm __convert_to_tm(const _ChronoT& __value)
46	//
47	// This manually converts the two values to the proper type. It is possible to
48	// convert from sys_days to time_t and then to _Tm. But this leads to the Y2K
49	// bug when time_t is a 32-bit signed integer. Chrono considers years beyond
50	// the year 2038 valid, so instead do the transformation manually.
51	template <class _Tm, class _Date>
52	requires(same_as<_Date, chrono::year_month_day> \|\| same_as<_Date, chrono::year_month_day_last>)
53	_LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _Date& __date, chrono::weekday __weekday) {
54	_Tm __result = {};
55	# ifdef __GLIBC__
56	__result.tm_zone = "UTC";
57	# endif
58	__result.tm_year = static_cast<int>(__date.year()) - 1900;
59	__result.tm_mon = static_cast<unsigned>(__date.month()) - 1;
60	__result.tm_mday = static_cast<unsigned>(__date.day());
61	__result.tm_wday = static_cast<unsigned>(__weekday.c_encoding());
62	__result.tm_yday =
63	(static_cast<chrono::sys_days>(__date) -
64	static_cast<chrono::sys_days>(chrono::year_month_day{__date.year(), chrono::January, chrono::day{1}}))
65	.count();
66
67	return __result;
68	}
69
70	// Convert a chrono (calendar) time point, or dururation to the given _Tm type,
71	// which must have the same properties as std::tm.
72	template <class _Tm, class _ChronoT>
73	_LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _ChronoT& __value) {
74	_Tm __result = {};
75	# ifdef __GLIBC__
76	__result.tm_zone = "UTC";
77	# endif
78
79	if constexpr (chrono::__is_duration<_ChronoT>::value) {
80	// [time.format]/6
81	// ... However, if a flag refers to a "time of day" (e.g. %H, %I, %p,
82	// etc.), then a specialization of duration is interpreted as the time of
83	// day elapsed since midnight.
84	uint64_t __sec = chrono::duration_cast<chrono::seconds>(__value).count();
85	__sec %= 24 * 3600;
86	__result.tm_hour = __sec / 3600;
87	__sec %= 3600;
88	__result.tm_min = __sec / 60;
89	__result.tm_sec = __sec % 60;
90	} else if constexpr (same_as<_ChronoT, chrono::day>)
91	__result.tm_mday = static_cast<unsigned>(__value);
92	else if constexpr (same_as<_ChronoT, chrono::month>)
93	__result.tm_mon = static_cast<unsigned>(__value) - 1;
94	else if constexpr (same_as<_ChronoT, chrono::year>)
95	__result.tm_year = static_cast<int>(__value) - 1900;
96	else if constexpr (same_as<_ChronoT, chrono::weekday>)
97	__result.tm_wday = __value.c_encoding();
98	else if constexpr (same_as<_ChronoT, chrono::weekday_indexed> \|\| same_as<_ChronoT, chrono::weekday_last>)
99	__result.tm_wday = __value.weekday().c_encoding();
100	else if constexpr (same_as<_ChronoT, chrono::month_day>) {
101	__result.tm_mday = static_cast<unsigned>(__value.day());
102	__result.tm_mon = static_cast<unsigned>(__value.month()) - 1;
103	} else if constexpr (same_as<_ChronoT, chrono::month_day_last>) {
104	__result.tm_mon = static_cast<unsigned>(__value.month()) - 1;
105	} else if constexpr (same_as<_ChronoT, chrono::month_weekday> \|\| same_as<_ChronoT, chrono::month_weekday_last>) {
106	__result.tm_wday = __value.weekday_indexed().weekday().c_encoding();
107	__result.tm_mon = static_cast<unsigned>(__value.month()) - 1;
108	} else if constexpr (same_as<_ChronoT, chrono::year_month>) {
109	__result.tm_year = static_cast<int>(__value.year()) - 1900;
110	__result.tm_mon = static_cast<unsigned>(__value.month()) - 1;
111	} else if constexpr (same_as<_ChronoT, chrono::year_month_day> \|\| same_as<_ChronoT, chrono::year_month_day_last>) {
112	return std::__convert_to_tm<_Tm>(
113	chrono::year_month_day{__value}, chrono::weekday{static_cast<chrono::sys_days>(__value)});
114	} else if constexpr (same_as<_ChronoT, chrono::year_month_weekday> \|\|
115	same_as<_ChronoT, chrono::year_month_weekday_last>) {
116	return std::__convert_to_tm<_Tm>(chrono::year_month_day{static_cast<chrono::sys_days>(__value)}, __value.weekday());
117	} else
118	static_assert(sizeof(_ChronoT) == 0, "Add the missing type specialization");
119
120	return __result;
121	}
122
123	#endif //if _LIBCPP_STD_VER > 17
124
125	_LIBCPP_END_NAMESPACE_STD
126
127	#endif // _LIBCPP___CHRONO_CONVERT_TO_TM_H

lib/libcxx/include/__chrono/day.h+6-6

lib/libcxx/include/__chrono/duration.h+33-26

 @@ -11,9 +11,12 @@
 #define _LIBCPP___CHRONO_DURATION_H
 #include <__config>
+#include <__type_traits/common_type.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_floating_point.h>
 #include <limits>
 #include <ratio>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -151,7 +154,7 @@ typename enable_if
 >::type
 floor(const duration<_Rep, _Period>& __d)
 {
-    _ToDuration __t = duration_cast<_ToDuration>(__d);
+    _ToDuration __t = chrono::duration_cast<_ToDuration>(__d);
     if (__t > __d)
         __t = __t - _ToDuration{1};
     return __t;
 @@ -166,7 +169,7 @@ typename enable_if
 >::type
 ceil(const duration<_Rep, _Period>& __d)
 {
-    _ToDuration __t = duration_cast<_ToDuration>(__d);
+    _ToDuration __t = chrono::duration_cast<_ToDuration>(__d);
     if (__t < __d)
         __t = __t + _ToDuration{1};
     return __t;
 @@ -181,7 +184,7 @@ typename enable_if
 >::type
 round(const duration<_Rep, _Period>& __d)
 {
-    _ToDuration __lower = floor<_ToDuration>(__d);
+    _ToDuration __lower = chrono::floor<_ToDuration>(__d);
     _ToDuration __upper = __lower + _ToDuration{1};
     auto __lowerDiff = __d - __lower;
     auto __upperDiff = __upper - __d;
 @@ -278,18 +281,18 @@ public:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR typename common_type<duration>::type operator+() const {return typename common_type<duration>::type(*this);}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR typename common_type<duration>::type operator-() const {return typename common_type<duration>::type(-__rep_);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator++()      {++__rep_; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator++()      {++__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration  operator++(int)   {return duration(__rep_++);}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration  operator++(int)   {return duration(__rep_++);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator--()      {--__rep_; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator--()      {--__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration  operator--(int)   {return duration(__rep_--);}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration  operator--(int)   {return duration(__rep_--);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator+=(const duration& __d) {__rep_ += __d.count(); return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator+=(const duration& __d) {__rep_ += __d.count(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator-=(const duration& __d) {__rep_ -= __d.count(); return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator-=(const duration& __d) {__rep_ -= __d.count(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator*=(const rep& __rhs) {__rep_ *= __rhs; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator*=(const rep& __rhs) {__rep_ *= __rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator/=(const rep& __rhs) {__rep_ /= __rhs; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator/=(const rep& __rhs) {__rep_ /= __rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator%=(const rep& __rhs) {__rep_ %= __rhs; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator%=(const rep& __rhs) {__rep_ %= __rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 duration& operator%=(const duration& __rhs) {__rep_ %= __rhs.count(); return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 duration& operator%=(const duration& __rhs) {__rep_ %= __rhs.count(); return *this;}
     // special values
 @@ -534,67 +537,67 @@ inline namespace literals
   inline namespace chrono_literals
   {
-    constexpr chrono::hours operator""h(unsigned long long __h)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::hours operator""h(unsigned long long __h)
     {
         return chrono::hours(static_cast<chrono::hours::rep>(__h));
     }
-    constexpr chrono::duration<long double, ratio<3600,1>> operator""h(long double __h)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double, ratio<3600,1>> operator""h(long double __h)
     {
         return chrono::duration<long double, ratio<3600,1>>(__h);
     }
-    constexpr chrono::minutes operator""min(unsigned long long __m)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::minutes operator""min(unsigned long long __m)
     {
         return chrono::minutes(static_cast<chrono::minutes::rep>(__m));
     }
-    constexpr chrono::duration<long double, ratio<60,1>> operator""min(long double __m)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double, ratio<60,1>> operator""min(long double __m)
     {
         return chrono::duration<long double, ratio<60,1>> (__m);
     }
-    constexpr chrono::seconds operator""s(unsigned long long __s)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::seconds operator""s(unsigned long long __s)
     {
         return chrono::seconds(static_cast<chrono::seconds::rep>(__s));
     }
-    constexpr chrono::duration<long double> operator""s(long double __s)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double> operator""s(long double __s)
     {
         return chrono::duration<long double> (__s);
     }
-    constexpr chrono::milliseconds operator""ms(unsigned long long __ms)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::milliseconds operator""ms(unsigned long long __ms)
     {
         return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(__ms));
     }
-    constexpr chrono::duration<long double, milli> operator""ms(long double __ms)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double, milli> operator""ms(long double __ms)
     {
         return chrono::duration<long double, milli>(__ms);
     }
-    constexpr chrono::microseconds operator""us(unsigned long long __us)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::microseconds operator""us(unsigned long long __us)
     {
         return chrono::microseconds(static_cast<chrono::microseconds::rep>(__us));
     }
-    constexpr chrono::duration<long double, micro> operator""us(long double __us)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double, micro> operator""us(long double __us)
     {
         return chrono::duration<long double, micro> (__us);
     }
-    constexpr chrono::nanoseconds operator""ns(unsigned long long __ns)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::nanoseconds operator""ns(unsigned long long __ns)
     {
         return chrono::nanoseconds(static_cast<chrono::nanoseconds::rep>(__ns));
     }
-    constexpr chrono::duration<long double, nano> operator""ns(long double __ns)
+    _LIBCPP_HIDE_FROM_ABI constexpr chrono::duration<long double, nano> operator""ns(long double __ns)
     {
         return chrono::duration<long double, nano> (__ns);
     }
 @@ -612,4 +615,8 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#endif
 #endif // _LIBCPP___CHRONO_DURATION_H

lib/libcxx/include/__chrono/file_clock.h+1-1

...	@@ -61,7 +61,7 @@ struct _FilesystemClock {	...	@@ -61,7 +61,7 @@ struct _FilesystemClock {
61	typedef chrono::time_point<_FilesystemClock> time_point;	61	typedef chrono::time_point<_FilesystemClock> time_point;
62		62
63	_LIBCPP_EXPORTED_FROM_ABI	63	_LIBCPP_EXPORTED_FROM_ABI
64	static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;	64	static _LIBCPP_CONSTEXPR_SINCE_CXX14 const bool is_steady = false;
65		65
66	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_FUNC_VIS static time_point now() noexcept;	66	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_FUNC_VIS static time_point now() noexcept;
67		67

lib/libcxx/include/__chrono/formatter.h created+716

...	@@ -0,0 +1,716 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CHRONO_FORMATTER_H
11	#define _LIBCPP___CHRONO_FORMATTER_H
12
13	#include <__chrono/calendar.h>
14	#include <__chrono/convert_to_tm.h>
15	#include <__chrono/day.h>
16	#include <__chrono/duration.h>
17	#include <__chrono/hh_mm_ss.h>
18	#include <__chrono/month.h>
19	#include <__chrono/month_weekday.h>
20	#include <__chrono/monthday.h>
21	#include <__chrono/ostream.h>
22	#include <__chrono/parser_std_format_spec.h>
23	#include <__chrono/statically_widen.h>
24	#include <__chrono/time_point.h>
25	#include <__chrono/weekday.h>
26	#include <__chrono/year.h>
27	#include <__chrono/year_month.h>
28	#include <__chrono/year_month_day.h>
29	#include <__chrono/year_month_weekday.h>
30	#include <__concepts/arithmetic.h>
31	#include <__concepts/same_as.h>
32	#include <__config>
33	#include <__format/concepts.h>
34	#include <__format/format_error.h>
35	#include <__format/format_functions.h>
36	#include <__format/format_parse_context.h>
37	#include <__format/formatter.h>
38	#include <__format/formatter_output.h>
39	#include <__format/parser_std_format_spec.h>
40	#include <__memory/addressof.h>
41	#include <cmath>
42	#include <ctime>
43	#include <sstream>
44	#include <string>
45	#include <string_view>
46
47	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
48	# pragma GCC system_header
49	#endif
50
51	_LIBCPP_BEGIN_NAMESPACE_STD
52
53	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
54
55	namespace __formatter {
56
57	/// Formats a time based on a tm struct.
58	///
59	/// This formatter passes the formatting to time_put which uses strftime. When
60	/// the value is outside the valid range it's unspecified what strftime will
61	/// output. For example weekday 8 can print 1 when the day is processed modulo
62	/// 7 since that handles the Sunday for 0-based weekday. It can also print 8 if
63	/// 7 is handled as a special case.
64	///
65	/// The Standard doesn't specify what to do in this case so the result depends
66	/// on the result of the underlying code.
67	///
68	/// \pre When the (abbreviated) weekday or month name are used, the caller
69	/// validates whether the value is valid. So the caller handles that
70	/// requirement of Table 97: Meaning of conversion specifiers
71	/// [tab:time.format.spec].
72	///
73	/// When no chrono-specs are provided it uses the stream formatter.
74
75	// For tiny ratios it's not possible to convert a duration to a hh_mm_ss. This
76	// fails compile-time due to the limited precision of the ratio (64-bit is too
77	// small). Therefore a duration uses its own conversion.
78	template <class _CharT, class _Tp>
79	requires(chrono::__is_duration<_Tp>::value)
80	_LIBCPP_HIDE_FROM_ABI void __format_sub_seconds(const _Tp& __value, basic_stringstream<_CharT>& __sstr) {
81	__sstr << std::use_facet<numpunct<_CharT>>(__sstr.getloc()).decimal_point();
82
83	auto __fraction = __value - chrono::duration_cast<chrono::seconds>(__value);
84	if constexpr (chrono::treat_as_floating_point_v<typename _Tp::rep>)
85	// When the floating-point value has digits itself they are ignored based
86	// on the wording in [tab:time.format.spec]
87	// If the precision of the input cannot be exactly represented with
88	// seconds, then the format is a decimal floating-point number with a
89	// fixed format and a precision matching that of the precision of the
90	// input (or to a microseconds precision if the conversion to
91	// floating-point decimal seconds cannot be made within 18 fractional
92	// digits).
93	//
94	// This matches the behaviour of MSVC STL, fmtlib interprets this
95	// differently and uses 3 decimals.
96	// https://godbolt.org/z/6dsbnW8ba
97	std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
98	_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"),
99	__fraction.count(),
100	chrono::hh_mm_ss<_Tp>::fractional_width);
101	else
102	std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
103	_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}}"),
104	__fraction.count(),
105	chrono::hh_mm_ss<_Tp>::fractional_width);
106	}
107
108	template <class _Tp>
109	consteval bool __use_fraction() {
110	if constexpr (chrono::__is_duration<_Tp>::value)
111	return chrono::hh_mm_ss<_Tp>::fractional_width;
112	else
113	return false;
114	}
115
116	template <class _CharT>
117	_LIBCPP_HIDE_FROM_ABI void __format_year(int __year, basic_stringstream<_CharT>& __sstr) {
118	if (__year < 0) {
119	__sstr << _CharT('-');
120	__year = -__year;
121	}
122
123	// TODO FMT Write an issue
124	// If the result has less than four digits it is zero-padded with 0 to two digits.
125	// is less -> has less
126	// left-padded -> zero-padded, otherwise the proper value would be 000-0.
127
128	// Note according to the wording it should be left padded, which is odd.
129	__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:04}"), __year);
130	}
131
132	template <class _CharT>
133	_LIBCPP_HIDE_FROM_ABI void __format_century(int __year, basic_stringstream<_CharT>& __sstr) {
134	// TODO FMT Write an issue
135	// [tab:time.format.spec]
136	// %C The year divided by 100 using floored division. If the result is a
137	// single decimal digit, it is prefixed with 0.
138
139	bool __negative = __year < 0;
140	int __century = (__year - (99 * __negative)) / 100; // floored division
141	__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), __century);
142	}
143
144	template <class _CharT, class _Tp>
145	_LIBCPP_HIDE_FROM_ABI void __format_chrono_using_chrono_specs(
146	const _Tp& __value, basic_stringstream<_CharT>& __sstr, basic_string_view<_CharT> __chrono_specs) {
147	tm __t = std::__convert_to_tm<tm>(__value);
148	const auto& __facet = std::use_facet<time_put<_CharT>>(__sstr.getloc());
149	for (auto __it = __chrono_specs.begin(); __it != __chrono_specs.end(); ++__it) {
150	if (*__it == _CharT('%')) {
151	auto __s = __it;
152	++__it;
153	// We only handle the types that can't be directly handled by time_put.
154	// (as an optimization n, t, and % are also handled directly.)
155	switch (*__it) {
156	case _CharT('n'):
157	__sstr << _CharT('\n');
158	break;
159	case _CharT('t'):
160	__sstr << _CharT('\t');
161	break;
162	case _CharT('%'):
163	__sstr << *__it;
164	break;
165
166	case _CharT('C'): {
167	// strftime's output is only defined in the range [00, 99].
168	int __year = __t.tm_year + 1900;
169	if (__year < 1000 \|\| __year > 9999)
170	__formatter::__format_century(__year, __sstr);
171	else
172	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
173	} break;
174
175	case _CharT('j'):
176	if constexpr (chrono::__is_duration<_Tp>::value)
177	// Converting a duration where the period has a small ratio to days
178	// may fail to compile. This due to loss of precision in the
179	// conversion. In order to avoid that issue convert to seconds as
180	// an intemediate step.
181	__sstr << chrono::duration_cast<chrono::days>(chrono::duration_cast<chrono::seconds>(__value)).count();
182	else
183	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
184	break;
185
186	case _CharT('q'):
187	if constexpr (chrono::__is_duration<_Tp>::value) {
188	__sstr << chrono::__units_suffix<_CharT, typename _Tp::period>();
189	break;
190	}
191	__builtin_unreachable();
192
193	case _CharT('Q'):
194	// TODO FMT Determine the proper ideas
195	// - Should it honour the precision?
196	// - Shoult it honour the locale setting for the separators?
197	// The wording for Q doesn't use the word locale and the effect of
198	// precision is unspecified.
199	//
200	// MSVC STL ignores precision but uses separator
201	// FMT honours precision and has a bug for separator
202	// https://godbolt.org/z/78b7sMxns
203	if constexpr (chrono::__is_duration<_Tp>::value) {
204	__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{}"), __value.count());
205	break;
206	}
207	__builtin_unreachable();
208
209	case _CharT('S'):
210	case _CharT('T'):
211	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
212	if constexpr (__use_fraction<_Tp>())
213	__formatter::__format_sub_seconds(__value, __sstr);
214	break;
215
216	// Unlike time_put and strftime the formatting library requires %Y
217	//
218	// [tab:time.format.spec]
219	// The year as a decimal number. If the result is less than four digits
220	// it is left-padded with 0 to four digits.
221	//
222	// This means years in the range (-1000, 1000) need manual formatting.
223	// It's unclear whether %EY needs the same treatment. For example the
224	// Japanese EY contains the era name and year. This is zero-padded to 2
225	// digits in time_put (note that older glibc versions didn't do
226	// padding.) However most eras won't reach 100 years, let alone 1000.
227	// So padding to 4 digits seems unwanted for Japanese.
228	//
229	// The same applies to %Ex since that too depends on the era.
230	//
231	// %x the locale's date representation is currently doesn't handle the
232	// zero-padding too.
233	//
234	// The 4 digits can be implemented better at a later time. On POSIX
235	// systems the required information can be extracted by nl_langinfo
236	// https://man7.org/linux/man-pages/man3/nl_langinfo.3.html
237	//
238	// Note since year < -1000 is expected to be rare it uses the more
239	// expensive year routine.
240	//
241	// TODO FMT evaluate the comment above.
242
243	# if defined(__GLIBC__) \|\| defined(_AIX)
244	case _CharT('y'):
245	// Glibc fails for negative values, AIX for positive values too.
246	__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), (std::abs(__t.tm_year + 1900)) % 100);
247	break;
248	# endif // defined(__GLIBC__) \|\| defined(_AIX)
249
250	case _CharT('Y'): {
251	int __year = __t.tm_year + 1900;
252	if (__year < 1000)
253	__formatter::__format_year(__year, __sstr);
254	else
255	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
256	} break;
257
258	case _CharT('F'): {
259	int __year = __t.tm_year + 1900;
260	if (__year < 1000) {
261	__formatter::__format_year(__year, __sstr);
262	__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "-{:02}-{:02}"), __t.tm_mon + 1, __t.tm_mday);
263	} else
264	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
265	} break;
266
267	case _CharT('O'):
268	if constexpr (__use_fraction<_Tp>()) {
269	// Handle OS using the normal representation for the non-fractional
270	// part. There seems to be no locale information regarding how the
271	// fractional part should be formatted.
272	if (*(__it + 1) == 'S') {
273	++__it;
274	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
275	__formatter::__format_sub_seconds(__value, __sstr);
276	break;
277	}
278	}
279	[[fallthrough]];
280	case _CharT('E'):
281	++__it;
282	[[fallthrough]];
283	default:
284	__facet.put({__sstr}, __sstr, _CharT(' '), std::addressof(__t), __s, __it + 1);
285	break;
286	}
287	} else {
288	__sstr << *__it;
289	}
290	}
291	}
292
293	template <class _Tp>
294	_LIBCPP_HIDE_FROM_ABI constexpr bool __weekday_ok(const _Tp& __value) {
295	if constexpr (same_as<_Tp, chrono::day>)
296	return true;
297	else if constexpr (same_as<_Tp, chrono::month>)
298	return __value.ok();
299	else if constexpr (same_as<_Tp, chrono::year>)
300	return true;
301	else if constexpr (same_as<_Tp, chrono::weekday>)
302	return true;
303	else if constexpr (same_as<_Tp, chrono::weekday_indexed>)
304	return true;
305	else if constexpr (same_as<_Tp, chrono::weekday_last>)
306	return true;
307	else if constexpr (same_as<_Tp, chrono::month_day>)
308	return true;
309	else if constexpr (same_as<_Tp, chrono::month_day_last>)
310	return true;
311	else if constexpr (same_as<_Tp, chrono::month_weekday>)
312	return true;
313	else if constexpr (same_as<_Tp, chrono::month_weekday_last>)
314	return true;
315	else if constexpr (same_as<_Tp, chrono::year_month>)
316	return true;
317	else if constexpr (same_as<_Tp, chrono::year_month_day>)
318	return __value.ok();
319	else if constexpr (same_as<_Tp, chrono::year_month_day_last>)
320	return __value.ok();
321	else if constexpr (same_as<_Tp, chrono::year_month_weekday>)
322	return __value.weekday().ok();
323	else if constexpr (same_as<_Tp, chrono::year_month_weekday_last>)
324	return __value.weekday().ok();
325	else
326	static_assert(sizeof(_Tp) == 0, "Add the missing type specialization");
327	}
328
329	template <class _Tp>
330	_LIBCPP_HIDE_FROM_ABI constexpr bool __weekday_name_ok(const _Tp& __value) {
331	if constexpr (same_as<_Tp, chrono::day>)
332	return true;
333	else if constexpr (same_as<_Tp, chrono::month>)
334	return __value.ok();
335	else if constexpr (same_as<_Tp, chrono::year>)
336	return true;
337	else if constexpr (same_as<_Tp, chrono::weekday>)
338	return __value.ok();
339	else if constexpr (same_as<_Tp, chrono::weekday_indexed>)
340	return __value.weekday().ok();
341	else if constexpr (same_as<_Tp, chrono::weekday_last>)
342	return __value.weekday().ok();
343	else if constexpr (same_as<_Tp, chrono::month_day>)
344	return true;
345	else if constexpr (same_as<_Tp, chrono::month_day_last>)
346	return true;
347	else if constexpr (same_as<_Tp, chrono::month_weekday>)
348	return __value.weekday_indexed().ok();
349	else if constexpr (same_as<_Tp, chrono::month_weekday_last>)
350	return __value.weekday_indexed().ok();
351	else if constexpr (same_as<_Tp, chrono::year_month>)
352	return true;
353	else if constexpr (same_as<_Tp, chrono::year_month_day>)
354	return __value.ok();
355	else if constexpr (same_as<_Tp, chrono::year_month_day_last>)
356	return __value.ok();
357	else if constexpr (same_as<_Tp, chrono::year_month_weekday>)
358	return __value.weekday().ok();
359	else if constexpr (same_as<_Tp, chrono::year_month_weekday_last>)
360	return __value.weekday().ok();
361	else
362	static_assert(sizeof(_Tp) == 0, "Add the missing type specialization");
363	}
364
365	template <class _Tp>
366	_LIBCPP_HIDE_FROM_ABI constexpr bool __date_ok(const _Tp& __value) {
367	if constexpr (same_as<_Tp, chrono::day>)
368	return true;
369	else if constexpr (same_as<_Tp, chrono::month>)
370	return __value.ok();
371	else if constexpr (same_as<_Tp, chrono::year>)
372	return true;
373	else if constexpr (same_as<_Tp, chrono::weekday>)
374	return true;
375	else if constexpr (same_as<_Tp, chrono::weekday_indexed>)
376	return true;
377	else if constexpr (same_as<_Tp, chrono::weekday_last>)
378	return true;
379	else if constexpr (same_as<_Tp, chrono::month_day>)
380	return true;
381	else if constexpr (same_as<_Tp, chrono::month_day_last>)
382	return true;
383	else if constexpr (same_as<_Tp, chrono::month_weekday>)
384	return true;
385	else if constexpr (same_as<_Tp, chrono::month_weekday_last>)
386	return true;
387	else if constexpr (same_as<_Tp, chrono::year_month>)
388	return true;
389	else if constexpr (same_as<_Tp, chrono::year_month_day>)
390	return __value.ok();
391	else if constexpr (same_as<_Tp, chrono::year_month_day_last>)
392	return __value.ok();
393	else if constexpr (same_as<_Tp, chrono::year_month_weekday>)
394	return __value.ok();
395	else if constexpr (same_as<_Tp, chrono::year_month_weekday_last>)
396	return __value.ok();
397	else
398	static_assert(sizeof(_Tp) == 0, "Add the missing type specialization");
399	}
400
401	template <class _Tp>
402	_LIBCPP_HIDE_FROM_ABI constexpr bool __month_name_ok(const _Tp& __value) {
403	if constexpr (same_as<_Tp, chrono::day>)
404	return true;
405	else if constexpr (same_as<_Tp, chrono::month>)
406	return __value.ok();
407	else if constexpr (same_as<_Tp, chrono::year>)
408	return true;
409	else if constexpr (same_as<_Tp, chrono::weekday>)
410	return true;
411	else if constexpr (same_as<_Tp, chrono::weekday_indexed>)
412	return true;
413	else if constexpr (same_as<_Tp, chrono::weekday_last>)
414	return true;
415	else if constexpr (same_as<_Tp, chrono::month_day>)
416	return __value.month().ok();
417	else if constexpr (same_as<_Tp, chrono::month_day_last>)
418	return __value.month().ok();
419	else if constexpr (same_as<_Tp, chrono::month_weekday>)
420	return __value.month().ok();
421	else if constexpr (same_as<_Tp, chrono::month_weekday_last>)
422	return __value.month().ok();
423	else if constexpr (same_as<_Tp, chrono::year_month>)
424	return __value.month().ok();
425	else if constexpr (same_as<_Tp, chrono::year_month_day>)
426	return __value.month().ok();
427	else if constexpr (same_as<_Tp, chrono::year_month_day_last>)
428	return __value.month().ok();
429	else if constexpr (same_as<_Tp, chrono::year_month_weekday>)
430	return __value.month().ok();
431	else if constexpr (same_as<_Tp, chrono::year_month_weekday_last>)
432	return __value.month().ok();
433	else
434	static_assert(sizeof(_Tp) == 0, "Add the missing type specialization");
435	}
436
437	template <class _CharT, class _Tp>
438	_LIBCPP_HIDE_FROM_ABI auto
439	__format_chrono(const _Tp& __value,
440	auto& __ctx,
441	__format_spec::__parsed_specifications<_CharT> __specs,
442	basic_string_view<_CharT> __chrono_specs) -> decltype(__ctx.out()) {
443	basic_stringstream<_CharT> __sstr;
444	// [time.format]/2
445	// 2.1 - the "C" locale if the L option is not present in chrono-format-spec, otherwise
446	// 2.2 - the locale passed to the formatting function if any, otherwise
447	// 2.3 - the global locale.
448	// Note that the __ctx's locale() call does 2.2 and 2.3.
449	if (__specs.__chrono_.__locale_specific_form_)
450	__sstr.imbue(__ctx.locale());
451	else
452	__sstr.imbue(locale::classic());
453
454	if (__chrono_specs.empty())
455	__sstr << __value;
456	else {
457	if constexpr (chrono::__is_duration<_Tp>::value) {
458	if (__value < __value.zero())
459	__sstr << _CharT('-');
460	__formatter::__format_chrono_using_chrono_specs(chrono::abs(__value), __sstr, __chrono_specs);
461	// TODO FMT When keeping the precision it will truncate the string.
462	// Note that the behaviour what the precision does isn't specified.
463	__specs.__precision_ = -1;
464	} else {
465	// Test __weekday_name_ before __weekday_ to give a better error.
466	if (__specs.__chrono_.__weekday_name_ && !__formatter::__weekday_name_ok(__value))
467	std::__throw_format_error("formatting a weekday name needs a valid weekday");
468
469	if (__specs.__chrono_.__weekday_ && !__formatter::__weekday_ok(__value))
470	std::__throw_format_error("formatting a weekday needs a valid weekday");
471
472	if (__specs.__chrono_.__day_of_year_ && !__formatter::__date_ok(__value))
473	std::__throw_format_error("formatting a day of year needs a valid date");
474
475	if (__specs.__chrono_.__week_of_year_ && !__formatter::__date_ok(__value))
476	std::__throw_format_error("formatting a week of year needs a valid date");
477
478	if (__specs.__chrono_.__month_name_ && !__formatter::__month_name_ok(__value))
479	std::__throw_format_error("formatting a month name from an invalid month number");
480
481	__formatter::__format_chrono_using_chrono_specs(__value, __sstr, __chrono_specs);
482	}
483	}
484
485	// TODO FMT Use the stringstream's view after P0408R7 has been implemented.
486	basic_string<_CharT> __str = __sstr.str();
487	return __formatter::__write_string(basic_string_view<_CharT>{__str}, __ctx.out(), __specs);
488	}
489
490	} // namespace __formatter
491
492	template <__fmt_char_type _CharT>
493	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_chrono {
494	public:
495	_LIBCPP_HIDE_FROM_ABI constexpr auto __parse(
496	basic_format_parse_context<_CharT>& __parse_ctx, __format_spec::__fields __fields, __format_spec::__flags __flags)
497	-> decltype(__parse_ctx.begin()) {
498	return __parser_.__parse(__parse_ctx, __fields, __flags);
499	}
500
501	template <class _Tp>
502	_LIBCPP_HIDE_FROM_ABI auto format(const _Tp& __value, auto& __ctx) const -> decltype(__ctx.out()) const {
503	return __formatter::__format_chrono(
504	__value, __ctx, __parser_.__parser_.__get_parsed_chrono_specifications(__ctx), __parser_.__chrono_specs_);
505	}
506
507	__format_spec::__parser_chrono<_CharT> __parser_;
508	};
509
510	template <class _Rep, class _Period, __fmt_char_type _CharT>
511	struct formatter<chrono::duration<_Rep, _Period>, _CharT> : public __formatter_chrono<_CharT> {
512	public:
513	using _Base = __formatter_chrono<_CharT>;
514
515	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
516	-> decltype(__parse_ctx.begin()) {
517	// [time.format]/1
518	// Giving a precision specification in the chrono-format-spec is valid only
519	// for std::chrono::duration types where the representation type Rep is a
520	// floating-point type. For all other Rep types, an exception of type
521	// format_error is thrown if the chrono-format-spec contains a precision
522	// specification.
523	//
524	// Note this doesn't refer to chrono::treat_as_floating_point_v<_Rep>.
525	if constexpr (std::floating_point<_Rep>)
526	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono_fractional, __format_spec::__flags::__duration);
527	else
528	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__duration);
529	}
530	};
531
532	template <__fmt_char_type _CharT>
533	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::day, _CharT>
534	: public __formatter_chrono<_CharT> {
535	public:
536	using _Base = __formatter_chrono<_CharT>;
537
538	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
539	-> decltype(__parse_ctx.begin()) {
540	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__day);
541	}
542	};
543
544	template <__fmt_char_type _CharT>
545	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::month, _CharT>
546	: public __formatter_chrono<_CharT> {
547	public:
548	using _Base = __formatter_chrono<_CharT>;
549
550	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
551	-> decltype(__parse_ctx.begin()) {
552	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__month);
553	}
554	};
555
556	template <__fmt_char_type _CharT>
557	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year, _CharT>
558	: public __formatter_chrono<_CharT> {
559	public:
560	using _Base = __formatter_chrono<_CharT>;
561
562	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
563	-> decltype(__parse_ctx.begin()) {
564	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__year);
565	}
566	};
567
568	template <__fmt_char_type _CharT>
569	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::weekday, _CharT>
570	: public __formatter_chrono<_CharT> {
571	public:
572	using _Base = __formatter_chrono<_CharT>;
573
574	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
575	-> decltype(__parse_ctx.begin()) {
576	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__weekday);
577	}
578	};
579
580	template <__fmt_char_type _CharT>
581	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::weekday_indexed, _CharT>
582	: public __formatter_chrono<_CharT> {
583	public:
584	using _Base = __formatter_chrono<_CharT>;
585
586	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
587	-> decltype(__parse_ctx.begin()) {
588	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__weekday);
589	}
590	};
591
592	template <__fmt_char_type _CharT>
593	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::weekday_last, _CharT>
594	: public __formatter_chrono<_CharT> {
595	public:
596	using _Base = __formatter_chrono<_CharT>;
597
598	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
599	-> decltype(__parse_ctx.begin()) {
600	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__weekday);
601	}
602	};
603
604	template <__fmt_char_type _CharT>
605	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::month_day, _CharT>
606	: public __formatter_chrono<_CharT> {
607	public:
608	using _Base = __formatter_chrono<_CharT>;
609
610	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
611	-> decltype(__parse_ctx.begin()) {
612	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__month_day);
613	}
614	};
615
616	template <__fmt_char_type _CharT>
617	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::month_day_last, _CharT>
618	: public __formatter_chrono<_CharT> {
619	public:
620	using _Base = __formatter_chrono<_CharT>;
621
622	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
623	-> decltype(__parse_ctx.begin()) {
624	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__month);
625	}
626	};
627
628	template <__fmt_char_type _CharT>
629	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::month_weekday, _CharT>
630	: public __formatter_chrono<_CharT> {
631	public:
632	using _Base = __formatter_chrono<_CharT>;
633
634	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
635	-> decltype(__parse_ctx.begin()) {
636	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__month_weekday);
637	}
638	};
639
640	template <__fmt_char_type _CharT>
641	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::month_weekday_last, _CharT>
642	: public __formatter_chrono<_CharT> {
643	public:
644	using _Base = __formatter_chrono<_CharT>;
645
646	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
647	-> decltype(__parse_ctx.begin()) {
648	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__month_weekday);
649	}
650	};
651
652	template <__fmt_char_type _CharT>
653	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year_month, _CharT>
654	: public __formatter_chrono<_CharT> {
655	public:
656	using _Base = __formatter_chrono<_CharT>;
657
658	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
659	-> decltype(__parse_ctx.begin()) {
660	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__year_month);
661	}
662	};
663
664	template <__fmt_char_type _CharT>
665	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year_month_day, _CharT>
666	: public __formatter_chrono<_CharT> {
667	public:
668	using _Base = __formatter_chrono<_CharT>;
669
670	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
671	-> decltype(__parse_ctx.begin()) {
672	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__date);
673	}
674	};
675
676	template <__fmt_char_type _CharT>
677	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year_month_day_last, _CharT>
678	: public __formatter_chrono<_CharT> {
679	public:
680	using _Base = __formatter_chrono<_CharT>;
681
682	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
683	-> decltype(__parse_ctx.begin()) {
684	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__date);
685	}
686	};
687
688	template <__fmt_char_type _CharT>
689	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year_month_weekday, _CharT>
690	: public __formatter_chrono<_CharT> {
691	public:
692	using _Base = __formatter_chrono<_CharT>;
693
694	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
695	-> decltype(__parse_ctx.begin()) {
696	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__date);
697	}
698	};
699
700	template <__fmt_char_type _CharT>
701	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<chrono::year_month_weekday_last, _CharT>
702	: public __formatter_chrono<_CharT> {
703	public:
704	using _Base = __formatter_chrono<_CharT>;
705
706	_LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
707	-> decltype(__parse_ctx.begin()) {
708	return _Base::__parse(__parse_ctx, __format_spec::__fields_chrono, __format_spec::__flags::__date);
709	}
710	};
711
712	#endif // if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
713
714	_LIBCPP_END_NAMESPACE_STD
715
716	#endif // _LIBCPP___CHRONO_FORMATTER_H

lib/libcxx/include/__chrono/hh_mm_ss.h+17-17

...	@@ -57,33 +57,33 @@ public:	...	@@ -57,33 +57,33 @@ public:
57	_LIBCPP_HIDE_FROM_ABI constexpr hh_mm_ss() noexcept : hh_mm_ss{_Duration::zero()} {}	57	_LIBCPP_HIDE_FROM_ABI constexpr hh_mm_ss() noexcept : hh_mm_ss{_Duration::zero()} {}
58		58
59	_LIBCPP_HIDE_FROM_ABI constexpr explicit hh_mm_ss(_Duration __d) noexcept :	59	_LIBCPP_HIDE_FROM_ABI constexpr explicit hh_mm_ss(_Duration __d) noexcept :
60	__is_neg(__d < _Duration(0)),	60	__is_neg_(__d < _Duration(0)),
61	__h(duration_cast<chrono::hours> (abs(__d))),	61	__h_(chrono::duration_cast<chrono::hours> (chrono::abs(__d))),
62	__m(duration_cast<chrono::minutes>(abs(__d) - hours())),	62	__m_(chrono::duration_cast<chrono::minutes>(chrono::abs(__d) - hours())),
63	__s(duration_cast<chrono::seconds>(abs(__d) - hours() - minutes())),	63	__s_(chrono::duration_cast<chrono::seconds>(chrono::abs(__d) - hours() - minutes())),
64	__f(duration_cast<precision> (abs(__d) - hours() - minutes() - seconds()))	64	__f_(chrono::duration_cast<precision> (chrono::abs(__d) - hours() - minutes() - seconds()))
65	{}	65	{}
66		66
67	_LIBCPP_HIDE_FROM_ABI constexpr bool is_negative() const noexcept { return __is_neg; }	67	_LIBCPP_HIDE_FROM_ABI constexpr bool is_negative() const noexcept { return __is_neg_; }
68	_LIBCPP_HIDE_FROM_ABI constexpr chrono::hours hours() const noexcept { return __h; }	68	_LIBCPP_HIDE_FROM_ABI constexpr chrono::hours hours() const noexcept { return __h_; }
69	_LIBCPP_HIDE_FROM_ABI constexpr chrono::minutes minutes() const noexcept { return __m; }	69	_LIBCPP_HIDE_FROM_ABI constexpr chrono::minutes minutes() const noexcept { return __m_; }
70	_LIBCPP_HIDE_FROM_ABI constexpr chrono::seconds seconds() const noexcept { return __s; }	70	_LIBCPP_HIDE_FROM_ABI constexpr chrono::seconds seconds() const noexcept { return __s_; }
71	_LIBCPP_HIDE_FROM_ABI constexpr precision subseconds() const noexcept { return __f; }	71	_LIBCPP_HIDE_FROM_ABI constexpr precision subseconds() const noexcept { return __f_; }
72		72
73	_LIBCPP_HIDE_FROM_ABI constexpr precision to_duration() const noexcept	73	_LIBCPP_HIDE_FROM_ABI constexpr precision to_duration() const noexcept
74	{	74	{
75	auto __dur = __h + __m + __s + __f;	75	auto __dur = __h_ + __m_ + __s_ + __f_;
76	return __is_neg ? -__dur : __dur;	76	return __is_neg_ ? -__dur : __dur;
77	}	77	}
78		78
79	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator precision() const noexcept { return to_duration(); }	79	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator precision() const noexcept { return to_duration(); }
80		80
81	private:	81	private:
82	bool __is_neg;	82	bool __is_neg_;
83	chrono::hours __h;	83	chrono::hours __h_;
84	chrono::minutes __m;	84	chrono::minutes __m_;
85	chrono::seconds __s;	85	chrono::seconds __s_;
86	precision __f;	86	precision __f_;
87	};	87	};
88		88
89	_LIBCPP_HIDE_FROM_ABI constexpr bool is_am(const hours& __h) noexcept { return __h >= hours( 0) && __h < hours(12); }	89	_LIBCPP_HIDE_FROM_ABI constexpr bool is_am(const hours& __h) noexcept { return __h >= hours( 0) && __h < hours(12); }

lib/libcxx/include/__chrono/month.h+10-25

 @@ -12,6 +12,7 @@
 #include <__chrono/duration.h>
 #include <__config>
+#include <compare>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -26,18 +27,18 @@ namespace chrono
 class month {
 private:
-    unsigned char __m;
+    unsigned char __m_;
 public:
     _LIBCPP_HIDE_FROM_ABI month() = default;
-    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr month(unsigned __val) noexcept : __m(static_cast<unsigned char>(__val)) {}
+    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr month(unsigned __val) noexcept : __m_(static_cast<unsigned char>(__val)) {}
-    _LIBCPP_HIDE_FROM_ABI inline constexpr month& operator++()    noexcept { ++__m; return *this; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr month& operator++()    noexcept { ++__m_; return *this; }
     _LIBCPP_HIDE_FROM_ABI inline constexpr month  operator++(int) noexcept { month __tmp = *this; ++(*this); return __tmp; }
-    _LIBCPP_HIDE_FROM_ABI inline constexpr month& operator--()    noexcept { --__m; return *this; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr month& operator--()    noexcept { --__m_; return *this; }
     _LIBCPP_HIDE_FROM_ABI inline constexpr month  operator--(int) noexcept { month __tmp = *this; --(*this); return __tmp; }
     _LIBCPP_HIDE_FROM_ABI        constexpr month& operator+=(const months& __m1) noexcept;
     _LIBCPP_HIDE_FROM_ABI        constexpr month& operator-=(const months& __m1) noexcept;
-    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __m; }
+    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __m_; }
-    _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m >= 1 && __m <= 12; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_ >= 1 && __m_ <= 12; }
 };
 @@ -45,25 +46,9 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr
 bool operator==(const month& __lhs, const month& __rhs) noexcept
 { return static_cast<unsigned>(__lhs) == static_cast<unsigned>(__rhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
+_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(const month& __lhs, const month& __rhs) noexcept {
-bool operator!=(const month& __lhs, const month& __rhs) noexcept
+    return static_cast<unsigned>(__lhs) <=> static_cast<unsigned>(__rhs);
-{ return !(__lhs == __rhs); }
+}
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator< (const month& __lhs, const month& __rhs) noexcept
-{ return static_cast<unsigned>(__lhs)  < static_cast<unsigned>(__rhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator> (const month& __lhs, const month& __rhs) noexcept
-{ return __rhs < __lhs; }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator<=(const month& __lhs, const month& __rhs) noexcept
-{ return !(__rhs < __lhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator>=(const month& __lhs, const month& __rhs) noexcept
-{ return !(__lhs < __rhs); }
 _LIBCPP_HIDE_FROM_ABI inline constexpr
 month operator+ (const month& __lhs, const months& __rhs) noexcept

lib/libcxx/include/__chrono/month_weekday.h+12-12

...	@@ -27,14 +27,14 @@ namespace chrono	...	@@ -27,14 +27,14 @@ namespace chrono
27		27
28	class month_weekday {	28	class month_weekday {
29	private:	29	private:
30	chrono::month __m;	30	chrono::month __m_;
31	chrono::weekday_indexed __wdi;	31	chrono::weekday_indexed __wdi_;
32	public:	32	public:
33	_LIBCPP_HIDE_FROM_ABI constexpr month_weekday(const chrono::month& __mval, const chrono::weekday_indexed& __wdival) noexcept	33	_LIBCPP_HIDE_FROM_ABI constexpr month_weekday(const chrono::month& __mval, const chrono::weekday_indexed& __wdival) noexcept
34	: __m{__mval}, __wdi{__wdival} {}	34	: __m_{__mval}, __wdi_{__wdival} {}
35	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	35	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
36	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi; }	36	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi_; }
37	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m.ok() && __wdi.ok(); }	37	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdi_.ok(); }
38	};	38	};
39		39
40	_LIBCPP_HIDE_FROM_ABI inline constexpr	40	_LIBCPP_HIDE_FROM_ABI inline constexpr
...	@@ -63,14 +63,14 @@ month_weekday operator/(const weekday_indexed& __lhs, int __rhs) noexcept	...	@@ -63,14 +63,14 @@ month_weekday operator/(const weekday_indexed& __lhs, int __rhs) noexcept
63		63
64		64
65	class month_weekday_last {	65	class month_weekday_last {
66	chrono::month __m;	66	chrono::month __m_;
67	chrono::weekday_last __wdl;	67	chrono::weekday_last __wdl_;
68	public:	68	public:
69	_LIBCPP_HIDE_FROM_ABI constexpr month_weekday_last(const chrono::month& __mval, const chrono::weekday_last& __wdlval) noexcept	69	_LIBCPP_HIDE_FROM_ABI constexpr month_weekday_last(const chrono::month& __mval, const chrono::weekday_last& __wdlval) noexcept
70	: __m{__mval}, __wdl{__wdlval} {}	70	: __m_{__mval}, __wdl_{__wdlval} {}
71	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	71	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
72	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl; }	72	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl_; }
73	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m.ok() && __wdl.ok(); }	73	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdl_.ok(); }
74	};	74	};
75		75
76	_LIBCPP_HIDE_FROM_ABI inline constexpr	76	_LIBCPP_HIDE_FROM_ABI inline constexpr

lib/libcxx/include/__chrono/monthday.h+22-53

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14	#include <__chrono/day.h>	14	#include <__chrono/day.h>
15	#include <__chrono/month.h>	15	#include <__chrono/month.h>
16	#include <__config>	16	#include <__config>
		17	#include <compare>
17		18
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	20	# pragma GCC system_header
...	@@ -28,26 +29,26 @@ namespace chrono	...	@@ -28,26 +29,26 @@ namespace chrono
28		29
29	class month_day {	30	class month_day {
30	private:	31	private:
31	chrono::month __m;	32	chrono::month __m_;
32	chrono::day __d;	33	chrono::day __d_;
33	public:	34	public:
34	_LIBCPP_HIDE_FROM_ABI month_day() = default;	35	_LIBCPP_HIDE_FROM_ABI month_day() = default;
35	_LIBCPP_HIDE_FROM_ABI constexpr month_day(const chrono::month& __mval, const chrono::day& __dval) noexcept	36	_LIBCPP_HIDE_FROM_ABI constexpr month_day(const chrono::month& __mval, const chrono::day& __dval) noexcept
36	: __m{__mval}, __d{__dval} {}	37	: __m_{__mval}, __d_{__dval} {}
37	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	38	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
38	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d; }	39	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
39	_LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;	40	_LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
40	};	41	};
41		42
42	_LIBCPP_HIDE_FROM_ABI inline constexpr	43	_LIBCPP_HIDE_FROM_ABI inline constexpr
43	bool month_day::ok() const noexcept	44	bool month_day::ok() const noexcept
44	{	45	{
45	if (!__m.ok()) return false;	46	if (!__m_.ok()) return false;
46	const unsigned __dval = static_cast<unsigned>(__d);	47	const unsigned __dval = static_cast<unsigned>(__d_);
47	if (__dval < 1 \|\| __dval > 31) return false;	48	if (__dval < 1 \|\| __dval > 31) return false;
48	if (__dval <= 29) return true;	49	if (__dval <= 29) return true;
49	// Now we've got either 30 or 31	50	// Now we've got either 30 or 31
50	const unsigned __mval = static_cast<unsigned>(__m);	51	const unsigned __mval = static_cast<unsigned>(__m_);
51	if (__mval == 2) return false;	52	if (__mval == 2) return false;
52	if (__mval == 4 \|\| __mval == 6 \|\| __mval == 9 \|\| __mval == 11)	53	if (__mval == 4 \|\| __mval == 6 \|\| __mval == 9 \|\| __mval == 11)
53	return __dval == 30;	54	return __dval == 30;
...	@@ -58,9 +59,11 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr	...	@@ -58,9 +59,11 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr
58	bool operator==(const month_day& __lhs, const month_day& __rhs) noexcept	59	bool operator==(const month_day& __lhs, const month_day& __rhs) noexcept
59	{ return __lhs.month() == __rhs.month() && __lhs.day() == __rhs.day(); }	60	{ return __lhs.month() == __rhs.month() && __lhs.day() == __rhs.day(); }
60		61
61	_LIBCPP_HIDE_FROM_ABI inline constexpr	62	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(const month_day& __lhs, const month_day& __rhs) noexcept {
62	bool operator!=(const month_day& __lhs, const month_day& __rhs) noexcept	63	if (auto __c = __lhs.month() <=> __rhs.month(); __c != 0)
63	{ return !(__lhs == __rhs); }	64	return __c;
		65	return __lhs.day() <=> __rhs.day();
		66	}
64		67
65	_LIBCPP_HIDE_FROM_ABI inline constexpr	68	_LIBCPP_HIDE_FROM_ABI inline constexpr
66	month_day operator/(const month& __lhs, const day& __rhs) noexcept	69	month_day operator/(const month& __lhs, const day& __rhs) noexcept
...	@@ -82,58 +85,24 @@ _LIBCPP_HIDE_FROM_ABI constexpr	...	@@ -82,58 +85,24 @@ _LIBCPP_HIDE_FROM_ABI constexpr
82	month_day operator/(const day& __lhs, int __rhs) noexcept	85	month_day operator/(const day& __lhs, int __rhs) noexcept
83	{ return month(__rhs) / __lhs; }	86	{ return month(__rhs) / __lhs; }
84		87
85
86	_LIBCPP_HIDE_FROM_ABI inline constexpr
87	bool operator< (const month_day& __lhs, const month_day& __rhs) noexcept
88	{ return __lhs.month() != __rhs.month() ? __lhs.month() < __rhs.month() : __lhs.day() < __rhs.day(); }
89
90	_LIBCPP_HIDE_FROM_ABI inline constexpr
91	bool operator> (const month_day& __lhs, const month_day& __rhs) noexcept
92	{ return __rhs < __lhs; }
93
94	_LIBCPP_HIDE_FROM_ABI inline constexpr
95	bool operator<=(const month_day& __lhs, const month_day& __rhs) noexcept
96	{ return !(__rhs < __lhs);}
97
98	_LIBCPP_HIDE_FROM_ABI inline constexpr
99	bool operator>=(const month_day& __lhs, const month_day& __rhs) noexcept
100	{ return !(__lhs < __rhs); }
101
102
103
104	class month_day_last {	88	class month_day_last {
105	private:	89	private:
106	chrono::month __m;	90	chrono::month __m_;
107	public:	91	public:
108	_LIBCPP_HIDE_FROM_ABI explicit constexpr month_day_last(const chrono::month& __val) noexcept	92	_LIBCPP_HIDE_FROM_ABI explicit constexpr month_day_last(const chrono::month& __val) noexcept
109	: __m{__val} {}	93	: __m_{__val} {}
110	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	94	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
111	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m.ok(); }	95	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok(); }
112	};	96	};
113		97
114	_LIBCPP_HIDE_FROM_ABI inline constexpr	98	_LIBCPP_HIDE_FROM_ABI inline constexpr
115	bool operator==(const month_day_last& __lhs, const month_day_last& __rhs) noexcept	99	bool operator==(const month_day_last& __lhs, const month_day_last& __rhs) noexcept
116	{ return __lhs.month() == __rhs.month(); }	100	{ return __lhs.month() == __rhs.month(); }
117		101
118	_LIBCPP_HIDE_FROM_ABI inline constexpr	102	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering
119	bool operator!=(const month_day_last& __lhs, const month_day_last& __rhs) noexcept	103	operator<=>(const month_day_last& __lhs, const month_day_last& __rhs) noexcept {
120	{ return !(__lhs == __rhs); }	104	return __lhs.month() <=> __rhs.month();
121		105	}
122	_LIBCPP_HIDE_FROM_ABI inline constexpr
123	bool operator< (const month_day_last& __lhs, const month_day_last& __rhs) noexcept
124	{ return __lhs.month() < __rhs.month(); }
125
126	_LIBCPP_HIDE_FROM_ABI inline constexpr
127	bool operator> (const month_day_last& __lhs, const month_day_last& __rhs) noexcept
128	{ return __rhs < __lhs; }
129
130	_LIBCPP_HIDE_FROM_ABI inline constexpr
131	bool operator<=(const month_day_last& __lhs, const month_day_last& __rhs) noexcept
132	{ return !(__rhs < __lhs);}
133
134	_LIBCPP_HIDE_FROM_ABI inline constexpr
135	bool operator>=(const month_day_last& __lhs, const month_day_last& __rhs) noexcept
136	{ return !(__lhs < __rhs); }
137		106
138	_LIBCPP_HIDE_FROM_ABI inline constexpr	107	_LIBCPP_HIDE_FROM_ABI inline constexpr
139	month_day_last operator/(const month& __lhs, last_spec) noexcept	108	month_day_last operator/(const month& __lhs, last_spec) noexcept

lib/libcxx/include/__chrono/ostream.h created+238

...	@@ -0,0 +1,238 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CHRONO_OSTREAM_H
11	#define _LIBCPP___CHRONO_OSTREAM_H
12
13	#include <__chrono/day.h>
14	#include <__chrono/duration.h>
15	#include <__chrono/month.h>
16	#include <__chrono/month_weekday.h>
17	#include <__chrono/monthday.h>
18	#include <__chrono/statically_widen.h>
19	#include <__chrono/weekday.h>
20	#include <__chrono/year.h>
21	#include <__chrono/year_month.h>
22	#include <__chrono/year_month_day.h>
23	#include <__chrono/year_month_weekday.h>
24	#include <__concepts/same_as.h>
25	#include <__config>
26	#include <__format/format_functions.h>
27	#include <ostream>
28	#include <ratio>
29
30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
31	# pragma GCC system_header
32	#endif
33
34	_LIBCPP_BEGIN_NAMESPACE_STD
35
36	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
37
38	namespace chrono {
39
40	// Depending on the type the return is a const _CharT* or a basic_string<_CharT>
41	template <class _CharT, class _Period>
42	_LIBCPP_HIDE_FROM_ABI auto __units_suffix() {
43	// TODO FMT LWG issue the suffixes are always char and not STATICALLY-WIDEN'ed.
44	if constexpr (same_as<typename _Period::type, atto>)
45	return _LIBCPP_STATICALLY_WIDEN(_CharT, "as");
46	else if constexpr (same_as<typename _Period::type, femto>)
47	return _LIBCPP_STATICALLY_WIDEN(_CharT, "fs");
48	else if constexpr (same_as<typename _Period::type, pico>)
49	return _LIBCPP_STATICALLY_WIDEN(_CharT, "ps");
50	else if constexpr (same_as<typename _Period::type, nano>)
51	return _LIBCPP_STATICALLY_WIDEN(_CharT, "ns");
52	else if constexpr (same_as<typename _Period::type, micro>)
53	# ifndef _LIBCPP_HAS_NO_UNICODE
54	return _LIBCPP_STATICALLY_WIDEN(_CharT, "\u00b5s");
55	# else
56	return _LIBCPP_STATICALLY_WIDEN(_CharT, "us");
57	# endif
58	else if constexpr (same_as<typename _Period::type, milli>)
59	return _LIBCPP_STATICALLY_WIDEN(_CharT, "ms");
60	else if constexpr (same_as<typename _Period::type, centi>)
61	return _LIBCPP_STATICALLY_WIDEN(_CharT, "cs");
62	else if constexpr (same_as<typename _Period::type, deci>)
63	return _LIBCPP_STATICALLY_WIDEN(_CharT, "ds");
64	else if constexpr (same_as<typename _Period::type, ratio<1>>)
65	return _LIBCPP_STATICALLY_WIDEN(_CharT, "s");
66	else if constexpr (same_as<typename _Period::type, deca>)
67	return _LIBCPP_STATICALLY_WIDEN(_CharT, "das");
68	else if constexpr (same_as<typename _Period::type, hecto>)
69	return _LIBCPP_STATICALLY_WIDEN(_CharT, "hs");
70	else if constexpr (same_as<typename _Period::type, kilo>)
71	return _LIBCPP_STATICALLY_WIDEN(_CharT, "ks");
72	else if constexpr (same_as<typename _Period::type, mega>)
73	return _LIBCPP_STATICALLY_WIDEN(_CharT, "Ms");
74	else if constexpr (same_as<typename _Period::type, giga>)
75	return _LIBCPP_STATICALLY_WIDEN(_CharT, "Gs");
76	else if constexpr (same_as<typename _Period::type, tera>)
77	return _LIBCPP_STATICALLY_WIDEN(_CharT, "Ts");
78	else if constexpr (same_as<typename _Period::type, peta>)
79	return _LIBCPP_STATICALLY_WIDEN(_CharT, "Ps");
80	else if constexpr (same_as<typename _Period::type, exa>)
81	return _LIBCPP_STATICALLY_WIDEN(_CharT, "Es");
82	else if constexpr (same_as<typename _Period::type, ratio<60>>)
83	return _LIBCPP_STATICALLY_WIDEN(_CharT, "min");
84	else if constexpr (same_as<typename _Period::type, ratio<3600>>)
85	return _LIBCPP_STATICALLY_WIDEN(_CharT, "h");
86	else if constexpr (same_as<typename _Period::type, ratio<86400>>)
87	return _LIBCPP_STATICALLY_WIDEN(_CharT, "d");
88	else if constexpr (_Period::den == 1)
89	return std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "[{}]s"), _Period::num);
90	else
91	return std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "[{}/{}]s"), _Period::num, _Period::den);
92	}
93
94	template <class _CharT, class _Traits, class _Rep, class _Period>
95	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
96	operator<<(basic_ostream<_CharT, _Traits>& __os, const duration<_Rep, _Period>& __d) {
97	basic_ostringstream<_CharT, _Traits> __s;
98	__s.flags(__os.flags());
99	__s.imbue(__os.getloc());
100	__s.precision(__os.precision());
101	__s << __d.count() << chrono::__units_suffix<_CharT, _Period>();
102	return __os << __s.str();
103	}
104
105	template <class _CharT, class _Traits>
106	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
107	operator<<(basic_ostream<_CharT, _Traits>& __os, const day& __d) {
108	return __os
109	<< (__d.ok()
110	? std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:%d}"), __d)
111	// Note this error differs from the wording of the Standard. The
112	// Standard wording doesn't work well on AIX or Windows. There
113	// the formatted day seems to be either modulo 100 or completely
114	// omitted. Judging by the wording this is valid.
115	// TODO FMT Write a paper of file an LWG issue.
116	: std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:02} is not a valid day"), static_cast<unsigned>(__d)));
117	}
118
119	template <class _CharT, class _Traits>
120	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
121	operator<<(basic_ostream<_CharT, _Traits>& __os, const month& __m) {
122	return __os << (__m.ok() ? std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L%b}"), __m)
123	: std::format(__os.getloc(),
124	_LIBCPP_STATICALLY_WIDEN(_CharT, "{} is not a valid month"),
125	static_cast<unsigned>(__m))); // TODO FMT Standard mandated locale isn't used.
126	}
127
128	template <class _CharT, class _Traits>
129	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
130	operator<<(basic_ostream<_CharT, _Traits>& __os, const year& __y) {
131	return __os << (__y.ok() ? std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:%Y}"), __y)
132	: std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:%Y} is not a valid year"), __y));
133	}
134
135	template <class _CharT, class _Traits>
136	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
137	operator<<(basic_ostream<_CharT, _Traits>& __os, const weekday& __wd) {
138	return __os << (__wd.ok() ? std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L%a}"), __wd)
139	: std::format(__os.getloc(), // TODO FMT Standard mandated locale isn't used.
140	_LIBCPP_STATICALLY_WIDEN(_CharT, "{} is not a valid weekday"),
141	static_cast<unsigned>(__wd.c_encoding())));
142	}
143
144	template <class _CharT, class _Traits>
145	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
146	operator<<(basic_ostream<_CharT, _Traits>& __os, const weekday_indexed& __wdi) {
147	auto __i = __wdi.index();
148	return __os << (__i >= 1 && __i <= 5
149	? std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}[{}]"), __wdi.weekday(), __i)
150	: std::format(__os.getloc(),
151	_LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}[{} is not a valid index]"),
152	__wdi.weekday(),
153	__i));
154	}
155
156	template <class _CharT, class _Traits>
157	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
158	operator<<(basic_ostream<_CharT, _Traits>& __os, const weekday_last& __wdl) {
159	return __os << std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}[last]"), __wdl.weekday());
160	}
161
162	template <class _CharT, class _Traits>
163	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
164	operator<<(basic_ostream<_CharT, _Traits>& __os, const month_day& __md) {
165	// TODO FMT The Standard allows 30th of February to be printed.
166	// It would be nice to show an error message instead.
167	return __os << std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}/{}"), __md.month(), __md.day());
168	}
169
170	template <class _CharT, class _Traits>
171	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
172	operator<<(basic_ostream<_CharT, _Traits>& __os, const month_day_last& __mdl) {
173	return __os << std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}/last"), __mdl.month());
174	}
175
176	template <class _CharT, class _Traits>
177	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
178	operator<<(basic_ostream<_CharT, _Traits>& __os, const month_weekday& __mwd) {
179	return __os << std::format(
180	__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}/{:L}"), __mwd.month(), __mwd.weekday_indexed());
181	}
182
183	template <class _CharT, class _Traits>
184	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
185	operator<<(basic_ostream<_CharT, _Traits>& __os, const month_weekday_last& __mwdl) {
186	return __os << std::format(
187	__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{:L}/{:L}"), __mwdl.month(), __mwdl.weekday_last());
188	}
189
190	template <class _CharT, class _Traits>
191	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
192	operator<<(basic_ostream<_CharT, _Traits>& __os, const year_month& __ym) {
193	return __os << std::format(__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{}/{:L}"), __ym.year(), __ym.month());
194	}
195
196	template <class _CharT, class _Traits>
197	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
198	operator<<(basic_ostream<_CharT, _Traits>& __os, const year_month_day& __ymd) {
199	return __os << (__ymd.ok() ? std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:%F}"), __ymd)
200	: std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:%F} is not a valid date"), __ymd));
201	}
202
203	template <class _CharT, class _Traits>
204	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
205	operator<<(basic_ostream<_CharT, _Traits>& __os, const year_month_day_last& __ymdl) {
206	return __os << std::format(
207	__os.getloc(), _LIBCPP_STATICALLY_WIDEN(_CharT, "{}/{:L}"), __ymdl.year(), __ymdl.month_day_last());
208	}
209
210	template <class _CharT, class _Traits>
211	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
212	operator<<(basic_ostream<_CharT, _Traits>& __os, const year_month_weekday& __ymwd) {
213	return __os << std::format(
214	__os.getloc(),
215	_LIBCPP_STATICALLY_WIDEN(_CharT, "{}/{:L}/{:L}"),
216	__ymwd.year(),
217	__ymwd.month(),
218	__ymwd.weekday_indexed());
219	}
220
221	template <class _CharT, class _Traits>
222	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT basic_ostream<_CharT, _Traits>&
223	operator<<(basic_ostream<_CharT, _Traits>& __os, const year_month_weekday_last& __ymwdl) {
224	return __os << std::format(
225	__os.getloc(),
226	_LIBCPP_STATICALLY_WIDEN(_CharT, "{}/{:L}/{:L}"),
227	__ymwdl.year(),
228	__ymwdl.month(),
229	__ymwdl.weekday_last());
230	}
231
232	} // namespace chrono
233
234	#endif //if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
235
236	_LIBCPP_END_NAMESPACE_STD
237
238	#endif // _LIBCPP___CHRONO_OSTREAM_H

lib/libcxx/include/__chrono/parser_std_format_spec.h created+410

...	@@ -0,0 +1,410 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
11	#define _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
12
13	#include <__config>
14	#include <__format/concepts.h>
15	#include <__format/format_error.h>
16	#include <__format/format_parse_context.h>
17	#include <__format/formatter_string.h>
18	#include <__format/parser_std_format_spec.h>
19	#include <string_view>
20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header
23	#endif
24
25	_LIBCPP_BEGIN_NAMESPACE_STD
26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
28
29	namespace __format_spec {
30
31	// By not placing this constant in the formatter class it's not duplicated for char and wchar_t
32	inline constexpr __fields __fields_chrono_fractional{
33	.__precision_ = true, .__locale_specific_form_ = true, .__type_ = false};
34	inline constexpr __fields __fields_chrono{.__locale_specific_form_ = true, .__type_ = false};
35
36	/// Flags available or required in a chrono type.
37	///
38	/// The caller of the chrono formatter lists the types it has available and the
39	/// validation tests whether the requested type spec (e.g. %M) is available in
40	/// the formatter.
41	/// When the type in the chrono-format-spec isn't present in the data a
42	/// \ref format_error is thrown.
43	enum class __flags {
44	__second = 0x1,
45	__minute = 0x2,
46	__hour = 0x4,
47	__time = __hour \| __minute \| __second,
48
49	__day = 0x8,
50	__month = 0x10,
51	__year = 0x20,
52
53	__weekday = 0x40,
54
55	__month_day = __day \| __month,
56	__month_weekday = __weekday \| __month,
57	__year_month = __month \| __year,
58	__date = __day \| __month \| __year \| __weekday,
59
60	__date_time = __date \| __time,
61
62	__duration = 0x80 \| __time,
63
64	__time_zone = 0x100,
65
66	__clock = __date_time \| __time_zone
67	};
68
69	_LIBCPP_HIDE_FROM_ABI constexpr __flags operator&(__flags __lhs, __flags __rhs) {
70	return static_cast<__flags>(static_cast<unsigned>(__lhs) & static_cast<unsigned>(__rhs));
71	}
72
73	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_second(__flags __flags) {
74	if ((__flags & __flags::__second) != __flags::__second)
75	std::__throw_format_error("The supplied date time doesn't contain a second");
76	}
77
78	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_minute(__flags __flags) {
79	if ((__flags & __flags::__minute) != __flags::__minute)
80	std::__throw_format_error("The supplied date time doesn't contain a minute");
81	}
82
83	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_hour(__flags __flags) {
84	if ((__flags & __flags::__hour) != __flags::__hour)
85	std::__throw_format_error("The supplied date time doesn't contain an hour");
86	}
87
88	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_time(__flags __flags) {
89	if ((__flags & __flags::__time) != __flags::__time)
90	std::__throw_format_error("The supplied date time doesn't contain a time");
91	}
92
93	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_day(__flags __flags) {
94	if ((__flags & __flags::__day) != __flags::__day)
95	std::__throw_format_error("The supplied date time doesn't contain a day");
96	}
97
98	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_month(__flags __flags) {
99	if ((__flags & __flags::__month) != __flags::__month)
100	std::__throw_format_error("The supplied date time doesn't contain a month");
101	}
102
103	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_year(__flags __flags) {
104	if ((__flags & __flags::__year) != __flags::__year)
105	std::__throw_format_error("The supplied date time doesn't contain a year");
106	}
107
108	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_date(__flags __flags) {
109	if ((__flags & __flags::__date) != __flags::__date)
110	std::__throw_format_error("The supplied date time doesn't contain a date");
111	}
112
113	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_date_or_duration(__flags __flags) {
114	if (((__flags & __flags::__date) != __flags::__date) && ((__flags & __flags::__duration) != __flags::__duration))
115	std::__throw_format_error("The supplied date time doesn't contain a date or duration");
116	}
117
118	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_date_time(__flags __flags) {
119	if ((__flags & __flags::__date_time) != __flags::__date_time)
120	std::__throw_format_error("The supplied date time doesn't contain a date and time");
121	}
122
123	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_weekday(__flags __flags) {
124	if ((__flags & __flags::__weekday) != __flags::__weekday)
125	std::__throw_format_error("The supplied date time doesn't contain a weekday");
126	}
127
128	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_duration(__flags __flags) {
129	if ((__flags & __flags::__duration) != __flags::__duration)
130	std::__throw_format_error("The supplied date time doesn't contain a duration");
131	}
132
133	_LIBCPP_HIDE_FROM_ABI constexpr void __validate_time_zone(__flags __flags) {
134	if ((__flags & __flags::__time_zone) != __flags::__time_zone)
135	std::__throw_format_error("The supplied date time doesn't contain a time zone");
136	}
137
138	template <class _CharT>
139	class _LIBCPP_TEMPLATE_VIS __parser_chrono {
140	public:
141	_LIBCPP_HIDE_FROM_ABI constexpr auto
142	__parse(basic_format_parse_context<_CharT>& __parse_ctx, __fields __fields, __flags __flags)
143	-> decltype(__parse_ctx.begin()) {
144	const _CharT* __begin = __parser_.__parse(__parse_ctx, __fields);
145	const _CharT* __end = __parse_ctx.end();
146	if (__begin == __end)
147	return __begin;
148
149	const _CharT* __last = __parse_chrono_specs(__begin, __end, __flags);
150	__chrono_specs_ = basic_string_view<_CharT>{__begin, __last};
151
152	return __last;
153	}
154
155	__parser<_CharT> __parser_;
156	basic_string_view<_CharT> __chrono_specs_;
157
158	private:
159	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT*
160	__parse_chrono_specs(const _CharT* __begin, const _CharT* __end, __flags __flags) {
161	_LIBCPP_ASSERT(__begin != __end,
162	"When called with an empty input the function will cause "
163	"undefined behavior by evaluating data not in the input");
164
165	if (__begin != _CharT('%') && __begin != _CharT('}'))
166	std::__throw_format_error("Expected '%' or '}' in the chrono format-string");
167
168	do {
169	switch (*__begin) {
170	case _CharT('{'):
171	std::__throw_format_error("The chrono-specs contains a '{'");
172
173	case _CharT('}'):
174	return __begin;
175
176	case _CharT('%'):
177	__parse_conversion_spec(__begin, __end, __flags);
178	[[fallthrough]];
179
180	default:
181	// All other literals
182	++__begin;
183	}
184
185	} while (__begin != __end && *__begin != _CharT('}'));
186
187	return __begin;
188	}
189
190	/// \pre *__begin == '%'
191	/// \post __begin points at the end parsed conversion-spec
192	_LIBCPP_HIDE_FROM_ABI constexpr void
193	__parse_conversion_spec(const _CharT& __begin, const _CharT __end, __flags __flags) {
194	++__begin;
195	if (__begin == __end)
196	std::__throw_format_error("End of input while parsing the modifier chrono conversion-spec");
197
198	switch (*__begin) {
199	case _CharT('n'):
200	case _CharT('t'):
201	case _CharT('%'):
202	break;
203
204	case _CharT('S'):
205	__format_spec::__validate_second(__flags);
206	break;
207
208	case _CharT('M'):
209	__format_spec::__validate_minute(__flags);
210	break;
211
212	case _CharT('p'): // TODO FMT does the formater require an hour or a time?
213	case _CharT('H'):
214	case _CharT('I'):
215	__validate_hour(__flags);
216	break;
217
218	case _CharT('r'):
219	case _CharT('R'):
220	case _CharT('T'):
221	case _CharT('X'):
222	__format_spec::__validate_time(__flags);
223	break;
224
225	case _CharT('d'):
226	case _CharT('e'):
227	__format_spec::__validate_day(__flags);
228	break;
229
230	case _CharT('b'):
231	case _CharT('h'):
232	case _CharT('B'):
233	__parser_.__month_name_ = true;
234	[[fallthrough]];
235	case _CharT('m'):
236	__format_spec::__validate_month(__flags);
237	break;
238
239	case _CharT('y'):
240	case _CharT('C'):
241	case _CharT('Y'):
242	__format_spec::__validate_year(__flags);
243	break;
244
245	case _CharT('j'):
246	__parser_.__day_of_year_ = true;
247	__format_spec::__validate_date_or_duration(__flags);
248	break;
249
250	case _CharT('g'):
251	case _CharT('G'):
252	case _CharT('U'):
253	case _CharT('V'):
254	case _CharT('W'):
255	__parser_.__week_of_year_ = true;
256	[[fallthrough]];
257	case _CharT('x'):
258	case _CharT('D'):
259	case _CharT('F'):
260	__format_spec::__validate_date(__flags);
261	break;
262
263	case _CharT('c'):
264	__format_spec::__validate_date_time(__flags);
265	break;
266
267	case _CharT('a'):
268	case _CharT('A'):
269	__parser_.__weekday_name_ = true;
270	[[fallthrough]];
271	case _CharT('u'):
272	case _CharT('w'):
273	__parser_.__weekday_ = true;
274	__validate_weekday(__flags);
275	__format_spec::__validate_weekday(__flags);
276	break;
277
278	case _CharT('q'):
279	case _CharT('Q'):
280	__format_spec::__validate_duration(__flags);
281	break;
282
283	case _CharT('E'):
284	__parse_modifier_E(__begin, __end, __flags);
285	break;
286
287	case _CharT('O'):
288	__parse_modifier_O(__begin, __end, __flags);
289	break;
290
291	case _CharT('z'):
292	case _CharT('Z'):
293	// Currently there's no time zone information. However some clocks have a
294	// hard-coded "time zone", for these clocks the information can be used.
295	// TODO FMT implement time zones.
296	__format_spec::__validate_time_zone(__flags);
297	break;
298
299	default: // unknown type;
300	std::__throw_format_error("The date time type specifier is invalid");
301	}
302	}
303
304	/// \pre *__begin == 'E'
305	/// \post __begin is incremented by one.
306	_LIBCPP_HIDE_FROM_ABI constexpr void
307	__parse_modifier_E(const _CharT& __begin, const _CharT __end, __flags __flags) {
308	++__begin;
309	if (__begin == __end)
310	std::__throw_format_error("End of input while parsing the modifier E");
311
312	switch (*__begin) {
313	case _CharT('X'):
314	__format_spec::__validate_time(__flags);
315	break;
316
317	case _CharT('y'):
318	case _CharT('C'):
319	case _CharT('Y'):
320	__format_spec::__validate_year(__flags);
321	break;
322
323	case _CharT('x'):
324	__format_spec::__validate_date(__flags);
325	break;
326
327	case _CharT('c'):
328	__format_spec::__validate_date_time(__flags);
329	break;
330
331	case _CharT('z'):
332	// Currently there's no time zone information. However some clocks have a
333	// hard-coded "time zone", for these clocks the information can be used.
334	// TODO FMT implement time zones.
335	__format_spec::__validate_time_zone(__flags);
336	break;
337
338	default:
339	std::__throw_format_error("The date time type specifier for modifier E is invalid");
340	}
341	}
342
343	/// \pre *__begin == 'O'
344	/// \post __begin is incremented by one.
345	_LIBCPP_HIDE_FROM_ABI constexpr void
346	__parse_modifier_O(const _CharT& __begin, const _CharT __end, __flags __flags) {
347	++__begin;
348	if (__begin == __end)
349	std::__throw_format_error("End of input while parsing the modifier O");
350
351	switch (*__begin) {
352	case _CharT('S'):
353	__format_spec::__validate_second(__flags);
354	break;
355
356	case _CharT('M'):
357	__format_spec::__validate_minute(__flags);
358	break;
359
360	case _CharT('I'):
361	case _CharT('H'):
362	__format_spec::__validate_hour(__flags);
363	break;
364
365	case _CharT('d'):
366	case _CharT('e'):
367	__format_spec::__validate_day(__flags);
368	break;
369
370	case _CharT('m'):
371	__format_spec::__validate_month(__flags);
372	break;
373
374	case _CharT('y'):
375	__format_spec::__validate_year(__flags);
376	break;
377
378	case _CharT('U'):
379	case _CharT('V'):
380	case _CharT('W'):
381	__parser_.__week_of_year_ = true;
382	__format_spec::__validate_date(__flags);
383	break;
384
385	case _CharT('u'):
386	case _CharT('w'):
387	__parser_.__weekday_ = true;
388	__format_spec::__validate_weekday(__flags);
389	break;
390
391	case _CharT('z'):
392	// Currently there's no time zone information. However some clocks have a
393	// hard-coded "time zone", for these clocks the information can be used.
394	// TODO FMT implement time zones.
395	__format_spec::__validate_time_zone(__flags);
396	break;
397
398	default:
399	std::__throw_format_error("The date time type specifier for modifier O is invalid");
400	}
401	}
402	};
403
404	} // namespace __format_spec
405
406	#endif //_LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
407
408	_LIBCPP_END_NAMESPACE_STD
409
410	#endif // _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H

lib/libcxx/include/__chrono/statically_widen.h created+52

...	@@ -0,0 +1,52 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CHRONO_STATICALLY_WIDEN_H
11	#define _LIBCPP___CHRONO_STATICALLY_WIDEN_H
12
13	// Implements the STATICALLY-WIDEN exposition-only function. ([time.general]/2)
14
15	#include <__concepts/same_as.h>
16	#include <__config>
17	#include <__format/concepts.h>
18
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header
21	#endif
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	#if _LIBCPP_STD_VER > 17
26
27	# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
28	template <__fmt_char_type _CharT>
29	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __statically_widen(const char* __str, const wchar_t* __wstr) {
30	if constexpr (same_as<_CharT, char>)
31	return __str;
32	else
33	return __wstr;
34	}
35	# define _LIBCPP_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str, L##__str)
36	# else // _LIBCPP_HAS_NO_WIDE_CHARACTERS
37
38	// Without this indirection the unit test test/libcxx/modules_include.sh.cpp
39	// fails for the CI build "No wide characters". This seems like a bug.
40	// TODO FMT investigate why this is needed.
41	template <__fmt_char_type _CharT>
42	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __statically_widen(const char* __str) {
43	return __str;
44	}
45	# define _LIBCPP_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str)
46	# endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
47
48	#endif //_LIBCPP_STD_VER > 17
49
50	_LIBCPP_END_NAMESPACE_STD
51
52	#endif // _LIBCPP___CHRONO_STATICALLY_WIDEN_H

lib/libcxx/include/__chrono/steady_clock.h+1-1

...	@@ -31,7 +31,7 @@ public:	...	@@ -31,7 +31,7 @@ public:
31	typedef duration::rep rep;	31	typedef duration::rep rep;
32	typedef duration::period period;	32	typedef duration::period period;
33	typedef chrono::time_point<steady_clock, duration> time_point;	33	typedef chrono::time_point<steady_clock, duration> time_point;
34	static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = true;	34	static _LIBCPP_CONSTEXPR_SINCE_CXX14 const bool is_steady = true;
35		35
36	static time_point now() _NOEXCEPT;	36	static time_point now() _NOEXCEPT;
37	};	37	};

lib/libcxx/include/__chrono/system_clock.h+1-1

...	@@ -31,7 +31,7 @@ public:	...	@@ -31,7 +31,7 @@ public:
31	typedef duration::rep rep;	31	typedef duration::rep rep;
32	typedef duration::period period;	32	typedef duration::period period;
33	typedef chrono::time_point<system_clock> time_point;	33	typedef chrono::time_point<system_clock> time_point;
34	static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;	34	static _LIBCPP_CONSTEXPR_SINCE_CXX14 const bool is_steady = false;
35		35
36	static time_point now() _NOEXCEPT;	36	static time_point now() _NOEXCEPT;
37	static time_t to_time_t (const time_point& __t) _NOEXCEPT;	37	static time_t to_time_t (const time_point& __t) _NOEXCEPT;

lib/libcxx/include/__chrono/time_point.h+23-21

lib/libcxx/include/__chrono/weekday.h+19-19

lib/libcxx/include/__chrono/year.h+13-28

 @@ -12,6 +12,7 @@
 #include <__chrono/duration.h>
 #include <__config>
+#include <compare>
 #include <limits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -30,22 +31,22 @@ namespace chrono
 class year {
 private:
-    short __y;
+    short __y_;
 public:
     _LIBCPP_HIDE_FROM_ABI year() = default;
-    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr year(int __val) noexcept : __y(static_cast<short>(__val)) {}
+    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr year(int __val) noexcept : __y_(static_cast<short>(__val)) {}
-    _LIBCPP_HIDE_FROM_ABI inline constexpr year& operator++()    noexcept { ++__y; return *this; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr year& operator++()    noexcept { ++__y_; return *this; }
     _LIBCPP_HIDE_FROM_ABI inline constexpr year  operator++(int) noexcept { year __tmp = *this; ++(*this); return __tmp; }
-    _LIBCPP_HIDE_FROM_ABI inline constexpr year& operator--()    noexcept { --__y; return *this; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr year& operator--()    noexcept { --__y_; return *this; }
     _LIBCPP_HIDE_FROM_ABI inline constexpr year  operator--(int) noexcept { year __tmp = *this; --(*this); return __tmp; }
     _LIBCPP_HIDE_FROM_ABI        constexpr year& operator+=(const years& __dy) noexcept;
     _LIBCPP_HIDE_FROM_ABI        constexpr year& operator-=(const years& __dy) noexcept;
     _LIBCPP_HIDE_FROM_ABI inline constexpr year operator+() const noexcept { return *this; }
-    _LIBCPP_HIDE_FROM_ABI inline constexpr year operator-() const noexcept { return year{-__y}; }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr year operator-() const noexcept { return year{-__y_}; }
-    _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_leap() const noexcept { return __y % 4 == 0 && (__y % 100 != 0 || __y % 400 == 0); }
+    _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_leap() const noexcept { return __y_ % 4 == 0 && (__y_ % 100 != 0 || __y_ % 400 == 0); }
-    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator int() const noexcept { return __y; }
+    _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator int() const noexcept { return __y_; }
     _LIBCPP_HIDE_FROM_ABI        constexpr bool ok() const noexcept;
     _LIBCPP_HIDE_FROM_ABI static inline constexpr year min() noexcept { return year{-32767}; }
     _LIBCPP_HIDE_FROM_ABI static inline constexpr year max() noexcept { return year{ 32767}; }
 @@ -56,25 +57,9 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr
 bool operator==(const year& __lhs, const year& __rhs) noexcept
 { return static_cast<int>(__lhs) == static_cast<int>(__rhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
+_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(const year& __lhs, const year& __rhs) noexcept {
-bool operator!=(const year& __lhs, const year& __rhs) noexcept
+    return static_cast<int>(__lhs) <=> static_cast<int>(__rhs);
-{ return !(__lhs == __rhs); }
+}
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator< (const year& __lhs, const year& __rhs) noexcept
-{ return static_cast<int>(__lhs)  < static_cast<int>(__rhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator> (const year& __lhs, const year& __rhs) noexcept
-{ return __rhs < __lhs; }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator<=(const year& __lhs, const year& __rhs) noexcept
-{ return !(__rhs < __lhs); }
-_LIBCPP_HIDE_FROM_ABI inline constexpr
-bool operator>=(const year& __lhs, const year& __rhs) noexcept
-{ return !(__lhs < __rhs); }
 _LIBCPP_HIDE_FROM_ABI inline constexpr
 year operator+ (const year& __lhs, const years& __rhs) noexcept
 @@ -102,8 +87,8 @@ year& year::operator-=(const years& __dy) noexcept
 { *this = *this - __dy; return *this; }
 _LIBCPP_HIDE_FROM_ABI constexpr bool year::ok() const noexcept {
-  static_assert(static_cast<int>(std::numeric_limits<decltype(__y)>::max()) == static_cast<int>(max()));
+  static_assert(static_cast<int>(std::numeric_limits<decltype(__y_)>::max()) == static_cast<int>(max()));
-  return static_cast<int>(min()) <= __y;
+  return static_cast<int>(min()) <= __y_;
 }
 } // namespace chrono

lib/libcxx/include/__chrono/year_month.h+16-29

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14	#include <__chrono/month.h>	14	#include <__chrono/month.h>
15	#include <__chrono/year.h>	15	#include <__chrono/year.h>
16	#include <__config>	16	#include <__config>
		17	#include <compare>
17		18
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	20	# pragma GCC system_header
...	@@ -27,19 +28,19 @@ namespace chrono	...	@@ -27,19 +28,19 @@ namespace chrono
27	{	28	{
28		29
29	class year_month {	30	class year_month {
30	chrono::year __y;	31	chrono::year __y_;
31	chrono::month __m;	32	chrono::month __m_;
32	public:	33	public:
33	_LIBCPP_HIDE_FROM_ABI year_month() = default;	34	_LIBCPP_HIDE_FROM_ABI year_month() = default;
34	_LIBCPP_HIDE_FROM_ABI constexpr year_month(const chrono::year& __yval, const chrono::month& __mval) noexcept	35	_LIBCPP_HIDE_FROM_ABI constexpr year_month(const chrono::year& __yval, const chrono::month& __mval) noexcept
35	: __y{__yval}, __m{__mval} {}	36	: __y_{__yval}, __m_{__mval} {}
36	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y; }	37	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
37	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	38	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
38	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const months& __dm) noexcept { this->__m += __dm; return *this; }	39	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const months& __dm) noexcept { this->__m_ += __dm; return *this; }
39	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const months& __dm) noexcept { this->__m -= __dm; return *this; }	40	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const months& __dm) noexcept { this->__m_ -= __dm; return *this; }
40	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const years& __dy) noexcept { this->__y += __dy; return *this; }	41	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const years& __dy) noexcept { this->__y_ += __dy; return *this; }
41	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const years& __dy) noexcept { this->__y -= __dy; return *this; }	42	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const years& __dy) noexcept { this->__y_ -= __dy; return *this; }
42	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y.ok() && __m.ok(); }	43	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __m_.ok(); }
43	};	44	};
44		45
45	_LIBCPP_HIDE_FROM_ABI inline constexpr	46	_LIBCPP_HIDE_FROM_ABI inline constexpr
...	@@ -52,25 +53,11 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr	...	@@ -52,25 +53,11 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr
52	bool operator==(const year_month& __lhs, const year_month& __rhs) noexcept	53	bool operator==(const year_month& __lhs, const year_month& __rhs) noexcept
53	{ return __lhs.year() == __rhs.year() && __lhs.month() == __rhs.month(); }	54	{ return __lhs.year() == __rhs.year() && __lhs.month() == __rhs.month(); }
54		55
55	_LIBCPP_HIDE_FROM_ABI inline constexpr	56	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(const year_month& __lhs, const year_month& __rhs) noexcept {
56	bool operator!=(const year_month& __lhs, const year_month& __rhs) noexcept	57	if (auto __c = __lhs.year() <=> __rhs.year(); __c != 0)
57	{ return !(__lhs == __rhs); }	58	return __c;
58		59	return __lhs.month() <=> __rhs.month();
59	_LIBCPP_HIDE_FROM_ABI inline constexpr	60	}
60	bool operator< (const year_month& __lhs, const year_month& __rhs) noexcept
61	{ return __lhs.year() != __rhs.year() ? __lhs.year() < __rhs.year() : __lhs.month() < __rhs.month(); }
62
63	_LIBCPP_HIDE_FROM_ABI inline constexpr
64	bool operator> (const year_month& __lhs, const year_month& __rhs) noexcept
65	{ return __rhs < __lhs; }
66
67	_LIBCPP_HIDE_FROM_ABI inline constexpr
68	bool operator<=(const year_month& __lhs, const year_month& __rhs) noexcept
69	{ return !(__rhs < __lhs);}
70
71	_LIBCPP_HIDE_FROM_ABI inline constexpr
72	bool operator>=(const year_month& __lhs, const year_month& __rhs) noexcept
73	{ return !(__lhs < __rhs); }
74		61
75	_LIBCPP_HIDE_FROM_ABI constexpr	62	_LIBCPP_HIDE_FROM_ABI constexpr
76	year_month operator+(const year_month& __lhs, const months& __rhs) noexcept	63	year_month operator+(const year_month& __lhs, const months& __rhs) noexcept

lib/libcxx/include/__chrono/year_month_day.h+29-45

...	@@ -20,6 +20,7 @@	...	@@ -20,6 +20,7 @@
20	#include <__chrono/year.h>	20	#include <__chrono/year.h>
21	#include <__chrono/year_month.h>	21	#include <__chrono/year_month.h>
22	#include <__config>	22	#include <__config>
		23	#include <compare>
23	#include <limits>	24	#include <limits>
24		25
25	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -37,14 +38,14 @@ class year_month_day_last;	...	@@ -37,14 +38,14 @@ class year_month_day_last;
37		38
38	class year_month_day {	39	class year_month_day {
39	private:	40	private:
40	chrono::year __y;	41	chrono::year __y_;
41	chrono::month __m;	42	chrono::month __m_;
42	chrono::day __d;	43	chrono::day __d_;
43	public:	44	public:
44	_LIBCPP_HIDE_FROM_ABI year_month_day() = default;	45	_LIBCPP_HIDE_FROM_ABI year_month_day() = default;
45	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day(	46	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day(
46	const chrono::year& __yval, const chrono::month& __mval, const chrono::day& __dval) noexcept	47	const chrono::year& __yval, const chrono::month& __mval, const chrono::day& __dval) noexcept
47	: __y{__yval}, __m{__mval}, __d{__dval} {}	48	: __y_{__yval}, __m_{__mval}, __d_{__dval} {}
48	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day(const year_month_day_last& __ymdl) noexcept;	49	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day(const year_month_day_last& __ymdl) noexcept;
49	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day(const sys_days& __sysd) noexcept	50	_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day(const sys_days& __sysd) noexcept
50	: year_month_day(__from_days(__sysd.time_since_epoch())) {}	51	: year_month_day(__from_days(__sysd.time_since_epoch())) {}
...	@@ -56,9 +57,9 @@ public:	...	@@ -56,9 +57,9 @@ public:
56	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const years& __dy) noexcept;	57	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const years& __dy) noexcept;
57	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const years& __dy) noexcept;	58	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const years& __dy) noexcept;
58		59
59	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y; }	60	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
60	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	61	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
61	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d; }	62	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
62	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }	63	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
63	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }	64	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }
64		65
...	@@ -94,9 +95,9 @@ days year_month_day::__to_days() const noexcept	...	@@ -94,9 +95,9 @@ days year_month_day::__to_days() const noexcept
94	static_assert(numeric_limits<unsigned>::digits >= 18, "");	95	static_assert(numeric_limits<unsigned>::digits >= 18, "");
95	static_assert(numeric_limits<int>::digits >= 20 , "");	96	static_assert(numeric_limits<int>::digits >= 20 , "");
96		97
97	const int __yr = static_cast<int>(__y) - (__m <= February);	98	const int __yr = static_cast<int>(__y_) - (__m_ <= February);
98	const unsigned __mth = static_cast<unsigned>(__m);	99	const unsigned __mth = static_cast<unsigned>(__m_);
99	const unsigned __dy = static_cast<unsigned>(__d);	100	const unsigned __dy = static_cast<unsigned>(__d_);
100		101
101	const int __era = (__yr >= 0 ? __yr : __yr - 399) / 400;	102	const int __era = (__yr >= 0 ? __yr : __yr - 399) / 400;
102	const unsigned __yoe = static_cast<unsigned>(__yr - __era * 400); // [0, 399]	103	const unsigned __yoe = static_cast<unsigned>(__yr - __era * 400); // [0, 399]
...	@@ -109,32 +110,15 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr	...	@@ -109,32 +110,15 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr
109	bool operator==(const year_month_day& __lhs, const year_month_day& __rhs) noexcept	110	bool operator==(const year_month_day& __lhs, const year_month_day& __rhs) noexcept
110	{ return __lhs.year() == __rhs.year() && __lhs.month() == __rhs.month() && __lhs.day() == __rhs.day(); }	111	{ return __lhs.year() == __rhs.year() && __lhs.month() == __rhs.month() && __lhs.day() == __rhs.day(); }
111		112
112	_LIBCPP_HIDE_FROM_ABI inline constexpr	113	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering
113	bool operator!=(const year_month_day& __lhs, const year_month_day& __rhs) noexcept	114	operator<=>(const year_month_day& __lhs, const year_month_day& __rhs) noexcept {
114	{ return !(__lhs == __rhs); }	115	if (auto __c = __lhs.year() <=> __rhs.year(); __c != 0)
115		116	return __c;
116	_LIBCPP_HIDE_FROM_ABI inline constexpr	117	if (auto __c = __lhs.month() <=> __rhs.month(); __c != 0)
117	bool operator< (const year_month_day& __lhs, const year_month_day& __rhs) noexcept	118	return __c;
118	{	119	return __lhs.day() <=> __rhs.day();
119	if (__lhs.year() < __rhs.year()) return true;
120	if (__lhs.year() > __rhs.year()) return false;
121	if (__lhs.month() < __rhs.month()) return true;
122	if (__lhs.month() > __rhs.month()) return false;
123	return __lhs.day() < __rhs.day();
124	}	120	}
125		121
126	_LIBCPP_HIDE_FROM_ABI inline constexpr
127	bool operator> (const year_month_day& __lhs, const year_month_day& __rhs) noexcept
128	{ return __rhs < __lhs; }
129
130	_LIBCPP_HIDE_FROM_ABI inline constexpr
131	bool operator<=(const year_month_day& __lhs, const year_month_day& __rhs) noexcept
132	{ return !(__rhs < __lhs);}
133
134	_LIBCPP_HIDE_FROM_ABI inline constexpr
135	bool operator>=(const year_month_day& __lhs, const year_month_day& __rhs) noexcept
136	{ return !(__lhs < __rhs); }
137
138	_LIBCPP_HIDE_FROM_ABI inline constexpr	122	_LIBCPP_HIDE_FROM_ABI inline constexpr
139	year_month_day operator/(const year_month& __lhs, const day& __rhs) noexcept	123	year_month_day operator/(const year_month& __lhs, const day& __rhs) noexcept
140	{ return year_month_day{__lhs.year(), __lhs.month(), __rhs}; }	124	{ return year_month_day{__lhs.year(), __lhs.month(), __rhs}; }
...	@@ -191,24 +175,24 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-	...	@@ -191,24 +175,24 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-
191		175
192	class year_month_day_last {	176	class year_month_day_last {
193	private:	177	private:
194	chrono::year __y;	178	chrono::year __y_;
195	chrono::month_day_last __mdl;	179	chrono::month_day_last __mdl_;
196	public:	180	public:
197	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last(const year& __yval, const month_day_last& __mdlval) noexcept	181	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last(const year& __yval, const month_day_last& __mdlval) noexcept
198	: __y{__yval}, __mdl{__mdlval} {}	182	: __y_{__yval}, __mdl_{__mdlval} {}
199		183
200	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const months& __m) noexcept;	184	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const months& __m) noexcept;
201	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const months& __m) noexcept;	185	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const months& __m) noexcept;
202	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const years& __y) noexcept;	186	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const years& __y) noexcept;
203	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const years& __y) noexcept;	187	_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const years& __y) noexcept;
204		188
205	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y; }	189	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
206	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __mdl.month(); }	190	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __mdl_.month(); }
207	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month_day_last month_day_last() const noexcept { return __mdl; }	191	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month_day_last month_day_last() const noexcept { return __mdl_; }
208	_LIBCPP_HIDE_FROM_ABI constexpr chrono::day day() const noexcept;	192	_LIBCPP_HIDE_FROM_ABI constexpr chrono::day day() const noexcept;
209	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{year()/month()/day()}; }	193	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{year()/month()/day()}; }
210	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{year()/month()/day()}; }	194	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{year()/month()/day()}; }
211	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y.ok() && __mdl.ok(); }	195	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __mdl_.ok(); }
212	};	196	};
213		197
214	_LIBCPP_HIDE_FROM_ABI inline constexpr	198	_LIBCPP_HIDE_FROM_ABI inline constexpr
...	@@ -221,7 +205,7 @@ chrono::day year_month_day_last::day() const noexcept	...	@@ -221,7 +205,7 @@ chrono::day year_month_day_last::day() const noexcept
221	chrono::day(31), chrono::day(31), chrono::day(30),	205	chrono::day(31), chrono::day(31), chrono::day(30),
222	chrono::day(31), chrono::day(30), chrono::day(31)	206	chrono::day(31), chrono::day(30), chrono::day(31)
223	};	207	};
224	return (month() != February \|\| !__y.is_leap()) && month().ok() ?	208	return (month() != February \|\| !__y_.is_leap()) && month().ok() ?
225	__d[static_cast<unsigned>(month()) - 1] : chrono::day{29};	209	__d[static_cast<unsigned>(month()) - 1] : chrono::day{29};
226	}	210	}
227		211
...	@@ -305,13 +289,13 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last& year_month_day_last:	...	@@ -305,13 +289,13 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last& year_month_day_last:
305		289
306	_LIBCPP_HIDE_FROM_ABI inline constexpr	290	_LIBCPP_HIDE_FROM_ABI inline constexpr
307	year_month_day::year_month_day(const year_month_day_last& __ymdl) noexcept	291	year_month_day::year_month_day(const year_month_day_last& __ymdl) noexcept
308	: __y{__ymdl.year()}, __m{__ymdl.month()}, __d{__ymdl.day()} {}	292	: __y_{__ymdl.year()}, __m_{__ymdl.month()}, __d_{__ymdl.day()} {}
309		293
310	_LIBCPP_HIDE_FROM_ABI inline constexpr	294	_LIBCPP_HIDE_FROM_ABI inline constexpr
311	bool year_month_day::ok() const noexcept	295	bool year_month_day::ok() const noexcept
312	{	296	{
313	if (!__y.ok() \|\| !__m.ok()) return false;	297	if (!__y_.ok() \|\| !__m_.ok()) return false;
314	return chrono::day{1} <= __d && __d <= (__y / __m / last).day();	298	return chrono::day{1} <= __d_ && __d_ <= (__y_ / __m_ / last).day();
315	}	299	}
316		300
317	} // namespace chrono	301	} // namespace chrono

lib/libcxx/include/__chrono/year_month_weekday.h+28-28

lib/libcxx/include/__compare/common_comparison_category.h+3-2

...	@@ -11,7 +11,8 @@	...	@@ -11,7 +11,8 @@
11		11
12	#include <__compare/ordering.h>	12	#include <__compare/ordering.h>
13	#include <__config>	13	#include <__config>
14	#include <type_traits>	14	#include <__type_traits/is_same.h>
		15	#include <cstddef>
15		16
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	18	# pragma GCC system_header
...	@@ -64,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI	...	@@ -64,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI
64	constexpr auto __get_comp_type() {	65	constexpr auto __get_comp_type() {
65	using _CCC = _ClassifyCompCategory;	66	using _CCC = _ClassifyCompCategory;
66	constexpr _CCC __type_kinds[] = {_StrongOrd, __type_to_enum<_Ts>()...};	67	constexpr _CCC __type_kinds[] = {_StrongOrd, __type_to_enum<_Ts>()...};
67	constexpr _CCC _Cat = __compute_comp_type(__type_kinds);	68	constexpr _CCC _Cat = __comp_detail::__compute_comp_type(__type_kinds);
68	if constexpr (_Cat == _None)	69	if constexpr (_Cat == _None)
69	return void();	70	return void();
70	else if constexpr (_Cat == _PartialOrd)	71	else if constexpr (_Cat == _PartialOrd)

lib/libcxx/include/__compare/compare_partial_order_fallback.h+2-1

 @@ -12,9 +12,10 @@
 #include <__compare/ordering.h>
 #include <__compare/partial_order.h>
 #include <__config>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_same.h>
 #include <__utility/forward.h>
 #include <__utility/priority_tag.h>
-#include <type_traits>
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header

lib/libcxx/include/__compare/compare_strong_order_fallback.h+2-1

 @@ -12,9 +12,10 @@
 #include <__compare/ordering.h>
 #include <__compare/strong_order.h>
 #include <__config>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_same.h>
 #include <__utility/forward.h>
 #include <__utility/priority_tag.h>
-#include <type_traits>
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header

lib/libcxx/include/__compare/compare_three_way_result.h+4-3

...	@@ -10,7 +10,8 @@	...	@@ -10,7 +10,8 @@
10	#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H	10	#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/make_const_lvalue_ref.h>
		14	#include <__utility/declval.h>
14		15
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -25,9 +26,9 @@ struct _LIBCPP_HIDE_FROM_ABI __compare_three_way_result { };	...	@@ -25,9 +26,9 @@ struct _LIBCPP_HIDE_FROM_ABI __compare_three_way_result { };
25		26
26	template<class _Tp, class _Up>	27	template<class _Tp, class _Up>
27	struct _LIBCPP_HIDE_FROM_ABI __compare_three_way_result<_Tp, _Up, decltype(	28	struct _LIBCPP_HIDE_FROM_ABI __compare_three_way_result<_Tp, _Up, decltype(
28	declval<__make_const_lvalue_ref<_Tp>>() <=> declval<__make_const_lvalue_ref<_Up>>(), void()	29	std::declval<__make_const_lvalue_ref<_Tp>>() <=> std::declval<__make_const_lvalue_ref<_Up>>(), void()
29	)> {	30	)> {
30	using type = decltype(declval<__make_const_lvalue_ref<_Tp>>() <=> declval<__make_const_lvalue_ref<_Up>>());	31	using type = decltype(std::declval<__make_const_lvalue_ref<_Tp>>() <=> std::declval<__make_const_lvalue_ref<_Up>>());
31	};	32	};
32		33
33	template<class _Tp, class _Up = _Tp>	34	template<class _Tp, class _Up = _Tp>

lib/libcxx/include/__compare/compare_weak_order_fallback.h+2-1

 @@ -12,9 +12,10 @@
 #include <__compare/ordering.h>
 #include <__compare/weak_order.h>
 #include <__config>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_same.h>
 #include <__utility/forward.h>
 #include <__utility/priority_tag.h>
-#include <type_traits>
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header

lib/libcxx/include/__compare/ordering.h+8-1

 @@ -10,7 +10,8 @@
 #define _LIBCPP___COMPARE_ORDERING_H
 #include <__config>
-#include <type_traits>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_same.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -312,6 +313,12 @@ inline constexpr strong_ordering strong_ordering::equal(_OrdResult::__equiv);
 inline constexpr strong_ordering strong_ordering::equivalent(_OrdResult::__equiv);
 inline constexpr strong_ordering strong_ordering::greater(_OrdResult::__greater);
+/// [cmp.categories.pre]/1
+/// The types partial_ordering, weak_ordering, and strong_ordering are
+/// collectively termed the comparison category types.
+template <class _Tp>
+concept __comparison_category = __one_of_v<_Tp, partial_ordering, weak_ordering, strong_ordering>;
 #endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__compare/partial_order.h+4-1

...	@@ -13,9 +13,10 @@	...	@@ -13,9 +13,10 @@
13	#include <__compare/ordering.h>	13	#include <__compare/ordering.h>
14	#include <__compare/weak_order.h>	14	#include <__compare/weak_order.h>
15	#include <__config>	15	#include <__config>
		16	#include <__type_traits/decay.h>
		17	#include <__type_traits/is_same.h>
16	#include <__utility/forward.h>	18	#include <__utility/forward.h>
17	#include <__utility/priority_tag.h>	19	#include <__utility/priority_tag.h>
18	#include <type_traits>
19		20
20	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER	21	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
21	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -28,6 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -28,6 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
28	// [cmp.alg]	29	// [cmp.alg]
29	namespace __partial_order {	30	namespace __partial_order {
30	struct __fn {	31	struct __fn {
		32	// NOLINTBEGIN(libcpp-robust-against-adl) partial_order should use ADL, but only here
31	template<class _Tp, class _Up>	33	template<class _Tp, class _Up>
32	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>	34	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>
33	_LIBCPP_HIDE_FROM_ABI static constexpr auto	35	_LIBCPP_HIDE_FROM_ABI static constexpr auto
...	@@ -35,6 +37,7 @@ namespace __partial_order {	...	@@ -35,6 +37,7 @@ namespace __partial_order {
35	noexcept(noexcept(partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u)))))	37	noexcept(noexcept(partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u)))))
36	-> decltype( partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))))	38	-> decltype( partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))))
37	{ return partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))); }	39	{ return partial_ordering(partial_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))); }
		40	// NOLINTEND(libcpp-robust-against-adl)
38		41
39	template<class _Tp, class _Up>	42	template<class _Tp, class _Up>
40	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>	43	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>

lib/libcxx/include/__compare/strong_order.h+4-1

 @@ -13,12 +13,13 @@
 #include <__compare/compare_three_way.h>
 #include <__compare/ordering.h>
 #include <__config>
+#include <__type_traits/conditional.h>
+#include <__type_traits/decay.h>
 #include <__utility/forward.h>
 #include <__utility/priority_tag.h>
 #include <cmath>
 #include <cstdint>
 #include <limits>
-#include <type_traits>
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
 @@ -34,6 +35,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // [cmp.alg]
 namespace __strong_order {
     struct __fn {
+    // NOLINTBEGIN(libcpp-robust-against-adl) strong_order should use ADL, but only here
         template<class _Tp, class _Up>
             requires is_same_v<decay_t<_Tp>, decay_t<_Up>>
         _LIBCPP_HIDE_FROM_ABI static constexpr auto
 @@ -41,6 +43,7 @@ namespace __strong_order {
             noexcept(noexcept(strong_ordering(strong_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u)))))
             -> decltype(      strong_ordering(strong_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))))
             { return          strong_ordering(strong_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))); }
+    // NOLINTEND(libcpp-robust-against-adl)
         template<class _Tp, class _Up, class _Dp = decay_t<_Tp>>
             requires is_same_v<_Dp, decay_t<_Up>> && is_floating_point_v<_Dp>

lib/libcxx/include/__compare/synth_three_way.h+1-1

...	@@ -42,7 +42,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way =	...	@@ -42,7 +42,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way =
42	};	42	};
43		43
44	template <class _Tp, class _Up = _Tp>	44	template <class _Tp, class _Up = _Tp>
45	using __synth_three_way_result = decltype(std::__synth_three_way(declval<_Tp&>(), declval<_Up&>()));	45	using __synth_three_way_result = decltype(std::__synth_three_way(std::declval<_Tp&>(), std::declval<_Up&>()));
46		46
47	#endif // _LIBCPP_STD_VER > 17	47	#endif // _LIBCPP_STD_VER > 17
48		48

lib/libcxx/include/__compare/three_way_comparable.h+2-1

...	@@ -16,7 +16,8 @@	...	@@ -16,7 +16,8 @@
16	#include <__concepts/same_as.h>	16	#include <__concepts/same_as.h>
17	#include <__concepts/totally_ordered.h>	17	#include <__concepts/totally_ordered.h>
18	#include <__config>	18	#include <__config>
19	#include <type_traits>	19	#include <__type_traits/common_reference.h>
		20	#include <__type_traits/make_const_lvalue_ref.h>
20		21
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header	23	# pragma GCC system_header

lib/libcxx/include/__compare/weak_order.h+3-1

...	@@ -13,10 +13,10 @@	...	@@ -13,10 +13,10 @@
13	#include <__compare/ordering.h>	13	#include <__compare/ordering.h>
14	#include <__compare/strong_order.h>	14	#include <__compare/strong_order.h>
15	#include <__config>	15	#include <__config>
		16	#include <__type_traits/decay.h>
16	#include <__utility/forward.h>	17	#include <__utility/forward.h>
17	#include <__utility/priority_tag.h>	18	#include <__utility/priority_tag.h>
18	#include <cmath>	19	#include <cmath>
19	#include <type_traits>
20		20
21	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER	21	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
22	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -29,6 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -29,6 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
29	// [cmp.alg]	29	// [cmp.alg]
30	namespace __weak_order {	30	namespace __weak_order {
31	struct __fn {	31	struct __fn {
		32	// NOLINTBEGIN(libcpp-robust-against-adl) weak_order should use ADL, but only here
32	template<class _Tp, class _Up>	33	template<class _Tp, class _Up>
33	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>	34	requires is_same_v<decay_t<_Tp>, decay_t<_Up>>
34	_LIBCPP_HIDE_FROM_ABI static constexpr auto	35	_LIBCPP_HIDE_FROM_ABI static constexpr auto
...	@@ -36,6 +37,7 @@ namespace __weak_order {	...	@@ -36,6 +37,7 @@ namespace __weak_order {
36	noexcept(noexcept(weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u)))))	37	noexcept(noexcept(weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u)))))
37	-> decltype( weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))))	38	-> decltype( weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))))
38	{ return weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))); }	39	{ return weak_ordering(weak_order(_VSTD::forward<_Tp>(__t), _VSTD::forward<_Up>(__u))); }
		40	// NOLINTEND(libcpp-robust-against-adl)
39		41
40	template<class _Tp, class _Up, class _Dp = decay_t<_Tp>>	42	template<class _Tp, class _Up, class _Dp = decay_t<_Tp>>
41	requires is_same_v<_Dp, decay_t<_Up>> && is_floating_point_v<_Dp>	43	requires is_same_v<_Dp, decay_t<_Up>> && is_floating_point_v<_Dp>

lib/libcxx/include/__concepts/arithmetic.h+3-1

 @@ -10,9 +10,11 @@
 #define _LIBCPP___CONCEPTS_ARITHMETIC_H
 #include <__config>
+#include <__type_traits/is_floating_point.h>
+#include <__type_traits/is_integral.h>
+#include <__type_traits/is_signed.h>
 #include <__type_traits/is_signed_integer.h>
 #include <__type_traits/is_unsigned_integer.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__concepts/assignable.h+2-1

 @@ -12,8 +12,9 @@
 #include <__concepts/common_reference_with.h>
 #include <__concepts/same_as.h>
 #include <__config>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/make_const_lvalue_ref.h>
 #include <__utility/forward.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__concepts/class_or_enum.h+5-2

...	@@ -10,7 +10,10 @@	...	@@ -10,7 +10,10 @@
10	#define _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H	10	#define _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/is_class.h>
		14	#include <__type_traits/is_enum.h>
		15	#include <__type_traits/is_union.h>
		16	#include <__type_traits/remove_cvref.h>
14		17
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	19	# pragma GCC system_header
...	@@ -28,7 +31,7 @@ concept __class_or_enum = is_class_v<_Tp> \|\| is_union_v<_Tp> \|\| is_enum_v<_Tp>;	...	@@ -28,7 +31,7 @@ concept __class_or_enum = is_class_v<_Tp> \|\| is_union_v<_Tp> \|\| is_enum_v<_Tp>;
28	// Work around Clang bug https://llvm.org/PR52970	31	// Work around Clang bug https://llvm.org/PR52970
29	// TODO: remove this workaround once libc++ no longer has to support Clang 13 (it was fixed in Clang 14).	32	// TODO: remove this workaround once libc++ no longer has to support Clang 13 (it was fixed in Clang 14).
30	template<class _Tp>	33	template<class _Tp>
31	concept __workaround_52970 = is_class_v<__uncvref_t<_Tp>> \|\| is_union_v<__uncvref_t<_Tp>>;	34	concept __workaround_52970 = is_class_v<__remove_cvref_t<_Tp>> \|\| is_union_v<__remove_cvref_t<_Tp>>;
32		35
33	#endif // _LIBCPP_STD_VER > 17	36	#endif // _LIBCPP_STD_VER > 17
34		37

lib/libcxx/include/__concepts/common_reference_with.h+1-1

...	@@ -12,7 +12,7 @@	...	@@ -12,7 +12,7 @@
12	#include <__concepts/convertible_to.h>	12	#include <__concepts/convertible_to.h>
13	#include <__concepts/same_as.h>	13	#include <__concepts/same_as.h>
14	#include <__config>	14	#include <__config>
15	#include <type_traits>	15	#include <__type_traits/common_reference.h>
16		16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	18	# pragma GCC system_header

lib/libcxx/include/__concepts/common_with.h+6-3

 @@ -12,7 +12,10 @@
 #include <__concepts/common_reference_with.h>
 #include <__concepts/same_as.h>
 #include <__config>
-#include <type_traits>
+#include <__type_traits/add_lvalue_reference.h>
+#include <__type_traits/common_reference.h>
+#include <__type_traits/common_type.h>
+#include <__utility/declval.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -28,8 +31,8 @@ template<class _Tp, class _Up>
 concept common_with =
   same_as<common_type_t<_Tp, _Up>, common_type_t<_Up, _Tp>> &&
   requires {
-    static_cast<common_type_t<_Tp, _Up>>(declval<_Tp>());
+    static_cast<common_type_t<_Tp, _Up>>(std::declval<_Tp>());
-    static_cast<common_type_t<_Tp, _Up>>(declval<_Up>());
+    static_cast<common_type_t<_Tp, _Up>>(std::declval<_Up>());
   } &&
   common_reference_with<
     add_lvalue_reference_t<const _Tp>,

lib/libcxx/include/__concepts/constructible.h+1-1

...	@@ -12,7 +12,7 @@	...	@@ -12,7 +12,7 @@
12	#include <__concepts/convertible_to.h>	12	#include <__concepts/convertible_to.h>
13	#include <__concepts/destructible.h>	13	#include <__concepts/destructible.h>
14	#include <__config>	14	#include <__config>
15	#include <type_traits>	15	#include <__type_traits/is_constructible.h>
16		16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	18	# pragma GCC system_header

lib/libcxx/include/__concepts/convertible_to.h+2-2

...	@@ -10,8 +10,8 @@	...	@@ -10,8 +10,8 @@
10	#define _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H	10	#define _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
11		11
12	#include <__config>	12	#include <__config>
		13	#include <__type_traits/is_convertible.h>
13	#include <__utility/declval.h>	14	#include <__utility/declval.h>
14	#include <type_traits>
15		15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -27,7 +27,7 @@ template<class _From, class _To>	...	@@ -27,7 +27,7 @@ template<class _From, class _To>
27	concept convertible_to =	27	concept convertible_to =
28	is_convertible_v<_From, _To> &&	28	is_convertible_v<_From, _To> &&
29	requires {	29	requires {
30	static_cast<_To>(declval<_From>());	30	static_cast<_To>(std::declval<_From>());
31	};	31	};
32		32
33	#endif // _LIBCPP_STD_VER > 17	33	#endif // _LIBCPP_STD_VER > 17

lib/libcxx/include/__concepts/derived_from.h+2-1

...	@@ -10,7 +10,8 @@	...	@@ -10,7 +10,8 @@
10	#define _LIBCPP___CONCEPTS_DERIVED_FROM_H	10	#define _LIBCPP___CONCEPTS_DERIVED_FROM_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/is_base_of.h>
		14	#include <__type_traits/is_convertible.h>
14		15
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__concepts/destructible.h+1-1

...	@@ -10,7 +10,7 @@	...	@@ -10,7 +10,7 @@
10	#define _LIBCPP___CONCEPTS_DESTRUCTIBLE_H	10	#define _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/is_nothrow_destructible.h>
14		14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__concepts/different_from.h+1-1

...	@@ -11,7 +11,7 @@	...	@@ -11,7 +11,7 @@
11		11
12	#include <__concepts/same_as.h>	12	#include <__concepts/same_as.h>
13	#include <__config>	13	#include <__config>
14	#include <type_traits>	14	#include <__type_traits/remove_cvref.h>
15		15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__concepts/equality_comparable.h+2-1

...	@@ -12,7 +12,8 @@	...	@@ -12,7 +12,8 @@
12	#include <__concepts/boolean_testable.h>	12	#include <__concepts/boolean_testable.h>
13	#include <__concepts/common_reference_with.h>	13	#include <__concepts/common_reference_with.h>
14	#include <__config>	14	#include <__config>
15	#include <type_traits>	15	#include <__type_traits/common_reference.h>
		16	#include <__type_traits/make_const_lvalue_ref.h>
16		17
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	19	# pragma GCC system_header

lib/libcxx/include/__concepts/invocable.h-1

...	@@ -12,7 +12,6 @@	...	@@ -12,7 +12,6 @@
12	#include <__config>	12	#include <__config>
13	#include <__functional/invoke.h>	13	#include <__functional/invoke.h>
14	#include <__utility/forward.h>	14	#include <__utility/forward.h>
15	#include <type_traits>
16		15
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__concepts/movable.h+1-1

...	@@ -13,7 +13,7 @@	...	@@ -13,7 +13,7 @@
13	#include <__concepts/constructible.h>	13	#include <__concepts/constructible.h>
14	#include <__concepts/swappable.h>	14	#include <__concepts/swappable.h>
15	#include <__config>	15	#include <__config>
16	#include <type_traits>	16	#include <__type_traits/is_object.h>
17		17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	19	# pragma GCC system_header

lib/libcxx/include/__concepts/predicate.h+1-1

...	@@ -12,7 +12,7 @@	...	@@ -12,7 +12,7 @@
12	#include <__concepts/boolean_testable.h>	12	#include <__concepts/boolean_testable.h>
13	#include <__concepts/invocable.h>	13	#include <__concepts/invocable.h>
14	#include <__config>	14	#include <__config>
15	#include <type_traits>	15	#include <__functional/invoke.h>
16		16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	18	# pragma GCC system_header

lib/libcxx/include/__concepts/same_as.h+1-1

...	@@ -10,7 +10,7 @@	...	@@ -10,7 +10,7 @@
10	#define _LIBCPP___CONCEPTS_SAME_AS_H	10	#define _LIBCPP___CONCEPTS_SAME_AS_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/is_same.h>
14		14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__concepts/swappable.h+6-1

 @@ -14,10 +14,15 @@
 #include <__concepts/common_reference_with.h>
 #include <__concepts/constructible.h>
 #include <__config>
+#include <__type_traits/extent.h>
+#include <__type_traits/is_nothrow_move_assignable.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/exchange.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <type_traits>
+#include <__utility/swap.h>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__concepts/totally_ordered.h+2-1

...	@@ -12,7 +12,8 @@	...	@@ -12,7 +12,8 @@
12	#include <__concepts/boolean_testable.h>	12	#include <__concepts/boolean_testable.h>
13	#include <__concepts/equality_comparable.h>	13	#include <__concepts/equality_comparable.h>
14	#include <__config>	14	#include <__config>
15	#include <type_traits>	15	#include <__type_traits/common_reference.h>
		16	#include <__type_traits/make_const_lvalue_ref.h>
16		17
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	19	# pragma GCC system_header

lib/libcxx/include/__config+114-93

 @@ -10,6 +10,8 @@
 #ifndef _LIBCPP___CONFIG
 #define _LIBCPP___CONFIG
+#include <__config_site>
 #if defined(_MSC_VER) && !defined(__clang__)
 #  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #    define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 @@ -28,13 +30,14 @@
 #  define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
 #elif defined(__GNUC__)
 #  define _LIBCPP_COMPILER_GCC
-#elif defined(_MSC_VER)
-#  define _LIBCPP_COMPILER_MSVC
 #endif
 #ifdef __cplusplus
-#  define _LIBCPP_VERSION 15003
+// _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.
+// Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is
+// defined to XXYYZZ.
+#  define _LIBCPP_VERSION 160000
 #  define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
 #  define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)
 @@ -57,7 +60,8 @@
 #    elif __cplusplus <= 202002L
 #      define _LIBCPP_STD_VER 20
 #    else
-#      define _LIBCPP_STD_VER 22 // current year, or date of c++2b ratification
+// Expected release year of the next C++ standard
+#      define _LIBCPP_STD_VER 23
 #    endif
 #  endif // _LIBCPP_STD_VER
 @@ -148,7 +152,7 @@
 #    endif
 // Feature macros for disabling pre ABI v1 features. All of these options
 // are deprecated.
-#    if defined(__FreeBSD__) || defined(__DragonFly__)
+#    if defined(__FreeBSD__)
 #      define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
 #    endif
 #  endif
 @@ -165,7 +169,7 @@
 #    define _LIBCPP_ABI_BAD_FUNCTION_CALL_KEY_FUNCTION
 #  endif
-#  define _LIBCPP_TOSTRING2(x) #  x
+#  define _LIBCPP_TOSTRING2(x) #x
 #  define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
 #  if __cplusplus < 201103L
 @@ -192,6 +196,10 @@
 #    define __has_cpp_attribute(__x) 0
 #  endif
+#  ifndef __has_constexpr_builtin
+#    define __has_constexpr_builtin(x) 0
+#  endif
 // '__is_identifier' returns '0' if '__x' is a reserved identifier provided by
 // the compiler and '1' otherwise.
 #  ifndef __is_identifier
 @@ -212,12 +220,6 @@
 #    error "libc++ only supports C++03 with Clang-based compilers. Please enable C++11"
 #  endif
-#  ifdef _LIBCPP_COMPILER_MSVC
-#    error If you successfully use libc++ with MSVC please tell the libc++ developers and consider upstreaming your \
-changes. We are not aware of anybody using this configuration and know that at least some code is currently broken. \
-If there are users of this configuration we are happy to provide support.
-#  endif
 // FIXME: ABI detection should be done via compiler builtin macros. This
 // is just a placeholder until Clang implements such macros. For now assume
 // that Windows compilers pretending to be MSVC++ target the Microsoft ABI,
 @@ -251,7 +253,6 @@ If there are users of this configuration we are happy to provide support.
 // easier to grep for target specific flags once the feature is complete.
 #  if !defined(_LIBCPP_ENABLE_EXPERIMENTAL) && !defined(_LIBCPP_BUILDING_LIBRARY)
 #    define _LIBCPP_HAS_NO_INCOMPLETE_FORMAT
-#    define _LIBCPP_HAS_NO_INCOMPLETE_RANGES
 #  endif
 // Need to detect which libc we're using if we're on Linux.
 @@ -416,17 +417,21 @@ If there are users of this configuration we are happy to provide support.
 #    define _LIBCPP_NORETURN [[noreturn]]
 #    define _NOEXCEPT noexcept
 #    define _NOEXCEPT_(x) noexcept(x)
+#    define _LIBCPP_CONSTEXPR constexpr
 #  else
 #    define _LIBCPP_ALIGNOF(_Tp) _Alignof(_Tp)
 #    define _ALIGNAS_TYPE(x) __attribute__((__aligned__(_LIBCPP_ALIGNOF(x))))
 #    define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#    define _LIBCPP_NORETURN __attribute__((noreturn))
+#    define _LIBCPP_NORETURN __attribute__((__noreturn__))
 #    define _LIBCPP_HAS_NO_NOEXCEPT
 #    define nullptr __nullptr
 #    define _NOEXCEPT throw()
 #    define _NOEXCEPT_(x)
+#    define static_assert(...) _Static_assert(__VA_ARGS__)
+#    define decltype(...) __decltype(__VA_ARGS__)
+#    define _LIBCPP_CONSTEXPR
 typedef __char16_t char16_t;
 typedef __char32_t char32_t;
 @@ -485,27 +490,7 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_DISABLE_EXTENSION_WARNING __extension__
-#  elif defined(_LIBCPP_COMPILER_MSVC)
+#  endif // _LIBCPP_COMPILER_[CLANG|GCC]
-#    define _LIBCPP_WARNING(x) __pragma(message(__FILE__ "(" _LIBCPP_TOSTRING(__LINE__) ") : warning note: " x))
-#    if _MSC_VER < 1900
-#      error "MSVC versions prior to Visual Studio 2015 are not supported"
-#    endif
-#    define _LIBCPP_NORETURN __declspec(noreturn)
-#    define _LIBCPP_WEAK
-#    define _LIBCPP_HAS_NO_ASAN
-#    define _LIBCPP_ALWAYS_INLINE __forceinline
-#    define _LIBCPP_HAS_NO_VECTOR_EXTENSION
-#    define _LIBCPP_DISABLE_EXTENSION_WARNING
-#  endif // _LIBCPP_COMPILER_[CLANG|GCC|MSVC]
 #  if defined(_LIBCPP_OBJECT_FORMAT_COFF)
 @@ -625,6 +610,15 @@ typedef __char32_t char32_t;
 // Note that we use _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION to ensure that we don't depend
 // on _LIBCPP_HIDE_FROM_ABI methods of classes explicitly instantiated in the dynamic library.
 //
+// Also note that the _LIBCPP_HIDE_FROM_ABI_VIRTUAL macro should be used on virtual functions
+// instead of _LIBCPP_HIDE_FROM_ABI. That macro does not use an ABI tag. Indeed, the mangled
+// name of a virtual function is part of its ABI, since some architectures like arm64e can sign
+// the virtual function pointer in the vtable based on the mangled name of the function. Since
+// we use an ABI tag that changes with each released version, the mangled name of the virtual
+// function would change, which is incorrect. Note that it doesn't make much sense to change
+// the implementation of a virtual function in an ABI-incompatible way in the first place,
+// since that would be an ABI break anyway. Hence, the lack of ABI tag should not be noticeable.
+//
 // TODO: We provide a escape hatch with _LIBCPP_NO_ABI_TAG for folks who want to avoid increasing
 //       the length of symbols with an ABI tag. In practice, we should remove the escape hatch and
 //       use compression mangling instead, see https://github.com/itanium-cxx-abi/cxx-abi/issues/70.
 @@ -635,6 +629,7 @@ typedef __char32_t char32_t;
 #  else
 #    define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
 #  endif
+#    define _LIBCPP_HIDE_FROM_ABI_VIRTUAL _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
 #  ifdef _LIBCPP_BUILDING_LIBRARY
 #    if _LIBCPP_ABI_VERSION > 1
 @@ -678,31 +673,20 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_HAS_NO_INT128
 #  endif
-#  ifdef _LIBCPP_CXX03_LANG
-#    define static_assert(...) _Static_assert(__VA_ARGS__)
-#    define decltype(...) __decltype(__VA_ARGS__)
-#  endif // _LIBCPP_CXX03_LANG
-#  ifdef _LIBCPP_CXX03_LANG
-#    define _LIBCPP_CONSTEXPR
-#  else
-#    define _LIBCPP_CONSTEXPR constexpr
-#  endif
 #  ifndef __cpp_consteval
 #    define _LIBCPP_CONSTEVAL _LIBCPP_CONSTEXPR
 #  else
 #    define _LIBCPP_CONSTEVAL consteval
 #  endif
-#  ifdef __GNUC__
+#  if __has_attribute(__malloc__)
 #    define _LIBCPP_NOALIAS __attribute__((__malloc__))
 #  else
 #    define _LIBCPP_NOALIAS
 #  endif
-#  if __has_attribute(using_if_exists)
+#  if __has_attribute(__using_if_exists__)
-#    define _LIBCPP_USING_IF_EXISTS __attribute__((using_if_exists))
+#    define _LIBCPP_USING_IF_EXISTS __attribute__((__using_if_exists__))
 #  else
 #    define _LIBCPP_USING_IF_EXISTS
 #  endif
 @@ -726,11 +710,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_CXX03_LANG
 #  if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || defined(__sun__) ||                \
-      defined(__NetBSD__) || defined(__DragonFly__)
+      defined(__NetBSD__)
 #    define _LIBCPP_LOCALE__L_EXTENSIONS 1
 #  endif
-#  if defined(__FreeBSD__) || defined(__DragonFly__)
+#  ifdef __FreeBSD__
 #    define _DECLARE_C99_LDBL_MATH 1
 #  endif
 @@ -750,11 +734,23 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
 #  endif
-#  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
+// It is not yet possible to use aligned_alloc() on all Apple platforms since
+// 10.15 was the first version to ship an implementation of aligned_alloc().
+#  if defined(__APPLE__)
+#    if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&                                                     \
+         __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101500)
+#      define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC
+#    endif
+#  elif defined(__ANDROID__) && __ANDROID_API__ < 28
+// Android only provides aligned_alloc when targeting API 28 or higher.
+#    define _LIBCPP_HAS_NO_C11_ALIGNED_ALLOC
+#  endif
+#  if defined(__APPLE__) || defined(__FreeBSD__)
 #    define _LIBCPP_HAS_DEFAULTRUNELOCALE
 #  endif
-#  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__) || defined(__DragonFly__)
+#  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
 #    define _LIBCPP_WCTYPE_IS_MASK
 #  endif
 @@ -769,7 +765,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #  if !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
 #    if __has_attribute(deprecated)
 #      define _LIBCPP_DEPRECATED __attribute__((deprecated))
-#      define _LIBCPP_DEPRECATED_(m) __attribute__((deprected(m)))
+#      define _LIBCPP_DEPRECATED_(m) __attribute__((deprecated(m)))
 #    elif _LIBCPP_STD_VER > 11
 #      define _LIBCPP_DEPRECATED [[deprecated]]
 #      define _LIBCPP_DEPRECATED_(m) [[deprecated(m)]]
 @@ -806,6 +802,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_DEPRECATED_IN_CXX20
 #  endif
+#if _LIBCPP_STD_VER >= 23
+#  define _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_DEPRECATED
+#else
+#  define _LIBCPP_DEPRECATED_IN_CXX23
+#endif
 #  if !defined(_LIBCPP_HAS_NO_CHAR8_T)
 #    define _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_DEPRECATED
 #  else
 @@ -830,27 +832,31 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #  endif
 #  if _LIBCPP_STD_VER > 11
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX11 constexpr
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX14 constexpr
 #  else
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX11
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX14
 #  endif
 #  if _LIBCPP_STD_VER > 14
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX14 constexpr
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX17 constexpr
 #  else
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX14
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX17
 #  endif
 #  if _LIBCPP_STD_VER > 17
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX17 constexpr
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX20 constexpr
 #  else
-#    define _LIBCPP_CONSTEXPR_AFTER_CXX17
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX20
 #  endif
-#  if __has_cpp_attribute(nodiscard) || defined(_LIBCPP_COMPILER_MSVC)
+#  if _LIBCPP_STD_VER > 20
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX23 constexpr
+#  else
+#    define _LIBCPP_CONSTEXPR_SINCE_CXX23
+#  endif
+#  if __has_cpp_attribute(nodiscard)
 #    define _LIBCPP_NODISCARD [[nodiscard]]
-#  elif defined(_LIBCPP_COMPILER_CLANG_BASED) && !defined(_LIBCPP_CXX03_LANG)
-#    define _LIBCPP_NODISCARD [[clang::warn_unused_result]]
 #  else
 // We can't use GCC's [[gnu::warn_unused_result]] and
 // __attribute__((warn_unused_result)), because GCC does not silence them via
 @@ -860,19 +866,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 // _LIBCPP_NODISCARD_EXT may be used to apply [[nodiscard]] to entities not
 // specified as such as an extension.
-#  if defined(_LIBCPP_ENABLE_NODISCARD) && !defined(_LIBCPP_DISABLE_NODISCARD_EXT)
+#  if !defined(_LIBCPP_DISABLE_NODISCARD_EXT)
 #    define _LIBCPP_NODISCARD_EXT _LIBCPP_NODISCARD
 #  else
 #    define _LIBCPP_NODISCARD_EXT
 #  endif
-#  if !defined(_LIBCPP_DISABLE_NODISCARD_AFTER_CXX17) && (_LIBCPP_STD_VER > 17 || defined(_LIBCPP_ENABLE_NODISCARD))
+#  if _LIBCPP_STD_VER > 17 || !defined(_LIBCPP_DISABLE_NODISCARD_EXT)
 #    define _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_NODISCARD
 #  else
 #    define _LIBCPP_NODISCARD_AFTER_CXX17
 #  endif
-#  if __has_attribute(no_destroy)
+#  if __has_attribute(__no_destroy__)
 #    define _LIBCPP_NO_DESTROY __attribute__((__no_destroy__))
 #  else
 #    define _LIBCPP_NO_DESTROY
 @@ -901,7 +907,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    if defined(__FreeBSD__) ||                                                                                        \
         defined(__wasi__) ||                                                                                           \
-        defined(__DragonFly__) ||                                                                                      \
         defined(__NetBSD__) ||                                                                                         \
         defined(__OpenBSD__) ||                                                                                        \
         defined(__NuttX__) ||                                                                                          \
 @@ -1035,18 +1040,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #  if _LIBCPP_STD_VER > 17
 #    define _LIBCPP_CONSTINIT constinit
-#  elif __has_attribute(require_constant_initialization)
+#  elif __has_attribute(__require_constant_initialization__)
 #    define _LIBCPP_CONSTINIT __attribute__((__require_constant_initialization__))
 #  else
 #    define _LIBCPP_CONSTINIT
 #  endif
-#  if __has_attribute(diagnose_if) && !defined(_LIBCPP_DISABLE_ADDITIONAL_DIAGNOSTICS)
+#  if __has_attribute(__diagnose_if__) && !defined(_LIBCPP_DISABLE_ADDITIONAL_DIAGNOSTICS)
-#    define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((diagnose_if(__VA_ARGS__, "warning")))
+#    define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((__diagnose_if__(__VA_ARGS__, "warning")))
-#    define _LIBCPP_DIAGNOSE_ERROR(...) __attribute__((diagnose_if(__VA_ARGS__, "error")))
 #  else
 #    define _LIBCPP_DIAGNOSE_WARNING(...)
-#    define _LIBCPP_DIAGNOSE_ERROR(...)
 #  endif
 // Use a function like macro to imply that it must be followed by a semicolon
 @@ -1058,6 +1061,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_FALLTHROUGH() ((void)0)
 #  endif
+#  if __has_cpp_attribute(_Clang::__lifetimebound__)
+#    define _LIBCPP_LIFETIMEBOUND [[_Clang::__lifetimebound__]]
+#  else
+#    define _LIBCPP_LIFETIMEBOUND
+#  endif
 #  if __has_attribute(__nodebug__)
 #    define _LIBCPP_NODEBUG __attribute__((__nodebug__))
 #  else
 @@ -1086,7 +1095,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_IF_WIDE_CHARACTERS(...) __VA_ARGS__
 #  endif
-#  if defined(_LIBCPP_ABI_MICROSOFT) && (defined(_LIBCPP_COMPILER_MSVC) || __has_declspec_attribute(empty_bases))
+#  if defined(_LIBCPP_ABI_MICROSOFT) && __has_declspec_attribute(empty_bases)
 #    define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
 #  else
 #    define _LIBCPP_DECLSPEC_EMPTY_BASES
 @@ -1100,13 +1109,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
 #  endif // _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
-// Leave the deprecation notices in by default, but don't remove unary_function and
-// binary_function entirely just yet. That way, folks will have one release to act
-// on the deprecation warnings.
-#  ifndef _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
-#    define _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
-#  endif
 #  if defined(_LIBCPP_ENABLE_CXX20_REMOVED_FEATURES)
 #    define _LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_MEMBERS
 #    define _LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_VOID_SPECIALIZATION
 @@ -1116,10 +1118,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS
 #  endif // _LIBCPP_ENABLE_CXX20_REMOVED_FEATURES
-#  if !defined(__cpp_impl_coroutine) || __cpp_impl_coroutine < 201902L
-#    define _LIBCPP_HAS_NO_CXX20_COROUTINES
-#  endif
 #  define _LIBCPP_PUSH_MACROS _Pragma("push_macro(\"min\")") _Pragma("push_macro(\"max\")")
 #  define _LIBCPP_POP_MACROS _Pragma("pop_macro(\"min\")") _Pragma("pop_macro(\"max\")")
 @@ -1151,19 +1149,13 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_HAS_NO_FGETPOS_FSETPOS
 #  endif
-#  if __has_attribute(init_priority)
+#  if __has_attribute(__init_priority__)
-// TODO: Remove this once we drop support for building libc++ with old Clangs
+#    define _LIBCPP_INIT_PRIORITY_MAX __attribute__((__init_priority__(100)))
-#    if (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER < 1200) ||                                                    \
-        (defined(__apple_build_version__) && __apple_build_version__ < 13000000)
-#      define _LIBCPP_INIT_PRIORITY_MAX __attribute__((init_priority(101)))
-#    else
-#      define _LIBCPP_INIT_PRIORITY_MAX __attribute__((init_priority(100)))
-#    endif
 #  else
 #    define _LIBCPP_INIT_PRIORITY_MAX
 #  endif
-#  if defined(__GNUC__) || defined(__clang__)
+#  if __has_attribute(__format__)
 // The attribute uses 1-based indices for ordinary and static member functions.
 // The attribute uses 2-based indices for non-static member functions.
 #    define _LIBCPP_ATTRIBUTE_FORMAT(archetype, format_string_index, first_format_arg_index)                           \
 @@ -1225,6 +1217,35 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #    define _LIBCPP_PACKED
 #  endif
+// c8rtomb() and mbrtoc8() were added in C++20 and C23. Support for these
+// functions is gradually being added to existing C libraries. The conditions
+// below check for known C library versions and conditions under which these
+// functions are declared by the C library.
+#  define _LIBCPP_HAS_NO_C8RTOMB_MBRTOC8
+// GNU libc 2.36 and newer declare c8rtomb() and mbrtoc8() in C++ modes if
+// __cpp_char8_t is defined or if C2X extensions are enabled. Unfortunately,
+// determining the latter depends on internal GNU libc details. If the
+// __cpp_char8_t feature test macro is not defined, then a char8_t typedef
+// will be declared as well.
+#  if defined(_LIBCPP_GLIBC_PREREQ) && defined(__GLIBC_USE)
+#    if _LIBCPP_GLIBC_PREREQ(2, 36) && (defined(__cpp_char8_t) || __GLIBC_USE(ISOC2X))
+#      undef _LIBCPP_HAS_NO_C8RTOMB_MBRTOC8
+#    endif
+#  endif
+// There are a handful of public standard library types that are intended to
+// support CTAD but don't need any explicit deduction guides to do so. This
+// macro is used to mark them as such, which suppresses the
+// '-Wctad-maybe-unsupported' compiler warning when CTAD is used in user code
+// with these classes.
+#if _LIBCPP_STD_VER >= 17
+#    define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName)                                                                \
+      template <class ..._Tag>                                                                                         \
+      _ClassName(typename _Tag::__allow_ctad...) -> _ClassName<_Tag...>
+#else
+#  define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) static_assert(true, "")
+#endif
 #endif // __cplusplus
 #endif // _LIBCPP___CONFIG

lib/libcxx/include/__coroutine/coroutine_handle.h+5-4

 @@ -13,14 +13,15 @@
 #include <__config>
 #include <__functional/hash.h>
 #include <__memory/addressof.h>
+#include <__type_traits/remove_cv.h>
 #include <compare>
-#include <type_traits>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)
+#if _LIBCPP_STD_VER > 17
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -115,7 +116,7 @@ public:
     _LIBCPP_HIDE_FROM_ABI
     static coroutine_handle from_promise(_Promise& __promise) {
-        using _RawPromise = typename remove_cv<_Promise>::type;
+        using _RawPromise = __remove_cv_t<_Promise>;
         coroutine_handle __tmp;
         __tmp.__handle_ =
             __builtin_coro_promise(_VSTD::addressof(const_cast<_RawPromise&>(__promise)), alignof(_Promise), true);
 @@ -197,6 +198,6 @@ struct hash<coroutine_handle<_Tp>> {
 _LIBCPP_END_NAMESPACE_STD
-#endif // __LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)
+#endif // __LIBCPP_STD_VER > 17
 #endif // _LIBCPP___COROUTINE_COROUTINE_HANDLE_H

lib/libcxx/include/__coroutine/coroutine_traits.h+4-4

...	@@ -10,13 +10,13 @@	...	@@ -10,13 +10,13 @@
10	#define _LIBCPP___COROUTINE_COROUTINE_TRAITS_H	10	#define _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/void_t.h>
14		14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	16	# pragma GCC system_header
17	#endif	17	#endif
18		18
19	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	19	#if _LIBCPP_STD_VER > 17
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
...	@@ -35,7 +35,7 @@ struct __coroutine_traits_sfinae {};	...	@@ -35,7 +35,7 @@ struct __coroutine_traits_sfinae {};
35		35
36	template <class _Tp>	36	template <class _Tp>
37	struct __coroutine_traits_sfinae<	37	struct __coroutine_traits_sfinae<
38	_Tp, typename __void_t<typename _Tp::promise_type>::type>	38	_Tp, __void_t<typename _Tp::promise_type> >
39	{	39	{
40	using promise_type = typename _Tp::promise_type;	40	using promise_type = typename _Tp::promise_type;
41	};	41	};
...	@@ -48,6 +48,6 @@ struct coroutine_traits	...	@@ -48,6 +48,6 @@ struct coroutine_traits
48		48
49	_LIBCPP_END_NAMESPACE_STD	49	_LIBCPP_END_NAMESPACE_STD
50		50
51	#endif // __LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	51	#endif // __LIBCPP_STD_VER > 17
52		52
53	#endif // _LIBCPP___COROUTINE_COROUTINE_TRAITS_H	53	#endif // _LIBCPP___COROUTINE_COROUTINE_TRAITS_H

lib/libcxx/include/__coroutine/noop_coroutine_handle.h+2-2

...	@@ -16,7 +16,7 @@	...	@@ -16,7 +16,7 @@
16	# pragma GCC system_header	16	# pragma GCC system_header
17	#endif	17	#endif
18		18
19	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	19	#if _LIBCPP_STD_VER > 17
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
...	@@ -107,6 +107,6 @@ noop_coroutine_handle noop_coroutine() noexcept { return noop_coroutine_handle()	...	@@ -107,6 +107,6 @@ noop_coroutine_handle noop_coroutine() noexcept { return noop_coroutine_handle()
107		107
108	_LIBCPP_END_NAMESPACE_STD	108	_LIBCPP_END_NAMESPACE_STD
109		109
110	#endif // __LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	110	#endif // __LIBCPP_STD_VER > 17
111		111
112	#endif // _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H	112	#endif // _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H

lib/libcxx/include/__coroutine/trivial_awaitables.h+2-2

...	@@ -16,7 +16,7 @@	...	@@ -16,7 +16,7 @@
16	# pragma GCC system_header	16	# pragma GCC system_header
17	#endif	17	#endif
18		18
19	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	19	#if _LIBCPP_STD_VER > 17
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
...	@@ -41,6 +41,6 @@ struct suspend_always {	...	@@ -41,6 +41,6 @@ struct suspend_always {
41		41
42	_LIBCPP_END_NAMESPACE_STD	42	_LIBCPP_END_NAMESPACE_STD
43		43
44	#endif // __LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)	44	#endif // __LIBCPP_STD_VER > 17
45		45
46	#endif // __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H	46	#endif // __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H

lib/libcxx/include/__debug+14-15

 @@ -12,22 +12,21 @@
 #include <__assert>
 #include <__config>
+#include <__type_traits/is_constant_evaluated.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-// Catch invalid uses of the legacy _LIBCPP_DEBUG toggle.
-#if defined(_LIBCPP_DEBUG) && _LIBCPP_DEBUG != 0 && !defined(_LIBCPP_ENABLE_DEBUG_MODE)
-#   error "Enabling the debug mode now requires having configured the library with support for the debug mode"
-#endif
 #if defined(_LIBCPP_ENABLE_DEBUG_MODE) && !defined(_LIBCPP_CXX03_LANG) && !defined(_LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY)
 # define _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY
 #endif
+#if defined(_LIBCPP_ENABLE_DEBUG_MODE) && !defined(_LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING)
+# define _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
+#endif
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
 #   define _LIBCPP_DEBUG_ASSERT(x, m) _LIBCPP_ASSERT(::std::__libcpp_is_constant_evaluated() || (x), m)
 #else
 @@ -87,10 +86,10 @@ struct _C_node
     explicit _C_node(void* __c, __c_node* __n)
         : __c_node(__c, __n) {}
-    virtual bool __dereferenceable(const void*) const;
+    bool __dereferenceable(const void*) const override;
-    virtual bool __decrementable(const void*) const;
+    bool __decrementable(const void*) const override;
-    virtual bool __addable(const void*, ptrdiff_t) const;
+    bool __addable(const void*, ptrdiff_t) const override;
-    virtual bool __subscriptable(const void*, ptrdiff_t) const;
+    bool __subscriptable(const void*, ptrdiff_t) const override;
 };
 template <class _Cont>
 @@ -212,7 +211,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_insert_c(_Tp* __c) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 inline void __debug_db_insert_c(_Tp* __c) {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
     if (!__libcpp_is_constant_evaluated())
         __get_db()->__insert_c(__c);
 @@ -222,7 +221,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_inser
 }
 template <class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_insert_i(_Tp* __i) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 inline void __debug_db_insert_i(_Tp* __i) {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
     if (!__libcpp_is_constant_evaluated())
         __get_db()->__insert_i(__i);
 @@ -232,7 +231,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_inser
 }
 template <class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_erase_c(_Tp* __c) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 inline void __debug_db_erase_c(_Tp* __c) {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
     if (!__libcpp_is_constant_evaluated())
         __get_db()->__erase_c(__c);
 @@ -242,7 +241,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_erase
 }
 template <class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_swap(_Tp* __lhs, _Tp* __rhs) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 inline void __debug_db_swap(_Tp* __lhs, _Tp* __rhs) {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
     if (!__libcpp_is_constant_evaluated())
         __get_db()->swap(__lhs, __rhs);
 @@ -253,7 +252,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_swap(
 }
 template <class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_invalidate_all(_Tp* __c) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 inline void __debug_db_invalidate_all(_Tp* __c) {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
     if (!__libcpp_is_constant_evaluated())
         __get_db()->__invalidate_all(__c);

lib/libcxx/include/__debug_utils/randomize_range.h+1-1

...	@@ -23,7 +23,7 @@	...	@@ -23,7 +23,7 @@
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	template <class _AlgPolicy, class _Iterator, class _Sentinel>	25	template <class _AlgPolicy, class _Iterator, class _Sentinel>
26	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	26	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
27	void __debug_randomize_range(_Iterator __first, _Sentinel __last) {	27	void __debug_randomize_range(_Iterator __first, _Sentinel __last) {
28	#ifdef _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY	28	#ifdef _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY
29	# ifdef _LIBCPP_CXX03_LANG	29	# ifdef _LIBCPP_CXX03_LANG

lib/libcxx/include/__expected/bad_expected_access.h created+64

...	@@ -0,0 +1,64 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	#ifndef _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
10	#define _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
11
12	#include <__config>
13	#include <__utility/move.h>
14
15	#include <exception>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	#if _LIBCPP_STD_VER >= 23
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	template <class _Err>
26	class bad_expected_access;
27
28	template <>
29	class bad_expected_access<void> : public exception {
30	protected:
31	_LIBCPP_HIDE_FROM_ABI bad_expected_access() noexcept = default;
32	_LIBCPP_HIDE_FROM_ABI bad_expected_access(const bad_expected_access&) = default;
33	_LIBCPP_HIDE_FROM_ABI bad_expected_access(bad_expected_access&&) = default;
34	_LIBCPP_HIDE_FROM_ABI bad_expected_access& operator=(const bad_expected_access&) = default;
35	_LIBCPP_HIDE_FROM_ABI bad_expected_access& operator=(bad_expected_access&&) = default;
36	~bad_expected_access() override = default;
37
38	public:
39	// The way this has been designed (by using a class template below) means that we'll already
40	// have a profusion of these vtables in TUs, and the dynamic linker will already have a bunch
41	// of work to do. So it is not worth hiding the <void> specialization in the dylib, given that
42	// it adds deployment target restrictions.
43	const char* what() const noexcept override { return "bad access to std::expected"; }
44	};
45
46	template <class _Err>
47	class bad_expected_access : public bad_expected_access<void> {
48	public:
49	_LIBCPP_HIDE_FROM_ABI explicit bad_expected_access(_Err __e) : __unex_(std::move(__e)) {}
50
51	_LIBCPP_HIDE_FROM_ABI _Err& error() & noexcept { return __unex_; }
52	_LIBCPP_HIDE_FROM_ABI const _Err& error() const& noexcept { return __unex_; }
53	_LIBCPP_HIDE_FROM_ABI _Err&& error() && noexcept { return std::move(__unex_); }
54	_LIBCPP_HIDE_FROM_ABI const _Err&& error() const&& noexcept { return std::move(__unex_); }
55
56	private:
57	_Err __unex_;
58	};
59
60	_LIBCPP_END_NAMESPACE_STD
61
62	#endif // _LIBCPP_STD_VER >= 23
63
64	#endif // _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H

lib/libcxx/include/__expected/expected.h created+973

...	@@ -0,0 +1,973 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	#ifndef _LIBCPP___EXPECTED_EXPECTED_H
10	#define _LIBCPP___EXPECTED_EXPECTED_H
11
12	#include <__assert>
13	#include <__config>
14	#include <__expected/bad_expected_access.h>
15	#include <__expected/unexpect.h>
16	#include <__expected/unexpected.h>
17	#include <__memory/addressof.h>
18	#include <__memory/construct_at.h>
19	#include <__type_traits/conjunction.h>
20	#include <__type_traits/disjunction.h>
21	#include <__type_traits/is_assignable.h>
22	#include <__type_traits/is_constructible.h>
23	#include <__type_traits/is_convertible.h>
24	#include <__type_traits/is_copy_assignable.h>
25	#include <__type_traits/is_copy_constructible.h>
26	#include <__type_traits/is_default_constructible.h>
27	#include <__type_traits/is_function.h>
28	#include <__type_traits/is_move_assignable.h>
29	#include <__type_traits/is_move_constructible.h>
30	#include <__type_traits/is_nothrow_constructible.h>
31	#include <__type_traits/is_nothrow_copy_assignable.h>
32	#include <__type_traits/is_nothrow_copy_constructible.h>
33	#include <__type_traits/is_nothrow_default_constructible.h>
34	#include <__type_traits/is_nothrow_move_assignable.h>
35	#include <__type_traits/is_nothrow_move_constructible.h>
36	#include <__type_traits/is_reference.h>
37	#include <__type_traits/is_same.h>
38	#include <__type_traits/is_swappable.h>
39	#include <__type_traits/is_trivially_copy_constructible.h>
40	#include <__type_traits/is_trivially_destructible.h>
41	#include <__type_traits/is_trivially_move_constructible.h>
42	#include <__type_traits/is_void.h>
43	#include <__type_traits/lazy.h>
44	#include <__type_traits/negation.h>
45	#include <__type_traits/remove_cv.h>
46	#include <__type_traits/remove_cvref.h>
47	#include <__utility/exception_guard.h>
48	#include <__utility/forward.h>
49	#include <__utility/in_place.h>
50	#include <__utility/move.h>
51	#include <__utility/swap.h>
52	#include <cstdlib> // for std::abort
53	#include <initializer_list>
54
55	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
56	# pragma GCC system_header
57	#endif
58
59	#if _LIBCPP_STD_VER >= 23
60
61	_LIBCPP_BEGIN_NAMESPACE_STD
62
63	namespace __expected {
64
65	template <class _Err, class _Arg>
66	_LIBCPP_HIDE_FROM_ABI void __throw_bad_expected_access(_Arg&& __arg) {
67	# ifndef _LIBCPP_NO_EXCEPTIONS
68	throw bad_expected_access<_Err>(std::forward<_Arg>(__arg));
69	# else
70	(void)__arg;
71	std::abort();
72	# endif
73	}
74
75	} // namespace __expected
76
77	template <class _Tp, class _Err>
78	class expected {
79	static_assert(
80	!is_reference_v<_Tp> &&
81	!is_function_v<_Tp> &&
82	!is_same_v<remove_cv_t<_Tp>, in_place_t> &&
83	!is_same_v<remove_cv_t<_Tp>, unexpect_t> &&
84	!__is_std_unexpected<remove_cv_t<_Tp>>::value &&
85	__valid_std_unexpected<_Err>::value
86	,
87	"[expected.object.general] A program that instantiates the definition of template expected<T, E> for a "
88	"reference type, a function type, or for possibly cv-qualified types in_place_t, unexpect_t, or a "
89	"specialization of unexpected for the T parameter is ill-formed. A program that instantiates the "
90	"definition of the template expected<T, E> with a type for the E parameter that is not a valid "
91	"template argument for unexpected is ill-formed.");
92
93	template <class _Up, class _OtherErr>
94	friend class expected;
95
96	public:
97	using value_type = _Tp;
98	using error_type = _Err;
99	using unexpected_type = unexpected<_Err>;
100
101	template <class _Up>
102	using rebind = expected<_Up, error_type>;
103
104	// [expected.object.ctor], constructors
105	_LIBCPP_HIDE_FROM_ABI constexpr expected()
106	noexcept(is_nothrow_default_constructible_v<_Tp>) // strengthened
107	requires is_default_constructible_v<_Tp>
108	: __has_val_(true) {
109	std::construct_at(std::addressof(__union_.__val_));
110	}
111
112	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected&) = delete;
113
114	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected&)
115	requires(is_copy_constructible_v<_Tp> &&
116	is_copy_constructible_v<_Err> &&
117	is_trivially_copy_constructible_v<_Tp> &&
118	is_trivially_copy_constructible_v<_Err>)
119	= default;
120
121	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected& __other)
122	noexcept(is_nothrow_copy_constructible_v<_Tp> && is_nothrow_copy_constructible_v<_Err>) // strengthened
123	requires(is_copy_constructible_v<_Tp> && is_copy_constructible_v<_Err> &&
124	!(is_trivially_copy_constructible_v<_Tp> && is_trivially_copy_constructible_v<_Err>))
125	: __has_val_(__other.__has_val_) {
126	if (__has_val_) {
127	std::construct_at(std::addressof(__union_.__val_), __other.__union_.__val_);
128	} else {
129	std::construct_at(std::addressof(__union_.__unex_), __other.__union_.__unex_);
130	}
131	}
132
133
134	_LIBCPP_HIDE_FROM_ABI constexpr expected(expected&&)
135	requires(is_move_constructible_v<_Tp> && is_move_constructible_v<_Err>
136	&& is_trivially_move_constructible_v<_Tp> && is_trivially_move_constructible_v<_Err>)
137	= default;
138
139	_LIBCPP_HIDE_FROM_ABI constexpr expected(expected&& __other)
140	noexcept(is_nothrow_move_constructible_v<_Tp> && is_nothrow_move_constructible_v<_Err>)
141	requires(is_move_constructible_v<_Tp> && is_move_constructible_v<_Err> &&
142	!(is_trivially_move_constructible_v<_Tp> && is_trivially_move_constructible_v<_Err>))
143	: __has_val_(__other.__has_val_) {
144	if (__has_val_) {
145	std::construct_at(std::addressof(__union_.__val_), std::move(__other.__union_.__val_));
146	} else {
147	std::construct_at(std::addressof(__union_.__unex_), std::move(__other.__union_.__unex_));
148	}
149	}
150
151	private:
152	template <class _Up, class _OtherErr, class _UfQual, class _OtherErrQual>
153	using __can_convert =
154	_And< is_constructible<_Tp, _UfQual>,
155	is_constructible<_Err, _OtherErrQual>,
156	_Not<is_constructible<_Tp, expected<_Up, _OtherErr>&>>,
157	_Not<is_constructible<_Tp, expected<_Up, _OtherErr>>>,
158	_Not<is_constructible<_Tp, const expected<_Up, _OtherErr>&>>,
159	_Not<is_constructible<_Tp, const expected<_Up, _OtherErr>>>,
160	_Not<is_convertible<expected<_Up, _OtherErr>&, _Tp>>,
161	_Not<is_convertible<expected<_Up, _OtherErr>&&, _Tp>>,
162	_Not<is_convertible<const expected<_Up, _OtherErr>&, _Tp>>,
163	_Not<is_convertible<const expected<_Up, _OtherErr>&&, _Tp>>,
164	_Not<is_constructible<unexpected<_Err>, expected<_Up, _OtherErr>&>>,
165	_Not<is_constructible<unexpected<_Err>, expected<_Up, _OtherErr>>>,
166	_Not<is_constructible<unexpected<_Err>, const expected<_Up, _OtherErr>&>>,
167	_Not<is_constructible<unexpected<_Err>, const expected<_Up, _OtherErr>>> >;
168
169
170	public:
171	template <class _Up, class _OtherErr>
172	requires __can_convert<_Up, _OtherErr, const _Up&, const _OtherErr&>::value
173	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<const _Up&, _Tp> \|\|
174	!is_convertible_v<const _OtherErr&, _Err>)
175	expected(const expected<_Up, _OtherErr>& __other)
176	noexcept(is_nothrow_constructible_v<_Tp, const _Up&> &&
177	is_nothrow_constructible_v<_Err, const _OtherErr&>) // strengthened
178	: __has_val_(__other.__has_val_) {
179	if (__has_val_) {
180	std::construct_at(std::addressof(__union_.__val_), __other.__union_.__val_);
181	} else {
182	std::construct_at(std::addressof(__union_.__unex_), __other.__union_.__unex_);
183	}
184	}
185
186	template <class _Up, class _OtherErr>
187	requires __can_convert<_Up, _OtherErr, _Up, _OtherErr>::value
188	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_Up, _Tp> \|\| !is_convertible_v<_OtherErr, _Err>)
189	expected(expected<_Up, _OtherErr>&& __other)
190	noexcept(is_nothrow_constructible_v<_Tp, _Up> && is_nothrow_constructible_v<_Err, _OtherErr>) // strengthened
191	: __has_val_(__other.__has_val_) {
192	if (__has_val_) {
193	std::construct_at(std::addressof(__union_.__val_), std::move(__other.__union_.__val_));
194	} else {
195	std::construct_at(std::addressof(__union_.__unex_), std::move(__other.__union_.__unex_));
196	}
197	}
198
199	template <class _Up = _Tp>
200	requires(!is_same_v<remove_cvref_t<_Up>, in_place_t> && !is_same_v<expected, remove_cvref_t<_Up>> &&
201	!__is_std_unexpected<remove_cvref_t<_Up>>::value && is_constructible_v<_Tp, _Up>)
202	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_Up, _Tp>)
203	expected(_Up&& __u)
204	noexcept(is_nothrow_constructible_v<_Tp, _Up>) // strengthened
205	: __has_val_(true) {
206	std::construct_at(std::addressof(__union_.__val_), std::forward<_Up>(__u));
207	}
208
209
210	template <class _OtherErr>
211	requires is_constructible_v<_Err, const _OtherErr&>
212	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<const _OtherErr&, _Err>)
213	expected(const unexpected<_OtherErr>& __unex)
214	noexcept(is_nothrow_constructible_v<_Err, const _OtherErr&>) // strengthened
215	: __has_val_(false) {
216	std::construct_at(std::addressof(__union_.__unex_), __unex.error());
217	}
218
219	template <class _OtherErr>
220	requires is_constructible_v<_Err, _OtherErr>
221	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_OtherErr, _Err>)
222	expected(unexpected<_OtherErr>&& __unex)
223	noexcept(is_nothrow_constructible_v<_Err, _OtherErr>) // strengthened
224	: __has_val_(false) {
225	std::construct_at(std::addressof(__union_.__unex_), std::move(__unex.error()));
226	}
227
228	template <class... _Args>
229	requires is_constructible_v<_Tp, _Args...>
230	_LIBCPP_HIDE_FROM_ABI constexpr explicit expected(in_place_t, _Args&&... __args)
231	noexcept(is_nothrow_constructible_v<_Tp, _Args...>) // strengthened
232	: __has_val_(true) {
233	std::construct_at(std::addressof(__union_.__val_), std::forward<_Args>(__args)...);
234	}
235
236	template <class _Up, class... _Args>
237	requires is_constructible_v< _Tp, initializer_list<_Up>&, _Args... >
238	_LIBCPP_HIDE_FROM_ABI constexpr explicit
239	expected(in_place_t, initializer_list<_Up> __il, _Args&&... __args)
240	noexcept(is_nothrow_constructible_v<_Tp, initializer_list<_Up>&, _Args...>) // strengthened
241	: __has_val_(true) {
242	std::construct_at(std::addressof(__union_.__val_), __il, std::forward<_Args>(__args)...);
243	}
244
245	template <class... _Args>
246	requires is_constructible_v<_Err, _Args...>
247	_LIBCPP_HIDE_FROM_ABI constexpr explicit expected(unexpect_t, _Args&&... __args)
248	noexcept(is_nothrow_constructible_v<_Err, _Args...>) // strengthened
249	: __has_val_(false) {
250	std::construct_at(std::addressof(__union_.__unex_), std::forward<_Args>(__args)...);
251	}
252
253	template <class _Up, class... _Args>
254	requires is_constructible_v< _Err, initializer_list<_Up>&, _Args... >
255	_LIBCPP_HIDE_FROM_ABI constexpr explicit
256	expected(unexpect_t, initializer_list<_Up> __il, _Args&&... __args)
257	noexcept(is_nothrow_constructible_v<_Err, initializer_list<_Up>&, _Args...>) // strengthened
258	: __has_val_(false) {
259	std::construct_at(std::addressof(__union_.__unex_), __il, std::forward<_Args>(__args)...);
260	}
261
262	// [expected.object.dtor], destructor
263
264	_LIBCPP_HIDE_FROM_ABI constexpr ~expected()
265	requires(is_trivially_destructible_v<_Tp> && is_trivially_destructible_v<_Err>)
266	= default;
267
268	_LIBCPP_HIDE_FROM_ABI constexpr ~expected()
269	requires(!is_trivially_destructible_v<_Tp> \|\| !is_trivially_destructible_v<_Err>)
270	{
271	if (__has_val_) {
272	std::destroy_at(std::addressof(__union_.__val_));
273	} else {
274	std::destroy_at(std::addressof(__union_.__unex_));
275	}
276	}
277
278	private:
279	template <class _T1, class _T2, class... _Args>
280	_LIBCPP_HIDE_FROM_ABI static constexpr void __reinit_expected(_T1& __newval, _T2& __oldval, _Args&&... __args) {
281	if constexpr (is_nothrow_constructible_v<_T1, _Args...>) {
282	std::destroy_at(std::addressof(__oldval));
283	std::construct_at(std::addressof(__newval), std::forward<_Args>(__args)...);
284	} else if constexpr (is_nothrow_move_constructible_v<_T1>) {
285	_T1 __tmp(std::forward<_Args>(__args)...);
286	std::destroy_at(std::addressof(__oldval));
287	std::construct_at(std::addressof(__newval), std::move(__tmp));
288	} else {
289	static_assert(
290	is_nothrow_move_constructible_v<_T2>,
291	"To provide strong exception guarantee, T2 has to satisfy `is_nothrow_move_constructible_v` so that it can "
292	"be reverted to the previous state in case an exception is thrown during the assignment.");
293	_T2 __tmp(std::move(__oldval));
294	std::destroy_at(std::addressof(__oldval));
295	__exception_guard __trans([&] { std::construct_at(std::addressof(__oldval), std::move(__tmp)); });
296	std::construct_at(std::addressof(__newval), std::forward<_Args>(__args)...);
297	__trans.__complete();
298	}
299	}
300
301	public:
302	// [expected.object.assign], assignment
303	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const expected&) = delete;
304
305	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const expected& __rhs)
306	noexcept(is_nothrow_copy_assignable_v<_Tp> &&
307	is_nothrow_copy_constructible_v<_Tp> &&
308	is_nothrow_copy_assignable_v<_Err> &&
309	is_nothrow_copy_constructible_v<_Err>) // strengthened
310	requires(is_copy_assignable_v<_Tp> &&
311	is_copy_constructible_v<_Tp> &&
312	is_copy_assignable_v<_Err> &&
313	is_copy_constructible_v<_Err> &&
314	(is_nothrow_move_constructible_v<_Tp> \|\|
315	is_nothrow_move_constructible_v<_Err>))
316	{
317	if (__has_val_ && __rhs.__has_val_) {
318	__union_.__val_ = __rhs.__union_.__val_;
319	} else if (__has_val_) {
320	__reinit_expected(__union_.__unex_, __union_.__val_, __rhs.__union_.__unex_);
321	} else if (__rhs.__has_val_) {
322	__reinit_expected(__union_.__val_, __union_.__unex_, __rhs.__union_.__val_);
323	} else {
324	__union_.__unex_ = __rhs.__union_.__unex_;
325	}
326	// note: only reached if no exception+rollback was done inside __reinit_expected
327	__has_val_ = __rhs.__has_val_;
328	return *this;
329	}
330
331	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(expected&& __rhs)
332	noexcept(is_nothrow_move_assignable_v<_Tp> &&
333	is_nothrow_move_constructible_v<_Tp> &&
334	is_nothrow_move_assignable_v<_Err> &&
335	is_nothrow_move_constructible_v<_Err>)
336	requires(is_move_constructible_v<_Tp> &&
337	is_move_assignable_v<_Tp> &&
338	is_move_constructible_v<_Err> &&
339	is_move_assignable_v<_Err> &&
340	(is_nothrow_move_constructible_v<_Tp> \|\|
341	is_nothrow_move_constructible_v<_Err>))
342	{
343	if (__has_val_ && __rhs.__has_val_) {
344	__union_.__val_ = std::move(__rhs.__union_.__val_);
345	} else if (__has_val_) {
346	__reinit_expected(__union_.__unex_, __union_.__val_, std::move(__rhs.__union_.__unex_));
347	} else if (__rhs.__has_val_) {
348	__reinit_expected(__union_.__val_, __union_.__unex_, std::move(__rhs.__union_.__val_));
349	} else {
350	__union_.__unex_ = std::move(__rhs.__union_.__unex_);
351	}
352	// note: only reached if no exception+rollback was done inside __reinit_expected
353	__has_val_ = __rhs.__has_val_;
354	return *this;
355	}
356
357	template <class _Up = _Tp>
358	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(_Up&& __v)
359	requires(!is_same_v<expected, remove_cvref_t<_Up>> &&
360	!__is_std_unexpected<remove_cvref_t<_Up>>::value &&
361	is_constructible_v<_Tp, _Up> &&
362	is_assignable_v<_Tp&, _Up> &&
363	(is_nothrow_constructible_v<_Tp, _Up> \|\|
364	is_nothrow_move_constructible_v<_Tp> \|\|
365	is_nothrow_move_constructible_v<_Err>))
366	{
367	if (__has_val_) {
368	__union_.__val_ = std::forward<_Up>(__v);
369	} else {
370	__reinit_expected(__union_.__val_, __union_.__unex_, std::forward<_Up>(__v));
371	__has_val_ = true;
372	}
373	return *this;
374	}
375
376	private:
377	template <class _OtherErrQual>
378	static constexpr bool __can_assign_from_unexpected =
379	_And< is_constructible<_Err, _OtherErrQual>,
380	is_assignable<_Err&, _OtherErrQual>,
381	_Lazy<_Or,
382	is_nothrow_constructible<_Err, _OtherErrQual>,
383	is_nothrow_move_constructible<_Tp>,
384	is_nothrow_move_constructible<_Err>> >::value;
385
386	public:
387	template <class _OtherErr>
388	requires(__can_assign_from_unexpected<const _OtherErr&>)
389	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const unexpected<_OtherErr>& __un) {
390	if (__has_val_) {
391	__reinit_expected(__union_.__unex_, __union_.__val_, __un.error());
392	__has_val_ = false;
393	} else {
394	__union_.__unex_ = __un.error();
395	}
396	return *this;
397	}
398
399	template <class _OtherErr>
400	requires(__can_assign_from_unexpected<_OtherErr>)
401	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(unexpected<_OtherErr>&& __un) {
402	if (__has_val_) {
403	__reinit_expected(__union_.__unex_, __union_.__val_, std::move(__un.error()));
404	__has_val_ = false;
405	} else {
406	__union_.__unex_ = std::move(__un.error());
407	}
408	return *this;
409	}
410
411	template <class... _Args>
412	requires is_nothrow_constructible_v<_Tp, _Args...>
413	_LIBCPP_HIDE_FROM_ABI constexpr _Tp& emplace(_Args&&... __args) noexcept {
414	if (__has_val_) {
415	std::destroy_at(std::addressof(__union_.__val_));
416	} else {
417	std::destroy_at(std::addressof(__union_.__unex_));
418	__has_val_ = true;
419	}
420	return *std::construct_at(std::addressof(__union_.__val_), std::forward<_Args>(__args)...);
421	}
422
423	template <class _Up, class... _Args>
424	requires is_nothrow_constructible_v< _Tp, initializer_list<_Up>&, _Args... >
425	_LIBCPP_HIDE_FROM_ABI constexpr _Tp& emplace(initializer_list<_Up> __il, _Args&&... __args) noexcept {
426	if (__has_val_) {
427	std::destroy_at(std::addressof(__union_.__val_));
428	} else {
429	std::destroy_at(std::addressof(__union_.__unex_));
430	__has_val_ = true;
431	}
432	return *std::construct_at(std::addressof(__union_.__val_), __il, std::forward<_Args>(__args)...);
433	}
434
435
436	public:
437	// [expected.object.swap], swap
438	_LIBCPP_HIDE_FROM_ABI constexpr void swap(expected& __rhs)
439	noexcept(is_nothrow_move_constructible_v<_Tp> &&
440	is_nothrow_swappable_v<_Tp> &&
441	is_nothrow_move_constructible_v<_Err> &&
442	is_nothrow_swappable_v<_Err>)
443	requires(is_swappable_v<_Tp> &&
444	is_swappable_v<_Err> &&
445	is_move_constructible_v<_Tp> &&
446	is_move_constructible_v<_Err> &&
447	(is_nothrow_move_constructible_v<_Tp> \|\|
448	is_nothrow_move_constructible_v<_Err>))
449	{
450	auto __swap_val_unex_impl = [&](expected& __with_val, expected& __with_err) {
451	if constexpr (is_nothrow_move_constructible_v<_Err>) {
452	_Err __tmp(std::move(__with_err.__union_.__unex_));
453	std::destroy_at(std::addressof(__with_err.__union_.__unex_));
454	__exception_guard __trans([&] {
455	std::construct_at(std::addressof(__with_err.__union_.__unex_), std::move(__tmp));
456	});
457	std::construct_at(std::addressof(__with_err.__union_.__val_), std::move(__with_val.__union_.__val_));
458	__trans.__complete();
459	std::destroy_at(std::addressof(__with_val.__union_.__val_));
460	std::construct_at(std::addressof(__with_val.__union_.__unex_), std::move(__tmp));
461	} else {
462	static_assert(is_nothrow_move_constructible_v<_Tp>,
463	"To provide strong exception guarantee, Tp has to satisfy `is_nothrow_move_constructible_v` so "
464	"that it can be reverted to the previous state in case an exception is thrown during swap.");
465	_Tp __tmp(std::move(__with_val.__union_.__val_));
466	std::destroy_at(std::addressof(__with_val.__union_.__val_));
467	__exception_guard __trans([&] {
468	std::construct_at(std::addressof(__with_val.__union_.__val_), std::move(__tmp));
469	});
470	std::construct_at(std::addressof(__with_val.__union_.__unex_), std::move(__with_err.__union_.__unex_));
471	__trans.__complete();
472	std::destroy_at(std::addressof(__with_err.__union_.__unex_));
473	std::construct_at(std::addressof(__with_err.__union_.__val_), std::move(__tmp));
474	}
475	__with_val.__has_val_ = false;
476	__with_err.__has_val_ = true;
477	};
478
479	if (__has_val_) {
480	if (__rhs.__has_val_) {
481	using std::swap;
482	swap(__union_.__val_, __rhs.__union_.__val_);
483	} else {
484	__swap_val_unex_impl(*this, __rhs);
485	}
486	} else {
487	if (__rhs.__has_val_) {
488	__swap_val_unex_impl(__rhs, *this);
489	} else {
490	using std::swap;
491	swap(__union_.__unex_, __rhs.__union_.__unex_);
492	}
493	}
494	}
495
496	_LIBCPP_HIDE_FROM_ABI friend constexpr void swap(expected& __x, expected& __y)
497	noexcept(noexcept(__x.swap(__y)))
498	requires requires { __x.swap(__y); }
499	{
500	__x.swap(__y);
501	}
502
503	// [expected.object.obs], observers
504	_LIBCPP_HIDE_FROM_ABI constexpr const _Tp* operator->() const noexcept {
505	_LIBCPP_ASSERT(__has_val_, "expected::operator-> requires the expected to contain a value");
506	return std::addressof(__union_.__val_);
507	}
508
509	_LIBCPP_HIDE_FROM_ABI constexpr _Tp* operator->() noexcept {
510	_LIBCPP_ASSERT(__has_val_, "expected::operator-> requires the expected to contain a value");
511	return std::addressof(__union_.__val_);
512	}
513
514	_LIBCPP_HIDE_FROM_ABI constexpr const _Tp& operator*() const& noexcept {
515	_LIBCPP_ASSERT(__has_val_, "expected::operator* requires the expected to contain a value");
516	return __union_.__val_;
517	}
518
519	_LIBCPP_HIDE_FROM_ABI constexpr _Tp& operator*() & noexcept {
520	_LIBCPP_ASSERT(__has_val_, "expected::operator* requires the expected to contain a value");
521	return __union_.__val_;
522	}
523
524	_LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& operator*() const&& noexcept {
525	_LIBCPP_ASSERT(__has_val_, "expected::operator* requires the expected to contain a value");
526	return std::move(__union_.__val_);
527	}
528
529	_LIBCPP_HIDE_FROM_ABI constexpr _Tp&& operator*() && noexcept {
530	_LIBCPP_ASSERT(__has_val_, "expected::operator* requires the expected to contain a value");
531	return std::move(__union_.__val_);
532	}
533
534	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator bool() const noexcept { return __has_val_; }
535
536	_LIBCPP_HIDE_FROM_ABI constexpr bool has_value() const noexcept { return __has_val_; }
537
538	_LIBCPP_HIDE_FROM_ABI constexpr const _Tp& value() const& {
539	if (!__has_val_) {
540	__expected::__throw_bad_expected_access<_Err>(__union_.__unex_);
541	}
542	return __union_.__val_;
543	}
544
545	_LIBCPP_HIDE_FROM_ABI constexpr _Tp& value() & {
546	if (!__has_val_) {
547	__expected::__throw_bad_expected_access<_Err>(__union_.__unex_);
548	}
549	return __union_.__val_;
550	}
551
552	_LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& value() const&& {
553	if (!__has_val_) {
554	__expected::__throw_bad_expected_access<_Err>(std::move(__union_.__unex_));
555	}
556	return std::move(__union_.__val_);
557	}
558
559	_LIBCPP_HIDE_FROM_ABI constexpr _Tp&& value() && {
560	if (!__has_val_) {
561	__expected::__throw_bad_expected_access<_Err>(std::move(__union_.__unex_));
562	}
563	return std::move(__union_.__val_);
564	}
565
566	_LIBCPP_HIDE_FROM_ABI constexpr const _Err& error() const& noexcept {
567	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
568	return __union_.__unex_;
569	}
570
571	_LIBCPP_HIDE_FROM_ABI constexpr _Err& error() & noexcept {
572	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
573	return __union_.__unex_;
574	}
575
576	_LIBCPP_HIDE_FROM_ABI constexpr const _Err&& error() const&& noexcept {
577	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
578	return std::move(__union_.__unex_);
579	}
580
581	_LIBCPP_HIDE_FROM_ABI constexpr _Err&& error() && noexcept {
582	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
583	return std::move(__union_.__unex_);
584	}
585
586	template <class _Up>
587	_LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) const& {
588	static_assert(is_copy_constructible_v<_Tp>, "value_type has to be copy constructible");
589	static_assert(is_convertible_v<_Up, _Tp>, "argument has to be convertible to value_type");
590	return __has_val_ ? __union_.__val_ : static_cast<_Tp>(std::forward<_Up>(__v));
591	}
592
593	template <class _Up>
594	_LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) && {
595	static_assert(is_move_constructible_v<_Tp>, "value_type has to be move constructible");
596	static_assert(is_convertible_v<_Up, _Tp>, "argument has to be convertible to value_type");
597	return __has_val_ ? std::move(__union_.__val_) : static_cast<_Tp>(std::forward<_Up>(__v));
598	}
599
600	// [expected.object.eq], equality operators
601	template <class _T2, class _E2>
602	requires(!is_void_v<_T2>)
603	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const expected<_T2, _E2>& __y) {
604	if (__x.__has_val_ != __y.__has_val_) {
605	return false;
606	} else {
607	if (__x.__has_val_) {
608	return __x.__union_.__val_ == __y.__union_.__val_;
609	} else {
610	return __x.__union_.__unex_ == __y.__union_.__unex_;
611	}
612	}
613	}
614
615	template <class _T2>
616	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const _T2& __v) {
617	return __x.__has_val_ && static_cast<bool>(__x.__union_.__val_ == __v);
618	}
619
620	template <class _E2>
621	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const unexpected<_E2>& __e) {
622	return !__x.__has_val_ && static_cast<bool>(__x.__union_.__unex_ == __e.error());
623	}
624
625	private:
626	struct __empty_t {};
627	// use named union because [[no_unique_address]] cannot be applied to an unnamed union
628	_LIBCPP_NO_UNIQUE_ADDRESS union __union_t {
629	_LIBCPP_HIDE_FROM_ABI constexpr __union_t() : __empty_() {}
630
631	_LIBCPP_HIDE_FROM_ABI constexpr ~__union_t()
632	requires(is_trivially_destructible_v<_Tp> && is_trivially_destructible_v<_Err>)
633	= default;
634
635	// the expected's destructor handles this
636	_LIBCPP_HIDE_FROM_ABI constexpr ~__union_t()
637	requires(!is_trivially_destructible_v<_Tp> \|\| !is_trivially_destructible_v<_Err>)
638	{}
639
640	_LIBCPP_NO_UNIQUE_ADDRESS __empty_t __empty_;
641	_LIBCPP_NO_UNIQUE_ADDRESS _Tp __val_;
642	_LIBCPP_NO_UNIQUE_ADDRESS _Err __unex_;
643	} __union_;
644
645	bool __has_val_;
646	};
647
648	template <class _Tp, class _Err>
649	requires is_void_v<_Tp>
650	class expected<_Tp, _Err> {
651	static_assert(__valid_std_unexpected<_Err>::value,
652	"[expected.void.general] A program that instantiates expected<T, E> with a E that is not a "
653	"valid argument for unexpected<E> is ill-formed");
654
655	template <class, class>
656	friend class expected;
657
658	template <class _Up, class _OtherErr, class _OtherErrQual>
659	using __can_convert =
660	_And< is_void<_Up>,
661	is_constructible<_Err, _OtherErrQual>,
662	_Not<is_constructible<unexpected<_Err>, expected<_Up, _OtherErr>&>>,
663	_Not<is_constructible<unexpected<_Err>, expected<_Up, _OtherErr>>>,
664	_Not<is_constructible<unexpected<_Err>, const expected<_Up, _OtherErr>&>>,
665	_Not<is_constructible<unexpected<_Err>, const expected<_Up, _OtherErr>>>>;
666
667	public:
668	using value_type = _Tp;
669	using error_type = _Err;
670	using unexpected_type = unexpected<_Err>;
671
672	template <class _Up>
673	using rebind = expected<_Up, error_type>;
674
675	// [expected.void.ctor], constructors
676	_LIBCPP_HIDE_FROM_ABI constexpr expected() noexcept : __has_val_(true) {}
677
678	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected&) = delete;
679
680	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected&)
681	requires(is_copy_constructible_v<_Err> && is_trivially_copy_constructible_v<_Err>)
682	= default;
683
684	_LIBCPP_HIDE_FROM_ABI constexpr expected(const expected& __rhs)
685	noexcept(is_nothrow_copy_constructible_v<_Err>) // strengthened
686	requires(is_copy_constructible_v<_Err> && !is_trivially_copy_constructible_v<_Err>)
687	: __has_val_(__rhs.__has_val_) {
688	if (!__rhs.__has_val_) {
689	std::construct_at(std::addressof(__union_.__unex_), __rhs.__union_.__unex_);
690	}
691	}
692
693	_LIBCPP_HIDE_FROM_ABI constexpr expected(expected&&)
694	requires(is_move_constructible_v<_Err> && is_trivially_move_constructible_v<_Err>)
695	= default;
696
697	_LIBCPP_HIDE_FROM_ABI constexpr expected(expected&& __rhs)
698	noexcept(is_nothrow_move_constructible_v<_Err>)
699	requires(is_move_constructible_v<_Err> && !is_trivially_move_constructible_v<_Err>)
700	: __has_val_(__rhs.__has_val_) {
701	if (!__rhs.__has_val_) {
702	std::construct_at(std::addressof(__union_.__unex_), std::move(__rhs.__union_.__unex_));
703	}
704	}
705
706	template <class _Up, class _OtherErr>
707	requires __can_convert<_Up, _OtherErr, const _OtherErr&>::value
708	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<const _OtherErr&, _Err>)
709	expected(const expected<_Up, _OtherErr>& __rhs)
710	noexcept(is_nothrow_constructible_v<_Err, const _OtherErr&>) // strengthened
711	: __has_val_(__rhs.__has_val_) {
712	if (!__rhs.__has_val_) {
713	std::construct_at(std::addressof(__union_.__unex_), __rhs.__union_.__unex_);
714	}
715	}
716
717	template <class _Up, class _OtherErr>
718	requires __can_convert<_Up, _OtherErr, _OtherErr>::value
719	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_OtherErr, _Err>)
720	expected(expected<_Up, _OtherErr>&& __rhs)
721	noexcept(is_nothrow_constructible_v<_Err, _OtherErr>) // strengthened
722	: __has_val_(__rhs.__has_val_) {
723	if (!__rhs.__has_val_) {
724	std::construct_at(std::addressof(__union_.__unex_), std::move(__rhs.__union_.__unex_));
725	}
726	}
727
728	template <class _OtherErr>
729	requires is_constructible_v<_Err, const _OtherErr&>
730	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<const _OtherErr&, _Err>)
731	expected(const unexpected<_OtherErr>& __unex)
732	noexcept(is_nothrow_constructible_v<_Err, const _OtherErr&>) // strengthened
733	: __has_val_(false) {
734	std::construct_at(std::addressof(__union_.__unex_), __unex.error());
735	}
736
737	template <class _OtherErr>
738	requires is_constructible_v<_Err, _OtherErr>
739	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_OtherErr, _Err>)
740	expected(unexpected<_OtherErr>&& __unex)
741	noexcept(is_nothrow_constructible_v<_Err, _OtherErr>) // strengthened
742	: __has_val_(false) {
743	std::construct_at(std::addressof(__union_.__unex_), std::move(__unex.error()));
744	}
745
746	_LIBCPP_HIDE_FROM_ABI constexpr explicit expected(in_place_t) noexcept : __has_val_(true) {}
747
748	template <class... _Args>
749	requires is_constructible_v<_Err, _Args...>
750	_LIBCPP_HIDE_FROM_ABI constexpr explicit expected(unexpect_t, _Args&&... __args)
751	noexcept(is_nothrow_constructible_v<_Err, _Args...>) // strengthened
752	: __has_val_(false) {
753	std::construct_at(std::addressof(__union_.__unex_), std::forward<_Args>(__args)...);
754	}
755
756	template <class _Up, class... _Args>
757	requires is_constructible_v< _Err, initializer_list<_Up>&, _Args... >
758	_LIBCPP_HIDE_FROM_ABI constexpr explicit expected(unexpect_t, initializer_list<_Up> __il, _Args&&... __args)
759	noexcept(is_nothrow_constructible_v<_Err, initializer_list<_Up>&, _Args...>) // strengthened
760	: __has_val_(false) {
761	std::construct_at(std::addressof(__union_.__unex_), __il, std::forward<_Args>(__args)...);
762	}
763
764	// [expected.void.dtor], destructor
765
766	_LIBCPP_HIDE_FROM_ABI constexpr ~expected()
767	requires is_trivially_destructible_v<_Err>
768	= default;
769
770	_LIBCPP_HIDE_FROM_ABI constexpr ~expected()
771	requires(!is_trivially_destructible_v<_Err>)
772	{
773	if (!__has_val_) {
774	std::destroy_at(std::addressof(__union_.__unex_));
775	}
776	}
777
778	// [expected.void.assign], assignment
779
780	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const expected&) = delete;
781
782	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const expected& __rhs)
783	noexcept(is_nothrow_copy_assignable_v<_Err> && is_nothrow_copy_constructible_v<_Err>) // strengthened
784	requires(is_copy_assignable_v<_Err> && is_copy_constructible_v<_Err>)
785	{
786	if (__has_val_) {
787	if (!__rhs.__has_val_) {
788	std::construct_at(std::addressof(__union_.__unex_), __rhs.__union_.__unex_);
789	__has_val_ = false;
790	}
791	} else {
792	if (__rhs.__has_val_) {
793	std::destroy_at(std::addressof(__union_.__unex_));
794	__has_val_ = true;
795	} else {
796	__union_.__unex_ = __rhs.__union_.__unex_;
797	}
798	}
799	return *this;
800	}
801
802	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(expected&&) = delete;
803
804	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(expected&& __rhs)
805	noexcept(is_nothrow_move_assignable_v<_Err> &&
806	is_nothrow_move_constructible_v<_Err>)
807	requires(is_move_assignable_v<_Err> &&
808	is_move_constructible_v<_Err>)
809	{
810	if (__has_val_) {
811	if (!__rhs.__has_val_) {
812	std::construct_at(std::addressof(__union_.__unex_), std::move(__rhs.__union_.__unex_));
813	__has_val_ = false;
814	}
815	} else {
816	if (__rhs.__has_val_) {
817	std::destroy_at(std::addressof(__union_.__unex_));
818	__has_val_ = true;
819	} else {
820	__union_.__unex_ = std::move(__rhs.__union_.__unex_);
821	}
822	}
823	return *this;
824	}
825
826	template <class _OtherErr>
827	requires(is_constructible_v<_Err, const _OtherErr&> && is_assignable_v<_Err&, const _OtherErr&>)
828	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(const unexpected<_OtherErr>& __un) {
829	if (__has_val_) {
830	std::construct_at(std::addressof(__union_.__unex_), __un.error());
831	__has_val_ = false;
832	} else {
833	__union_.__unex_ = __un.error();
834	}
835	return *this;
836	}
837
838	template <class _OtherErr>
839	requires(is_constructible_v<_Err, _OtherErr> && is_assignable_v<_Err&, _OtherErr>)
840	_LIBCPP_HIDE_FROM_ABI constexpr expected& operator=(unexpected<_OtherErr>&& __un) {
841	if (__has_val_) {
842	std::construct_at(std::addressof(__union_.__unex_), std::move(__un.error()));
843	__has_val_ = false;
844	} else {
845	__union_.__unex_ = std::move(__un.error());
846	}
847	return *this;
848	}
849
850	_LIBCPP_HIDE_FROM_ABI constexpr void emplace() noexcept {
851	if (!__has_val_) {
852	std::destroy_at(std::addressof(__union_.__unex_));
853	__has_val_ = true;
854	}
855	}
856
857	// [expected.void.swap], swap
858	_LIBCPP_HIDE_FROM_ABI constexpr void swap(expected& __rhs)
859	noexcept(is_nothrow_move_constructible_v<_Err> && is_nothrow_swappable_v<_Err>)
860	requires(is_swappable_v<_Err> && is_move_constructible_v<_Err>)
861	{
862	auto __swap_val_unex_impl = [&](expected& __with_val, expected& __with_err) {
863	std::construct_at(std::addressof(__with_val.__union_.__unex_), std::move(__with_err.__union_.__unex_));
864	std::destroy_at(std::addressof(__with_err.__union_.__unex_));
865	__with_val.__has_val_ = false;
866	__with_err.__has_val_ = true;
867	};
868
869	if (__has_val_) {
870	if (!__rhs.__has_val_) {
871	__swap_val_unex_impl(*this, __rhs);
872	}
873	} else {
874	if (__rhs.__has_val_) {
875	__swap_val_unex_impl(__rhs, *this);
876	} else {
877	using std::swap;
878	swap(__union_.__unex_, __rhs.__union_.__unex_);
879	}
880	}
881	}
882
883	_LIBCPP_HIDE_FROM_ABI friend constexpr void swap(expected& __x, expected& __y)
884	noexcept(noexcept(__x.swap(__y)))
885	requires requires { __x.swap(__y); }
886	{
887	__x.swap(__y);
888	}
889
890	// [expected.void.obs], observers
891	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator bool() const noexcept { return __has_val_; }
892
893	_LIBCPP_HIDE_FROM_ABI constexpr bool has_value() const noexcept { return __has_val_; }
894
895	_LIBCPP_HIDE_FROM_ABI constexpr void operator*() const noexcept {
896	_LIBCPP_ASSERT(__has_val_, "expected::operator* requires the expected to contain a value");
897	}
898
899	_LIBCPP_HIDE_FROM_ABI constexpr void value() const& {
900	if (!__has_val_) {
901	__expected::__throw_bad_expected_access<_Err>(__union_.__unex_);
902	}
903	}
904
905	_LIBCPP_HIDE_FROM_ABI constexpr void value() && {
906	if (!__has_val_) {
907	__expected::__throw_bad_expected_access<_Err>(std::move(__union_.__unex_));
908	}
909	}
910
911	_LIBCPP_HIDE_FROM_ABI constexpr const _Err& error() const& noexcept {
912	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
913	return __union_.__unex_;
914	}
915
916	_LIBCPP_HIDE_FROM_ABI constexpr _Err& error() & noexcept {
917	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
918	return __union_.__unex_;
919	}
920
921	_LIBCPP_HIDE_FROM_ABI constexpr const _Err&& error() const&& noexcept {
922	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
923	return std::move(__union_.__unex_);
924	}
925
926	_LIBCPP_HIDE_FROM_ABI constexpr _Err&& error() && noexcept {
927	_LIBCPP_ASSERT(!__has_val_, "expected::error requires the expected to contain an error");
928	return std::move(__union_.__unex_);
929	}
930
931	// [expected.void.eq], equality operators
932	template <class _T2, class _E2>
933	requires is_void_v<_T2>
934	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const expected<_T2, _E2>& __y) {
935	if (__x.__has_val_ != __y.__has_val_) {
936	return false;
937	} else {
938	return __x.__has_val_ \|\| static_cast<bool>(__x.__union_.__unex_ == __y.__union_.__unex_);
939	}
940	}
941
942	template <class _E2>
943	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const unexpected<_E2>& __y) {
944	return !__x.__has_val_ && static_cast<bool>(__x.__union_.__unex_ == __y.error());
945	}
946
947	private:
948	struct __empty_t {};
949	// use named union because [[no_unique_address]] cannot be applied to an unnamed union
950	_LIBCPP_NO_UNIQUE_ADDRESS union __union_t {
951	_LIBCPP_HIDE_FROM_ABI constexpr __union_t() : __empty_() {}
952
953	_LIBCPP_HIDE_FROM_ABI constexpr ~__union_t()
954	requires(is_trivially_destructible_v<_Err>)
955	= default;
956
957	// the expected's destructor handles this
958	_LIBCPP_HIDE_FROM_ABI constexpr ~__union_t()
959	requires(!is_trivially_destructible_v<_Err>)
960	{}
961
962	_LIBCPP_NO_UNIQUE_ADDRESS __empty_t __empty_;
963	_LIBCPP_NO_UNIQUE_ADDRESS _Err __unex_;
964	} __union_;
965
966	bool __has_val_;
967	};
968
969	_LIBCPP_END_NAMESPACE_STD
970
971	#endif // _LIBCPP_STD_VER >= 23
972
973	#endif // _LIBCPP___EXPECTED_EXPECTED_H

lib/libcxx/include/__expected/unexpect.h created+32

...	@@ -0,0 +1,32 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	#ifndef _LIBCPP___EXPECTED_UNEXPECT_H
10	#define _LIBCPP___EXPECTED_UNEXPECT_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	#if _LIBCPP_STD_VER >= 23
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	struct unexpect_t {
23	_LIBCPP_HIDE_FROM_ABI explicit unexpect_t() = default;
24	};
25
26	inline constexpr unexpect_t unexpect{};
27
28	_LIBCPP_END_NAMESPACE_STD
29
30	#endif // _LIBCPP_STD_VER >= 23
31
32	#endif // _LIBCPP___EXPECTED_UNEXPECT_H

lib/libcxx/include/__expected/unexpected.h created+122

...	@@ -0,0 +1,122 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	#ifndef _LIBCPP___EXPECTED_UNEXPECTED_H
10	#define _LIBCPP___EXPECTED_UNEXPECTED_H
11
12	#include <__config>
13	#include <__type_traits/conjunction.h>
14	#include <__type_traits/is_array.h>
15	#include <__type_traits/is_const.h>
16	#include <__type_traits/is_constructible.h>
17	#include <__type_traits/is_nothrow_constructible.h>
18	#include <__type_traits/is_object.h>
19	#include <__type_traits/is_same.h>
20	#include <__type_traits/is_swappable.h>
21	#include <__type_traits/is_volatile.h>
22	#include <__type_traits/negation.h>
23	#include <__type_traits/remove_cvref.h>
24	#include <__utility/forward.h>
25	#include <__utility/in_place.h>
26	#include <__utility/move.h>
27	#include <__utility/swap.h>
28	#include <initializer_list>
29
30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
31	# pragma GCC system_header
32	#endif
33
34	#if _LIBCPP_STD_VER >= 23
35
36	_LIBCPP_BEGIN_NAMESPACE_STD
37
38	template <class _Err>
39	class unexpected;
40
41	template <class _Tp>
42	struct __is_std_unexpected : false_type {};
43
44	template <class _Err>
45	struct __is_std_unexpected<unexpected<_Err>> : true_type {};
46
47	template <class _Tp>
48	using __valid_std_unexpected = _BoolConstant< //
49	is_object_v<_Tp> && //
50	!is_array_v<_Tp> && //
51	!__is_std_unexpected<_Tp>::value && //
52	!is_const_v<_Tp> && //
53	!is_volatile_v<_Tp> //
54	>;
55
56	template <class _Err>
57	class unexpected {
58	static_assert(__valid_std_unexpected<_Err>::value,
59	"[expected.un.general] states a program that instantiates std::unexpected for a non-object type, an "
60	"array type, a specialization of unexpected, or a cv-qualified type is ill-formed.");
61
62	public:
63	_LIBCPP_HIDE_FROM_ABI constexpr unexpected(const unexpected&) = default;
64	_LIBCPP_HIDE_FROM_ABI constexpr unexpected(unexpected&&) = default;
65
66	template <class _Error = _Err>
67	requires(!is_same_v<remove_cvref_t<_Error>, unexpected> && //
68	!is_same_v<remove_cvref_t<_Error>, in_place_t> && //
69	is_constructible_v<_Err, _Error>)
70	_LIBCPP_HIDE_FROM_ABI constexpr explicit unexpected(_Error&& __error) //
71	noexcept(is_nothrow_constructible_v<_Err, _Error>) // strengthened
72	: __unex_(std::forward<_Error>(__error)) {}
73
74	template <class... _Args>
75	requires is_constructible_v<_Err, _Args...>
76	_LIBCPP_HIDE_FROM_ABI constexpr explicit unexpected(in_place_t, _Args&&... __args) //
77	noexcept(is_nothrow_constructible_v<_Err, _Args...>) // strengthened
78	: __unex_(std::forward<_Args>(__args)...) {}
79
80	template <class _Up, class... _Args>
81	requires is_constructible_v<_Err, initializer_list<_Up>&, _Args...>
82	_LIBCPP_HIDE_FROM_ABI constexpr explicit unexpected(in_place_t, initializer_list<_Up> __il, _Args&&... __args) //
83	noexcept(is_nothrow_constructible_v<_Err, initializer_list<_Up>&, _Args...>) // strengthened
84	: __unex_(__il, std::forward<_Args>(__args)...) {}
85
86	_LIBCPP_HIDE_FROM_ABI constexpr unexpected& operator=(const unexpected&) = default;
87	_LIBCPP_HIDE_FROM_ABI constexpr unexpected& operator=(unexpected&&) = default;
88
89	_LIBCPP_HIDE_FROM_ABI constexpr const _Err& error() const& noexcept { return __unex_; }
90	_LIBCPP_HIDE_FROM_ABI constexpr _Err& error() & noexcept { return __unex_; }
91	_LIBCPP_HIDE_FROM_ABI constexpr const _Err&& error() const&& noexcept { return std::move(__unex_); }
92	_LIBCPP_HIDE_FROM_ABI constexpr _Err&& error() && noexcept { return std::move(__unex_); }
93
94	_LIBCPP_HIDE_FROM_ABI constexpr void swap(unexpected& __other) noexcept(is_nothrow_swappable_v<_Err>) {
95	static_assert(is_swappable_v<_Err>, "unexpected::swap requires is_swappable_v<E> to be true");
96	using std::swap;
97	swap(__unex_, __other.__unex_);
98	}
99
100	_LIBCPP_HIDE_FROM_ABI friend constexpr void swap(unexpected& __x, unexpected& __y) noexcept(noexcept(__x.swap(__y)))
101	requires is_swappable_v<_Err>
102	{
103	__x.swap(__y);
104	}
105
106	template <class _Err2>
107	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const unexpected& __x, const unexpected<_Err2>& __y) {
108	return __x.__unex_ == __y.__unex_;
109	}
110
111	private:
112	_Err __unex_;
113	};
114
115	template <class _Err>
116	unexpected(_Err) -> unexpected<_Err>;
117
118	_LIBCPP_END_NAMESPACE_STD
119
120	#endif // _LIBCPP_STD_VER >= 23
121
122	#endif // _LIBCPP___EXPECTED_UNEXPECTED_H

lib/libcxx/include/__filesystem/directory_entry.h+15-4

 @@ -215,21 +215,23 @@ public:
     return __get_symlink_status(&__ec);
   }
-  _LIBCPP_INLINE_VISIBILITY
-  bool operator<(directory_entry const& __rhs) const noexcept {
-    return __p_ < __rhs.__p_;
-  }
   _LIBCPP_INLINE_VISIBILITY
   bool operator==(directory_entry const& __rhs) const noexcept {
     return __p_ == __rhs.__p_;
   }
+#if _LIBCPP_STD_VER <= 17
   _LIBCPP_INLINE_VISIBILITY
   bool operator!=(directory_entry const& __rhs) const noexcept {
     return __p_ != __rhs.__p_;
   }
+  _LIBCPP_INLINE_VISIBILITY
+  bool operator<(directory_entry const& __rhs) const noexcept {
+    return __p_ < __rhs.__p_;
+  }
   _LIBCPP_INLINE_VISIBILITY
   bool operator<=(directory_entry const& __rhs) const noexcept {
     return __p_ <= __rhs.__p_;
 @@ -245,6 +247,15 @@ public:
     return __p_ >= __rhs.__p_;
   }
+#else // _LIBCPP_STD_VER <= 17
+  _LIBCPP_HIDE_FROM_ABI
+  strong_ordering operator<=>(const directory_entry& __rhs) const noexcept {
+    return __p_ <=> __rhs.__p_;
+  }
+#endif // _LIBCPP_STD_VER <= 17
   template <class _CharT, class _Traits>
   _LIBCPP_INLINE_VISIBILITY
   friend basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, const directory_entry& __d) {

lib/libcxx/include/__filesystem/filesystem_error.h+2-1

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14	#include <__config>	14	#include <__config>
15	#include <__filesystem/path.h>	15	#include <__filesystem/path.h>
16	#include <__memory/shared_ptr.h>	16	#include <__memory/shared_ptr.h>
		17	#include <__utility/forward.h>
17	#include <iosfwd>	18	#include <iosfwd>
18	#include <new>	19	#include <new>
19	#include <system_error>	20	#include <system_error>
...	@@ -60,7 +61,7 @@ public:	...	@@ -60,7 +61,7 @@ public:
60	filesystem_error(const filesystem_error&) = default;	61	filesystem_error(const filesystem_error&) = default;
61	~filesystem_error() override; // key function	62	~filesystem_error() override; // key function
62		63
63	_LIBCPP_INLINE_VISIBILITY	64	_LIBCPP_HIDE_FROM_ABI_VIRTUAL
64	const char* what() const noexcept override {	65	const char* what() const noexcept override {
65	return __storage_->__what_.c_str();	66	return __storage_->__what_.c_str();
66	}	67	}

lib/libcxx/include/__filesystem/path.h+37-30

 @@ -141,15 +141,15 @@ struct __is_pathable_string<
 template <class _Source, class _DS = typename decay<_Source>::type,
           class _UnqualPtrType =
-              typename remove_const<typename remove_pointer<_DS>::type>::type,
+              __remove_const_t<__remove_pointer_t<_DS> >,
           bool _IsCharPtr = is_pointer<_DS>::value&&
               __can_convert_char<_UnqualPtrType>::value>
 struct __is_pathable_char_array : false_type {};
 template <class _Source, class _ECharT, class _UPtr>
 struct __is_pathable_char_array<_Source, _ECharT*, _UPtr, true>
-    : __can_convert_char<typename remove_const<_ECharT>::type> {
+    : __can_convert_char<__remove_const_t<_ECharT> > {
-  using _Base = __can_convert_char<typename remove_const<_ECharT>::type>;
+  using _Base = __can_convert_char<__remove_const_t<_ECharT> >;
   _LIBCPP_HIDE_FROM_ABI
   static _ECharT const* __range_begin(const _ECharT* __b) { return __b; }
 @@ -619,7 +619,7 @@ public:
   _EnableIfPathable<_Source> append(const _Source& __src) {
     using _Traits = __is_pathable<_Source>;
     using _CVT = _PathCVT<_SourceChar<_Source> >;
-    bool __source_is_absolute = __is_separator(_Traits::__first_or_null(__src));
+    bool __source_is_absolute = _VSTD_FS::__is_separator(_Traits::__first_or_null(__src));
     if (__source_is_absolute)
       __pn_.clear();
     else if (has_filename())
 @@ -634,7 +634,7 @@ public:
     typedef typename iterator_traits<_InputIt>::value_type _ItVal;
     static_assert(__can_convert_char<_ItVal>::value, "Must convertible");
     using _CVT = _PathCVT<_ItVal>;
-    if (__first != __last && __is_separator(*__first))
+    if (__first != __last && _VSTD_FS::__is_separator(*__first))
       __pn_.clear();
     else if (has_filename())
       __pn_ += preferred_separator;
 @@ -732,6 +732,37 @@ public:
   path& replace_extension(const path& __replacement = path());
+  friend _LIBCPP_HIDE_FROM_ABI bool operator==(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) == 0;
+  }
+#  if _LIBCPP_STD_VER <= 17
+  friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) != 0;
+  }
+  friend _LIBCPP_HIDE_FROM_ABI bool operator<(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) < 0;
+  }
+  friend _LIBCPP_HIDE_FROM_ABI bool operator<=(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) <= 0;
+  }
+  friend _LIBCPP_HIDE_FROM_ABI bool operator>(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) > 0;
+  }
+  friend _LIBCPP_HIDE_FROM_ABI bool operator>=(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) >= 0;
+  }
+#  else // _LIBCPP_STD_VER <= 17
+  friend _LIBCPP_HIDE_FROM_ABI strong_ordering operator<=>(const path& __lhs, const path& __rhs) noexcept {
+    return __lhs.__compare(__rhs.__pn_) <=> 0;
+  }
+#  endif // _LIBCPP_STD_VER <= 17
+  friend _LIBCPP_HIDE_FROM_ABI path operator/(const path& __lhs, const path& __rhs) {
+    path __result(__lhs);
+    __result /= __rhs;
+    return __result;
+  }
   _LIBCPP_HIDE_FROM_ABI
   void swap(path& __rhs) noexcept { __pn_.swap(__rhs.__pn_); }
 @@ -835,7 +866,7 @@ public:
     using _Str = basic_string<_ECharT, _Traits, _Allocator>;
     _Str __s(__a);
     __s.reserve(__pn_.size());
-    _CVT()(back_inserter(__s), __pn_.data(), __pn_.data() + __pn_.size());
+    _CVT()(std::back_inserter(__s), __pn_.data(), __pn_.data() + __pn_.size());
     return __s;
   }
 @@ -1035,30 +1066,6 @@ public:
   }
 #endif // !_LIBCPP_HAS_NO_LOCALIZATION
-  friend _LIBCPP_HIDE_FROM_ABI bool operator==(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) == 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) != 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator<(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) < 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator<=(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) <= 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator>(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) > 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator>=(const path& __lhs, const path& __rhs) noexcept {
-    return __lhs.__compare(__rhs.__pn_) >= 0;
-  }
-  friend _LIBCPP_HIDE_FROM_ABI path operator/(const path& __lhs, const path& __rhs) {
-    path __result(__lhs);
-    __result /= __rhs;
-    return __result;
-  }
 private:
   inline _LIBCPP_HIDE_FROM_ABI path&
   __assign_view(__string_view const& __s) noexcept {

lib/libcxx/include/__filesystem/space_info.h+4

 @@ -28,6 +28,10 @@ struct _LIBCPP_TYPE_VIS space_info {
   uintmax_t capacity;
   uintmax_t free;
   uintmax_t available;
+#  if _LIBCPP_STD_VER > 17
+  friend _LIBCPP_HIDE_FROM_ABI bool operator==(const space_info&, const space_info&) = default;
+#  endif
 };
 _LIBCPP_AVAILABILITY_FILESYSTEM_POP

lib/libcxx/include/__format/buffer.h+283-79

...	@@ -11,22 +11,27 @@	...	@@ -11,22 +11,27 @@
11	#define _LIBCPP___FORMAT_BUFFER_H	11	#define _LIBCPP___FORMAT_BUFFER_H
12		12
13	#include <__algorithm/copy_n.h>	13	#include <__algorithm/copy_n.h>
		14	#include <__algorithm/fill_n.h>
14	#include <__algorithm/max.h>	15	#include <__algorithm/max.h>
15	#include <__algorithm/min.h>	16	#include <__algorithm/min.h>
		17	#include <__algorithm/ranges_copy_n.h>
		18	#include <__algorithm/transform.h>
16	#include <__algorithm/unwrap_iter.h>	19	#include <__algorithm/unwrap_iter.h>
		20	#include <__concepts/same_as.h>
17	#include <__config>	21	#include <__config>
		22	#include <__format/concepts.h>
18	#include <__format/enable_insertable.h>	23	#include <__format/enable_insertable.h>
19	#include <__format/format_to_n_result.h>	24	#include <__format/format_to_n_result.h>
20	#include <__format/formatter.h> // for __char_type TODO FMT Move the concept?
21	#include <__iterator/back_insert_iterator.h>	25	#include <__iterator/back_insert_iterator.h>
22	#include <__iterator/concepts.h>	26	#include <__iterator/concepts.h>
23	#include <__iterator/incrementable_traits.h>	27	#include <__iterator/incrementable_traits.h>
24	#include <__iterator/iterator_traits.h>	28	#include <__iterator/iterator_traits.h>
25	#include <__iterator/wrap_iter.h>	29	#include <__iterator/wrap_iter.h>
26	#include <__utility/move.h>	30	#include <__utility/move.h>
27	#include <concepts>
28	#include <cstddef>	31	#include <cstddef>
		32	#include <string_view>
29	#include <type_traits>	33	#include <type_traits>
		34	#include <vector>
30		35
31	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	36	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
32	# pragma GCC system_header	37	# pragma GCC system_header
...	@@ -46,41 +51,125 @@ namespace __format {	...	@@ -46,41 +51,125 @@ namespace __format {
46	/// This helper is used together with the @ref back_insert_iterator to offer	51	/// This helper is used together with the @ref back_insert_iterator to offer
47	/// type-erasure for the formatting functions. This reduces the number to	52	/// type-erasure for the formatting functions. This reduces the number to
48	/// template instantiations.	53	/// template instantiations.
49	template <__formatter::__char_type _CharT>	54	template <__fmt_char_type _CharT>
50	class _LIBCPP_TEMPLATE_VIS __output_buffer {	55	class _LIBCPP_TEMPLATE_VIS __output_buffer {
51	public:	56	public:
52	using value_type = _CharT;	57	using value_type = _CharT;
53		58
54	template <class _Tp>	59	template <class _Tp>
55	_LIBCPP_HIDE_FROM_ABI explicit __output_buffer(_CharT* __ptr,	60	_LIBCPP_HIDE_FROM_ABI explicit __output_buffer(_CharT* __ptr, size_t __capacity, _Tp* __obj)
56	size_t __capacity, _Tp* __obj)	61	: __ptr_(__ptr),
57	: __ptr_(__ptr), __capacity_(__capacity),	62	__capacity_(__capacity),
58	__flush_([](_CharT* __p, size_t __size, void* __o) {	63	__flush_([](_CharT* __p, size_t __n, void* __o) { static_cast<_Tp*>(__o)->__flush(__p, __n); }),
59	static_cast<_Tp*>(__o)->flush(__p, __size);
60	}),
61	__obj_(__obj) {}	64	__obj_(__obj) {}
62		65
63	_LIBCPP_HIDE_FROM_ABI void reset(_CharT* __ptr, size_t __capacity) {	66	_LIBCPP_HIDE_FROM_ABI void __reset(_CharT* __ptr, size_t __capacity) {
64	__ptr_ = __ptr;	67	__ptr_ = __ptr;
65	__capacity_ = __capacity;	68	__capacity_ = __capacity;
66	}	69	}
67		70
68	_LIBCPP_HIDE_FROM_ABI auto make_output_iterator() {	71	_LIBCPP_HIDE_FROM_ABI auto __make_output_iterator() { return std::back_insert_iterator{*this}; }
69	return back_insert_iterator{*this};
70	}
71		72
72	// TODO FMT It would be nice to have an overload taking a	73	// Used in std::back_insert_iterator.
73	// basic_string_view<_CharT> and append it directly.
74	_LIBCPP_HIDE_FROM_ABI void push_back(_CharT __c) {	74	_LIBCPP_HIDE_FROM_ABI void push_back(_CharT __c) {
75	__ptr_[__size_++] = __c;	75	__ptr_[__size_++] = __c;
76		76
77	// Profiling showed flushing after adding is more efficient than flushing	77	// Profiling showed flushing after adding is more efficient than flushing
78	// when entering the function.	78	// when entering the function.
79	if (__size_ == __capacity_)	79	if (__size_ == __capacity_)
80	flush();	80	__flush();
		81	}
		82
		83	/// Copies the input __str to the buffer.
		84	///
		85	/// Since some of the input is generated by std::to_chars, there needs to be a
		86	/// conversion when _CharT is wchar_t.
		87	template <__fmt_char_type _InCharT>
		88	_LIBCPP_HIDE_FROM_ABI void __copy(basic_string_view<_InCharT> __str) {
		89	// When the underlying iterator is a simple iterator the __capacity_ is
		90	// infinite. For a string or container back_inserter it isn't. This means
		91	// adding a large string the the buffer can cause some overhead. In that
		92	// case a better approach could be:
		93	// - flush the buffer
		94	// - container.append(__str.begin(), __str.end());
		95	// The same holds true for the fill.
		96	// For transform it might be slightly harder, however the use case for
		97	// transform is slightly less common; it converts hexadecimal values to
		98	// upper case. For integral these strings are short.
		99	// TODO FMT Look at the improvements above.
		100	size_t __n = __str.size();
		101
		102	__flush_on_overflow(__n);
		103	if (__n <= __capacity_) {
		104	_VSTD::copy_n(__str.data(), __n, _VSTD::addressof(__ptr_[__size_]));
		105	__size_ += __n;
		106	return;
		107	}
		108
		109	// The output doesn't fit in the internal buffer.
		110	// Copy the data in "__capacity_" sized chunks.
		111	_LIBCPP_ASSERT(__size_ == 0, "the buffer should be flushed by __flush_on_overflow");
		112	const _InCharT* __first = __str.data();
		113	do {
		114	size_t __chunk = _VSTD::min(__n, __capacity_);
		115	_VSTD::copy_n(__first, __chunk, _VSTD::addressof(__ptr_[__size_]));
		116	__size_ = __chunk;
		117	__first += __chunk;
		118	__n -= __chunk;
		119	__flush();
		120	} while (__n);
		121	}
		122
		123	/// A std::transform wrapper.
		124	///
		125	/// Like @ref __copy it may need to do type conversion.
		126	template <__fmt_char_type _InCharT, class _UnaryOperation>
		127	_LIBCPP_HIDE_FROM_ABI void __transform(const _InCharT* __first, const _InCharT* __last, _UnaryOperation __operation) {
		128	_LIBCPP_ASSERT(__first <= __last, "not a valid range");
		129
		130	size_t __n = static_cast<size_t>(__last - __first);
		131	__flush_on_overflow(__n);
		132	if (__n <= __capacity_) {
		133	_VSTD::transform(__first, __last, _VSTD::addressof(__ptr_[__size_]), _VSTD::move(__operation));
		134	__size_ += __n;
		135	return;
		136	}
		137
		138	// The output doesn't fit in the internal buffer.
		139	// Transform the data in "__capacity_" sized chunks.
		140	_LIBCPP_ASSERT(__size_ == 0, "the buffer should be flushed by __flush_on_overflow");
		141	do {
		142	size_t __chunk = _VSTD::min(__n, __capacity_);
		143	_VSTD::transform(__first, __first + __chunk, _VSTD::addressof(__ptr_[__size_]), __operation);
		144	__size_ = __chunk;
		145	__first += __chunk;
		146	__n -= __chunk;
		147	__flush();
		148	} while (__n);
		149	}
		150
		151	/// A \c fill_n wrapper.
		152	_LIBCPP_HIDE_FROM_ABI void __fill(size_t __n, _CharT __value) {
		153	__flush_on_overflow(__n);
		154	if (__n <= __capacity_) {
		155	_VSTD::fill_n(_VSTD::addressof(__ptr_[__size_]), __n, __value);
		156	__size_ += __n;
		157	return;
		158	}
		159
		160	// The output doesn't fit in the internal buffer.
		161	// Fill the buffer in "__capacity_" sized chunks.
		162	_LIBCPP_ASSERT(__size_ == 0, "the buffer should be flushed by __flush_on_overflow");
		163	do {
		164	size_t __chunk = _VSTD::min(__n, __capacity_);
		165	_VSTD::fill_n(_VSTD::addressof(__ptr_[__size_]), __chunk, __value);
		166	__size_ = __chunk;
		167	__n -= __chunk;
		168	__flush();
		169	} while (__n);
81	}	170	}
82		171
83	_LIBCPP_HIDE_FROM_ABI void flush() {	172	_LIBCPP_HIDE_FROM_ABI void __flush() {
84	__flush_(__ptr_, __size_, __obj_);	173	__flush_(__ptr_, __size_, __obj_);
85	__size_ = 0;	174	__size_ = 0;
86	}	175	}
...	@@ -91,16 +180,54 @@ private:	...	@@ -91,16 +180,54 @@ private:
91	size_t __size_{0};	180	size_t __size_{0};
92	void (__flush_)(_CharT, size_t, void*);	181	void (__flush_)(_CharT, size_t, void*);
93	void* __obj_;	182	void* __obj_;
		183
		184	/// Flushes the buffer when the output operation would overflow the buffer.
		185	///
		186	/// A simple approach for the overflow detection would be something along the
		187	/// lines:
		188	/// \code
		189	/// // The internal buffer is large enough.
		190	/// if (__n <= __capacity_) {
		191	/// // Flush when we really would overflow.
		192	/// if (__size_ + __n >= __capacity_)
		193	/// __flush();
		194	/// ...
		195	/// }
		196	/// \endcode
		197	///
		198	/// This approach works for all cases but one:
		199	/// A __format_to_n_buffer_base where \ref __enable_direct_output is true.
		200	/// In that case the \ref __capacity_ of the buffer changes during the first
		201	/// \ref __flush. During that operation the output buffer switches from its
		202	/// __writer_ to its __storage_. The \ref __capacity_ of the former depends
		203	/// on the value of n, of the latter is a fixed size. For example:
		204	/// - a format_to_n call with a 10'000 char buffer,
		205	/// - the buffer is filled with 9'500 chars,
		206	/// - adding 1'000 elements would overflow the buffer so the buffer gets
		207	/// changed and the \ref __capacity_ decreases from 10'000 to
		208	/// __buffer_size (256 at the time of writing).
		209	///
		210	/// This means that the \ref __flush for this class may need to copy a part of
		211	/// the internal buffer to the proper output. In this example there will be
		212	/// 500 characters that need this copy operation.
		213	///
		214	/// Note it would be more efficient to write 500 chars directly and then swap
		215	/// the buffers. This would make the code more complex and \ref format_to_n is
		216	/// not the most common use case. Therefore the optimization isn't done.
		217	_LIBCPP_HIDE_FROM_ABI void __flush_on_overflow(size_t __n) {
		218	if (__size_ + __n >= __capacity_)
		219	__flush();
		220	}
94	};	221	};
95		222
96	/// A storage using an internal buffer.	223	/// A storage using an internal buffer.
97	///	224	///
98	/// This storage is used when writing a single element to the output iterator	225	/// This storage is used when writing a single element to the output iterator
99	/// is expensive.	226	/// is expensive.
100	template <__formatter::__char_type _CharT>	227	template <__fmt_char_type _CharT>
101	class _LIBCPP_TEMPLATE_VIS __internal_storage {	228	class _LIBCPP_TEMPLATE_VIS __internal_storage {
102	public:	229	public:
103	_LIBCPP_HIDE_FROM_ABI _CharT* begin() { return __buffer_; }	230	_LIBCPP_HIDE_FROM_ABI _CharT* __begin() { return __buffer_; }
104		231
105	static constexpr size_t __buffer_size = 256 / sizeof(_CharT);	232	static constexpr size_t __buffer_size = 256 / sizeof(_CharT);
106		233
...	@@ -113,11 +240,11 @@ private:	...	@@ -113,11 +240,11 @@ private:
113	/// This requires the storage to be a contiguous buffer of \a _CharT.	240	/// This requires the storage to be a contiguous buffer of \a _CharT.
114	/// Since the output is directly written to the underlying storage this class	241	/// Since the output is directly written to the underlying storage this class
115	/// is just an empty class.	242	/// is just an empty class.
116	template <__formatter::__char_type _CharT>	243	template <__fmt_char_type _CharT>
117	class _LIBCPP_TEMPLATE_VIS __direct_storage {};	244	class _LIBCPP_TEMPLATE_VIS __direct_storage {};
118		245
119	template <class _OutIt, class _CharT>	246	template <class _OutIt, class _CharT>
120	concept __enable_direct_output = __formatter::__char_type<_CharT> &&	247	concept __enable_direct_output = __fmt_char_type<_CharT> &&
121	(same_as<_OutIt, _CharT*>	248	(same_as<_OutIt, _CharT*>
122	#ifndef _LIBCPP_ENABLE_DEBUG_MODE	249	#ifndef _LIBCPP_ENABLE_DEBUG_MODE
123	\|\| same_as<_OutIt, __wrap_iter<_CharT*>>	250	\|\| same_as<_OutIt, __wrap_iter<_CharT*>>
...	@@ -125,18 +252,18 @@ concept __enable_direct_output = __formatter::__char_type<_CharT> &&	...	@@ -125,18 +252,18 @@ concept __enable_direct_output = __formatter::__char_type<_CharT> &&
125	);	252	);
126		253
127	/// Write policy for directly writing to the underlying output.	254	/// Write policy for directly writing to the underlying output.
128	template <class _OutIt, __formatter::__char_type _CharT>	255	template <class _OutIt, __fmt_char_type _CharT>
129	class _LIBCPP_TEMPLATE_VIS __writer_direct {	256	class _LIBCPP_TEMPLATE_VIS __writer_direct {
130	public:	257	public:
131	_LIBCPP_HIDE_FROM_ABI explicit __writer_direct(_OutIt __out_it)	258	_LIBCPP_HIDE_FROM_ABI explicit __writer_direct(_OutIt __out_it)
132	: __out_it_(__out_it) {}	259	: __out_it_(__out_it) {}
133		260
134	_LIBCPP_HIDE_FROM_ABI auto out() { return __out_it_; }	261	_LIBCPP_HIDE_FROM_ABI _OutIt __out_it() { return __out_it_; }
135		262
136	_LIBCPP_HIDE_FROM_ABI void flush(_CharT*, size_t __size) {	263	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT*, size_t __n) {
137	// _OutIt can be a __wrap_iter<CharT*>. Therefore the original iterator	264	// _OutIt can be a __wrap_iter<CharT*>. Therefore the original iterator
138	// is adjusted.	265	// is adjusted.
139	__out_it_ += __size;	266	__out_it_ += __n;
140	}	267	}
141		268
142	private:	269	private:
...	@@ -144,16 +271,16 @@ private:	...	@@ -144,16 +271,16 @@ private:
144	};	271	};
145		272
146	/// Write policy for copying the buffer to the output.	273	/// Write policy for copying the buffer to the output.
147	template <class _OutIt, __formatter::__char_type _CharT>	274	template <class _OutIt, __fmt_char_type _CharT>
148	class _LIBCPP_TEMPLATE_VIS __writer_iterator {	275	class _LIBCPP_TEMPLATE_VIS __writer_iterator {
149	public:	276	public:
150	_LIBCPP_HIDE_FROM_ABI explicit __writer_iterator(_OutIt __out_it)	277	_LIBCPP_HIDE_FROM_ABI explicit __writer_iterator(_OutIt __out_it)
151	: __out_it_{_VSTD::move(__out_it)} {}	278	: __out_it_{_VSTD::move(__out_it)} {}
152		279
153	_LIBCPP_HIDE_FROM_ABI auto out() { return __out_it_; }	280	_LIBCPP_HIDE_FROM_ABI _OutIt __out_it() && { return std::move(__out_it_); }
154		281
155	_LIBCPP_HIDE_FROM_ABI void flush(_CharT* __ptr, size_t __size) {	282	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT* __ptr, size_t __n) {
156	__out_it_ = _VSTD::copy_n(__ptr, __size, _VSTD::move(__out_it_));	283	__out_it_ = std::ranges::copy_n(__ptr, __n, std::move(__out_it_)).out;
157	}	284	}
158		285
159	private:	286	private:
...	@@ -169,7 +296,7 @@ private:	...	@@ -169,7 +296,7 @@ private:
169	/// \ref __enable_insertable.	296	/// \ref __enable_insertable.
170	template <class _Container>	297	template <class _Container>
171	concept __insertable =	298	concept __insertable =
172	__enable_insertable<_Container> && __formatter::__char_type<typename _Container::value_type> &&	299	__enable_insertable<_Container> && __fmt_char_type<typename _Container::value_type> &&
173	requires(_Container& __t, add_pointer_t<typename _Container::value_type> __first,	300	requires(_Container& __t, add_pointer_t<typename _Container::value_type> __first,
174	add_pointer_t<typename _Container::value_type> __last) { __t.insert(__t.end(), __first, __last); };	301	add_pointer_t<typename _Container::value_type> __last) { __t.insert(__t.end(), __first, __last); };
175		302
...	@@ -193,10 +320,10 @@ public:	...	@@ -193,10 +320,10 @@ public:
193	_LIBCPP_HIDE_FROM_ABI explicit __writer_container(back_insert_iterator<_Container> __out_it)	320	_LIBCPP_HIDE_FROM_ABI explicit __writer_container(back_insert_iterator<_Container> __out_it)
194	: __container_{__out_it.__get_container()} {}	321	: __container_{__out_it.__get_container()} {}
195		322
196	_LIBCPP_HIDE_FROM_ABI auto out() { return back_inserter(*__container_); }	323	_LIBCPP_HIDE_FROM_ABI auto __out_it() { return std::back_inserter(*__container_); }
197		324
198	_LIBCPP_HIDE_FROM_ABI void flush(_CharT* __ptr, size_t __size) {	325	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT* __ptr, size_t __n) {
199	__container_->insert(__container_->end(), __ptr, __ptr + __size);	326	__container_->insert(__container_->end(), __ptr, __ptr + __n);
200	}	327	}
201		328
202	private:	329	private:
...	@@ -215,7 +342,7 @@ public:	...	@@ -215,7 +342,7 @@ public:
215	};	342	};
216		343
217	/// The generic formatting buffer.	344	/// The generic formatting buffer.
218	template <class _OutIt, __formatter::__char_type _CharT>	345	template <class _OutIt, __fmt_char_type _CharT>
219	requires(output_iterator<_OutIt, const _CharT&>) class _LIBCPP_TEMPLATE_VIS	346	requires(output_iterator<_OutIt, const _CharT&>) class _LIBCPP_TEMPLATE_VIS
220	__format_buffer {	347	__format_buffer {
221	using _Storage =	348	using _Storage =
...	@@ -225,24 +352,20 @@ requires(output_iterator<_OutIt, const _CharT&>) class _LIBCPP_TEMPLATE_VIS	...	@@ -225,24 +352,20 @@ requires(output_iterator<_OutIt, const _CharT&>) class _LIBCPP_TEMPLATE_VIS
225	public:	352	public:
226	_LIBCPP_HIDE_FROM_ABI explicit __format_buffer(_OutIt __out_it)	353	_LIBCPP_HIDE_FROM_ABI explicit __format_buffer(_OutIt __out_it)
227	requires(same_as<_Storage, __internal_storage<_CharT>>)	354	requires(same_as<_Storage, __internal_storage<_CharT>>)
228	: __output_(__storage_.begin(), __storage_.__buffer_size, this), __writer_(_VSTD::move(__out_it)) {}	355	: __output_(__storage_.__begin(), __storage_.__buffer_size, this), __writer_(_VSTD::move(__out_it)) {}
229		356
230	_LIBCPP_HIDE_FROM_ABI explicit __format_buffer(_OutIt __out_it) requires(	357	_LIBCPP_HIDE_FROM_ABI explicit __format_buffer(_OutIt __out_it) requires(
231	same_as<_Storage, __direct_storage<_CharT>>)	358	same_as<_Storage, __direct_storage<_CharT>>)
232	: __output_(_VSTD::__unwrap_iter(__out_it), size_t(-1), this),	359	: __output_(_VSTD::__unwrap_iter(__out_it), size_t(-1), this),
233	__writer_(_VSTD::move(__out_it)) {}	360	__writer_(_VSTD::move(__out_it)) {}
234		361
235	_LIBCPP_HIDE_FROM_ABI auto make_output_iterator() {	362	_LIBCPP_HIDE_FROM_ABI auto __make_output_iterator() { return __output_.__make_output_iterator(); }
236	return __output_.make_output_iterator();
237	}
238		363
239	_LIBCPP_HIDE_FROM_ABI void flush(_CharT* __ptr, size_t __size) {	364	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT* __ptr, size_t __n) { __writer_.__flush(__ptr, __n); }
240	__writer_.flush(__ptr, __size);
241	}
242		365
243	_LIBCPP_HIDE_FROM_ABI _OutIt out() && {	366	_LIBCPP_HIDE_FROM_ABI _OutIt __out_it() && {
244	__output_.flush();	367	__output_.__flush();
245	return _VSTD::move(__writer_).out();	368	return _VSTD::move(__writer_).__out_it();
246	}	369	}
247		370
248	private:	371	private:
...	@@ -255,46 +378,46 @@ private:	...	@@ -255,46 +378,46 @@ private:
255	///	378	///
256	/// Since \ref formatted_size only needs to know the size, the output itself is	379	/// Since \ref formatted_size only needs to know the size, the output itself is
257	/// discarded.	380	/// discarded.
258	template <__formatter::__char_type _CharT>	381	template <__fmt_char_type _CharT>
259	class _LIBCPP_TEMPLATE_VIS __formatted_size_buffer {	382	class _LIBCPP_TEMPLATE_VIS __formatted_size_buffer {
260	public:	383	public:
261	_LIBCPP_HIDE_FROM_ABI auto make_output_iterator() { return __output_.make_output_iterator(); }	384	_LIBCPP_HIDE_FROM_ABI auto __make_output_iterator() { return __output_.__make_output_iterator(); }
262		385
263	_LIBCPP_HIDE_FROM_ABI void flush(const _CharT*, size_t __size) { __size_ += __size; }	386	_LIBCPP_HIDE_FROM_ABI void __flush(const _CharT*, size_t __n) { __size_ += __n; }
264		387
265	_LIBCPP_HIDE_FROM_ABI size_t result() && {	388	_LIBCPP_HIDE_FROM_ABI size_t __result() && {
266	__output_.flush();	389	__output_.__flush();
267	return __size_;	390	return __size_;
268	}	391	}
269		392
270	private:	393	private:
271	__internal_storage<_CharT> __storage_;	394	__internal_storage<_CharT> __storage_;
272	__output_buffer<_CharT> __output_{__storage_.begin(), __storage_.__buffer_size, this};	395	__output_buffer<_CharT> __output_{__storage_.__begin(), __storage_.__buffer_size, this};
273	size_t __size_{0};	396	size_t __size_{0};
274	};	397	};
275		398
276	/// The base of a buffer that counts and limits the number of insertions.	399	/// The base of a buffer that counts and limits the number of insertions.
277	template <class _OutIt, __formatter::__char_type _CharT, bool>	400	template <class _OutIt, __fmt_char_type _CharT, bool>
278	requires(output_iterator<_OutIt, const _CharT&>)	401	requires(output_iterator<_OutIt, const _CharT&>)
279	struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer_base {	402	struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer_base {
280	using _Size = iter_difference_t<_OutIt>;	403	using _Size = iter_difference_t<_OutIt>;
281		404
282	public:	405	public:
283	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer_base(_OutIt __out_it, _Size __n)	406	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer_base(_OutIt __out_it, _Size __max_size)
284	: __writer_(_VSTD::move(__out_it)), __n_(_VSTD::max(_Size(0), __n)) {}	407	: __writer_(_VSTD::move(__out_it)), __max_size_(_VSTD::max(_Size(0), __max_size)) {}
285		408
286	_LIBCPP_HIDE_FROM_ABI void flush(_CharT* __ptr, size_t __size) {	409	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT* __ptr, size_t __n) {
287	if (_Size(__size_) <= __n_)	410	if (_Size(__size_) <= __max_size_)
288	__writer_.flush(__ptr, _VSTD::min(_Size(__size), __n_ - __size_));	411	__writer_.__flush(__ptr, _VSTD::min(_Size(__n), __max_size_ - __size_));
289	__size_ += __size;	412	__size_ += __n;
290	}	413	}
291		414
292	protected:	415	protected:
293	__internal_storage<_CharT> __storage_;	416	__internal_storage<_CharT> __storage_;
294	__output_buffer<_CharT> __output_{__storage_.begin(), __storage_.__buffer_size, this};	417	__output_buffer<_CharT> __output_{__storage_.__begin(), __storage_.__buffer_size, this};
295	typename __writer_selector<_OutIt, _CharT>::type __writer_;	418	typename __writer_selector<_OutIt, _CharT>::type __writer_;
296		419
297	_Size __n_;	420	_Size __max_size_;
298	_Size __size_{0};	421	_Size __size_{0};
299	};	422	};
300		423
...	@@ -302,35 +425,46 @@ protected:	...	@@ -302,35 +425,46 @@ protected:
302	///	425	///
303	/// This version is used when \c __enable_direct_output<_OutIt, _CharT> == true.	426	/// This version is used when \c __enable_direct_output<_OutIt, _CharT> == true.
304	///	427	///
305	/// This class limits the size available the the direct writer so it will not	428	/// This class limits the size available to the direct writer so it will not
306	/// exceed the maximum number of code units.	429	/// exceed the maximum number of code units.
307	template <class _OutIt, __formatter::__char_type _CharT>	430	template <class _OutIt, __fmt_char_type _CharT>
308	requires(output_iterator<_OutIt, const _CharT&>)	431	requires(output_iterator<_OutIt, const _CharT&>)
309	class _LIBCPP_TEMPLATE_VIS __format_to_n_buffer_base<_OutIt, _CharT, true> {	432	class _LIBCPP_TEMPLATE_VIS __format_to_n_buffer_base<_OutIt, _CharT, true> {
310	using _Size = iter_difference_t<_OutIt>;	433	using _Size = iter_difference_t<_OutIt>;
311		434
312	public:	435	public:
313	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer_base(_OutIt __out_it, _Size __n)	436	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer_base(_OutIt __out_it, _Size __max_size)
314	: __output_(_VSTD::__unwrap_iter(__out_it), __n, this), __writer_(_VSTD::move(__out_it)) {	437	: __output_(_VSTD::__unwrap_iter(__out_it), __max_size, this),
315	if (__n <= 0) [[unlikely]]	438	__writer_(_VSTD::move(__out_it)),
316	__output_.reset(__storage_.begin(), __storage_.__buffer_size);	439	__max_size_(__max_size) {
		440	if (__max_size <= 0) [[unlikely]]
		441	__output_.__reset(__storage_.__begin(), __storage_.__buffer_size);
317	}	442	}
318		443
319	_LIBCPP_HIDE_FROM_ABI void flush(_CharT* __ptr, size_t __size) {	444	_LIBCPP_HIDE_FROM_ABI void __flush(_CharT* __ptr, size_t __n) {
320	// A flush to the direct writer happens in two occasions:	445	// A __flush to the direct writer happens in the following occasions:
321	// - The format function has written the maximum number of allowed code	446	// - The format function has written the maximum number of allowed code
322	// units. At this point it's no longer valid to write to this writer. So	447	// units. At this point it's no longer valid to write to this writer. So
323	// switch to the internal storage. This internal storage doesn't need to	448	// switch to the internal storage. This internal storage doesn't need to
324	// be written anywhere so the flush for that storage writes no output.	449	// be written anywhere so the __flush for that storage writes no output.
		450	// - Like above, but the next "mass write" operation would overflow the
		451	// buffer. In that case the buffer is pre-emptively switched. The still
		452	// valid code units will be written separately.
325	// - The format_to_n function is finished. In this case there's no need to	453	// - The format_to_n function is finished. In this case there's no need to
326	// switch the buffer, but for simplicity the buffers are still switched.	454	// switch the buffer, but for simplicity the buffers are still switched.
327	// When the __n <= 0 the constructor already switched the buffers.	455	// When the __max_size <= 0 the constructor already switched the buffers.
328	if (__size_ == 0 && __ptr != __storage_.begin()) {	456	if (__size_ == 0 && __ptr != __storage_.__begin()) {
329	__writer_.flush(__ptr, __size);	457	__writer_.__flush(__ptr, __n);
330	__output_.reset(__storage_.begin(), __storage_.__buffer_size);	458	__output_.__reset(__storage_.__begin(), __storage_.__buffer_size);
		459	} else if (__size_ < __max_size_) {
		460	// Copies a part of the internal buffer to the output up to n characters.
		461	// See __output_buffer<_CharT>::__flush_on_overflow for more information.
		462	_Size __s = _VSTD::min(_Size(__n), __max_size_ - __size_);
		463	std::copy_n(__ptr, __s, __writer_.__out_it());
		464	__writer_.__flush(__ptr, __s);
331	}	465	}
332		466
333	__size_ += __size;	467	__size_ += __n;
334	}	468	}
335		469
336	protected:	470	protected:
...	@@ -338,11 +472,12 @@ protected:	...	@@ -338,11 +472,12 @@ protected:
338	__output_buffer<_CharT> __output_;	472	__output_buffer<_CharT> __output_;
339	__writer_direct<_OutIt, _CharT> __writer_;	473	__writer_direct<_OutIt, _CharT> __writer_;
340		474
		475	_Size __max_size_;
341	_Size __size_{0};	476	_Size __size_{0};
342	};	477	};
343		478
344	/// The buffer that counts and limits the number of insertions.	479	/// The buffer that counts and limits the number of insertions.
345	template <class _OutIt, __formatter::__char_type _CharT>	480	template <class _OutIt, __fmt_char_type _CharT>
346	requires(output_iterator<_OutIt, const _CharT&>)	481	requires(output_iterator<_OutIt, const _CharT&>)
347	struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer final	482	struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer final
348	: public __format_to_n_buffer_base< _OutIt, _CharT, __enable_direct_output<_OutIt, _CharT>> {	483	: public __format_to_n_buffer_base< _OutIt, _CharT, __enable_direct_output<_OutIt, _CharT>> {
...	@@ -350,14 +485,83 @@ struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer final	...	@@ -350,14 +485,83 @@ struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer final
350	using _Size = iter_difference_t<_OutIt>;	485	using _Size = iter_difference_t<_OutIt>;
351		486
352	public:	487	public:
353	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer(_OutIt __out_it, _Size __n) : _Base(_VSTD::move(__out_it), __n) {}	488	_LIBCPP_HIDE_FROM_ABI explicit __format_to_n_buffer(_OutIt __out_it, _Size __max_size)
354	_LIBCPP_HIDE_FROM_ABI auto make_output_iterator() { return this->__output_.make_output_iterator(); }	489	: _Base(_VSTD::move(__out_it), __max_size) {}
		490	_LIBCPP_HIDE_FROM_ABI auto __make_output_iterator() { return this->__output_.__make_output_iterator(); }
		491
		492	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> __result() && {
		493	this->__output_.__flush();
		494	return {_VSTD::move(this->__writer_).__out_it(), this->__size_};
		495	}
		496	};
		497
		498	// A dynamically growing buffer intended to be used for retargeting a context.
		499	//
		500	// P2286 Formatting ranges adds range formatting support. It allows the user to
		501	// specify the minimum width for the entire formatted range. The width of the
		502	// range is not known until the range is formatted. Formatting is done to an
		503	// output_iterator so there's no guarantee it would be possible to add the fill
		504	// to the front of the output. Instead the range is formatted to a temporary
		505	// buffer and that buffer is formatted as a string.
		506	//
		507	// There is an issue with that approach, the format context used in
		508	// std::formatter<T>::format contains the output iterator used as part of its
		509	// type. So using this output iterator means there needs to be a new format
		510	// context and the format arguments need to be retargeted to the new context.
		511	// This retargeting is done by a basic_format_context specialized for the
		512	// __iterator of this container.
		513	template <__fmt_char_type _CharT>
		514	class _LIBCPP_TEMPLATE_VIS __retarget_buffer {
		515	public:
		516	using value_type = _CharT;
		517
		518	struct __iterator {
		519	using difference_type = ptrdiff_t;
		520
		521	_LIBCPP_HIDE_FROM_ABI constexpr explicit __iterator(__retarget_buffer& __buffer)
		522	: __buffer_(std::addressof(__buffer)) {}
		523	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator=(const _CharT& __c) {
		524	__buffer_->push_back(__c);
		525	return *this;
		526	}
		527	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator=(_CharT&& __c) {
		528	__buffer_->push_back(__c);
		529	return *this;
		530	}
		531
		532	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator() { return this; }
		533	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() { return *this; }
		534	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator++(int) { return *this; }
		535	__retarget_buffer* __buffer_;
		536	};
355		537
356	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> result() && {	538	_LIBCPP_HIDE_FROM_ABI explicit __retarget_buffer(size_t __size_hint) { __buffer_.reserve(__size_hint); }
357	this->__output_.flush();	539
358	return {_VSTD::move(this->__writer_).out(), this->__size_};	540	_LIBCPP_HIDE_FROM_ABI __iterator __make_output_iterator() { return __iterator{*this}; }
		541
		542	_LIBCPP_HIDE_FROM_ABI void push_back(_CharT __c) { __buffer_.push_back(__c); }
		543
		544	template <__fmt_char_type _InCharT>
		545	_LIBCPP_HIDE_FROM_ABI void __copy(basic_string_view<_InCharT> __str) {
		546	__buffer_.insert(__buffer_.end(), __str.begin(), __str.end());
		547	}
		548
		549	template <__fmt_char_type _InCharT, class _UnaryOperation>
		550	_LIBCPP_HIDE_FROM_ABI void __transform(const _InCharT* __first, const _InCharT* __last, _UnaryOperation __operation) {
		551	_LIBCPP_ASSERT(__first <= __last, "not a valid range");
		552	std::transform(__first, __last, std::back_inserter(__buffer_), std::move(__operation));
359	}	553	}
		554
		555	_LIBCPP_HIDE_FROM_ABI void __fill(size_t __n, _CharT __value) { __buffer_.insert(__buffer_.end(), __n, __value); }
		556
		557	_LIBCPP_HIDE_FROM_ABI basic_string_view<_CharT> __view() { return {__buffer_.data(), __buffer_.size()}; }
		558
		559	private:
		560	// Use vector instead of string to avoid adding zeros after every append
		561	// operation. The buffer is exposed as a string_view and not as a c-string.
		562	vector<_CharT> __buffer_;
360	};	563	};
		564
361	} // namespace __format	565	} // namespace __format
362		566
363	#endif //_LIBCPP_STD_VER > 17	567	#endif //_LIBCPP_STD_VER > 17

lib/libcxx/include/__format/concepts.h+37-12

 @@ -15,6 +15,9 @@
 #include <__config>
 #include <__format/format_fwd.h>
 #include <__format/format_parse_context.h>
+#include <__type_traits/is_specialization.h>
+#include <__utility/pair.h>
+#include <tuple>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -25,6 +28,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 17
+/// The character type specializations of \ref formatter.
+template <class _CharT>
+concept __fmt_char_type =
+    same_as<_CharT, char>
+#  ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+    || same_as<_CharT, wchar_t>
+#  endif
+    ;
 // The output iterator isn't specified. A formatter should accept any
 // output_iterator. This iterator is a minimal iterator to test the concept.
 // (Note testing for (w)format_context would be a valid choice, but requires
 @@ -32,20 +44,33 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _CharT>
 using __fmt_iter_for = _CharT*;
-// The concept is based on P2286R6
-// It lacks the const of __cf as required by, the not yet accepted, LWG-3636.
-// The current formatters can't be easily adapted, but that is WIP.
-// TODO FMT properly implement this concepts once accepted.
 template <class _Tp, class _CharT>
-concept __formattable = (semiregular<formatter<remove_cvref_t<_Tp>, _CharT>>) &&
+concept __formattable =
-                        requires(formatter<remove_cvref_t<_Tp>, _CharT> __f,
+    (semiregular<formatter<remove_cvref_t<_Tp>, _CharT>>) &&
-                                 formatter<remove_cvref_t<_Tp>, _CharT> __cf, _Tp __t,
+    requires(formatter<remove_cvref_t<_Tp>, _CharT> __f,
-                                 basic_format_context<__fmt_iter_for<_CharT>, _CharT> __fc,
+             const formatter<remove_cvref_t<_Tp>, _CharT> __cf,
-                                 basic_format_parse_context<_CharT> __pc) {
+             _Tp __t,
-                          { __f.parse(__pc) } -> same_as<typename basic_format_parse_context<_CharT>::iterator>;
+             basic_format_context<__fmt_iter_for<_CharT>, _CharT> __fc,
-                          { __cf.format(__t, __fc) } -> same_as<__fmt_iter_for<_CharT>>;
+             basic_format_parse_context<_CharT> __pc) {
-                        };
+      { __f.parse(__pc) } -> same_as<typename basic_format_parse_context<_CharT>::iterator>;
+      { __cf.format(__t, __fc) } -> same_as<__fmt_iter_for<_CharT>>;
+    };
+#  if _LIBCPP_STD_VER > 20
+template <class _Tp, class _CharT>
+concept formattable = __formattable<_Tp, _CharT>;
+// [tuple.like] defines a tuple-like exposition only concept. This concept is
+// not related to that. Therefore it uses a different name for the concept.
+//
+// TODO FMT Add a test to validate we fail when using that concept after P2165
+// has been implemented.
+template <class _Tp>
+concept __fmt_pair_like = __is_specialization_v<_Tp, pair> ||
+                          // Use a requires since tuple_size_v may fail to instantiate,
+                          (__is_specialization_v<_Tp, tuple> && requires { tuple_size_v<_Tp> == 2; });
+#  endif //_LIBCPP_STD_VER > 20
 #endif //_LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__format/container_adaptor.h created+70

...	@@ -0,0 +1,70 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
11	#define _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
12
13	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
14	# pragma GCC system_header
15	#endif
16
17	#include <__availability>
18	#include <__config>
19	#include <__format/concepts.h>
20	#include <__format/formatter.h>
21	#include <__format/range_default_formatter.h>
22	#include <queue>
23	#include <stack>
24
25	_LIBCPP_BEGIN_NAMESPACE_STD
26
27	#if _LIBCPP_STD_VER > 20
28
29	// [container.adaptors.format] only specifies the library should provide the
30	// formatter specializations, not which header should provide them.
31	// Since <format> includes a lot of headers, add these headers here instead of
32	// adding more dependencies like, locale, optinal, string, tuple, etc. to the
33	// adaptor headers. To use the format functions users already include <format>.
34
35	template <class _Adaptor, class _CharT>
36	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_container_adaptor {
37	private:
38	using __maybe_const_adaptor = __fmt_maybe_const<_Adaptor, _CharT>;
39	formatter<typename _Adaptor::container_type, _CharT> __underlying_;
40
41	public:
42	template <class _ParseContext>
43	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
44	return __underlying_.parse(__ctx);
45	}
46
47	template <class _FormatContext>
48	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
49	format(__maybe_const_adaptor& __adaptor, _FormatContext& __ctx) const {
50	return __underlying_.format(__adaptor.__get_container(), __ctx);
51	}
52	};
53
54	template <class _CharT, class _Tp, formattable<_CharT> _Container>
55	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<queue<_Tp, _Container>, _CharT>
56	: public __formatter_container_adaptor<queue<_Tp, _Container>, _CharT> {};
57
58	template <class _CharT, class _Tp, class _Container, class _Compare>
59	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<priority_queue<_Tp, _Container, _Compare>, _CharT>
60	: public __formatter_container_adaptor<priority_queue<_Tp, _Container, _Compare>, _CharT> {};
61
62	template <class _CharT, class _Tp, formattable<_CharT> _Container>
63	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<stack<_Tp, _Container>, _CharT>
64	: public __formatter_container_adaptor<stack<_Tp, _Container>, _CharT> {};
65
66	#endif //_LIBCPP_STD_VER > 20
67
68	_LIBCPP_END_NAMESPACE_STD
69
70	#endif // _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H

lib/libcxx/include/__format/escaped_output_table.h created+1038

...	@@ -0,0 +1,1038 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	// WARNING, this entire header is generated by
11	// utils/generate_escaped_output_table.py
12	// DO NOT MODIFY!
13
14	// UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
15	//
16	// See Terms of Use <https://www.unicode.org/copyright.html>
17	// for definitions of Unicode Inc.'s Data Files and Software.
18	//
19	// NOTICE TO USER: Carefully read the following legal agreement.
20	// BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
21	// DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
22	// YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
23	// TERMS AND CONDITIONS OF THIS AGREEMENT.
24	// IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
25	// THE DATA FILES OR SOFTWARE.
26	//
27	// COPYRIGHT AND PERMISSION NOTICE
28	//
29	// Copyright (c) 1991-2022 Unicode, Inc. All rights reserved.
30	// Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
31	//
32	// Permission is hereby granted, free of charge, to any person obtaining
33	// a copy of the Unicode data files and any associated documentation
34	// (the "Data Files") or Unicode software and any associated documentation
35	// (the "Software") to deal in the Data Files or Software
36	// without restriction, including without limitation the rights to use,
37	// copy, modify, merge, publish, distribute, and/or sell copies of
38	// the Data Files or Software, and to permit persons to whom the Data Files
39	// or Software are furnished to do so, provided that either
40	// (a) this copyright and permission notice appear with all copies
41	// of the Data Files or Software, or
42	// (b) this copyright and permission notice appear in associated
43	// Documentation.
44	//
45	// THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
46	// ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
47	// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
48	// NONINFRINGEMENT OF THIRD PARTY RIGHTS.
49	// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
50	// NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
51	// DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
52	// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
53	// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
54	// PERFORMANCE OF THE DATA FILES OR SOFTWARE.
55	//
56	// Except as contained in this notice, the name of a copyright holder
57	// shall not be used in advertising or otherwise to promote the sale,
58	// use or other dealings in these Data Files or Software without prior
59	// written authorization of the copyright holder.
60
61	#ifndef _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
62	#define _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
63
64	#include <__algorithm/ranges_upper_bound.h>
65	#include <__config>
66	#include <cstddef>
67	#include <cstdint>
68
69	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
70	# pragma GCC system_header
71	#endif
72
73	_LIBCPP_BEGIN_NAMESPACE_STD
74
75	#if _LIBCPP_STD_VER > 20
76
77	namespace __escaped_output_table {
78
79	/// The entries of the characters to escape in format's debug string.
80	///
81	/// Contains the entries for [format.string.escaped]/2.2.1.2.1
82	/// CE is a Unicode encoding and C corresponds to either a UCS scalar value
83	/// whose Unicode property General_Category has a value in the groups
84	/// Separator (Z) or Other (C) or to a UCS scalar value which has the Unicode
85	/// property Grapheme_Extend=Yes, as described by table 12 of UAX #44
86	///
87	/// Separator (Z) consists of General_Category
88	/// - Space_Separator,
89	/// - Line_Separator,
90	/// - Paragraph_Separator.
91	///
92	/// Other (C) consists of General_Category
93	/// - Control,
94	/// - Format,
95	/// - Surrogate,
96	/// - Private_Use,
97	/// - Unassigned.
98	///
99	/// The data is generated from
100	/// - https://www.unicode.org/Public/UCD/latest/ucd/DerivedCoreProperties.txt
101	/// - https://www.unicode.org/Public/UCD/latest/ucd/extracted/DerivedGeneralCategory.txt
102	///
103	/// The table is similar to the table
104	/// __extended_grapheme_custer_property_boundary::__entries
105	/// which explains the details of these classes. The only difference is this
106	/// table lacks a property, thus having more bits available for the size.
107	///
108	/// The data has 2 values:
109	/// - bits [0, 10] The size of the range, allowing 2048 elements.
110	/// - bits [11, 31] The lower bound code point of the range. The upper bound of
111	/// the range is lower bound + size.
112	inline constexpr uint32_t __entries[893] = {
113	0x00000020,
114	0x0003f821,
115	0x00056800,
116	0x0018006f,
117	0x001bc001,
118	0x001c0003,
119	0x001c5800,
120	0x001c6800,
121	0x001d1000,
122	0x00241806,
123	0x00298000,
124	0x002ab801,
125	0x002c5801,
126	0x002c802d,
127	0x002df800,
128	0x002e0801,
129	0x002e2001,
130	0x002e3808,
131	0x002f5803,
132	0x002fa810,
133	0x0030800a,
134	0x0030e000,
135	0x00325814,
136	0x00338000,
137	0x0036b007,
138	0x0036f805,
139	0x00373801,
140	0x00375003,
141	0x00387001,
142	0x00388800,
143	0x0039801c,
144	0x003d300a,
145	0x003d900d,
146	0x003f5808,
147	0x003fd802,
148	0x0040b003,
149	0x0040d808,
150	0x00412802,
151	0x00414806,
152	0x0041f800,
153	0x0042c804,
154	0x0042f800,
155	0x00435804,
156	0x00447810,
157	0x00465038,
158	0x0049d000,
159	0x0049e000,
160	0x004a0807,
161	0x004a6800,
162	0x004a8806,
163	0x004b1001,
164	0x004c0800,
165	0x004c2000,
166	0x004c6801,
167	0x004c8801,
168	0x004d4800,
169	0x004d8800,
170	0x004d9802,
171	0x004dd002,
172	0x004df000,
173	0x004e0805,
174	0x004e4801,
175	0x004e6800,
176	0x004e780c,
177	0x004ef000,
178	0x004f1003,
179	0x004ff004,
180	0x00502000,
181	0x00505803,
182	0x00508801,
183	0x00514800,
184	0x00518800,
185	0x0051a000,
186	0x0051b800,
187	0x0051d003,
188	0x00520817,
189	0x0052e800,
190	0x0052f806,
191	0x00538001,
192	0x0053a800,
193	0x0053b80b,
194	0x00542000,
195	0x00547000,
196	0x00549000,
197	0x00554800,
198	0x00558800,
199	0x0055a000,
200	0x0055d002,
201	0x00560807,
202	0x00565000,
203	0x00566802,
204	0x0056880e,
205	0x00571003,
206	0x00579006,
207	0x0057d007,
208	0x00582000,
209	0x00586801,
210	0x00588801,
211	0x00594800,
212	0x00598800,
213	0x0059a000,
214	0x0059d002,
215	0x0059f001,
216	0x005a0805,
217	0x005a4801,
218	0x005a680e,
219	0x005af000,
220	0x005b1003,
221	0x005bc00a,
222	0x005c2000,
223	0x005c5802,
224	0x005c8800,
225	0x005cb002,
226	0x005cd800,
227	0x005ce800,
228	0x005d0002,
229	0x005d2802,
230	0x005d5802,
231	0x005dd004,
232	0x005e0000,
233	0x005e1802,
234	0x005e4800,
235	0x005e6802,
236	0x005e8814,
237	0x005fd805,
238	0x00602000,
239	0x00606800,
240	0x00608800,
241	0x00614800,
242	0x0061d002,
243	0x0061f002,
244	0x00622812,
245	0x0062d801,
246	0x0062f001,
247	0x00631003,
248	0x00638006,
249	0x00640800,
250	0x00646800,
251	0x00648800,
252	0x00654800,
253	0x0065a000,
254	0x0065d002,
255	0x0065f800,
256	0x00661000,
257	0x00662801,
258	0x00664800,
259	0x00666010,
260	0x0066f800,
261	0x00671003,
262	0x00678000,
263	0x0067a00d,
264	0x00686800,
265	0x00688800,
266	0x0069d801,
267	0x0069f000,
268	0x006a0804,
269	0x006a4800,
270	0x006a6800,
271	0x006a8003,
272	0x006ab800,
273	0x006b1003,
274	0x006c0001,
275	0x006c2000,
276	0x006cb802,
277	0x006d9000,
278	0x006de000,
279	0x006df001,
280	0x006e3808,
281	0x006e9005,
282	0x006ef806,
283	0x006f8001,
284	0x006fa80b,
285	0x00718800,
286	0x0071a00a,
287	0x00723807,
288	0x0072e024,
289	0x00741800,
290	0x00742800,
291	0x00745800,
292	0x00752000,
293	0x00753000,
294	0x00758800,
295	0x0075a008,
296	0x0075f001,
297	0x00762800,
298	0x00763808,
299	0x0076d001,
300	0x0077001f,
301	0x0078c001,
302	0x0079a800,
303	0x0079b800,
304	0x0079c800,
305	0x007a4000,
306	0x007b6811,
307	0x007c0004,
308	0x007c3001,
309	0x007c6830,
310	0x007e3000,
311	0x007e6800,
312	0x007ed824,
313	0x00816803,
314	0x00819005,
315	0x0081c801,
316	0x0081e801,
317	0x0082c001,
318	0x0082f002,
319	0x00838803,
320	0x00841000,
321	0x00842801,
322	0x00846800,
323	0x0084e800,
324	0x00863000,
325	0x00864004,
326	0x00867001,
327	0x00924800,
328	0x00927001,
329	0x0092b800,
330	0x0092c800,
331	0x0092f001,
332	0x00944800,
333	0x00947001,
334	0x00958800,
335	0x0095b001,
336	0x0095f800,
337	0x00960800,
338	0x00963001,
339	0x0096b800,
340	0x00988800,
341	0x0098b001,
342	0x009ad804,
343	0x009be802,
344	0x009cd005,
345	0x009fb001,
346	0x009ff001,
347	0x00b40000,
348	0x00b4e802,
349	0x00b7c806,
350	0x00b89002,
351	0x00b8b008,
352	0x00b99001,
353	0x00b9b808,
354	0x00ba900d,
355	0x00bb6800,
356	0x00bb880e,
357	0x00bda001,
358	0x00bdb806,
359	0x00be3000,
360	0x00be480a,
361	0x00bee802,
362	0x00bf5005,
363	0x00bfd005,
364	0x00c05804,
365	0x00c0d005,
366	0x00c3c806,
367	0x00c42801,
368	0x00c54800,
369	0x00c55804,
370	0x00c7b009,
371	0x00c8f803,
372	0x00c93801,
373	0x00c96003,
374	0x00c99000,
375	0x00c9c806,
376	0x00ca0802,
377	0x00cb7001,
378	0x00cba80a,
379	0x00cd6003,
380	0x00ce5005,
381	0x00ced802,
382	0x00d0b801,
383	0x00d0d802,
384	0x00d2b000,
385	0x00d2c008,
386	0x00d31000,
387	0x00d32807,
388	0x00d3980c,
389	0x00d45005,
390	0x00d4d005,
391	0x00d57055,
392	0x00d9a006,
393	0x00d9e000,
394	0x00da1000,
395	0x00da6802,
396	0x00db5808,
397	0x00dbf802,
398	0x00dd1003,
399	0x00dd4001,
400	0x00dd5802,
401	0x00df3000,
402	0x00df4001,
403	0x00df6800,
404	0x00df7802,
405	0x00dfa007,
406	0x00e16007,
407	0x00e1b004,
408	0x00e25002,
409	0x00e44806,
410	0x00e5d801,
411	0x00e6400a,
412	0x00e6a00c,
413	0x00e71006,
414	0x00e76800,
415	0x00e7a000,
416	0x00e7c001,
417	0x00e7d804,
418	0x00ee003f,
419	0x00f8b001,
420	0x00f8f001,
421	0x00fa3001,
422	0x00fa7001,
423	0x00fac000,
424	0x00fad000,
425	0x00fae000,
426	0x00faf000,
427	0x00fbf001,
428	0x00fda800,
429	0x00fe2800,
430	0x00fea001,
431	0x00fee000,
432	0x00ff8001,
433	0x00ffa800,
434	0x00fff810,
435	0x01014007,
436	0x0102f810,
437	0x01039001,
438	0x01047800,
439	0x0104e802,
440	0x0106083e,
441	0x010c6003,
442	0x01213818,
443	0x01225814,
444	0x015ba001,
445	0x015cb000,
446	0x01677802,
447	0x0167a004,
448	0x01693000,
449	0x01694004,
450	0x01697001,
451	0x016b4006,
452	0x016b880e,
453	0x016cb808,
454	0x016d3800,
455	0x016d7800,
456	0x016db800,
457	0x016df800,
458	0x016e3800,
459	0x016e7800,
460	0x016eb800,
461	0x016ef820,
462	0x0172f021,
463	0x0174d000,
464	0x0177a00b,
465	0x017eb019,
466	0x017fe004,
467	0x01815005,
468	0x01820000,
469	0x0184b803,
470	0x01880004,
471	0x01898000,
472	0x018c7800,
473	0x018f200b,
474	0x0190f800,
475	0x05246802,
476	0x05263808,
477	0x05316013,
478	0x05337803,
479	0x0533a009,
480	0x0534f001,
481	0x05378001,
482	0x0537c007,
483	0x053e5804,
484	0x053e9000,
485	0x053ea000,
486	0x053ed017,
487	0x05401000,
488	0x05403000,
489	0x05405800,
490	0x05412801,
491	0x05416003,
492	0x0541d005,
493	0x0543c007,
494	0x05462009,
495	0x0546d017,
496	0x0547f800,
497	0x05493007,
498	0x054a380a,
499	0x054aa00a,
500	0x054be805,
501	0x054d9800,
502	0x054db003,
503	0x054de001,
504	0x054e7000,
505	0x054ed003,
506	0x054f2800,
507	0x054ff800,
508	0x05514805,
509	0x05518801,
510	0x0551a80a,
511	0x05521800,
512	0x05526000,
513	0x05527001,
514	0x0552d001,
515	0x0553e000,
516	0x05558000,
517	0x05559002,
518	0x0555b801,
519	0x0555f001,
520	0x05560800,
521	0x05561817,
522	0x05576001,
523	0x0557b00a,
524	0x05583801,
525	0x05587801,
526	0x0558b808,
527	0x05593800,
528	0x05597800,
529	0x055b6003,
530	0x055f2800,
531	0x055f4000,
532	0x055f6802,
533	0x055fd005,
534	0x06bd200b,
535	0x06be3803,
536	0x06bfe7ff,
537	0x06ffe7ff,
538	0x073fe7ff,
539	0x077fe7ff,
540	0x07bfe103,
541	0x07d37001,
542	0x07d6d025,
543	0x07d8380b,
544	0x07d8c004,
545	0x07d8f000,
546	0x07d9b800,
547	0x07d9e800,
548	0x07d9f800,
549	0x07da1000,
550	0x07da2800,
551	0x07de180f,
552	0x07ec8001,
553	0x07ee4006,
554	0x07ee801f,
555	0x07f0000f,
556	0x07f0d015,
557	0x07f29800,
558	0x07f33800,
559	0x07f36003,
560	0x07f3a800,
561	0x07f7e803,
562	0x07fcf001,
563	0x07fdf802,
564	0x07fe4001,
565	0x07fe8001,
566	0x07fec001,
567	0x07fee802,
568	0x07ff3800,
569	0x07ff780c,
570	0x07fff001,
571	0x08006000,
572	0x08013800,
573	0x0801d800,
574	0x0801f000,
575	0x08027001,
576	0x0802f021,
577	0x0807d804,
578	0x08081803,
579	0x0809a002,
580	0x080c7800,
581	0x080ce802,
582	0x080d082e,
583	0x080fe882,
584	0x0814e802,
585	0x0816880f,
586	0x0817e003,
587	0x08192008,
588	0x081a5804,
589	0x081bb009,
590	0x081cf000,
591	0x081e2003,
592	0x081eb029,
593	0x0824f001,
594	0x08255005,
595	0x0826a003,
596	0x0827e003,
597	0x08294007,
598	0x082b200a,
599	0x082bd800,
600	0x082c5800,
601	0x082c9800,
602	0x082cb000,
603	0x082d1000,
604	0x082d9000,
605	0x082dd000,
606	0x082de842,
607	0x0839b808,
608	0x083ab009,
609	0x083b4017,
610	0x083c3000,
611	0x083d8800,
612	0x083dd844,
613	0x08403001,
614	0x08404800,
615	0x0841b000,
616	0x0841c802,
617	0x0841e801,
618	0x0842b000,
619	0x0844f807,
620	0x0845802f,
621	0x08479800,
622	0x0847b004,
623	0x0848e002,
624	0x0849d004,
625	0x084a003f,
626	0x084dc003,
627	0x084e8001,
628	0x0850080e,
629	0x0850a000,
630	0x0850c000,
631	0x0851b009,
632	0x08524806,
633	0x0852c806,
634	0x0855001f,
635	0x08572805,
636	0x0857b808,
637	0x0859b002,
638	0x085ab001,
639	0x085b9804,
640	0x085c9006,
641	0x085ce80b,
642	0x085d804f,
643	0x08624836,
644	0x0865980c,
645	0x08679806,
646	0x0869200b,
647	0x0869d125,
648	0x0873f800,
649	0x08755002,
650	0x08757001,
651	0x0875904d,
652	0x08794007,
653	0x087a300a,
654	0x087ad015,
655	0x087c1003,
656	0x087c5025,
657	0x087e6013,
658	0x087fb808,
659	0x08800800,
660	0x0881c00e,
661	0x08827003,
662	0x08838000,
663	0x08839801,
664	0x0883b00b,
665	0x08859803,
666	0x0885c801,
667	0x0885e800,
668	0x0886100d,
669	0x08874806,
670	0x0887d008,
671	0x08893804,
672	0x08896808,
673	0x088a4007,
674	0x088b9800,
675	0x088bb80a,
676	0x088db008,
677	0x088e4803,
678	0x088e7800,
679	0x088f0000,
680	0x088fa80a,
681	0x08909000,
682	0x08917802,
683	0x0891a000,
684	0x0891b001,
685	0x0891f000,
686	0x0892083e,
687	0x08943800,
688	0x08944800,
689	0x08947000,
690	0x0894f000,
691	0x08955005,
692	0x0896f800,
693	0x0897180c,
694	0x0897d007,
695	0x08982000,
696	0x08986801,
697	0x08988801,
698	0x08994800,
699	0x08998800,
700	0x0899a000,
701	0x0899d002,
702	0x0899f000,
703	0x089a0000,
704	0x089a2801,
705	0x089a4801,
706	0x089a7001,
707	0x089a880b,
708	0x089b209b,
709	0x08a1c007,
710	0x08a21002,
711	0x08a23000,
712	0x08a2e000,
713	0x08a2f000,
714	0x08a3101d,
715	0x08a58000,
716	0x08a59805,
717	0x08a5d000,
718	0x08a5e800,
719	0x08a5f801,
720	0x08a61001,
721	0x08a64007,
722	0x08a6d0a5,
723	0x08ad7800,
724	0x08ad9005,
725	0x08ade001,
726	0x08adf801,
727	0x08aee023,
728	0x08b19807,
729	0x08b1e800,
730	0x08b1f801,
731	0x08b2280a,
732	0x08b2d005,
733	0x08b36812,
734	0x08b55800,
735	0x08b56800,
736	0x08b58005,
737	0x08b5b800,
738	0x08b5d005,
739	0x08b65035,
740	0x08b8d804,
741	0x08b91003,
742	0x08b93808,
743	0x08ba38b8,
744	0x08c17808,
745	0x08c1c801,
746	0x08c1e063,
747	0x08c7980b,
748	0x08c83801,
749	0x08c85001,
750	0x08c8a000,
751	0x08c8b800,
752	0x08c98000,
753	0x08c9b000,
754	0x08c9c803,
755	0x08c9f000,
756	0x08ca1800,
757	0x08ca3808,
758	0x08cad045,
759	0x08cd4001,
760	0x08cea007,
761	0x08cf0000,
762	0x08cf281a,
763	0x08d00809,
764	0x08d19805,
765	0x08d1d803,
766	0x08d23808,
767	0x08d28805,
768	0x08d2c802,
769	0x08d4500c,
770	0x08d4c001,
771	0x08d5180c,
772	0x08d7c806,
773	0x08d850f5,
774	0x08e04800,
775	0x08e1800d,
776	0x08e1f800,
777	0x08e23009,
778	0x08e36802,
779	0x08e48018,
780	0x08e55006,
781	0x08e59001,
782	0x08e5a84a,
783	0x08e83800,
784	0x08e85000,
785	0x08e98814,
786	0x08ea3808,
787	0x08ead005,
788	0x08eb3000,
789	0x08eb4800,
790	0x08ec7803,
791	0x08eca800,
792	0x08ecb800,
793	0x08ecc806,
794	0x08ed5135,
795	0x08f79801,
796	0x08f7c808,
797	0x08f88800,
798	0x08f9b007,
799	0x08fa0000,
800	0x08fa1000,
801	0x08fad055,
802	0x08fd880e,
803	0x08ff900c,
804	0x091cd065,
805	0x09237800,
806	0x0923a80a,
807	0x092a27ff,
808	0x096a224b,
809	0x097f980c,
810	0x09a18010,
811	0x09a23fff,
812	0x09e23fb8,
813	0x0a323fff,
814	0x0a723fff,
815	0x0ab23fff,
816	0x0af23fff,
817	0x0b3239b8,
818	0x0b51c806,
819	0x0b52f800,
820	0x0b535003,
821	0x0b55f800,
822	0x0b565005,
823	0x0b577006,
824	0x0b57b009,
825	0x0b598006,
826	0x0b5a3009,
827	0x0b5ad000,
828	0x0b5b1000,
829	0x0b5bc004,
830	0x0b5c82af,
831	0x0b74d864,
832	0x0b7a5804,
833	0x0b7c400a,
834	0x0b7d003f,
835	0x0b7f200b,
836	0x0b7f900d,
837	0x0c3fc007,
838	0x0c66b029,
839	0x0c684fff,
840	0x0ca84fff,
841	0x0ce84fff,
842	0x0d284fff,
843	0x0d684ae6,
844	0x0d7fa000,
845	0x0d7fe000,
846	0x0d7ff800,
847	0x0d89180e,
848	0x0d89981c,
849	0x0d8a9801,
850	0x0d8ab00d,
851	0x0d8b4007,
852	0x0d97e7ff,
853	0x0dd7e103,
854	0x0de35804,
855	0x0de3e802,
856	0x0de44806,
857	0x0de4d001,
858	0x0de4e801,
859	0x0de507ff,
860	0x0e2507ff,
861	0x0e6502af,
862	0x0e7e203b,
863	0x0e87b009,
864	0x0e893801,
865	0x0e8b2800,
866	0x0e8b3802,
867	0x0e8b7014,
868	0x0e8c2806,
869	0x0e8d5003,
870	0x0e8f5814,
871	0x0e921002,
872	0x0e923079,
873	0x0e96a00b,
874	0x0e97a00b,
875	0x0e9ab808,
876	0x0e9bc886,
877	0x0ea2a800,
878	0x0ea4e800,
879	0x0ea50001,
880	0x0ea51801,
881	0x0ea53801,
882	0x0ea56800,
883	0x0ea5d000,
884	0x0ea5e000,
885	0x0ea62000,
886	0x0ea83000,
887	0x0ea85801,
888	0x0ea8a800,
889	0x0ea8e800,
890	0x0ea9d000,
891	0x0ea9f800,
892	0x0eaa2800,
893	0x0eaa3802,
894	0x0eaa8800,
895	0x0eb53001,
896	0x0ebe6001,
897	0x0ed00036,
898	0x0ed1d831,
899	0x0ed3a800,
900	0x0ed42000,
901	0x0ed46473,
902	0x0ef8f805,
903	0x0ef95904,
904	0x0f037091,
905	0x0f096809,
906	0x0f09f001,
907	0x0f0a5003,
908	0x0f0a813f,
909	0x0f157011,
910	0x0f176003,
911	0x0f17d004,
912	0x0f1801cf,
913	0x0f276003,
914	0x0f27d2e5,
915	0x0f3f3800,
916	0x0f3f6000,
917	0x0f3f7800,
918	0x0f3ff800,
919	0x0f462801,
920	0x0f46802f,
921	0x0f4a2006,
922	0x0f4a6003,
923	0x0f4ad003,
924	0x0f4b0310,
925	0x0f65a84b,
926	0x0f69f0c1,
927	0x0f702000,
928	0x0f710000,
929	0x0f711800,
930	0x0f712801,
931	0x0f714000,
932	0x0f719800,
933	0x0f71c000,
934	0x0f71d000,
935	0x0f71e005,
936	0x0f721803,
937	0x0f724000,
938	0x0f725000,
939	0x0f726000,
940	0x0f728000,
941	0x0f729800,
942	0x0f72a801,
943	0x0f72c000,
944	0x0f72d000,
945	0x0f72e000,
946	0x0f72f000,
947	0x0f730000,
948	0x0f731800,
949	0x0f732801,
950	0x0f735800,
951	0x0f739800,
952	0x0f73c000,
953	0x0f73e800,
954	0x0f73f800,
955	0x0f745000,
956	0x0f74e004,
957	0x0f752000,
958	0x0f755000,
959	0x0f75e033,
960	0x0f77910d,
961	0x0f816003,
962	0x0f84a00b,
963	0x0f857801,
964	0x0f860000,
965	0x0f868000,
966	0x0f87b009,
967	0x0f8d7037,
968	0x0f90180c,
969	0x0f91e003,
970	0x0f924806,
971	0x0f92900d,
972	0x0f933099,
973	0x0fb6c003,
974	0x0fb76802,
975	0x0fb7e802,
976	0x0fbbb803,
977	0x0fbed005,
978	0x0fbf6003,
979	0x0fbf880e,
980	0x0fc06003,
981	0x0fc24007,
982	0x0fc2d005,
983	0x0fc44007,
984	0x0fc57001,
985	0x0fc5904d,
986	0x0fd2a00b,
987	0x0fd37001,
988	0x0fd3e802,
989	0x0fd44806,
990	0x0fd5f000,
991	0x0fd63007,
992	0x0fd6e003,
993	0x0fd74806,
994	0x0fd7c806,
995	0x0fdc9800,
996	0x0fde5824,
997	0x0fdfd405,
998	0x1537001f,
999	0x15b9d005,
1000	0x15c0f001,
1001	0x1675100d,
1002	0x175f0fff,
1003	0x179f0c1e,
1004	0x17d0f5e1,
1005	0x189a5804};
1006
1007	/// At the end of the valid Unicode code points space a lot of code points are
1008	/// either reserved or a noncharacter. Adding all these entries to the
1009	/// lookup table would add 446 entries to the table (in Unicode 14).
1010	/// Instead the only the start of the region is stored, every code point in
1011	/// this region needs to be escaped.
1012	inline constexpr uint32_t __unallocated_region_lower_bound = 0x000323b0;
1013
1014	/// Returns whether the code unit needs to be escaped.
1015	///
1016	/// \pre The code point is a valid Unicode code point.
1017	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool __needs_escape(const char32_t __code_point) noexcept {
1018	// Since __unallocated_region_lower_bound contains the unshifted range do the
1019	// comparison without shifting.
1020	if (__code_point >= __unallocated_region_lower_bound)
1021	return true;
1022
1023	ptrdiff_t __i = std::ranges::upper_bound(__entries, (__code_point << 11) \| 0x7ffu) - __entries;
1024	if (__i == 0)
1025	return false;
1026
1027	--__i;
1028	uint32_t __upper_bound = (__entries[__i] >> 11) + (__entries[__i] & 0x7ffu);
1029	return __code_point <= __upper_bound;
1030	}
1031
1032	} // namespace __escaped_output_table
1033
1034	#endif //_LIBCPP_STD_VER > 20
1035
1036	_LIBCPP_END_NAMESPACE_STD
1037
1038	#endif // _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H

lib/libcxx/include/__format/extended_grapheme_cluster_table.h+1501-172

...	@@ -8,7 +8,7 @@	...	@@ -8,7 +8,7 @@
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	// WARNING, this entire header is generated by	10	// WARNING, this entire header is generated by
11	// utiles/generate_extended_grapheme_cluster_table.py	11	// utils/generate_extended_grapheme_cluster_table.py
12	// DO NOT MODIFY!	12	// DO NOT MODIFY!
13		13
14	// UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE	14	// UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
...	@@ -61,7 +61,7 @@	...	@@ -61,7 +61,7 @@
61	#ifndef _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H	61	#ifndef _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
62	#define _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H	62	#define _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
63		63
64	#include <__algorithm/upper_bound.h>	64	#include <__algorithm/ranges_upper_bound.h>
65	#include <__config>	65	#include <__config>
66	#include <__iterator/access.h>	66	#include <__iterator/access.h>
67	#include <cstddef>	67	#include <cstddef>
...	@@ -111,7 +111,7 @@ enum class __property : uint8_t {	...	@@ -111,7 +111,7 @@ enum class __property : uint8_t {
111	/// - https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt	111	/// - https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt
112	///	112	///
113	/// The data has 3 values	113	/// The data has 3 values
114	/// - bits [0, 3] The property. One of the values generated form the datafiles	114	/// - bits [0, 3] The property. One of the values generated from the datafiles
115	/// of \ref __property	115	/// of \ref __property
116	/// - bits [4, 10] The size of the range.	116	/// - bits [4, 10] The size of the range.
117	/// - bits [11, 31] The lower bound code point of the range. The upper bound of	117	/// - bits [11, 31] The lower bound code point of the range. The upper bound of
...	@@ -124,177 +124,1506 @@ enum class __property : uint8_t {	...	@@ -124,177 +124,1506 @@ enum class __property : uint8_t {
124	/// this approach uses less space for the data and is about 4% faster in the	124	/// this approach uses less space for the data and is about 4% faster in the
125	/// following benchmark.	125	/// following benchmark.
126	/// libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp	126	/// libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp
127	inline constexpr uint32_t __entries[1480] = {	127	inline constexpr uint32_t __entries[1496] = {
128	0x00000091, 0x00005005, 0x00005811, 0x00006800, 0x00007111, 0x0003fa01, 0x00054803, 0x00056801, 0x00057003,	128	0x00000091,
129	0x001806f2, 0x00241862, 0x002c8ac2, 0x002df802, 0x002e0812, 0x002e2012, 0x002e3802, 0x00300058, 0x003080a2,	129	0x00005005,
130	0x0030e001, 0x00325942, 0x00338002, 0x0036b062, 0x0036e808, 0x0036f852, 0x00373812, 0x00375032, 0x00387808,	130	0x00005811,
131	0x00388802, 0x003981a2, 0x003d30a2, 0x003f5882, 0x003fe802, 0x0040b032, 0x0040d882, 0x00412822, 0x00414842,	131	0x00006800,
132	0x0042c822, 0x00448018, 0x0044c072, 0x00465172, 0x00471008, 0x004719f2, 0x0048180a, 0x0049d002, 0x0049d80a,	132	0x00007111,
133	0x0049e002, 0x0049f02a, 0x004a0872, 0x004a483a, 0x004a6802, 0x004a701a, 0x004a8862, 0x004b1012, 0x004c0802,	133	0x0003fa01,
134	0x004c101a, 0x004de002, 0x004df002, 0x004df81a, 0x004e0832, 0x004e381a, 0x004e581a, 0x004e6802, 0x004eb802,	134	0x00054803,
135	0x004f1012, 0x004ff002, 0x00500812, 0x0050180a, 0x0051e002, 0x0051f02a, 0x00520812, 0x00523812, 0x00525822,	135	0x00056801,
136	0x00528802, 0x00538012, 0x0053a802, 0x00540812, 0x0054180a, 0x0055e002, 0x0055f02a, 0x00560842, 0x00563812,	136	0x00057003,
137	0x0056480a, 0x0056581a, 0x00566802, 0x00571012, 0x0057d052, 0x00580802, 0x0058101a, 0x0059e002, 0x0059f012,	137	0x001806f2,
138	0x005a000a, 0x005a0832, 0x005a381a, 0x005a581a, 0x005a6802, 0x005aa822, 0x005b1012, 0x005c1002, 0x005df002,	138	0x00241862,
139	0x005df80a, 0x005e0002, 0x005e081a, 0x005e302a, 0x005e502a, 0x005e6802, 0x005eb802, 0x00600002, 0x0060082a,	139	0x002c8ac2,
140	0x00602002, 0x0061e002, 0x0061f022, 0x0062083a, 0x00623022, 0x00625032, 0x0062a812, 0x00631012, 0x00640802,	140	0x002df802,
141	0x0064101a, 0x0065e002, 0x0065f00a, 0x0065f802, 0x0066001a, 0x00661002, 0x0066181a, 0x00663002, 0x0066381a,	141	0x002e0812,
142	0x0066501a, 0x00666012, 0x0066a812, 0x00671012, 0x00680012, 0x0068101a, 0x0069d812, 0x0069f002, 0x0069f81a,	142	0x002e2012,
143	0x006a0832, 0x006a302a, 0x006a502a, 0x006a6802, 0x006a7008, 0x006ab802, 0x006b1012, 0x006c0802, 0x006c101a,	143	0x002e3802,
144	0x006e5002, 0x006e7802, 0x006e801a, 0x006e9022, 0x006eb002, 0x006ec06a, 0x006ef802, 0x006f901a, 0x00718802,	144	0x00300058,
145	0x0071980a, 0x0071a062, 0x00723872, 0x00758802, 0x0075980a, 0x0075a082, 0x00764052, 0x0078c012, 0x0079a802,	145	0x003080a2,
146	0x0079b802, 0x0079c802, 0x0079f01a, 0x007b88d2, 0x007bf80a, 0x007c0042, 0x007c3012, 0x007c68a2, 0x007cca32,	146	0x0030e001,
147	0x007e3002, 0x00816832, 0x0081880a, 0x00819052, 0x0081c812, 0x0081d81a, 0x0081e812, 0x0082b01a, 0x0082c012,	147	0x00325942,
148	0x0082f022, 0x00838832, 0x00841002, 0x0084200a, 0x00842812, 0x00846802, 0x0084e802, 0x008805f4, 0x008b047c,	148	0x00338002,
149	0x008d457b, 0x009ae822, 0x00b89022, 0x00b8a80a, 0x00b99012, 0x00b9a00a, 0x00ba9012, 0x00bb9012, 0x00bda012,	149	0x0036b062,
150	0x00bdb00a, 0x00bdb862, 0x00bdf07a, 0x00be3002, 0x00be381a, 0x00be48a2, 0x00bee802, 0x00c05822, 0x00c07001,	150	0x0036e808,
151	0x00c07802, 0x00c42812, 0x00c54802, 0x00c90022, 0x00c9183a, 0x00c93812, 0x00c9482a, 0x00c9801a, 0x00c99002,	151	0x0036f852,
152	0x00c9985a, 0x00c9c822, 0x00d0b812, 0x00d0c81a, 0x00d0d802, 0x00d2a80a, 0x00d2b002, 0x00d2b80a, 0x00d2c062,	152	0x00373812,
153	0x00d30002, 0x00d31002, 0x00d32872, 0x00d3685a, 0x00d39892, 0x00d3f802, 0x00d581e2, 0x00d80032, 0x00d8200a,	153	0x00375032,
154	0x00d9a062, 0x00d9d80a, 0x00d9e002, 0x00d9e84a, 0x00da1002, 0x00da181a, 0x00db5882, 0x00dc0012, 0x00dc100a,	154	0x00387808,
155	0x00dd080a, 0x00dd1032, 0x00dd301a, 0x00dd4012, 0x00dd500a, 0x00dd5822, 0x00df3002, 0x00df380a, 0x00df4012,	155	0x00388802,
156	0x00df502a, 0x00df6802, 0x00df700a, 0x00df7822, 0x00df901a, 0x00e1207a, 0x00e16072, 0x00e1a01a, 0x00e1b012,	156	0x003981a2,
157	0x00e68022, 0x00e6a0c2, 0x00e7080a, 0x00e71062, 0x00e76802, 0x00e7a002, 0x00e7b80a, 0x00e7c012, 0x00ee03f2,	157	0x003d30a2,
158	0x01005801, 0x01006002, 0x0100680d, 0x01007011, 0x01014061, 0x0101e003, 0x01024803, 0x010300f1, 0x01068202,	158	0x003f5882,
159	0x01091003, 0x0109c803, 0x010ca053, 0x010d4813, 0x0118d013, 0x01194003, 0x011c4003, 0x011e7803, 0x011f48a3,	159	0x003fe802,
160	0x011fc023, 0x01261003, 0x012d5013, 0x012db003, 0x012e0003, 0x012fd833, 0x01300053, 0x013038b3, 0x0130a713,	160	0x0040b032,
161	0x01348753, 0x013840a3, 0x0138a003, 0x0138b003, 0x0138e803, 0x01390803, 0x01394003, 0x01399813, 0x013a2003,	161	0x0040d882,
162	0x013a3803, 0x013a6003, 0x013a7003, 0x013a9823, 0x013ab803, 0x013b1843, 0x013ca823, 0x013d0803, 0x013d8003,	162	0x00412822,
163	0x013df803, 0x0149a013, 0x01582823, 0x0158d813, 0x015a8003, 0x015aa803, 0x01677822, 0x016bf802, 0x016f01f2,	163	0x00414842,
164	0x01815052, 0x01818003, 0x0181e803, 0x0184c812, 0x0194b803, 0x0194c803, 0x05337832, 0x0533a092, 0x0534f012,	164	0x0042c822,
165	0x05378012, 0x05401002, 0x05403002, 0x05405802, 0x0541181a, 0x05412812, 0x0541380a, 0x05416002, 0x0544001a,	165	0x00448018,
166	0x0545a0fa, 0x05462012, 0x05470112, 0x0547f802, 0x05493072, 0x054a38a2, 0x054a901a, 0x054b01c4, 0x054c0022,	166	0x0044c072,
167	0x054c180a, 0x054d9802, 0x054da01a, 0x054db032, 0x054dd01a, 0x054de012, 0x054df02a, 0x054f2802, 0x05514852,	167	0x00465172,
168	0x0551781a, 0x05518812, 0x0551981a, 0x0551a812, 0x05521802, 0x05526002, 0x0552680a, 0x0553e002, 0x05558002,	168	0x00471008,
169	0x05559022, 0x0555b812, 0x0555f012, 0x05560802, 0x0557580a, 0x05576012, 0x0557701a, 0x0557a80a, 0x0557b002,	169	0x004719f2,
170	0x055f181a, 0x055f2802, 0x055f301a, 0x055f4002, 0x055f481a, 0x055f600a, 0x055f6802, 0x05600006, 0x056009a7,	170	0x0048180a,
171	0x0560e006, 0x0560e9a7, 0x0561c006, 0x0561c9a7, 0x0562a006, 0x0562a9a7, 0x05638006, 0x056389a7, 0x05646006,	171	0x0049d002,
172	0x056469a7, 0x05654006, 0x056549a7, 0x05662006, 0x056629a7, 0x05670006, 0x056709a7, 0x0567e006, 0x0567e9a7,	172	0x0049d80a,
173	0x0568c006, 0x0568c9a7, 0x0569a006, 0x0569a9a7, 0x056a8006, 0x056a89a7, 0x056b6006, 0x056b69a7, 0x056c4006,	173	0x0049e002,
174	0x056c49a7, 0x056d2006, 0x056d29a7, 0x056e0006, 0x056e09a7, 0x056ee006, 0x056ee9a7, 0x056fc006, 0x056fc9a7,	174	0x0049f02a,
175	0x0570a006, 0x0570a9a7, 0x05718006, 0x057189a7, 0x05726006, 0x057269a7, 0x05734006, 0x057349a7, 0x05742006,	175	0x004a0872,
176	0x057429a7, 0x05750006, 0x057509a7, 0x0575e006, 0x0575e9a7, 0x0576c006, 0x0576c9a7, 0x0577a006, 0x0577a9a7,	176	0x004a483a,
177	0x05788006, 0x057889a7, 0x05796006, 0x057969a7, 0x057a4006, 0x057a49a7, 0x057b2006, 0x057b29a7, 0x057c0006,	177	0x004a6802,
178	0x057c09a7, 0x057ce006, 0x057ce9a7, 0x057dc006, 0x057dc9a7, 0x057ea006, 0x057ea9a7, 0x057f8006, 0x057f89a7,	178	0x004a701a,
179	0x05806006, 0x058069a7, 0x05814006, 0x058149a7, 0x05822006, 0x058229a7, 0x05830006, 0x058309a7, 0x0583e006,	179	0x004a8862,
180	0x0583e9a7, 0x0584c006, 0x0584c9a7, 0x0585a006, 0x0585a9a7, 0x05868006, 0x058689a7, 0x05876006, 0x058769a7,	180	0x004b1012,
181	0x05884006, 0x058849a7, 0x05892006, 0x058929a7, 0x058a0006, 0x058a09a7, 0x058ae006, 0x058ae9a7, 0x058bc006,	181	0x004c0802,
182	0x058bc9a7, 0x058ca006, 0x058ca9a7, 0x058d8006, 0x058d89a7, 0x058e6006, 0x058e69a7, 0x058f4006, 0x058f49a7,	182	0x004c101a,
183	0x05902006, 0x059029a7, 0x05910006, 0x059109a7, 0x0591e006, 0x0591e9a7, 0x0592c006, 0x0592c9a7, 0x0593a006,	183	0x004de002,
184	0x0593a9a7, 0x05948006, 0x059489a7, 0x05956006, 0x059569a7, 0x05964006, 0x059649a7, 0x05972006, 0x059729a7,	184	0x004df002,
185	0x05980006, 0x059809a7, 0x0598e006, 0x0598e9a7, 0x0599c006, 0x0599c9a7, 0x059aa006, 0x059aa9a7, 0x059b8006,	185	0x004df81a,
186	0x059b89a7, 0x059c6006, 0x059c69a7, 0x059d4006, 0x059d49a7, 0x059e2006, 0x059e29a7, 0x059f0006, 0x059f09a7,	186	0x004e0832,
187	0x059fe006, 0x059fe9a7, 0x05a0c006, 0x05a0c9a7, 0x05a1a006, 0x05a1a9a7, 0x05a28006, 0x05a289a7, 0x05a36006,	187	0x004e381a,
188	0x05a369a7, 0x05a44006, 0x05a449a7, 0x05a52006, 0x05a529a7, 0x05a60006, 0x05a609a7, 0x05a6e006, 0x05a6e9a7,	188	0x004e581a,
189	0x05a7c006, 0x05a7c9a7, 0x05a8a006, 0x05a8a9a7, 0x05a98006, 0x05a989a7, 0x05aa6006, 0x05aa69a7, 0x05ab4006,	189	0x004e6802,
190	0x05ab49a7, 0x05ac2006, 0x05ac29a7, 0x05ad0006, 0x05ad09a7, 0x05ade006, 0x05ade9a7, 0x05aec006, 0x05aec9a7,	190	0x004eb802,
191	0x05afa006, 0x05afa9a7, 0x05b08006, 0x05b089a7, 0x05b16006, 0x05b169a7, 0x05b24006, 0x05b249a7, 0x05b32006,	191	0x004f1012,
192	0x05b329a7, 0x05b40006, 0x05b409a7, 0x05b4e006, 0x05b4e9a7, 0x05b5c006, 0x05b5c9a7, 0x05b6a006, 0x05b6a9a7,	192	0x004ff002,
193	0x05b78006, 0x05b789a7, 0x05b86006, 0x05b869a7, 0x05b94006, 0x05b949a7, 0x05ba2006, 0x05ba29a7, 0x05bb0006,	193	0x00500812,
194	0x05bb09a7, 0x05bbe006, 0x05bbe9a7, 0x05bcc006, 0x05bcc9a7, 0x05bda006, 0x05bda9a7, 0x05be8006, 0x05be89a7,	194	0x0050180a,
195	0x05bf6006, 0x05bf69a7, 0x05c04006, 0x05c049a7, 0x05c12006, 0x05c129a7, 0x05c20006, 0x05c209a7, 0x05c2e006,	195	0x0051e002,
196	0x05c2e9a7, 0x05c3c006, 0x05c3c9a7, 0x05c4a006, 0x05c4a9a7, 0x05c58006, 0x05c589a7, 0x05c66006, 0x05c669a7,	196	0x0051f02a,
197	0x05c74006, 0x05c749a7, 0x05c82006, 0x05c829a7, 0x05c90006, 0x05c909a7, 0x05c9e006, 0x05c9e9a7, 0x05cac006,	197	0x00520812,
198	0x05cac9a7, 0x05cba006, 0x05cba9a7, 0x05cc8006, 0x05cc89a7, 0x05cd6006, 0x05cd69a7, 0x05ce4006, 0x05ce49a7,	198	0x00523812,
199	0x05cf2006, 0x05cf29a7, 0x05d00006, 0x05d009a7, 0x05d0e006, 0x05d0e9a7, 0x05d1c006, 0x05d1c9a7, 0x05d2a006,	199	0x00525822,
200	0x05d2a9a7, 0x05d38006, 0x05d389a7, 0x05d46006, 0x05d469a7, 0x05d54006, 0x05d549a7, 0x05d62006, 0x05d629a7,	200	0x00528802,
201	0x05d70006, 0x05d709a7, 0x05d7e006, 0x05d7e9a7, 0x05d8c006, 0x05d8c9a7, 0x05d9a006, 0x05d9a9a7, 0x05da8006,	201	0x00538012,
202	0x05da89a7, 0x05db6006, 0x05db69a7, 0x05dc4006, 0x05dc49a7, 0x05dd2006, 0x05dd29a7, 0x05de0006, 0x05de09a7,	202	0x0053a802,
203	0x05dee006, 0x05dee9a7, 0x05dfc006, 0x05dfc9a7, 0x05e0a006, 0x05e0a9a7, 0x05e18006, 0x05e189a7, 0x05e26006,	203	0x00540812,
204	0x05e269a7, 0x05e34006, 0x05e349a7, 0x05e42006, 0x05e429a7, 0x05e50006, 0x05e509a7, 0x05e5e006, 0x05e5e9a7,	204	0x0054180a,
205	0x05e6c006, 0x05e6c9a7, 0x05e7a006, 0x05e7a9a7, 0x05e88006, 0x05e889a7, 0x05e96006, 0x05e969a7, 0x05ea4006,	205	0x0055e002,
206	0x05ea49a7, 0x05eb2006, 0x05eb29a7, 0x05ec0006, 0x05ec09a7, 0x05ece006, 0x05ece9a7, 0x05edc006, 0x05edc9a7,	206	0x0055f02a,
207	0x05eea006, 0x05eea9a7, 0x05ef8006, 0x05ef89a7, 0x05f06006, 0x05f069a7, 0x05f14006, 0x05f149a7, 0x05f22006,	207	0x00560842,
208	0x05f229a7, 0x05f30006, 0x05f309a7, 0x05f3e006, 0x05f3e9a7, 0x05f4c006, 0x05f4c9a7, 0x05f5a006, 0x05f5a9a7,	208	0x00563812,
209	0x05f68006, 0x05f689a7, 0x05f76006, 0x05f769a7, 0x05f84006, 0x05f849a7, 0x05f92006, 0x05f929a7, 0x05fa0006,	209	0x0056480a,
210	0x05fa09a7, 0x05fae006, 0x05fae9a7, 0x05fbc006, 0x05fbc9a7, 0x05fca006, 0x05fca9a7, 0x05fd8006, 0x05fd89a7,	210	0x0056581a,
211	0x05fe6006, 0x05fe69a7, 0x05ff4006, 0x05ff49a7, 0x06002006, 0x060029a7, 0x06010006, 0x060109a7, 0x0601e006,	211	0x00566802,
212	0x0601e9a7, 0x0602c006, 0x0602c9a7, 0x0603a006, 0x0603a9a7, 0x06048006, 0x060489a7, 0x06056006, 0x060569a7,	212	0x00571012,
213	0x06064006, 0x060649a7, 0x06072006, 0x060729a7, 0x06080006, 0x060809a7, 0x0608e006, 0x0608e9a7, 0x0609c006,	213	0x0057d052,
214	0x0609c9a7, 0x060aa006, 0x060aa9a7, 0x060b8006, 0x060b89a7, 0x060c6006, 0x060c69a7, 0x060d4006, 0x060d49a7,	214	0x00580802,
215	0x060e2006, 0x060e29a7, 0x060f0006, 0x060f09a7, 0x060fe006, 0x060fe9a7, 0x0610c006, 0x0610c9a7, 0x0611a006,	215	0x0058101a,
216	0x0611a9a7, 0x06128006, 0x061289a7, 0x06136006, 0x061369a7, 0x06144006, 0x061449a7, 0x06152006, 0x061529a7,	216	0x0059e002,
217	0x06160006, 0x061609a7, 0x0616e006, 0x0616e9a7, 0x0617c006, 0x0617c9a7, 0x0618a006, 0x0618a9a7, 0x06198006,	217	0x0059f012,
218	0x061989a7, 0x061a6006, 0x061a69a7, 0x061b4006, 0x061b49a7, 0x061c2006, 0x061c29a7, 0x061d0006, 0x061d09a7,	218	0x005a000a,
219	0x061de006, 0x061de9a7, 0x061ec006, 0x061ec9a7, 0x061fa006, 0x061fa9a7, 0x06208006, 0x062089a7, 0x06216006,	219	0x005a0832,
220	0x062169a7, 0x06224006, 0x062249a7, 0x06232006, 0x062329a7, 0x06240006, 0x062409a7, 0x0624e006, 0x0624e9a7,	220	0x005a381a,
221	0x0625c006, 0x0625c9a7, 0x0626a006, 0x0626a9a7, 0x06278006, 0x062789a7, 0x06286006, 0x062869a7, 0x06294006,	221	0x005a581a,
222	0x062949a7, 0x062a2006, 0x062a29a7, 0x062b0006, 0x062b09a7, 0x062be006, 0x062be9a7, 0x062cc006, 0x062cc9a7,	222	0x005a6802,
223	0x062da006, 0x062da9a7, 0x062e8006, 0x062e89a7, 0x062f6006, 0x062f69a7, 0x06304006, 0x063049a7, 0x06312006,	223	0x005aa822,
224	0x063129a7, 0x06320006, 0x063209a7, 0x0632e006, 0x0632e9a7, 0x0633c006, 0x0633c9a7, 0x0634a006, 0x0634a9a7,	224	0x005b1012,
225	0x06358006, 0x063589a7, 0x06366006, 0x063669a7, 0x06374006, 0x063749a7, 0x06382006, 0x063829a7, 0x06390006,	225	0x005c1002,
226	0x063909a7, 0x0639e006, 0x0639e9a7, 0x063ac006, 0x063ac9a7, 0x063ba006, 0x063ba9a7, 0x063c8006, 0x063c89a7,	226	0x005df002,
227	0x063d6006, 0x063d69a7, 0x063e4006, 0x063e49a7, 0x063f2006, 0x063f29a7, 0x06400006, 0x064009a7, 0x0640e006,	227	0x005df80a,
228	0x0640e9a7, 0x0641c006, 0x0641c9a7, 0x0642a006, 0x0642a9a7, 0x06438006, 0x064389a7, 0x06446006, 0x064469a7,	228	0x005e0002,
229	0x06454006, 0x064549a7, 0x06462006, 0x064629a7, 0x06470006, 0x064709a7, 0x0647e006, 0x0647e9a7, 0x0648c006,	229	0x005e081a,
230	0x0648c9a7, 0x0649a006, 0x0649a9a7, 0x064a8006, 0x064a89a7, 0x064b6006, 0x064b69a7, 0x064c4006, 0x064c49a7,	230	0x005e302a,
231	0x064d2006, 0x064d29a7, 0x064e0006, 0x064e09a7, 0x064ee006, 0x064ee9a7, 0x064fc006, 0x064fc9a7, 0x0650a006,	231	0x005e502a,
232	0x0650a9a7, 0x06518006, 0x065189a7, 0x06526006, 0x065269a7, 0x06534006, 0x065349a7, 0x06542006, 0x065429a7,	232	0x005e6802,
233	0x06550006, 0x065509a7, 0x0655e006, 0x0655e9a7, 0x0656c006, 0x0656c9a7, 0x0657a006, 0x0657a9a7, 0x06588006,	233	0x005eb802,
234	0x065889a7, 0x06596006, 0x065969a7, 0x065a4006, 0x065a49a7, 0x065b2006, 0x065b29a7, 0x065c0006, 0x065c09a7,	234	0x00600002,
235	0x065ce006, 0x065ce9a7, 0x065dc006, 0x065dc9a7, 0x065ea006, 0x065ea9a7, 0x065f8006, 0x065f89a7, 0x06606006,	235	0x0060082a,
236	0x066069a7, 0x06614006, 0x066149a7, 0x06622006, 0x066229a7, 0x06630006, 0x066309a7, 0x0663e006, 0x0663e9a7,	236	0x00602002,
237	0x0664c006, 0x0664c9a7, 0x0665a006, 0x0665a9a7, 0x06668006, 0x066689a7, 0x06676006, 0x066769a7, 0x06684006,	237	0x0061e002,
238	0x066849a7, 0x06692006, 0x066929a7, 0x066a0006, 0x066a09a7, 0x066ae006, 0x066ae9a7, 0x066bc006, 0x066bc9a7,	238	0x0061f022,
239	0x066ca006, 0x066ca9a7, 0x066d8006, 0x066d89a7, 0x066e6006, 0x066e69a7, 0x066f4006, 0x066f49a7, 0x06702006,	239	0x0062083a,
240	0x067029a7, 0x06710006, 0x067109a7, 0x0671e006, 0x0671e9a7, 0x0672c006, 0x0672c9a7, 0x0673a006, 0x0673a9a7,	240	0x00623022,
241	0x06748006, 0x067489a7, 0x06756006, 0x067569a7, 0x06764006, 0x067649a7, 0x06772006, 0x067729a7, 0x06780006,	241	0x00625032,
242	0x067809a7, 0x0678e006, 0x0678e9a7, 0x0679c006, 0x0679c9a7, 0x067aa006, 0x067aa9a7, 0x067b8006, 0x067b89a7,	242	0x0062a812,
243	0x067c6006, 0x067c69a7, 0x067d4006, 0x067d49a7, 0x067e2006, 0x067e29a7, 0x067f0006, 0x067f09a7, 0x067fe006,	243	0x00631012,
244	0x067fe9a7, 0x0680c006, 0x0680c9a7, 0x0681a006, 0x0681a9a7, 0x06828006, 0x068289a7, 0x06836006, 0x068369a7,	244	0x00640802,
245	0x06844006, 0x068449a7, 0x06852006, 0x068529a7, 0x06860006, 0x068609a7, 0x0686e006, 0x0686e9a7, 0x0687c006,	245	0x0064101a,
246	0x0687c9a7, 0x0688a006, 0x0688a9a7, 0x06898006, 0x068989a7, 0x068a6006, 0x068a69a7, 0x068b4006, 0x068b49a7,	246	0x0065e002,
247	0x068c2006, 0x068c29a7, 0x068d0006, 0x068d09a7, 0x068de006, 0x068de9a7, 0x068ec006, 0x068ec9a7, 0x068fa006,	247	0x0065f00a,
248	0x068fa9a7, 0x06908006, 0x069089a7, 0x06916006, 0x069169a7, 0x06924006, 0x069249a7, 0x06932006, 0x069329a7,	248	0x0065f802,
249	0x06940006, 0x069409a7, 0x0694e006, 0x0694e9a7, 0x0695c006, 0x0695c9a7, 0x0696a006, 0x0696a9a7, 0x06978006,	249	0x0066001a,
250	0x069789a7, 0x06986006, 0x069869a7, 0x06994006, 0x069949a7, 0x069a2006, 0x069a29a7, 0x069b0006, 0x069b09a7,	250	0x00661002,
251	0x069be006, 0x069be9a7, 0x069cc006, 0x069cc9a7, 0x069da006, 0x069da9a7, 0x069e8006, 0x069e89a7, 0x069f6006,	251	0x0066181a,
252	0x069f69a7, 0x06a04006, 0x06a049a7, 0x06a12006, 0x06a129a7, 0x06a20006, 0x06a209a7, 0x06a2e006, 0x06a2e9a7,	252	0x00663002,
253	0x06a3c006, 0x06a3c9a7, 0x06a4a006, 0x06a4a9a7, 0x06a58006, 0x06a589a7, 0x06a66006, 0x06a669a7, 0x06a74006,	253	0x0066381a,
254	0x06a749a7, 0x06a82006, 0x06a829a7, 0x06a90006, 0x06a909a7, 0x06a9e006, 0x06a9e9a7, 0x06aac006, 0x06aac9a7,	254	0x0066501a,
255	0x06aba006, 0x06aba9a7, 0x06ac8006, 0x06ac89a7, 0x06ad6006, 0x06ad69a7, 0x06ae4006, 0x06ae49a7, 0x06af2006,	255	0x00666012,
256	0x06af29a7, 0x06b00006, 0x06b009a7, 0x06b0e006, 0x06b0e9a7, 0x06b1c006, 0x06b1c9a7, 0x06b2a006, 0x06b2a9a7,	256	0x0066a812,
257	0x06b38006, 0x06b389a7, 0x06b46006, 0x06b469a7, 0x06b54006, 0x06b549a7, 0x06b62006, 0x06b629a7, 0x06b70006,	257	0x00671012,
258	0x06b709a7, 0x06b7e006, 0x06b7e9a7, 0x06b8c006, 0x06b8c9a7, 0x06b9a006, 0x06b9a9a7, 0x06ba8006, 0x06ba89a7,	258	0x0067980a,
259	0x06bb6006, 0x06bb69a7, 0x06bc4006, 0x06bc49a7, 0x06bd816c, 0x06be5b0b, 0x07d8f002, 0x07f000f2, 0x07f100f2,	259	0x00680012,
260	0x07f7f801, 0x07fcf012, 0x07ff80b1, 0x080fe802, 0x08170002, 0x081bb042, 0x08500822, 0x08502812, 0x08506032,	260	0x0068101a,
261	0x0851c022, 0x0851f802, 0x08572812, 0x08692032, 0x08755812, 0x087a30a2, 0x087c1032, 0x0880000a, 0x08800802,	261	0x0069d812,
262	0x0880100a, 0x0881c0e2, 0x08838002, 0x08839812, 0x0883f822, 0x0884100a, 0x0885802a, 0x08859832, 0x0885b81a,	262	0x0069f002,
263	0x0885c812, 0x0885e808, 0x08861002, 0x08866808, 0x08880022, 0x08893842, 0x0889600a, 0x08896872, 0x088a281a,	263	0x0069f81a,
264	0x088b9802, 0x088c0012, 0x088c100a, 0x088d982a, 0x088db082, 0x088df81a, 0x088e1018, 0x088e4832, 0x088e700a,	264	0x006a0832,
265	0x088e7802, 0x0891602a, 0x08917822, 0x0891901a, 0x0891a002, 0x0891a80a, 0x0891b012, 0x0891f002, 0x0896f802,	265	0x006a302a,
266	0x0897002a, 0x08971872, 0x08980012, 0x0898101a, 0x0899d812, 0x0899f002, 0x0899f80a, 0x089a0002, 0x089a083a,	266	0x006a502a,
267	0x089a381a, 0x089a582a, 0x089ab802, 0x089b101a, 0x089b3062, 0x089b8042, 0x08a1a82a, 0x08a1c072, 0x08a2001a,	267	0x006a6802,
268	0x08a21022, 0x08a2280a, 0x08a23002, 0x08a2f002, 0x08a58002, 0x08a5881a, 0x08a59852, 0x08a5c80a, 0x08a5d002,	268	0x006a7008,
269	0x08a5d81a, 0x08a5e802, 0x08a5f00a, 0x08a5f812, 0x08a6080a, 0x08a61012, 0x08ad7802, 0x08ad801a, 0x08ad9032,	269	0x006ab802,
270	0x08adc03a, 0x08ade012, 0x08adf00a, 0x08adf812, 0x08aee012, 0x08b1802a, 0x08b19872, 0x08b1d81a, 0x08b1e802,	270	0x006b1012,
271	0x08b1f00a, 0x08b1f812, 0x08b55802, 0x08b5600a, 0x08b56802, 0x08b5701a, 0x08b58052, 0x08b5b00a, 0x08b5b802,	271	0x006c0802,
272	0x08b8e822, 0x08b91032, 0x08b9300a, 0x08b93842, 0x08c1602a, 0x08c17882, 0x08c1c00a, 0x08c1c812, 0x08c98002,	272	0x006c101a,
273	0x08c9884a, 0x08c9b81a, 0x08c9d812, 0x08c9e80a, 0x08c9f002, 0x08c9f808, 0x08ca000a, 0x08ca0808, 0x08ca100a,	273	0x006e5002,
274	0x08ca1802, 0x08ce882a, 0x08cea032, 0x08ced012, 0x08cee03a, 0x08cf0002, 0x08cf200a, 0x08d00892, 0x08d19852,	274	0x006e7802,
275	0x08d1c80a, 0x08d1d008, 0x08d1d832, 0x08d23802, 0x08d28852, 0x08d2b81a, 0x08d2c822, 0x08d42058, 0x08d450c2,	275	0x006e801a,
276	0x08d4b80a, 0x08d4c012, 0x08e1780a, 0x08e18062, 0x08e1c052, 0x08e1f00a, 0x08e1f802, 0x08e49152, 0x08e5480a,	276	0x006e9022,
277	0x08e55062, 0x08e5880a, 0x08e59012, 0x08e5a00a, 0x08e5a812, 0x08e98852, 0x08e9d002, 0x08e9e012, 0x08e9f862,	277	0x006eb002,
278	0x08ea3008, 0x08ea3802, 0x08ec504a, 0x08ec8012, 0x08ec981a, 0x08eca802, 0x08ecb00a, 0x08ecb802, 0x08f79812,	278	0x006ec06a,
279	0x08f7a81a, 0x09a18081, 0x0b578042, 0x0b598062, 0x0b7a7802, 0x0b7a8b6a, 0x0b7c7832, 0x0b7f2002, 0x0b7f801a,	279	0x006ef802,
280	0x0de4e812, 0x0de50031, 0x0e7802d2, 0x0e798162, 0x0e8b2802, 0x0e8b300a, 0x0e8b3822, 0x0e8b680a, 0x0e8b7042,	280	0x006f901a,
281	0x0e8b9871, 0x0e8bd872, 0x0e8c2862, 0x0e8d5032, 0x0e921022, 0x0ed00362, 0x0ed1db12, 0x0ed3a802, 0x0ed42002,	281	0x00718802,
282	0x0ed4d842, 0x0ed508e2, 0x0f000062, 0x0f004102, 0x0f00d862, 0x0f011812, 0x0f013042, 0x0f098062, 0x0f157002,	282	0x0071980a,
283	0x0f176032, 0x0f468062, 0x0f4a2062, 0x0f8007f3, 0x0f8407f3, 0x0f886823, 0x0f897803, 0x0f8b6053, 0x0f8bf013,	283	0x0071a062,
284	0x0f8c7003, 0x0f8c8893, 0x0f8d6b83, 0x0f8f3199, 0x0f9008e3, 0x0f90d003, 0x0f917803, 0x0f919083, 0x0f91e033,	284	0x00723872,
285	0x0f924ff3, 0x0f964ff3, 0x0f9a4ff3, 0x0f9e4b13, 0x0f9fd842, 0x0fa007f3, 0x0fa407f3, 0x0fa803d3, 0x0faa37f3,	285	0x00758802,
286	0x0fae37f3, 0x0fb23093, 0x0fb407f3, 0x0fbba0b3, 0x0fbeaaa3, 0x0fc06033, 0x0fc24073, 0x0fc2d053, 0x0fc44073,	286	0x0075980a,
287	0x0fc57513, 0x0fc862e3, 0x0fc9e093, 0x0fca3ff3, 0x0fce3ff3, 0x0fd23ff3, 0x0fd63b83, 0x0fe007f3, 0x0fe407f3,	287	0x0075a082,
288	0x0fe807f3, 0x0fec07f3, 0x0ff007f3, 0x0ff407f3, 0x0ff807f3, 0x0ffc07d3, 0x700001f1, 0x700105f2, 0x700407f1,	288	0x00764062,
289	0x700807f2, 0x700c06f2, 0x700f87f1, 0x701387f1, 0x701787f1, 0x701b87f1, 0x701f87f1, 0x702387f1, 0x702787f1,	289	0x0078c012,
290	0x702b87f1, 0x702f87f1, 0x703387f1, 0x703787f1, 0x703b87f1, 0x703f87f1, 0x704387f1, 0x704787f1, 0x704b87f1,	290	0x0079a802,
291	0x704f87f1, 0x705387f1, 0x705787f1, 0x705b87f1, 0x705f87f1, 0x706387f1, 0x706787f1, 0x706b87f1, 0x706f87f1,	291	0x0079b802,
292	0x707387f1, 0x707787f1, 0x707b87f1, 0x707f80f1};	292	0x0079c802,
		293	0x0079f01a,
		294	0x007b88d2,
		295	0x007bf80a,
		296	0x007c0042,
		297	0x007c3012,
		298	0x007c68a2,
		299	0x007cca32,
		300	0x007e3002,
		301	0x00816832,
		302	0x0081880a,
		303	0x00819052,
		304	0x0081c812,
		305	0x0081d81a,
		306	0x0081e812,
		307	0x0082b01a,
		308	0x0082c012,
		309	0x0082f022,
		310	0x00838832,
		311	0x00841002,
		312	0x0084200a,
		313	0x00842812,
		314	0x00846802,
		315	0x0084e802,
		316	0x008805f4,
		317	0x008b047c,
		318	0x008d457b,
		319	0x009ae822,
		320	0x00b89022,
		321	0x00b8a80a,
		322	0x00b99012,
		323	0x00b9a00a,
		324	0x00ba9012,
		325	0x00bb9012,
		326	0x00bda012,
		327	0x00bdb00a,
		328	0x00bdb862,
		329	0x00bdf07a,
		330	0x00be3002,
		331	0x00be381a,
		332	0x00be48a2,
		333	0x00bee802,
		334	0x00c05822,
		335	0x00c07001,
		336	0x00c07802,
		337	0x00c42812,
		338	0x00c54802,
		339	0x00c90022,
		340	0x00c9183a,
		341	0x00c93812,
		342	0x00c9482a,
		343	0x00c9801a,
		344	0x00c99002,
		345	0x00c9985a,
		346	0x00c9c822,
		347	0x00d0b812,
		348	0x00d0c81a,
		349	0x00d0d802,
		350	0x00d2a80a,
		351	0x00d2b002,
		352	0x00d2b80a,
		353	0x00d2c062,
		354	0x00d30002,
		355	0x00d31002,
		356	0x00d32872,
		357	0x00d3685a,
		358	0x00d39892,
		359	0x00d3f802,
		360	0x00d581e2,
		361	0x00d80032,
		362	0x00d8200a,
		363	0x00d9a062,
		364	0x00d9d80a,
		365	0x00d9e002,
		366	0x00d9e84a,
		367	0x00da1002,
		368	0x00da181a,
		369	0x00db5882,
		370	0x00dc0012,
		371	0x00dc100a,
		372	0x00dd080a,
		373	0x00dd1032,
		374	0x00dd301a,
		375	0x00dd4012,
		376	0x00dd500a,
		377	0x00dd5822,
		378	0x00df3002,
		379	0x00df380a,
		380	0x00df4012,
		381	0x00df502a,
		382	0x00df6802,
		383	0x00df700a,
		384	0x00df7822,
		385	0x00df901a,
		386	0x00e1207a,
		387	0x00e16072,
		388	0x00e1a01a,
		389	0x00e1b012,
		390	0x00e68022,
		391	0x00e6a0c2,
		392	0x00e7080a,
		393	0x00e71062,
		394	0x00e76802,
		395	0x00e7a002,
		396	0x00e7b80a,
		397	0x00e7c012,
		398	0x00ee03f2,
		399	0x01005801,
		400	0x01006002,
		401	0x0100680d,
		402	0x01007011,
		403	0x01014061,
		404	0x0101e003,
		405	0x01024803,
		406	0x010300f1,
		407	0x01068202,
		408	0x01091003,
		409	0x0109c803,
		410	0x010ca053,
		411	0x010d4813,
		412	0x0118d013,
		413	0x01194003,
		414	0x011c4003,
		415	0x011e7803,
		416	0x011f48a3,
		417	0x011fc023,
		418	0x01261003,
		419	0x012d5013,
		420	0x012db003,
		421	0x012e0003,
		422	0x012fd833,
		423	0x01300053,
		424	0x013038b3,
		425	0x0130a713,
		426	0x01348753,
		427	0x013840a3,
		428	0x0138a003,
		429	0x0138b003,
		430	0x0138e803,
		431	0x01390803,
		432	0x01394003,
		433	0x01399813,
		434	0x013a2003,
		435	0x013a3803,
		436	0x013a6003,
		437	0x013a7003,
		438	0x013a9823,
		439	0x013ab803,
		440	0x013b1843,
		441	0x013ca823,
		442	0x013d0803,
		443	0x013d8003,
		444	0x013df803,
		445	0x0149a013,
		446	0x01582823,
		447	0x0158d813,
		448	0x015a8003,
		449	0x015aa803,
		450	0x01677822,
		451	0x016bf802,
		452	0x016f01f2,
		453	0x01815052,
		454	0x01818003,
		455	0x0181e803,
		456	0x0184c812,
		457	0x0194b803,
		458	0x0194c803,
		459	0x05337832,
		460	0x0533a092,
		461	0x0534f012,
		462	0x05378012,
		463	0x05401002,
		464	0x05403002,
		465	0x05405802,
		466	0x0541181a,
		467	0x05412812,
		468	0x0541380a,
		469	0x05416002,
		470	0x0544001a,
		471	0x0545a0fa,
		472	0x05462012,
		473	0x05470112,
		474	0x0547f802,
		475	0x05493072,
		476	0x054a38a2,
		477	0x054a901a,
		478	0x054b01c4,
		479	0x054c0022,
		480	0x054c180a,
		481	0x054d9802,
		482	0x054da01a,
		483	0x054db032,
		484	0x054dd01a,
		485	0x054de012,
		486	0x054df02a,
		487	0x054f2802,
		488	0x05514852,
		489	0x0551781a,
		490	0x05518812,
		491	0x0551981a,
		492	0x0551a812,
		493	0x05521802,
		494	0x05526002,
		495	0x0552680a,
		496	0x0553e002,
		497	0x05558002,
		498	0x05559022,
		499	0x0555b812,
		500	0x0555f012,
		501	0x05560802,
		502	0x0557580a,
		503	0x05576012,
		504	0x0557701a,
		505	0x0557a80a,
		506	0x0557b002,
		507	0x055f181a,
		508	0x055f2802,
		509	0x055f301a,
		510	0x055f4002,
		511	0x055f481a,
		512	0x055f600a,
		513	0x055f6802,
		514	0x05600006,
		515	0x056009a7,
		516	0x0560e006,
		517	0x0560e9a7,
		518	0x0561c006,
		519	0x0561c9a7,
		520	0x0562a006,
		521	0x0562a9a7,
		522	0x05638006,
		523	0x056389a7,
		524	0x05646006,
		525	0x056469a7,
		526	0x05654006,
		527	0x056549a7,
		528	0x05662006,
		529	0x056629a7,
		530	0x05670006,
		531	0x056709a7,
		532	0x0567e006,
		533	0x0567e9a7,
		534	0x0568c006,
		535	0x0568c9a7,
		536	0x0569a006,
		537	0x0569a9a7,
		538	0x056a8006,
		539	0x056a89a7,
		540	0x056b6006,
		541	0x056b69a7,
		542	0x056c4006,
		543	0x056c49a7,
		544	0x056d2006,
		545	0x056d29a7,
		546	0x056e0006,
		547	0x056e09a7,
		548	0x056ee006,
		549	0x056ee9a7,
		550	0x056fc006,
		551	0x056fc9a7,
		552	0x0570a006,
		553	0x0570a9a7,
		554	0x05718006,
		555	0x057189a7,
		556	0x05726006,
		557	0x057269a7,
		558	0x05734006,
		559	0x057349a7,
		560	0x05742006,
		561	0x057429a7,
		562	0x05750006,
		563	0x057509a7,
		564	0x0575e006,
		565	0x0575e9a7,
		566	0x0576c006,
		567	0x0576c9a7,
		568	0x0577a006,
		569	0x0577a9a7,
		570	0x05788006,
		571	0x057889a7,
		572	0x05796006,
		573	0x057969a7,
		574	0x057a4006,
		575	0x057a49a7,
		576	0x057b2006,
		577	0x057b29a7,
		578	0x057c0006,
		579	0x057c09a7,
		580	0x057ce006,
		581	0x057ce9a7,
		582	0x057dc006,
		583	0x057dc9a7,
		584	0x057ea006,
		585	0x057ea9a7,
		586	0x057f8006,
		587	0x057f89a7,
		588	0x05806006,
		589	0x058069a7,
		590	0x05814006,
		591	0x058149a7,
		592	0x05822006,
		593	0x058229a7,
		594	0x05830006,
		595	0x058309a7,
		596	0x0583e006,
		597	0x0583e9a7,
		598	0x0584c006,
		599	0x0584c9a7,
		600	0x0585a006,
		601	0x0585a9a7,
		602	0x05868006,
		603	0x058689a7,
		604	0x05876006,
		605	0x058769a7,
		606	0x05884006,
		607	0x058849a7,
		608	0x05892006,
		609	0x058929a7,
		610	0x058a0006,
		611	0x058a09a7,
		612	0x058ae006,
		613	0x058ae9a7,
		614	0x058bc006,
		615	0x058bc9a7,
		616	0x058ca006,
		617	0x058ca9a7,
		618	0x058d8006,
		619	0x058d89a7,
		620	0x058e6006,
		621	0x058e69a7,
		622	0x058f4006,
		623	0x058f49a7,
		624	0x05902006,
		625	0x059029a7,
		626	0x05910006,
		627	0x059109a7,
		628	0x0591e006,
		629	0x0591e9a7,
		630	0x0592c006,
		631	0x0592c9a7,
		632	0x0593a006,
		633	0x0593a9a7,
		634	0x05948006,
		635	0x059489a7,
		636	0x05956006,
		637	0x059569a7,
		638	0x05964006,
		639	0x059649a7,
		640	0x05972006,
		641	0x059729a7,
		642	0x05980006,
		643	0x059809a7,
		644	0x0598e006,
		645	0x0598e9a7,
		646	0x0599c006,
		647	0x0599c9a7,
		648	0x059aa006,
		649	0x059aa9a7,
		650	0x059b8006,
		651	0x059b89a7,
		652	0x059c6006,
		653	0x059c69a7,
		654	0x059d4006,
		655	0x059d49a7,
		656	0x059e2006,
		657	0x059e29a7,
		658	0x059f0006,
		659	0x059f09a7,
		660	0x059fe006,
		661	0x059fe9a7,
		662	0x05a0c006,
		663	0x05a0c9a7,
		664	0x05a1a006,
		665	0x05a1a9a7,
		666	0x05a28006,
		667	0x05a289a7,
		668	0x05a36006,
		669	0x05a369a7,
		670	0x05a44006,
		671	0x05a449a7,
		672	0x05a52006,
		673	0x05a529a7,
		674	0x05a60006,
		675	0x05a609a7,
		676	0x05a6e006,
		677	0x05a6e9a7,
		678	0x05a7c006,
		679	0x05a7c9a7,
		680	0x05a8a006,
		681	0x05a8a9a7,
		682	0x05a98006,
		683	0x05a989a7,
		684	0x05aa6006,
		685	0x05aa69a7,
		686	0x05ab4006,
		687	0x05ab49a7,
		688	0x05ac2006,
		689	0x05ac29a7,
		690	0x05ad0006,
		691	0x05ad09a7,
		692	0x05ade006,
		693	0x05ade9a7,
		694	0x05aec006,
		695	0x05aec9a7,
		696	0x05afa006,
		697	0x05afa9a7,
		698	0x05b08006,
		699	0x05b089a7,
		700	0x05b16006,
		701	0x05b169a7,
		702	0x05b24006,
		703	0x05b249a7,
		704	0x05b32006,
		705	0x05b329a7,
		706	0x05b40006,
		707	0x05b409a7,
		708	0x05b4e006,
		709	0x05b4e9a7,
		710	0x05b5c006,
		711	0x05b5c9a7,
		712	0x05b6a006,
		713	0x05b6a9a7,
		714	0x05b78006,
		715	0x05b789a7,
		716	0x05b86006,
		717	0x05b869a7,
		718	0x05b94006,
		719	0x05b949a7,
		720	0x05ba2006,
		721	0x05ba29a7,
		722	0x05bb0006,
		723	0x05bb09a7,
		724	0x05bbe006,
		725	0x05bbe9a7,
		726	0x05bcc006,
		727	0x05bcc9a7,
		728	0x05bda006,
		729	0x05bda9a7,
		730	0x05be8006,
		731	0x05be89a7,
		732	0x05bf6006,
		733	0x05bf69a7,
		734	0x05c04006,
		735	0x05c049a7,
		736	0x05c12006,
		737	0x05c129a7,
		738	0x05c20006,
		739	0x05c209a7,
		740	0x05c2e006,
		741	0x05c2e9a7,
		742	0x05c3c006,
		743	0x05c3c9a7,
		744	0x05c4a006,
		745	0x05c4a9a7,
		746	0x05c58006,
		747	0x05c589a7,
		748	0x05c66006,
		749	0x05c669a7,
		750	0x05c74006,
		751	0x05c749a7,
		752	0x05c82006,
		753	0x05c829a7,
		754	0x05c90006,
		755	0x05c909a7,
		756	0x05c9e006,
		757	0x05c9e9a7,
		758	0x05cac006,
		759	0x05cac9a7,
		760	0x05cba006,
		761	0x05cba9a7,
		762	0x05cc8006,
		763	0x05cc89a7,
		764	0x05cd6006,
		765	0x05cd69a7,
		766	0x05ce4006,
		767	0x05ce49a7,
		768	0x05cf2006,
		769	0x05cf29a7,
		770	0x05d00006,
		771	0x05d009a7,
		772	0x05d0e006,
		773	0x05d0e9a7,
		774	0x05d1c006,
		775	0x05d1c9a7,
		776	0x05d2a006,
		777	0x05d2a9a7,
		778	0x05d38006,
		779	0x05d389a7,
		780	0x05d46006,
		781	0x05d469a7,
		782	0x05d54006,
		783	0x05d549a7,
		784	0x05d62006,
		785	0x05d629a7,
		786	0x05d70006,
		787	0x05d709a7,
		788	0x05d7e006,
		789	0x05d7e9a7,
		790	0x05d8c006,
		791	0x05d8c9a7,
		792	0x05d9a006,
		793	0x05d9a9a7,
		794	0x05da8006,
		795	0x05da89a7,
		796	0x05db6006,
		797	0x05db69a7,
		798	0x05dc4006,
		799	0x05dc49a7,
		800	0x05dd2006,
		801	0x05dd29a7,
		802	0x05de0006,
		803	0x05de09a7,
		804	0x05dee006,
		805	0x05dee9a7,
		806	0x05dfc006,
		807	0x05dfc9a7,
		808	0x05e0a006,
		809	0x05e0a9a7,
		810	0x05e18006,
		811	0x05e189a7,
		812	0x05e26006,
		813	0x05e269a7,
		814	0x05e34006,
		815	0x05e349a7,
		816	0x05e42006,
		817	0x05e429a7,
		818	0x05e50006,
		819	0x05e509a7,
		820	0x05e5e006,
		821	0x05e5e9a7,
		822	0x05e6c006,
		823	0x05e6c9a7,
		824	0x05e7a006,
		825	0x05e7a9a7,
		826	0x05e88006,
		827	0x05e889a7,
		828	0x05e96006,
		829	0x05e969a7,
		830	0x05ea4006,
		831	0x05ea49a7,
		832	0x05eb2006,
		833	0x05eb29a7,
		834	0x05ec0006,
		835	0x05ec09a7,
		836	0x05ece006,
		837	0x05ece9a7,
		838	0x05edc006,
		839	0x05edc9a7,
		840	0x05eea006,
		841	0x05eea9a7,
		842	0x05ef8006,
		843	0x05ef89a7,
		844	0x05f06006,
		845	0x05f069a7,
		846	0x05f14006,
		847	0x05f149a7,
		848	0x05f22006,
		849	0x05f229a7,
		850	0x05f30006,
		851	0x05f309a7,
		852	0x05f3e006,
		853	0x05f3e9a7,
		854	0x05f4c006,
		855	0x05f4c9a7,
		856	0x05f5a006,
		857	0x05f5a9a7,
		858	0x05f68006,
		859	0x05f689a7,
		860	0x05f76006,
		861	0x05f769a7,
		862	0x05f84006,
		863	0x05f849a7,
		864	0x05f92006,
		865	0x05f929a7,
		866	0x05fa0006,
		867	0x05fa09a7,
		868	0x05fae006,
		869	0x05fae9a7,
		870	0x05fbc006,
		871	0x05fbc9a7,
		872	0x05fca006,
		873	0x05fca9a7,
		874	0x05fd8006,
		875	0x05fd89a7,
		876	0x05fe6006,
		877	0x05fe69a7,
		878	0x05ff4006,
		879	0x05ff49a7,
		880	0x06002006,
		881	0x060029a7,
		882	0x06010006,
		883	0x060109a7,
		884	0x0601e006,
		885	0x0601e9a7,
		886	0x0602c006,
		887	0x0602c9a7,
		888	0x0603a006,
		889	0x0603a9a7,
		890	0x06048006,
		891	0x060489a7,
		892	0x06056006,
		893	0x060569a7,
		894	0x06064006,
		895	0x060649a7,
		896	0x06072006,
		897	0x060729a7,
		898	0x06080006,
		899	0x060809a7,
		900	0x0608e006,
		901	0x0608e9a7,
		902	0x0609c006,
		903	0x0609c9a7,
		904	0x060aa006,
		905	0x060aa9a7,
		906	0x060b8006,
		907	0x060b89a7,
		908	0x060c6006,
		909	0x060c69a7,
		910	0x060d4006,
		911	0x060d49a7,
		912	0x060e2006,
		913	0x060e29a7,
		914	0x060f0006,
		915	0x060f09a7,
		916	0x060fe006,
		917	0x060fe9a7,
		918	0x0610c006,
		919	0x0610c9a7,
		920	0x0611a006,
		921	0x0611a9a7,
		922	0x06128006,
		923	0x061289a7,
		924	0x06136006,
		925	0x061369a7,
		926	0x06144006,
		927	0x061449a7,
		928	0x06152006,
		929	0x061529a7,
		930	0x06160006,
		931	0x061609a7,
		932	0x0616e006,
		933	0x0616e9a7,
		934	0x0617c006,
		935	0x0617c9a7,
		936	0x0618a006,
		937	0x0618a9a7,
		938	0x06198006,
		939	0x061989a7,
		940	0x061a6006,
		941	0x061a69a7,
		942	0x061b4006,
		943	0x061b49a7,
		944	0x061c2006,
		945	0x061c29a7,
		946	0x061d0006,
		947	0x061d09a7,
		948	0x061de006,
		949	0x061de9a7,
		950	0x061ec006,
		951	0x061ec9a7,
		952	0x061fa006,
		953	0x061fa9a7,
		954	0x06208006,
		955	0x062089a7,
		956	0x06216006,
		957	0x062169a7,
		958	0x06224006,
		959	0x062249a7,
		960	0x06232006,
		961	0x062329a7,
		962	0x06240006,
		963	0x062409a7,
		964	0x0624e006,
		965	0x0624e9a7,
		966	0x0625c006,
		967	0x0625c9a7,
		968	0x0626a006,
		969	0x0626a9a7,
		970	0x06278006,
		971	0x062789a7,
		972	0x06286006,
		973	0x062869a7,
		974	0x06294006,
		975	0x062949a7,
		976	0x062a2006,
		977	0x062a29a7,
		978	0x062b0006,
		979	0x062b09a7,
		980	0x062be006,
		981	0x062be9a7,
		982	0x062cc006,
		983	0x062cc9a7,
		984	0x062da006,
		985	0x062da9a7,
		986	0x062e8006,
		987	0x062e89a7,
		988	0x062f6006,
		989	0x062f69a7,
		990	0x06304006,
		991	0x063049a7,
		992	0x06312006,
		993	0x063129a7,
		994	0x06320006,
		995	0x063209a7,
		996	0x0632e006,
		997	0x0632e9a7,
		998	0x0633c006,
		999	0x0633c9a7,
		1000	0x0634a006,
		1001	0x0634a9a7,
		1002	0x06358006,
		1003	0x063589a7,
		1004	0x06366006,
		1005	0x063669a7,
		1006	0x06374006,
		1007	0x063749a7,
		1008	0x06382006,
		1009	0x063829a7,
		1010	0x06390006,
		1011	0x063909a7,
		1012	0x0639e006,
		1013	0x0639e9a7,
		1014	0x063ac006,
		1015	0x063ac9a7,
		1016	0x063ba006,
		1017	0x063ba9a7,
		1018	0x063c8006,
		1019	0x063c89a7,
		1020	0x063d6006,
		1021	0x063d69a7,
		1022	0x063e4006,
		1023	0x063e49a7,
		1024	0x063f2006,
		1025	0x063f29a7,
		1026	0x06400006,
		1027	0x064009a7,
		1028	0x0640e006,
		1029	0x0640e9a7,
		1030	0x0641c006,
		1031	0x0641c9a7,
		1032	0x0642a006,
		1033	0x0642a9a7,
		1034	0x06438006,
		1035	0x064389a7,
		1036	0x06446006,
		1037	0x064469a7,
		1038	0x06454006,
		1039	0x064549a7,
		1040	0x06462006,
		1041	0x064629a7,
		1042	0x06470006,
		1043	0x064709a7,
		1044	0x0647e006,
		1045	0x0647e9a7,
		1046	0x0648c006,
		1047	0x0648c9a7,
		1048	0x0649a006,
		1049	0x0649a9a7,
		1050	0x064a8006,
		1051	0x064a89a7,
		1052	0x064b6006,
		1053	0x064b69a7,
		1054	0x064c4006,
		1055	0x064c49a7,
		1056	0x064d2006,
		1057	0x064d29a7,
		1058	0x064e0006,
		1059	0x064e09a7,
		1060	0x064ee006,
		1061	0x064ee9a7,
		1062	0x064fc006,
		1063	0x064fc9a7,
		1064	0x0650a006,
		1065	0x0650a9a7,
		1066	0x06518006,
		1067	0x065189a7,
		1068	0x06526006,
		1069	0x065269a7,
		1070	0x06534006,
		1071	0x065349a7,
		1072	0x06542006,
		1073	0x065429a7,
		1074	0x06550006,
		1075	0x065509a7,
		1076	0x0655e006,
		1077	0x0655e9a7,
		1078	0x0656c006,
		1079	0x0656c9a7,
		1080	0x0657a006,
		1081	0x0657a9a7,
		1082	0x06588006,
		1083	0x065889a7,
		1084	0x06596006,
		1085	0x065969a7,
		1086	0x065a4006,
		1087	0x065a49a7,
		1088	0x065b2006,
		1089	0x065b29a7,
		1090	0x065c0006,
		1091	0x065c09a7,
		1092	0x065ce006,
		1093	0x065ce9a7,
		1094	0x065dc006,
		1095	0x065dc9a7,
		1096	0x065ea006,
		1097	0x065ea9a7,
		1098	0x065f8006,
		1099	0x065f89a7,
		1100	0x06606006,
		1101	0x066069a7,
		1102	0x06614006,
		1103	0x066149a7,
		1104	0x06622006,
		1105	0x066229a7,
		1106	0x06630006,
		1107	0x066309a7,
		1108	0x0663e006,
		1109	0x0663e9a7,
		1110	0x0664c006,
		1111	0x0664c9a7,
		1112	0x0665a006,
		1113	0x0665a9a7,
		1114	0x06668006,
		1115	0x066689a7,
		1116	0x06676006,
		1117	0x066769a7,
		1118	0x06684006,
		1119	0x066849a7,
		1120	0x06692006,
		1121	0x066929a7,
		1122	0x066a0006,
		1123	0x066a09a7,
		1124	0x066ae006,
		1125	0x066ae9a7,
		1126	0x066bc006,
		1127	0x066bc9a7,
		1128	0x066ca006,
		1129	0x066ca9a7,
		1130	0x066d8006,
		1131	0x066d89a7,
		1132	0x066e6006,
		1133	0x066e69a7,
		1134	0x066f4006,
		1135	0x066f49a7,
		1136	0x06702006,
		1137	0x067029a7,
		1138	0x06710006,
		1139	0x067109a7,
		1140	0x0671e006,
		1141	0x0671e9a7,
		1142	0x0672c006,
		1143	0x0672c9a7,
		1144	0x0673a006,
		1145	0x0673a9a7,
		1146	0x06748006,
		1147	0x067489a7,
		1148	0x06756006,
		1149	0x067569a7,
		1150	0x06764006,
		1151	0x067649a7,
		1152	0x06772006,
		1153	0x067729a7,
		1154	0x06780006,
		1155	0x067809a7,
		1156	0x0678e006,
		1157	0x0678e9a7,
		1158	0x0679c006,
		1159	0x0679c9a7,
		1160	0x067aa006,
		1161	0x067aa9a7,
		1162	0x067b8006,
		1163	0x067b89a7,
		1164	0x067c6006,
		1165	0x067c69a7,
		1166	0x067d4006,
		1167	0x067d49a7,
		1168	0x067e2006,
		1169	0x067e29a7,
		1170	0x067f0006,
		1171	0x067f09a7,
		1172	0x067fe006,
		1173	0x067fe9a7,
		1174	0x0680c006,
		1175	0x0680c9a7,
		1176	0x0681a006,
		1177	0x0681a9a7,
		1178	0x06828006,
		1179	0x068289a7,
		1180	0x06836006,
		1181	0x068369a7,
		1182	0x06844006,
		1183	0x068449a7,
		1184	0x06852006,
		1185	0x068529a7,
		1186	0x06860006,
		1187	0x068609a7,
		1188	0x0686e006,
		1189	0x0686e9a7,
		1190	0x0687c006,
		1191	0x0687c9a7,
		1192	0x0688a006,
		1193	0x0688a9a7,
		1194	0x06898006,
		1195	0x068989a7,
		1196	0x068a6006,
		1197	0x068a69a7,
		1198	0x068b4006,
		1199	0x068b49a7,
		1200	0x068c2006,
		1201	0x068c29a7,
		1202	0x068d0006,
		1203	0x068d09a7,
		1204	0x068de006,
		1205	0x068de9a7,
		1206	0x068ec006,
		1207	0x068ec9a7,
		1208	0x068fa006,
		1209	0x068fa9a7,
		1210	0x06908006,
		1211	0x069089a7,
		1212	0x06916006,
		1213	0x069169a7,
		1214	0x06924006,
		1215	0x069249a7,
		1216	0x06932006,
		1217	0x069329a7,
		1218	0x06940006,
		1219	0x069409a7,
		1220	0x0694e006,
		1221	0x0694e9a7,
		1222	0x0695c006,
		1223	0x0695c9a7,
		1224	0x0696a006,
		1225	0x0696a9a7,
		1226	0x06978006,
		1227	0x069789a7,
		1228	0x06986006,
		1229	0x069869a7,
		1230	0x06994006,
		1231	0x069949a7,
		1232	0x069a2006,
		1233	0x069a29a7,
		1234	0x069b0006,
		1235	0x069b09a7,
		1236	0x069be006,
		1237	0x069be9a7,
		1238	0x069cc006,
		1239	0x069cc9a7,
		1240	0x069da006,
		1241	0x069da9a7,
		1242	0x069e8006,
		1243	0x069e89a7,
		1244	0x069f6006,
		1245	0x069f69a7,
		1246	0x06a04006,
		1247	0x06a049a7,
		1248	0x06a12006,
		1249	0x06a129a7,
		1250	0x06a20006,
		1251	0x06a209a7,
		1252	0x06a2e006,
		1253	0x06a2e9a7,
		1254	0x06a3c006,
		1255	0x06a3c9a7,
		1256	0x06a4a006,
		1257	0x06a4a9a7,
		1258	0x06a58006,
		1259	0x06a589a7,
		1260	0x06a66006,
		1261	0x06a669a7,
		1262	0x06a74006,
		1263	0x06a749a7,
		1264	0x06a82006,
		1265	0x06a829a7,
		1266	0x06a90006,
		1267	0x06a909a7,
		1268	0x06a9e006,
		1269	0x06a9e9a7,
		1270	0x06aac006,
		1271	0x06aac9a7,
		1272	0x06aba006,
		1273	0x06aba9a7,
		1274	0x06ac8006,
		1275	0x06ac89a7,
		1276	0x06ad6006,
		1277	0x06ad69a7,
		1278	0x06ae4006,
		1279	0x06ae49a7,
		1280	0x06af2006,
		1281	0x06af29a7,
		1282	0x06b00006,
		1283	0x06b009a7,
		1284	0x06b0e006,
		1285	0x06b0e9a7,
		1286	0x06b1c006,
		1287	0x06b1c9a7,
		1288	0x06b2a006,
		1289	0x06b2a9a7,
		1290	0x06b38006,
		1291	0x06b389a7,
		1292	0x06b46006,
		1293	0x06b469a7,
		1294	0x06b54006,
		1295	0x06b549a7,
		1296	0x06b62006,
		1297	0x06b629a7,
		1298	0x06b70006,
		1299	0x06b709a7,
		1300	0x06b7e006,
		1301	0x06b7e9a7,
		1302	0x06b8c006,
		1303	0x06b8c9a7,
		1304	0x06b9a006,
		1305	0x06b9a9a7,
		1306	0x06ba8006,
		1307	0x06ba89a7,
		1308	0x06bb6006,
		1309	0x06bb69a7,
		1310	0x06bc4006,
		1311	0x06bc49a7,
		1312	0x06bd816c,
		1313	0x06be5b0b,
		1314	0x07d8f002,
		1315	0x07f000f2,
		1316	0x07f100f2,
		1317	0x07f7f801,
		1318	0x07fcf012,
		1319	0x07ff80b1,
		1320	0x080fe802,
		1321	0x08170002,
		1322	0x081bb042,
		1323	0x08500822,
		1324	0x08502812,
		1325	0x08506032,
		1326	0x0851c022,
		1327	0x0851f802,
		1328	0x08572812,
		1329	0x08692032,
		1330	0x08755812,
		1331	0x0877e822,
		1332	0x087a30a2,
		1333	0x087c1032,
		1334	0x0880000a,
		1335	0x08800802,
		1336	0x0880100a,
		1337	0x0881c0e2,
		1338	0x08838002,
		1339	0x08839812,
		1340	0x0883f822,
		1341	0x0884100a,
		1342	0x0885802a,
		1343	0x08859832,
		1344	0x0885b81a,
		1345	0x0885c812,
		1346	0x0885e808,
		1347	0x08861002,
		1348	0x08866808,
		1349	0x08880022,
		1350	0x08893842,
		1351	0x0889600a,
		1352	0x08896872,
		1353	0x088a281a,
		1354	0x088b9802,
		1355	0x088c0012,
		1356	0x088c100a,
		1357	0x088d982a,
		1358	0x088db082,
		1359	0x088df81a,
		1360	0x088e1018,
		1361	0x088e4832,
		1362	0x088e700a,
		1363	0x088e7802,
		1364	0x0891602a,
		1365	0x08917822,
		1366	0x0891901a,
		1367	0x0891a002,
		1368	0x0891a80a,
		1369	0x0891b012,
		1370	0x0891f002,
		1371	0x08920802,
		1372	0x0896f802,
		1373	0x0897002a,
		1374	0x08971872,
		1375	0x08980012,
		1376	0x0898101a,
		1377	0x0899d812,
		1378	0x0899f002,
		1379	0x0899f80a,
		1380	0x089a0002,
		1381	0x089a083a,
		1382	0x089a381a,
		1383	0x089a582a,
		1384	0x089ab802,
		1385	0x089b101a,
		1386	0x089b3062,
		1387	0x089b8042,
		1388	0x08a1a82a,
		1389	0x08a1c072,
		1390	0x08a2001a,
		1391	0x08a21022,
		1392	0x08a2280a,
		1393	0x08a23002,
		1394	0x08a2f002,
		1395	0x08a58002,
		1396	0x08a5881a,
		1397	0x08a59852,
		1398	0x08a5c80a,
		1399	0x08a5d002,
		1400	0x08a5d81a,
		1401	0x08a5e802,
		1402	0x08a5f00a,
		1403	0x08a5f812,
		1404	0x08a6080a,
		1405	0x08a61012,
		1406	0x08ad7802,
		1407	0x08ad801a,
		1408	0x08ad9032,
		1409	0x08adc03a,
		1410	0x08ade012,
		1411	0x08adf00a,
		1412	0x08adf812,
		1413	0x08aee012,
		1414	0x08b1802a,
		1415	0x08b19872,
		1416	0x08b1d81a,
		1417	0x08b1e802,
		1418	0x08b1f00a,
		1419	0x08b1f812,
		1420	0x08b55802,
		1421	0x08b5600a,
		1422	0x08b56802,
		1423	0x08b5701a,
		1424	0x08b58052,
		1425	0x08b5b00a,
		1426	0x08b5b802,
		1427	0x08b8e822,
		1428	0x08b91032,
		1429	0x08b9300a,
		1430	0x08b93842,
		1431	0x08c1602a,
		1432	0x08c17882,
		1433	0x08c1c00a,
		1434	0x08c1c812,
		1435	0x08c98002,
		1436	0x08c9884a,
		1437	0x08c9b81a,
		1438	0x08c9d812,
		1439	0x08c9e80a,
		1440	0x08c9f002,
		1441	0x08c9f808,
		1442	0x08ca000a,
		1443	0x08ca0808,
		1444	0x08ca100a,
		1445	0x08ca1802,
		1446	0x08ce882a,
		1447	0x08cea032,
		1448	0x08ced012,
		1449	0x08cee03a,
		1450	0x08cf0002,
		1451	0x08cf200a,
		1452	0x08d00892,
		1453	0x08d19852,
		1454	0x08d1c80a,
		1455	0x08d1d008,
		1456	0x08d1d832,
		1457	0x08d23802,
		1458	0x08d28852,
		1459	0x08d2b81a,
		1460	0x08d2c822,
		1461	0x08d42058,
		1462	0x08d450c2,
		1463	0x08d4b80a,
		1464	0x08d4c012,
		1465	0x08e1780a,
		1466	0x08e18062,
		1467	0x08e1c052,
		1468	0x08e1f00a,
		1469	0x08e1f802,
		1470	0x08e49152,
		1471	0x08e5480a,
		1472	0x08e55062,
		1473	0x08e5880a,
		1474	0x08e59012,
		1475	0x08e5a00a,
		1476	0x08e5a812,
		1477	0x08e98852,
		1478	0x08e9d002,
		1479	0x08e9e012,
		1480	0x08e9f862,
		1481	0x08ea3008,
		1482	0x08ea3802,
		1483	0x08ec504a,
		1484	0x08ec8012,
		1485	0x08ec981a,
		1486	0x08eca802,
		1487	0x08ecb00a,
		1488	0x08ecb802,
		1489	0x08f79812,
		1490	0x08f7a81a,
		1491	0x08f80012,
		1492	0x08f81008,
		1493	0x08f8180a,
		1494	0x08f9a01a,
		1495	0x08f9b042,
		1496	0x08f9f01a,
		1497	0x08fa0002,
		1498	0x08fa080a,
		1499	0x08fa1002,
		1500	0x09a180f1,
		1501	0x09a20002,
		1502	0x09a238e2,
		1503	0x0b578042,
		1504	0x0b598062,
		1505	0x0b7a7802,
		1506	0x0b7a8b6a,
		1507	0x0b7c7832,
		1508	0x0b7f2002,
		1509	0x0b7f801a,
		1510	0x0de4e812,
		1511	0x0de50031,
		1512	0x0e7802d2,
		1513	0x0e798162,
		1514	0x0e8b2802,
		1515	0x0e8b300a,
		1516	0x0e8b3822,
		1517	0x0e8b680a,
		1518	0x0e8b7042,
		1519	0x0e8b9871,
		1520	0x0e8bd872,
		1521	0x0e8c2862,
		1522	0x0e8d5032,
		1523	0x0e921022,
		1524	0x0ed00362,
		1525	0x0ed1db12,
		1526	0x0ed3a802,
		1527	0x0ed42002,
		1528	0x0ed4d842,
		1529	0x0ed508e2,
		1530	0x0f000062,
		1531	0x0f004102,
		1532	0x0f00d862,
		1533	0x0f011812,
		1534	0x0f013042,
		1535	0x0f047802,
		1536	0x0f098062,
		1537	0x0f157002,
		1538	0x0f176032,
		1539	0x0f276032,
		1540	0x0f468062,
		1541	0x0f4a2062,
		1542	0x0f8007f3,
		1543	0x0f8407f3,
		1544	0x0f886823,
		1545	0x0f897803,
		1546	0x0f8b6053,
		1547	0x0f8bf013,
		1548	0x0f8c7003,
		1549	0x0f8c8893,
		1550	0x0f8d6b83,
		1551	0x0f8f3199,
		1552	0x0f9008e3,
		1553	0x0f90d003,
		1554	0x0f917803,
		1555	0x0f919083,
		1556	0x0f91e033,
		1557	0x0f924ff3,
		1558	0x0f964ff3,
		1559	0x0f9a4ff3,
		1560	0x0f9e4b13,
		1561	0x0f9fd842,
		1562	0x0fa007f3,
		1563	0x0fa407f3,
		1564	0x0fa803d3,
		1565	0x0faa37f3,
		1566	0x0fae37f3,
		1567	0x0fb23093,
		1568	0x0fb407f3,
		1569	0x0fbba0b3,
		1570	0x0fbeaaa3,
		1571	0x0fc06033,
		1572	0x0fc24073,
		1573	0x0fc2d053,
		1574	0x0fc44073,
		1575	0x0fc57513,
		1576	0x0fc862e3,
		1577	0x0fc9e093,
		1578	0x0fca3ff3,
		1579	0x0fce3ff3,
		1580	0x0fd23ff3,
		1581	0x0fd63b83,
		1582	0x0fe007f3,
		1583	0x0fe407f3,
		1584	0x0fe807f3,
		1585	0x0fec07f3,
		1586	0x0ff007f3,
		1587	0x0ff407f3,
		1588	0x0ff807f3,
		1589	0x0ffc07d3,
		1590	0x700001f1,
		1591	0x700105f2,
		1592	0x700407f1,
		1593	0x700807f2,
		1594	0x700c06f2,
		1595	0x700f87f1,
		1596	0x701387f1,
		1597	0x701787f1,
		1598	0x701b87f1,
		1599	0x701f87f1,
		1600	0x702387f1,
		1601	0x702787f1,
		1602	0x702b87f1,
		1603	0x702f87f1,
		1604	0x703387f1,
		1605	0x703787f1,
		1606	0x703b87f1,
		1607	0x703f87f1,
		1608	0x704387f1,
		1609	0x704787f1,
		1610	0x704b87f1,
		1611	0x704f87f1,
		1612	0x705387f1,
		1613	0x705787f1,
		1614	0x705b87f1,
		1615	0x705f87f1,
		1616	0x706387f1,
		1617	0x706787f1,
		1618	0x706b87f1,
		1619	0x706f87f1,
		1620	0x707387f1,
		1621	0x707787f1,
		1622	0x707b87f1,
		1623	0x707f80f1};
293		1624
294	/// Returns the extended grapheme cluster bondary property of a code point.	1625	/// Returns the extended grapheme cluster bondary property of a code point.
295	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __property __get_property(const char32_t __code_point) noexcept {	1626	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __property __get_property(const char32_t __code_point) noexcept {
296	// TODO FMT use std::ranges::upper_bound.
297
298	// The algorithm searches for the upper bound of the range and, when found,	1627	// The algorithm searches for the upper bound of the range and, when found,
299	// steps back one entry. This algorithm is used since the code point can be	1628	// steps back one entry. This algorithm is used since the code point can be
300	// anywhere in the range. After a lower bound is found the next step is to	1629	// anywhere in the range. After a lower bound is found the next step is to
...	@@ -311,7 +1640,7 @@ inline constexpr uint32_t __entries[1480] = {	...	@@ -311,7 +1640,7 @@ inline constexpr uint32_t __entries[1480] = {
311	// size. Then the upper bound for code point 3 will return the entry after	1640	// size. Then the upper bound for code point 3 will return the entry after
312	// 0x1810. After moving to the previous entry the algorithm arrives at the	1641	// 0x1810. After moving to the previous entry the algorithm arrives at the
313	// correct entry.	1642	// correct entry.
314	ptrdiff_t __i = std::upper_bound(__entries, std::end(__entries), (__code_point << 11) \| 0x7ffu) - __entries;	1643	ptrdiff_t __i = std::ranges::upper_bound(__entries, (__code_point << 11) \| 0x7ffu) - __entries;
315	if (__i == 0)	1644	if (__i == 0)
316	return __property::__none;	1645	return __property::__none;
317		1646

lib/libcxx/include/__format/format_arg.h+35-5

 @@ -45,16 +45,22 @@ namespace __format {
 /// It could be packed in 4-bits but that means a new type directly becomes an
 /// ABI break. The packed type is 64-bit so this reduces the maximum number of
 /// packed elements from 16 to 12.
+///
+/// @note Some members of this enum are an extension. These extensions need
+/// special behaviour in visit_format_arg. There they need to be wrapped in a
+/// handle to satisfy the user observable behaviour. The internal function
+/// __visit_format_arg doesn't do this wrapping. So in the format functions
+/// this function is used to avoid unneeded overhead.
 enum class _LIBCPP_ENUM_VIS __arg_t : uint8_t {
   __none,
   __boolean,
   __char_type,
   __int,
   __long_long,
-  __i128,
+  __i128, // extension
   __unsigned,
   __unsigned_long_long,
-  __u128,
+  __u128, // extension
   __float,
   __double,
   __long_double,
 @@ -85,9 +91,11 @@ constexpr __arg_t __get_packed_type(uint64_t __types, size_t __id) {
 } // namespace __format
+// This function is not user obervable, so it can directly use the non-standard
+// types of the "variant". See __arg_t for more details.
 template <class _Visitor, class _Context>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT decltype(auto) visit_format_arg(_Visitor&& __vis,
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT decltype(auto)
-                                                                                  basic_format_arg<_Context> __arg) {
+__visit_format_arg(_Visitor&& __vis, basic_format_arg<_Context> __arg) {
   switch (__arg.__type_) {
   case __format::__arg_t::__none:
     return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), __arg.__value_.__monostate_);
 @@ -153,7 +161,7 @@ public:
             using _Dp = remove_cvref_t<_Tp>;
             using _Formatter = typename _Context::template formatter_type<_Dp>;
             constexpr bool __const_formattable =
-                requires { _Formatter().format(declval<const _Dp&>(), declval<_Context&>()); };
+                requires { _Formatter().format(std::declval<const _Dp&>(), std::declval<_Context&>()); };
             using _Qp = conditional_t<__const_formattable, const _Dp, _Dp>;
             static_assert(__const_formattable || !is_const_v<remove_reference_t<_Tp>>, "Mandated by [format.arg]/18");
 @@ -265,6 +273,28 @@ private:
   typename __basic_format_arg_value<_Context>::__handle& __handle_;
 };
+// This function is user facing, so it must wrap the non-standard types of
+// the "variant" in a handle to stay conforming. See __arg_t for more details.
+template <class _Visitor, class _Context>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT decltype(auto)
+visit_format_arg(_Visitor&& __vis, basic_format_arg<_Context> __arg) {
+  switch (__arg.__type_) {
+#  ifndef _LIBCPP_HAS_NO_INT128
+  case __format::__arg_t::__i128: {
+    typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__i128_};
+    return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
+  }
+  case __format::__arg_t::__u128: {
+    typename __basic_format_arg_value<_Context>::__handle __h{__arg.__value_.__u128_};
+    return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), typename basic_format_arg<_Context>::handle{__h});
+  }
+#  endif
+  default:
+    return _VSTD::__visit_format_arg(_VSTD::forward<_Visitor>(__vis), __arg);
+  }
+}
 #endif //_LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__format/format_arg_store.h+3-2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#include <__config>	19	#include <__config>
20	#include <__format/concepts.h>	20	#include <__format/concepts.h>
21	#include <__format/format_arg.h>	21	#include <__format/format_arg.h>
		22	#include <__utility/forward.h>
22	#include <cstring>	23	#include <cstring>
23	#include <string>	24	#include <string>
24	#include <string_view>	25	#include <string_view>
...	@@ -197,7 +198,7 @@ _LIBCPP_HIDE_FROM_ABI void __create_packed_storage(uint64_t& __types, __basic_fo	...	@@ -197,7 +198,7 @@ _LIBCPP_HIDE_FROM_ABI void __create_packed_storage(uint64_t& __types, __basic_fo
197	int __shift = 0;	198	int __shift = 0;
198	(	199	(
199	[&] {	200	[&] {
200	basic_format_arg<_Context> __arg = __create_format_arg<_Context>(__args);	201	basic_format_arg<_Context> __arg = __format::__create_format_arg<_Context>(__args);
201	if (__shift != 0)	202	if (__shift != 0)
202	__types \|= static_cast<uint64_t>(__arg.__type_) << __shift;	203	__types \|= static_cast<uint64_t>(__arg.__type_) << __shift;
203	else	204	else
...	@@ -211,7 +212,7 @@ _LIBCPP_HIDE_FROM_ABI void __create_packed_storage(uint64_t& __types, __basic_fo	...	@@ -211,7 +212,7 @@ _LIBCPP_HIDE_FROM_ABI void __create_packed_storage(uint64_t& __types, __basic_fo
211		212
212	template <class _Context, class... _Args>	213	template <class _Context, class... _Args>
213	_LIBCPP_HIDE_FROM_ABI void __store_basic_format_arg(basic_format_arg<_Context>* __data, _Args&&... __args) noexcept {	214	_LIBCPP_HIDE_FROM_ABI void __store_basic_format_arg(basic_format_arg<_Context>* __data, _Args&&... __args) noexcept {
214	([&] { *__data++ = __create_format_arg<_Context>(__args); }(), ...);	215	([&] { *__data++ = __format::__create_format_arg<_Context>(__args); }(), ...);
215	}	216	}
216		217
217	template <class _Context, size_t N>	218	template <class _Context, size_t N>

lib/libcxx/include/__format/format_args.h+1

...	@@ -71,6 +71,7 @@ private:	...	@@ -71,6 +71,7 @@ private:
71	const basic_format_arg<_Context>* __args_;	71	const basic_format_arg<_Context>* __args_;
72	};	72	};
73	};	73	};
		74	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_format_args);
74		75
75	#endif //_LIBCPP_STD_VER > 17	76	#endif //_LIBCPP_STD_VER > 17
76		77

lib/libcxx/include/__format/format_context.h+80-8

...	@@ -11,14 +11,19 @@	...	@@ -11,14 +11,19 @@
11	#define _LIBCPP___FORMAT_FORMAT_CONTEXT_H	11	#define _LIBCPP___FORMAT_FORMAT_CONTEXT_H
12		12
13	#include <__availability>	13	#include <__availability>
		14	#include <__concepts/same_as.h>
14	#include <__config>	15	#include <__config>
15	#include <__format/buffer.h>	16	#include <__format/buffer.h>
		17	#include <__format/format_arg.h>
		18	#include <__format/format_arg_store.h>
16	#include <__format/format_args.h>	19	#include <__format/format_args.h>
		20	#include <__format/format_error.h>
17	#include <__format/format_fwd.h>	21	#include <__format/format_fwd.h>
18	#include <__iterator/back_insert_iterator.h>	22	#include <__iterator/back_insert_iterator.h>
19	#include <__iterator/concepts.h>	23	#include <__iterator/concepts.h>
		24	#include <__memory/addressof.h>
20	#include <__utility/move.h>	25	#include <__utility/move.h>
21	#include <concepts>	26	#include <__variant/monostate.h>
22	#include <cstddef>	27	#include <cstddef>
23		28
24	#ifndef _LIBCPP_HAS_NO_LOCALIZATION	29	#ifndef _LIBCPP_HAS_NO_LOCALIZATION
...	@@ -50,8 +55,7 @@ __format_context_create(	...	@@ -50,8 +55,7 @@ __format_context_create(
50	_OutIt __out_it,	55	_OutIt __out_it,
51	basic_format_args<basic_format_context<_OutIt, _CharT>> __args,	56	basic_format_args<basic_format_context<_OutIt, _CharT>> __args,
52	optional<_VSTD::locale>&& __loc = nullopt) {	57	optional<_VSTD::locale>&& __loc = nullopt) {
53	return _VSTD::basic_format_context(_VSTD::move(__out_it), __args,	58	return _VSTD::basic_format_context(_VSTD::move(__out_it), __args, _VSTD::move(__loc));
54	_VSTD::move(__loc));
55	}	59	}
56	#else	60	#else
57	template <class _OutIt, class _CharT>	61	template <class _OutIt, class _CharT>
...	@@ -87,9 +91,6 @@ public:	...	@@ -87,9 +91,6 @@ public:
87	template <class _Tp>	91	template <class _Tp>
88	using formatter_type = formatter<_Tp, _CharT>;	92	using formatter_type = formatter<_Tp, _CharT>;
89		93
90	basic_format_context(const basic_format_context&) = delete;
91	basic_format_context& operator=(const basic_format_context&) = delete;
92
93	_LIBCPP_HIDE_FROM_ABI basic_format_arg<basic_format_context>	94	_LIBCPP_HIDE_FROM_ABI basic_format_arg<basic_format_context>
94	arg(size_t __id) const noexcept {	95	arg(size_t __id) const noexcept {
95	return __args_.get(__id);	96	return __args_.get(__id);
...	@@ -101,8 +102,8 @@ public:	...	@@ -101,8 +102,8 @@ public:
101	return *__loc_;	102	return *__loc_;
102	}	103	}
103	#endif	104	#endif
104	_LIBCPP_HIDE_FROM_ABI iterator out() { return __out_it_; }	105	_LIBCPP_HIDE_FROM_ABI iterator out() { return std::move(__out_it_); }
105	_LIBCPP_HIDE_FROM_ABI void advance_to(iterator __it) { __out_it_ = __it; }	106	_LIBCPP_HIDE_FROM_ABI void advance_to(iterator __it) { __out_it_ = std::move(__it); }
106		107
107	private:	108	private:
108	iterator __out_it_;	109	iterator __out_it_;
...	@@ -144,6 +145,77 @@ private:	...	@@ -144,6 +145,77 @@ private:
144	#endif	145	#endif
145	};	146	};
146		147
		148	// A specialization for __retarget_buffer
		149	//
		150	// See __retarget_buffer for the motivation for this specialization.
		151	//
		152	// This context holds a reference to the instance of the basic_format_context
		153	// that is retargeted. It converts a formatting argument when it is requested
		154	// during formatting. It is expected that the usage of the arguments is rare so
		155	// the lookups are not expected to be used often. An alternative would be to
		156	// convert all elements during construction.
		157	//
		158	// The elements of the retargets context are only used when an underlying
		159	// formatter uses a locale specific formatting or an formatting argument is
		160	// part for the format spec. For example
		161	// format("{:256:{}}", input, 8);
		162	// Here the width of an element in input is determined dynamically.
		163	// Note when the top-level element has no width the retargeting is not needed.
		164	template <class _CharT>
		165	class _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT
		166	basic_format_context<typename __format::__retarget_buffer<_CharT>::__iterator, _CharT> {
		167	public:
		168	using iterator = typename __format::__retarget_buffer<_CharT>::__iterator;
		169	using char_type = _CharT;
		170	template <class _Tp>
		171	using formatter_type = formatter<_Tp, _CharT>;
		172
		173	template <class _Context>
		174	_LIBCPP_HIDE_FROM_ABI explicit basic_format_context(iterator __out_it, _Context& __ctx)
		175	: __out_it_(std::move(__out_it)),
		176	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
		177	__loc_([](void* __c) { return static_cast<_Context*>(__c)->locale(); }),
		178	# endif
		179	__ctx_(std::addressof(__ctx)),
		180	__arg_([](void* __c, size_t __id) {
		181	return std::visit_format_arg(
		182	[&](auto __arg) -> basic_format_arg<basic_format_context> {
		183	if constexpr (same_as<decltype(__arg), monostate>)
		184	return {};
		185	else if constexpr (same_as<decltype(__arg), typename basic_format_arg<_Context>::handle>)
		186	// At the moment it's not possible for formatting to use a re-targeted handle.
		187	// TODO FMT add this when support is needed.
		188	std::__throw_format_error("Re-targeting handle not supported");
		189	else
		190	return basic_format_arg<basic_format_context>{
		191	__format::__determine_arg_t<basic_format_context, decltype(__arg)>(),
		192	__basic_format_arg_value<basic_format_context>(__arg)};
		193	},
		194	static_cast<_Context*>(__c)->arg(__id));
		195	}) {
		196	}
		197
		198	_LIBCPP_HIDE_FROM_ABI basic_format_arg<basic_format_context> arg(size_t __id) const noexcept {
		199	return __arg_(__ctx_, __id);
		200	}
		201	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
		202	_LIBCPP_HIDE_FROM_ABI _VSTD::locale locale() { return __loc_(__ctx_); }
		203	# endif
		204	_LIBCPP_HIDE_FROM_ABI iterator out() { return std::move(__out_it_); }
		205	_LIBCPP_HIDE_FROM_ABI void advance_to(iterator __it) { __out_it_ = std::move(__it); }
		206
		207	private:
		208	iterator __out_it_;
		209
		210	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
		211	std::locale (__loc_)(void __ctx);
		212	# endif
		213
		214	void* __ctx_;
		215	basic_format_arg<basic_format_context> (__arg_)(void __ctx, size_t __id);
		216	};
		217
		218	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_format_context);
147	#endif //_LIBCPP_STD_VER > 17	219	#endif //_LIBCPP_STD_VER > 17
148		220
149	_LIBCPP_END_NAMESPACE_STD	221	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__format/format_error.h+9-5

 @@ -11,11 +11,8 @@
 #define _LIBCPP___FORMAT_FORMAT_ERROR_H
 #include <__config>
-#include <stdexcept>
-#ifdef _LIBCPP_NO_EXCEPTIONS
 #include <cstdlib>
-#endif
+#include <stdexcept>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -31,7 +28,14 @@ public:
       : runtime_error(__s) {}
   _LIBCPP_HIDE_FROM_ABI explicit format_error(const char* __s)
       : runtime_error(__s) {}
-  virtual ~format_error() noexcept;
+  // TODO FMT Remove when format is no longer experimental.
+  // Avoids linker errors when building the Clang-cl Windows DLL which doesn't
+  // support the experimental library.
+#  ifndef _LIBCPP_INLINE_FORMAT_ERROR_DTOR
+  ~format_error() noexcept override;
+#  else
+  ~format_error() noexcept  override {}
+#  endif
 };
 _LIBCPP_NORETURN inline _LIBCPP_HIDE_FROM_ABI void

lib/libcxx/include/__format/format_functions.h created+661

...	@@ -0,0 +1,661 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_FORMAT_FUNCTIONS
11	#define _LIBCPP___FORMAT_FORMAT_FUNCTIONS
12
13	// TODO FMT This is added to fix Apple back-deployment.
14	#include <version>
15	#if !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
16
17	#include <__algorithm/clamp.h>
18	#include <__availability>
19	#include <__concepts/convertible_to.h>
20	#include <__concepts/same_as.h>
21	#include <__config>
22	#include <__debug>
23	#include <__format/buffer.h>
24	#include <__format/format_arg.h>
25	#include <__format/format_arg_store.h>
26	#include <__format/format_args.h>
27	#include <__format/format_context.h>
28	#include <__format/format_error.h>
29	#include <__format/format_parse_context.h>
30	#include <__format/format_string.h>
31	#include <__format/format_to_n_result.h>
32	#include <__format/formatter.h>
33	#include <__format/formatter_bool.h>
34	#include <__format/formatter_char.h>
35	#include <__format/formatter_floating_point.h>
36	#include <__format/formatter_integer.h>
37	#include <__format/formatter_pointer.h>
38	#include <__format/formatter_string.h>
39	#include <__format/parser_std_format_spec.h>
40	#include <__iterator/back_insert_iterator.h>
41	#include <__iterator/incrementable_traits.h>
42	#include <__variant/monostate.h>
43	#include <array>
44	#include <string>
45	#include <string_view>
46
47	#ifndef _LIBCPP_HAS_NO_LOCALIZATION
48	#include <locale>
49	#endif
50
51	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
52	# pragma GCC system_header
53	#endif
54
55	_LIBCPP_BEGIN_NAMESPACE_STD
56
57	#if _LIBCPP_STD_VER > 17
58
59	// TODO FMT Evaluate which templates should be external templates. This
60	// improves the efficiency of the header. However since the header is still
61	// under heavy development and not all classes are stable it makes no sense
62	// to do this optimization now.
63
64	using format_args = basic_format_args<format_context>;
65	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
66	using wformat_args = basic_format_args<wformat_context>;
67	#endif
68
69	template <class _Context = format_context, class... _Args>
70	_LIBCPP_HIDE_FROM_ABI __format_arg_store<_Context, _Args...> make_format_args(_Args&&... __args) {
71	return _VSTD::__format_arg_store<_Context, _Args...>(__args...);
72	}
73
74	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
75	template <class... _Args>
76	_LIBCPP_HIDE_FROM_ABI __format_arg_store<wformat_context, _Args...> make_wformat_args(_Args&&... __args) {
77	return _VSTD::__format_arg_store<wformat_context, _Args...>(__args...);
78	}
79	#endif
80
81	namespace __format {
82
83	/// Helper class parse and handle argument.
84	///
85	/// When parsing a handle which is not enabled the code is ill-formed.
86	/// This helper uses the parser of the appropriate formatter for the stored type.
87	template <class _CharT>
88	class _LIBCPP_TEMPLATE_VIS __compile_time_handle {
89	public:
90	_LIBCPP_HIDE_FROM_ABI
91	constexpr void __parse(basic_format_parse_context<_CharT>& __parse_ctx) const { __parse_(__parse_ctx); }
92
93	template <class _Tp>
94	_LIBCPP_HIDE_FROM_ABI constexpr void __enable() {
95	__parse_ = [](basic_format_parse_context<_CharT>& __parse_ctx) {
96	formatter<_Tp, _CharT> __f;
97	__parse_ctx.advance_to(__f.parse(__parse_ctx));
98	};
99	}
100
101	// Before calling __parse the proper handler needs to be set with __enable.
102	// The default handler isn't a core constant expression.
103	_LIBCPP_HIDE_FROM_ABI constexpr __compile_time_handle()
104	: __parse_([](basic_format_parse_context<_CharT>&) { std::__throw_format_error("Not a handle"); }) {}
105
106	private:
107	void (*__parse_)(basic_format_parse_context<_CharT>&);
108	};
109
110	// Dummy format_context only providing the parts used during constant
111	// validation of the basic_format_string.
112	template <class _CharT>
113	struct _LIBCPP_TEMPLATE_VIS __compile_time_basic_format_context {
114	public:
115	using char_type = _CharT;
116
117	_LIBCPP_HIDE_FROM_ABI constexpr explicit __compile_time_basic_format_context(
118	const __arg_t* __args, const __compile_time_handle<_CharT>* __handles, size_t __size)
119	: __args_(__args), __handles_(__handles), __size_(__size) {}
120
121	// During the compile-time validation nothing needs to be written.
122	// Therefore all operations of this iterator are a NOP.
123	struct iterator {
124	_LIBCPP_HIDE_FROM_ABI constexpr iterator& operator=(_CharT) { return *this; }
125	_LIBCPP_HIDE_FROM_ABI constexpr iterator& operator() { return this; }
126	_LIBCPP_HIDE_FROM_ABI constexpr iterator operator++(int) { return *this; }
127	};
128
129	_LIBCPP_HIDE_FROM_ABI constexpr __arg_t arg(size_t __id) const {
130	if (__id >= __size_)
131	std::__throw_format_error("Argument index out of bounds");
132	return __args_[__id];
133	}
134
135	_LIBCPP_HIDE_FROM_ABI constexpr const __compile_time_handle<_CharT>& __handle(size_t __id) const {
136	if (__id >= __size_)
137	std::__throw_format_error("Argument index out of bounds");
138	return __handles_[__id];
139	}
140
141	_LIBCPP_HIDE_FROM_ABI constexpr iterator out() { return {}; }
142	_LIBCPP_HIDE_FROM_ABI constexpr void advance_to(iterator) {}
143
144	private:
145	const __arg_t* __args_;
146	const __compile_time_handle<_CharT>* __handles_;
147	size_t __size_;
148	};
149
150	_LIBCPP_HIDE_FROM_ABI
151	constexpr void __compile_time_validate_integral(__arg_t __type) {
152	switch (__type) {
153	case __arg_t::__int:
154	case __arg_t::__long_long:
155	case __arg_t::__i128:
156	case __arg_t::__unsigned:
157	case __arg_t::__unsigned_long_long:
158	case __arg_t::__u128:
159	return;
160
161	default:
162	std::__throw_format_error("Argument isn't an integral type");
163	}
164	}
165
166	// _HasPrecision does the formatter have a precision?
167	template <class _CharT, class _Tp, bool _HasPrecision = false>
168	_LIBCPP_HIDE_FROM_ABI constexpr void
169	__compile_time_validate_argument(basic_format_parse_context<_CharT>& __parse_ctx,
170	__compile_time_basic_format_context<_CharT>& __ctx) {
171	formatter<_Tp, _CharT> __formatter;
172	__parse_ctx.advance_to(__formatter.parse(__parse_ctx));
173	// [format.string.std]/7
174	// ... If the corresponding formatting argument is not of integral type, or
175	// its value is negative for precision or non-positive for width, an
176	// exception of type format_error is thrown.
177	//
178	// Validate whether the arguments are integrals.
179	if (__formatter.__parser_.__width_as_arg_)
180	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__parser_.__width_));
181
182	if constexpr (_HasPrecision)
183	if (__formatter.__parser_.__precision_as_arg_)
184	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__parser_.__precision_));
185	}
186
187	// This function is not user facing, so it can directly use the non-standard types of the "variant".
188	template <class _CharT>
189	_LIBCPP_HIDE_FROM_ABI constexpr void __compile_time_visit_format_arg(basic_format_parse_context<_CharT>& __parse_ctx,
190	__compile_time_basic_format_context<_CharT>& __ctx,
191	__arg_t __type) {
192	switch (__type) {
193	case __arg_t::__none:
194	std::__throw_format_error("Invalid argument");
195	case __arg_t::__boolean:
196	return __format::__compile_time_validate_argument<_CharT, bool>(__parse_ctx, __ctx);
197	case __arg_t::__char_type:
198	return __format::__compile_time_validate_argument<_CharT, _CharT>(__parse_ctx, __ctx);
199	case __arg_t::__int:
200	return __format::__compile_time_validate_argument<_CharT, int>(__parse_ctx, __ctx);
201	case __arg_t::__long_long:
202	return __format::__compile_time_validate_argument<_CharT, long long>(__parse_ctx, __ctx);
203	case __arg_t::__i128:
204	# ifndef _LIBCPP_HAS_NO_INT128
205	return __format::__compile_time_validate_argument<_CharT, __int128_t>(__parse_ctx, __ctx);
206	# else
207	std::__throw_format_error("Invalid argument");
208	# endif
209	return;
210	case __arg_t::__unsigned:
211	return __format::__compile_time_validate_argument<_CharT, unsigned>(__parse_ctx, __ctx);
212	case __arg_t::__unsigned_long_long:
213	return __format::__compile_time_validate_argument<_CharT, unsigned long long>(__parse_ctx, __ctx);
214	case __arg_t::__u128:
215	# ifndef _LIBCPP_HAS_NO_INT128
216	return __format::__compile_time_validate_argument<_CharT, __uint128_t>(__parse_ctx, __ctx);
217	# else
218	std::__throw_format_error("Invalid argument");
219	# endif
220	return;
221	case __arg_t::__float:
222	return __format::__compile_time_validate_argument<_CharT, float, true>(__parse_ctx, __ctx);
223	case __arg_t::__double:
224	return __format::__compile_time_validate_argument<_CharT, double, true>(__parse_ctx, __ctx);
225	case __arg_t::__long_double:
226	return __format::__compile_time_validate_argument<_CharT, long double, true>(__parse_ctx, __ctx);
227	case __arg_t::__const_char_type_ptr:
228	return __format::__compile_time_validate_argument<_CharT, const _CharT*, true>(__parse_ctx, __ctx);
229	case __arg_t::__string_view:
230	return __format::__compile_time_validate_argument<_CharT, basic_string_view<_CharT>, true>(__parse_ctx, __ctx);
231	case __arg_t::__ptr:
232	return __format::__compile_time_validate_argument<_CharT, const void*>(__parse_ctx, __ctx);
233	case __arg_t::__handle:
234	std::__throw_format_error("Handle should use __compile_time_validate_handle_argument");
235	}
236	std::__throw_format_error("Invalid argument");
237	}
238
239	template <class _CharT, class _ParseCtx, class _Ctx>
240	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT*
241	__handle_replacement_field(const _CharT* __begin, const _CharT* __end,
242	_ParseCtx& __parse_ctx, _Ctx& __ctx) {
243	__format::__parse_number_result __r = __format::__parse_arg_id(__begin, __end, __parse_ctx);
244
245	bool __parse = *__r.__ptr == _CharT(':');
246	switch (*__r.__ptr) {
247	case _CharT(':'):
248	// The arg-id has a format-specifier, advance the input to the format-spec.
249	__parse_ctx.advance_to(__r.__ptr + 1);
250	break;
251	case _CharT('}'):
252	// The arg-id has no format-specifier.
253	__parse_ctx.advance_to(__r.__ptr);
254	break;
255	default:
256	std::__throw_format_error("The replacement field arg-id should terminate at a ':' or '}'");
257	}
258
259	if constexpr (same_as<_Ctx, __compile_time_basic_format_context<_CharT>>) {
260	__arg_t __type = __ctx.arg(__r.__value);
261	if (__type == __arg_t::__handle)
262	__ctx.__handle(__r.__value).__parse(__parse_ctx);
263	else
264	__format::__compile_time_visit_format_arg(__parse_ctx, __ctx, __type);
265	} else
266	_VSTD::__visit_format_arg(
267	[&](auto __arg) {
268	if constexpr (same_as<decltype(__arg), monostate>)
269	std::__throw_format_error("Argument index out of bounds");
270	else if constexpr (same_as<decltype(__arg), typename basic_format_arg<_Ctx>::handle>)
271	__arg.format(__parse_ctx, __ctx);
272	else {
273	formatter<decltype(__arg), _CharT> __formatter;
274	if (__parse)
275	__parse_ctx.advance_to(__formatter.parse(__parse_ctx));
276	__ctx.advance_to(__formatter.format(__arg, __ctx));
277	}
278	},
279	__ctx.arg(__r.__value));
280
281	__begin = __parse_ctx.begin();
282	if (__begin == __end \|\| *__begin != _CharT('}'))
283	std::__throw_format_error("The replacement field misses a terminating '}'");
284
285	return ++__begin;
286	}
287
288	template <class _ParseCtx, class _Ctx>
289	_LIBCPP_HIDE_FROM_ABI constexpr typename _Ctx::iterator
290	__vformat_to(_ParseCtx&& __parse_ctx, _Ctx&& __ctx) {
291	using _CharT = typename _ParseCtx::char_type;
292	static_assert(same_as<typename _Ctx::char_type, _CharT>);
293
294	const _CharT* __begin = __parse_ctx.begin();
295	const _CharT* __end = __parse_ctx.end();
296	typename _Ctx::iterator __out_it = __ctx.out();
297	while (__begin != __end) {
298	switch (*__begin) {
299	case _CharT('{'):
300	++__begin;
301	if (__begin == __end)
302	std::__throw_format_error("The format string terminates at a '{'");
303
304	if (*__begin != _CharT('{')) [[likely]] {
305	__ctx.advance_to(_VSTD::move(__out_it));
306	__begin =
307	__format::__handle_replacement_field(__begin, __end, __parse_ctx, __ctx);
308	__out_it = __ctx.out();
309
310	// The output is written and __begin points to the next character. So
311	// start the next iteration.
312	continue;
313	}
314	// The string is an escape character.
315	break;
316
317	case _CharT('}'):
318	++__begin;
319	if (__begin == __end \|\| *__begin != _CharT('}'))
320	std::__throw_format_error("The format string contains an invalid escape sequence");
321
322	break;
323	}
324
325	// Copy the character to the output verbatim.
326	__out_it++ = __begin++;
327	}
328	return __out_it;
329	}
330
331	} // namespace __format
332
333	template <class _CharT, class... _Args>
334	struct _LIBCPP_TEMPLATE_VIS basic_format_string {
335	template <class _Tp>
336	requires convertible_to<const _Tp&, basic_string_view<_CharT>>
337	consteval basic_format_string(const _Tp& __str) : __str_{__str} {
338	__format::__vformat_to(basic_format_parse_context<_CharT>{__str_, sizeof...(_Args)},
339	_Context{__types_.data(), __handles_.data(), sizeof...(_Args)});
340	}
341
342	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT constexpr basic_string_view<_CharT> get() const noexcept {
343	return __str_;
344	}
345
346	private:
347	basic_string_view<_CharT> __str_;
348
349	using _Context = __format::__compile_time_basic_format_context<_CharT>;
350
351	static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{
352	__format::__determine_arg_t<_Context, remove_cvref_t<_Args>>()...};
353
354	// TODO FMT remove this work-around when the AIX ICE has been resolved.
355	# if defined(_AIX) && defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER < 1400
356	template <class _Tp>
357	static constexpr __format::__compile_time_handle<_CharT> __get_handle() {
358	__format::__compile_time_handle<_CharT> __handle;
359	if (__format::__determine_arg_t<_Context, _Tp>() == __format::__arg_t::__handle)
360	__handle.template __enable<_Tp>();
361
362	return __handle;
363	}
364
365	static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{
366	__get_handle<_Args>()...};
367	# else
368	static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{[] {
369	using _Tp = remove_cvref_t<_Args>;
370	__format::__compile_time_handle<_CharT> __handle;
371	if (__format::__determine_arg_t<_Context, _Tp>() == __format::__arg_t::__handle)
372	__handle.template __enable<_Tp>();
373
374	return __handle;
375	}()...};
376	# endif
377	};
378
379	template <class... _Args>
380	using format_string = basic_format_string<char, type_identity_t<_Args>...>;
381
382	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
383	template <class... _Args>
384	using wformat_string = basic_format_string<wchar_t, type_identity_t<_Args>...>;
385	#endif
386
387	template <class _OutIt, class _CharT, class _FormatOutIt>
388	requires(output_iterator<_OutIt, const _CharT&>) _LIBCPP_HIDE_FROM_ABI _OutIt
389	__vformat_to(
390	_OutIt __out_it, basic_string_view<_CharT> __fmt,
391	basic_format_args<basic_format_context<_FormatOutIt, _CharT>> __args) {
392	if constexpr (same_as<_OutIt, _FormatOutIt>)
393	return _VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
394	_VSTD::__format_context_create(_VSTD::move(__out_it), __args));
395	else {
396	__format::__format_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it)};
397	_VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
398	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args));
399	return _VSTD::move(__buffer).__out_it();
400	}
401	}
402
403	// The function is _LIBCPP_ALWAYS_INLINE since the compiler is bad at inlining
404	// https://reviews.llvm.org/D110499#inline-1180704
405	// TODO FMT Evaluate whether we want to file a Clang bug report regarding this.
406	template <output_iterator<const char&> _OutIt>
407	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
408	vformat_to(_OutIt __out_it, string_view __fmt, format_args __args) {
409	return _VSTD::__vformat_to(_VSTD::move(__out_it), __fmt, __args);
410	}
411
412	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
413	template <output_iterator<const wchar_t&> _OutIt>
414	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
415	vformat_to(_OutIt __out_it, wstring_view __fmt, wformat_args __args) {
416	return _VSTD::__vformat_to(_VSTD::move(__out_it), __fmt, __args);
417	}
418	#endif
419
420	template <output_iterator<const char&> _OutIt, class... _Args>
421	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
422	format_to(_OutIt __out_it, format_string<_Args...> __fmt, _Args&&... __args) {
423	return _VSTD::vformat_to(_VSTD::move(__out_it), __fmt.get(),
424	_VSTD::make_format_args(__args...));
425	}
426
427	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
428	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
429	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
430	format_to(_OutIt __out_it, wformat_string<_Args...> __fmt, _Args&&... __args) {
431	return _VSTD::vformat_to(_VSTD::move(__out_it), __fmt.get(),
432	_VSTD::make_wformat_args(__args...));
433	}
434	#endif
435
436	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string
437	vformat(string_view __fmt, format_args __args) {
438	string __res;
439	_VSTD::vformat_to(_VSTD::back_inserter(__res), __fmt, __args);
440	return __res;
441	}
442
443	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
444	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
445	vformat(wstring_view __fmt, wformat_args __args) {
446	wstring __res;
447	_VSTD::vformat_to(_VSTD::back_inserter(__res), __fmt, __args);
448	return __res;
449	}
450	#endif
451
452	template <class... _Args>
453	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string format(format_string<_Args...> __fmt,
454	_Args&&... __args) {
455	return _VSTD::vformat(__fmt.get(), _VSTD::make_format_args(__args...));
456	}
457
458	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
459	template <class... _Args>
460	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
461	format(wformat_string<_Args...> __fmt, _Args&&... __args) {
462	return _VSTD::vformat(__fmt.get(), _VSTD::make_wformat_args(__args...));
463	}
464	#endif
465
466	template <class _Context, class _OutIt, class _CharT>
467	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> __vformat_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n,
468	basic_string_view<_CharT> __fmt,
469	basic_format_args<_Context> __args) {
470	__format::__format_to_n_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it), __n};
471	_VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
472	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args));
473	return _VSTD::move(__buffer).__result();
474	}
475
476	template <output_iterator<const char&> _OutIt, class... _Args>
477	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
478	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, format_string<_Args...> __fmt, _Args&&... __args) {
479	return _VSTD::__vformat_to_n<format_context>(_VSTD::move(__out_it), __n, __fmt.get(), _VSTD::make_format_args(__args...));
480	}
481
482	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
483	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
484	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
485	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, wformat_string<_Args...> __fmt,
486	_Args&&... __args) {
487	return _VSTD::__vformat_to_n<wformat_context>(_VSTD::move(__out_it), __n, __fmt.get(), _VSTD::make_wformat_args(__args...));
488	}
489	#endif
490
491	template <class _CharT>
492	_LIBCPP_HIDE_FROM_ABI size_t __vformatted_size(basic_string_view<_CharT> __fmt, auto __args) {
493	__format::__formatted_size_buffer<_CharT> __buffer;
494	_VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
495	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args));
496	return _VSTD::move(__buffer).__result();
497	}
498
499	template <class... _Args>
500	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
501	formatted_size(format_string<_Args...> __fmt, _Args&&... __args) {
502	return _VSTD::__vformatted_size(__fmt.get(), basic_format_args{_VSTD::make_format_args(__args...)});
503	}
504
505	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
506	template <class... _Args>
507	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
508	formatted_size(wformat_string<_Args...> __fmt, _Args&&... __args) {
509	return _VSTD::__vformatted_size(__fmt.get(), basic_format_args{_VSTD::make_wformat_args(__args...)});
510	}
511	#endif
512
513	#ifndef _LIBCPP_HAS_NO_LOCALIZATION
514
515	template <class _OutIt, class _CharT, class _FormatOutIt>
516	requires(output_iterator<_OutIt, const _CharT&>) _LIBCPP_HIDE_FROM_ABI _OutIt
517	__vformat_to(
518	_OutIt __out_it, locale __loc, basic_string_view<_CharT> __fmt,
519	basic_format_args<basic_format_context<_FormatOutIt, _CharT>> __args) {
520	if constexpr (same_as<_OutIt, _FormatOutIt>)
521	return _VSTD::__format::__vformat_to(
522	basic_format_parse_context{__fmt, __args.__size()},
523	_VSTD::__format_context_create(_VSTD::move(__out_it), __args, _VSTD::move(__loc)));
524	else {
525	__format::__format_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it)};
526	_VSTD::__format::__vformat_to(
527	basic_format_parse_context{__fmt, __args.__size()},
528	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args, _VSTD::move(__loc)));
529	return _VSTD::move(__buffer).__out_it();
530	}
531	}
532
533	template <output_iterator<const char&> _OutIt>
534	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt vformat_to(
535	_OutIt __out_it, locale __loc, string_view __fmt, format_args __args) {
536	return _VSTD::__vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt,
537	__args);
538	}
539
540	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
541	template <output_iterator<const wchar_t&> _OutIt>
542	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt vformat_to(
543	_OutIt __out_it, locale __loc, wstring_view __fmt, wformat_args __args) {
544	return _VSTD::__vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt,
545	__args);
546	}
547	#endif
548
549	template <output_iterator<const char&> _OutIt, class... _Args>
550	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
551	format_to(_OutIt __out_it, locale __loc, format_string<_Args...> __fmt, _Args&&... __args) {
552	return _VSTD::vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt.get(),
553	_VSTD::make_format_args(__args...));
554	}
555
556	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
557	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
558	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
559	format_to(_OutIt __out_it, locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
560	return _VSTD::vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt.get(),
561	_VSTD::make_wformat_args(__args...));
562	}
563	#endif
564
565	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string
566	vformat(locale __loc, string_view __fmt, format_args __args) {
567	string __res;
568	_VSTD::vformat_to(_VSTD::back_inserter(__res), _VSTD::move(__loc), __fmt,
569	__args);
570	return __res;
571	}
572
573	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
574	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
575	vformat(locale __loc, wstring_view __fmt, wformat_args __args) {
576	wstring __res;
577	_VSTD::vformat_to(_VSTD::back_inserter(__res), _VSTD::move(__loc), __fmt,
578	__args);
579	return __res;
580	}
581	#endif
582
583	template <class... _Args>
584	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string format(locale __loc,
585	format_string<_Args...> __fmt,
586	_Args&&... __args) {
587	return _VSTD::vformat(_VSTD::move(__loc), __fmt.get(),
588	_VSTD::make_format_args(__args...));
589	}
590
591	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
592	template <class... _Args>
593	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
594	format(locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
595	return _VSTD::vformat(_VSTD::move(__loc), __fmt.get(),
596	_VSTD::make_wformat_args(__args...));
597	}
598	#endif
599
600	template <class _Context, class _OutIt, class _CharT>
601	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> __vformat_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n,
602	locale __loc, basic_string_view<_CharT> __fmt,
603	basic_format_args<_Context> __args) {
604	__format::__format_to_n_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it), __n};
605	_VSTD::__format::__vformat_to(
606	basic_format_parse_context{__fmt, __args.__size()},
607	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args, _VSTD::move(__loc)));
608	return _VSTD::move(__buffer).__result();
609	}
610
611	template <output_iterator<const char&> _OutIt, class... _Args>
612	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
613	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, locale __loc, format_string<_Args...> __fmt,
614	_Args&&... __args) {
615	return _VSTD::__vformat_to_n<format_context>(_VSTD::move(__out_it), __n, _VSTD::move(__loc), __fmt.get(),
616	_VSTD::make_format_args(__args...));
617	}
618
619	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
620	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
621	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
622	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, locale __loc, wformat_string<_Args...> __fmt,
623	_Args&&... __args) {
624	return _VSTD::__vformat_to_n<wformat_context>(_VSTD::move(__out_it), __n, _VSTD::move(__loc), __fmt.get(),
625	_VSTD::make_wformat_args(__args...));
626	}
627	#endif
628
629	template <class _CharT>
630	_LIBCPP_HIDE_FROM_ABI size_t __vformatted_size(locale __loc, basic_string_view<_CharT> __fmt, auto __args) {
631	__format::__formatted_size_buffer<_CharT> __buffer;
632	_VSTD::__format::__vformat_to(
633	basic_format_parse_context{__fmt, __args.__size()},
634	_VSTD::__format_context_create(__buffer.__make_output_iterator(), __args, _VSTD::move(__loc)));
635	return _VSTD::move(__buffer).__result();
636	}
637
638	template <class... _Args>
639	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
640	formatted_size(locale __loc, format_string<_Args...> __fmt, _Args&&... __args) {
641	return _VSTD::__vformatted_size(_VSTD::move(__loc), __fmt.get(), basic_format_args{_VSTD::make_format_args(__args...)});
642	}
643
644	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
645	template <class... _Args>
646	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
647	formatted_size(locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
648	return _VSTD::__vformatted_size(_VSTD::move(__loc), __fmt.get(), basic_format_args{_VSTD::make_wformat_args(__args...)});
649	}
650	#endif
651
652	#endif // _LIBCPP_HAS_NO_LOCALIZATION
653
654
655	#endif //_LIBCPP_STD_VER > 17
656
657	_LIBCPP_END_NAMESPACE_STD
658
659	#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
660
661	#endif // _LIBCPP___FORMAT_FORMAT_FUNCTIONS

lib/libcxx/include/__format/format_parse_context.h+4-5

...	@@ -54,8 +54,7 @@ public:	...	@@ -54,8 +54,7 @@ public:
54		54
55	_LIBCPP_HIDE_FROM_ABI constexpr size_t next_arg_id() {	55	_LIBCPP_HIDE_FROM_ABI constexpr size_t next_arg_id() {
56	if (__indexing_ == __manual)	56	if (__indexing_ == __manual)
57	__throw_format_error("Using automatic argument numbering in manual "	57	std::__throw_format_error("Using automatic argument numbering in manual argument numbering mode");
58	"argument numbering mode");
59		58
60	if (__indexing_ == __unknown)	59	if (__indexing_ == __unknown)
61	__indexing_ = __automatic;	60	__indexing_ = __automatic;
...	@@ -63,8 +62,7 @@ public:	...	@@ -63,8 +62,7 @@ public:
63	}	62	}
64	_LIBCPP_HIDE_FROM_ABI constexpr void check_arg_id(size_t __id) {	63	_LIBCPP_HIDE_FROM_ABI constexpr void check_arg_id(size_t __id) {
65	if (__indexing_ == __automatic)	64	if (__indexing_ == __automatic)
66	__throw_format_error("Using manual argument numbering in automatic "	65	std::__throw_format_error("Using manual argument numbering in automatic argument numbering mode");
67	"argument numbering mode");
68		66
69	if (__indexing_ == __unknown)	67	if (__indexing_ == __unknown)
70	__indexing_ = __manual;	68	__indexing_ = __manual;
...	@@ -77,7 +75,7 @@ public:	...	@@ -77,7 +75,7 @@ public:
77	// Note: the Throws clause [format.parse.ctx]/10 doesn't specify the	75	// Note: the Throws clause [format.parse.ctx]/10 doesn't specify the
78	// behavior when id >= num_args_.	76	// behavior when id >= num_args_.
79	if (is_constant_evaluated() && __id >= __num_args_)	77	if (is_constant_evaluated() && __id >= __num_args_)
80	__throw_format_error("Argument index outside the valid range");	78	std::__throw_format_error("Argument index outside the valid range");
81	}	79	}
82		80
83	private:	81	private:
...	@@ -88,6 +86,7 @@ private:	...	@@ -88,6 +86,7 @@ private:
88	size_t __next_arg_id_;	86	size_t __next_arg_id_;
89	size_t __num_args_;	87	size_t __num_args_;
90	};	88	};
		89	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_format_parse_context);
91		90
92	using format_parse_context = basic_format_parse_context<char>;	91	using format_parse_context = basic_format_parse_context<char>;
93	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	92	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS

lib/libcxx/include/__format/format_string.h+6-4

...	@@ -32,6 +32,9 @@ struct _LIBCPP_TEMPLATE_VIS __parse_number_result {	...	@@ -32,6 +32,9 @@ struct _LIBCPP_TEMPLATE_VIS __parse_number_result {
32	uint32_t __value;	32	uint32_t __value;
33	};	33	};
34		34
		35	template <class _CharT>
		36	__parse_number_result(const _CharT*, uint32_t) -> __parse_number_result<_CharT>;
		37
35	template <class _CharT>	38	template <class _CharT>
36	_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_CharT>	39	_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_CharT>
37	__parse_number(const _CharT* __begin, const _CharT* __end);	40	__parse_number(const _CharT* __begin, const _CharT* __end);
...	@@ -70,7 +73,7 @@ __parse_automatic(const _CharT* __begin, const _CharT*, auto& __parse_ctx) {	...	@@ -70,7 +73,7 @@ __parse_automatic(const _CharT* __begin, const _CharT*, auto& __parse_ctx) {
70	template <class _CharT>	73	template <class _CharT>
71	_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_CharT>	74	_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_CharT>
72	__parse_manual(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {	75	__parse_manual(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {
73	__parse_number_result<_CharT> __r = __parse_number(__begin, __end);	76	__parse_number_result<_CharT> __r = __format::__parse_number(__begin, __end);
74	__parse_ctx.check_arg_id(__r.__value);	77	__parse_ctx.check_arg_id(__r.__value);
75	return __r;	78	return __r;
76	}	79	}
...	@@ -117,7 +120,7 @@ __parse_number(const _CharT* __begin, const _CharT* __end_input) {	...	@@ -117,7 +120,7 @@ __parse_number(const _CharT* __begin, const _CharT* __end_input) {
117	if (__v > __number_max \|\|	120	if (__v > __number_max \|\|
118	(__begin != __end_input && *__begin >= _CharT('0') &&	121	(__begin != __end_input && *__begin >= _CharT('0') &&
119	*__begin <= _CharT('9')))	122	*__begin <= _CharT('9')))
120	__throw_format_error("The numeric value of the format-spec is too large");	123	std::__throw_format_error("The numeric value of the format-spec is too large");
121		124
122	__value = __v;	125	__value = __v;
123	}	126	}
...	@@ -146,8 +149,7 @@ __parse_arg_id(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {	...	@@ -146,8 +149,7 @@ __parse_arg_id(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {
146	return __detail::__parse_automatic(__begin, __end, __parse_ctx);	149	return __detail::__parse_automatic(__begin, __end, __parse_ctx);
147	}	150	}
148	if (__begin < _CharT('0') \|\| __begin > _CharT('9'))	151	if (__begin < _CharT('0') \|\| __begin > _CharT('9'))
149	__throw_format_error(	152	std::__throw_format_error("The arg-id of the format-spec starts with an invalid character");
150	"The arg-id of the format-spec starts with an invalid character");
151		153
152	return __detail::__parse_manual(__begin, __end, __parse_ctx);	154	return __detail::__parse_manual(__begin, __end, __parse_ctx);
153	}	155	}

lib/libcxx/include/__format/format_to_n_result.h+1

...	@@ -26,6 +26,7 @@ struct _LIBCPP_TEMPLATE_VIS format_to_n_result {	...	@@ -26,6 +26,7 @@ struct _LIBCPP_TEMPLATE_VIS format_to_n_result {
26	_OutIt out;	26	_OutIt out;
27	iter_difference_t<_OutIt> size;	27	iter_difference_t<_OutIt> size;
28	};	28	};
		29	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(format_to_n_result);
29		30
30	#endif //_LIBCPP_STD_VER > 17	31	#endif //_LIBCPP_STD_VER > 17
31		32

lib/libcxx/include/__format/formatter.h+8-8

...	@@ -11,7 +11,6 @@	...	@@ -11,7 +11,6 @@
11	#define _LIBCPP___FORMAT_FORMATTER_H	11	#define _LIBCPP___FORMAT_FORMATTER_H
12		12
13	#include <__availability>	13	#include <__availability>
14	#include <__concepts/same_as.h>
15	#include <__config>	14	#include <__config>
16	#include <__format/format_fwd.h>	15	#include <__format/format_fwd.h>
17		16
...	@@ -39,15 +38,16 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter {	...	@@ -39,15 +38,16 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter {
39	formatter& operator=(const formatter&) = delete;	38	formatter& operator=(const formatter&) = delete;
40	};	39	};
41		40
42	namespace __formatter {	41	# if _LIBCPP_STD_VER > 20
43		42
44	/** The character types that formatters are specialized for. */	43	template <class _Tp>
45	template <class _CharT>	44	_LIBCPP_HIDE_FROM_ABI constexpr void __set_debug_format(_Tp& __formatter) {
46	concept __char_type = same_as<_CharT, char> \|\| same_as<_CharT, wchar_t>;	45	if constexpr (requires { __formatter.set_debug_format(); })
		46	__formatter.set_debug_format();
		47	}
47		48
48	} // namespace __formatter	49	# endif // _LIBCPP_STD_VER > 20
49		50	#endif // _LIBCPP_STD_VER > 17
50	#endif //_LIBCPP_STD_VER > 17
51		51
52	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD
53		53

lib/libcxx/include/__format/formatter_bool.h+2-2

...	@@ -14,8 +14,8 @@	...	@@ -14,8 +14,8 @@
14	#include <__availability>	14	#include <__availability>
15	#include <__config>	15	#include <__config>
16	#include <__debug>	16	#include <__debug>
		17	#include <__format/concepts.h>
17	#include <__format/format_error.h>	18	#include <__format/format_error.h>
18	#include <__format/format_fwd.h>
19	#include <__format/format_parse_context.h>	19	#include <__format/format_parse_context.h>
20	#include <__format/formatter.h>	20	#include <__format/formatter.h>
21	#include <__format/formatter_integral.h>	21	#include <__format/formatter_integral.h>
...	@@ -35,7 +35,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -35,7 +35,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
35		35
36	#if _LIBCPP_STD_VER > 17	36	#if _LIBCPP_STD_VER > 17
37		37
38	template <__formatter::__char_type _CharT>	38	template <__fmt_char_type _CharT>
39	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<bool, _CharT> {	39	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<bool, _CharT> {
40	public:	40	public:
41	_LIBCPP_HIDE_FROM_ABI constexpr auto	41	_LIBCPP_HIDE_FROM_ABI constexpr auto

lib/libcxx/include/__format/formatter_char.h+11-2

...	@@ -13,7 +13,7 @@	...	@@ -13,7 +13,7 @@
13	#include <__availability>	13	#include <__availability>
14	#include <__concepts/same_as.h>	14	#include <__concepts/same_as.h>
15	#include <__config>	15	#include <__config>
16	#include <__format/format_fwd.h>	16	#include <__format/concepts.h>
17	#include <__format/format_parse_context.h>	17	#include <__format/format_parse_context.h>
18	#include <__format/formatter.h>	18	#include <__format/formatter.h>
19	#include <__format/formatter_integral.h>	19	#include <__format/formatter_integral.h>
...	@@ -30,7 +30,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -30,7 +30,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
30		30
31	#if _LIBCPP_STD_VER > 17	31	#if _LIBCPP_STD_VER > 17
32		32
33	template <__formatter::__char_type _CharT>	33	template <__fmt_char_type _CharT>
34	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_char {	34	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_char {
35	public:	35	public:
36	_LIBCPP_HIDE_FROM_ABI constexpr auto	36	_LIBCPP_HIDE_FROM_ABI constexpr auto
...	@@ -44,6 +44,11 @@ public:	...	@@ -44,6 +44,11 @@ public:
44	if (__parser_.__type_ == __format_spec::__type::__default \|\| __parser_.__type_ == __format_spec::__type::__char)	44	if (__parser_.__type_ == __format_spec::__type::__default \|\| __parser_.__type_ == __format_spec::__type::__char)
45	return __formatter::__format_char(__value, __ctx.out(), __parser_.__get_parsed_std_specifications(__ctx));	45	return __formatter::__format_char(__value, __ctx.out(), __parser_.__get_parsed_std_specifications(__ctx));
46		46
		47	# if _LIBCPP_STD_VER > 20
		48	if (__parser_.__type_ == __format_spec::__type::__debug)
		49	return __formatter::__format_escaped_char(__value, __ctx.out(), __parser_.__get_parsed_std_specifications(__ctx));
		50	# endif
		51
47	if constexpr (sizeof(_CharT) <= sizeof(int))	52	if constexpr (sizeof(_CharT) <= sizeof(int))
48	// Promotes _CharT to an integral type. This reduces the number of	53	// Promotes _CharT to an integral type. This reduces the number of
49	// instantiations of __format_integer reducing code size.	54	// instantiations of __format_integer reducing code size.
...	@@ -61,6 +66,10 @@ public:	...	@@ -61,6 +66,10 @@ public:
61	return format(static_cast<wchar_t>(__value), __ctx);	66	return format(static_cast<wchar_t>(__value), __ctx);
62	}	67	}
63		68
		69	# if _LIBCPP_STD_VER > 20
		70	_LIBCPP_HIDE_FROM_ABI constexpr void set_debug_format() { __parser_.__type_ = __format_spec::__type::__debug; }
		71	# endif
		72
64	__format_spec::__parser<_CharT> __parser_;	73	__format_spec::__parser<_CharT> __parser_;
65	};	74	};
66		75

lib/libcxx/include/__format/formatter_floating_point.h+72-36

...	@@ -10,17 +10,16 @@	...	@@ -10,17 +10,16 @@
10	#ifndef _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H	10	#ifndef _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
11	#define _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H	11	#define _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
12		12
13	#include <__algorithm/copy.h>
14	#include <__algorithm/copy_n.h>	13	#include <__algorithm/copy_n.h>
15	#include <__algorithm/fill_n.h>
16	#include <__algorithm/find.h>	14	#include <__algorithm/find.h>
		15	#include <__algorithm/max.h>
17	#include <__algorithm/min.h>	16	#include <__algorithm/min.h>
18	#include <__algorithm/rotate.h>	17	#include <__algorithm/rotate.h>
19	#include <__algorithm/transform.h>	18	#include <__algorithm/transform.h>
20	#include <__concepts/arithmetic.h>	19	#include <__concepts/arithmetic.h>
21	#include <__concepts/same_as.h>	20	#include <__concepts/same_as.h>
22	#include <__config>	21	#include <__config>
23	#include <__format/format_fwd.h>	22	#include <__format/concepts.h>
24	#include <__format/format_parse_context.h>	23	#include <__format/format_parse_context.h>
25	#include <__format/formatter.h>	24	#include <__format/formatter.h>
26	#include <__format/formatter_integral.h>	25	#include <__format/formatter_integral.h>
...	@@ -103,7 +102,7 @@ template <class _Tp>	...	@@ -103,7 +102,7 @@ template <class _Tp>
103	struct __traits;	102	struct __traits;
104		103
105	template <floating_point _Fp>	104	template <floating_point _Fp>
106	static constexpr size_t __float_buffer_size(int __precision) {	105	_LIBCPP_HIDE_FROM_ABI constexpr size_t __float_buffer_size(int __precision) {
107	using _Traits = __traits<_Fp>;	106	using _Traits = __traits<_Fp>;
108	return 4 + _Traits::__max_integral + __precision + _Traits::__max_fractional_value;	107	return 4 + _Traits::__max_integral + __precision + _Traits::__max_fractional_value;
109	}	108	}
...	@@ -183,6 +182,7 @@ public:	...	@@ -183,6 +182,7 @@ public:
183	_LIBCPP_HIDE_FROM_ABI int __precision() const { return __precision_; }	182	_LIBCPP_HIDE_FROM_ABI int __precision() const { return __precision_; }
184	_LIBCPP_HIDE_FROM_ABI int __num_trailing_zeros() const { return __num_trailing_zeros_; }	183	_LIBCPP_HIDE_FROM_ABI int __num_trailing_zeros() const { return __num_trailing_zeros_; }
185	_LIBCPP_HIDE_FROM_ABI void __remove_trailing_zeros() { __num_trailing_zeros_ = 0; }	184	_LIBCPP_HIDE_FROM_ABI void __remove_trailing_zeros() { __num_trailing_zeros_ = 0; }
		185	_LIBCPP_HIDE_FROM_ABI void __add_trailing_zeros(int __zeros) { __num_trailing_zeros_ += __zeros; }
186		186
187	private:	187	private:
188	int __precision_;	188	int __precision_;
...	@@ -216,7 +216,7 @@ struct __float_result {	...	@@ -216,7 +216,7 @@ struct __float_result {
216	/// \returns a pointer to the exponent or __last when not found.	216	/// \returns a pointer to the exponent or __last when not found.
217	constexpr inline _LIBCPP_HIDE_FROM_ABI char* __find_exponent(char* __first, char* __last) {	217	constexpr inline _LIBCPP_HIDE_FROM_ABI char* __find_exponent(char* __first, char* __last) {
218	ptrdiff_t __size = __last - __first;	218	ptrdiff_t __size = __last - __first;
219	if (__size > 4) {	219	if (__size >= 4) {
220	__first = __last - _VSTD::min(__size, ptrdiff_t(6));	220	__first = __last - _VSTD::min(__size, ptrdiff_t(6));
221	for (; __first != __last - 3; ++__first) {	221	for (; __first != __last - 3; ++__first) {
222	if (*__first == 'e')	222	if (*__first == 'e')
...	@@ -404,6 +404,7 @@ _LIBCPP_HIDE_FROM_ABI __float_result __format_buffer_general_lower_case(__float_	...	@@ -404,6 +404,7 @@ _LIBCPP_HIDE_FROM_ABI __float_result __format_buffer_general_lower_case(__float_
404	// In fixed mode the algorithm truncates trailing spaces and possibly the	404	// In fixed mode the algorithm truncates trailing spaces and possibly the
405	// radix point. There's no good guess for the position of the radix point	405	// radix point. There's no good guess for the position of the radix point
406	// therefore scan the output after the first digit.	406	// therefore scan the output after the first digit.
		407
407	__result.__radix_point = _VSTD::find(__first, __result.__last, '.');	408	__result.__radix_point = _VSTD::find(__first, __result.__last, '.');
408	}	409	}
409	}	410	}
...	@@ -454,7 +455,10 @@ _LIBCPP_HIDE_FROM_ABI __float_result __format_buffer(	...	@@ -454,7 +455,10 @@ _LIBCPP_HIDE_FROM_ABI __float_result __format_buffer(
454	char* __first = __formatter::__insert_sign(__buffer.begin(), __negative, __sign);	455	char* __first = __formatter::__insert_sign(__buffer.begin(), __negative, __sign);
455	switch (__type) {	456	switch (__type) {
456	case __format_spec::__type::__default:	457	case __format_spec::__type::__default:
457	return __formatter::__format_buffer_default(__buffer, __value, __first);	458	if (__has_precision)
		459	return __formatter::__format_buffer_general_lower_case(__buffer, __value, __buffer.__precision(), __first);
		460	else
		461	return __formatter::__format_buffer_default(__buffer, __value, __first);
458		462
459	case __format_spec::__type::__hexfloat_lower_case:	463	case __format_spec::__type::__hexfloat_lower_case:
460	return __formatter::__format_buffer_hexadecimal_lower_case(	464	return __formatter::__format_buffer_hexadecimal_lower_case(
...	@@ -494,7 +498,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(	...	@@ -494,7 +498,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(
494	const __float_result& __result,	498	const __float_result& __result,
495	_VSTD::locale __loc,	499	_VSTD::locale __loc,
496	__format_spec::__parsed_specifications<_CharT> __specs) {	500	__format_spec::__parsed_specifications<_CharT> __specs) {
497	const auto& __np = use_facet<numpunct<_CharT>>(__loc);	501	const auto& __np = std::use_facet<numpunct<_CharT>>(__loc);
498	string __grouping = __np.grouping();	502	string __grouping = __np.grouping();
499	char* __first = __result.__integral;	503	char* __first = __result.__integral;
500	// When no radix point or exponent are present __last will be __result.__last.	504	// When no radix point or exponent are present __last will be __result.__last.
...	@@ -528,13 +532,13 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(	...	@@ -528,13 +532,13 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(
528	// sign and (zero padding or alignment)	532	// sign and (zero padding or alignment)
529	if (__zero_padding && __first != __buffer.begin())	533	if (__zero_padding && __first != __buffer.begin())
530	__out_it++ = __buffer.begin();	534	__out_it++ = __buffer.begin();
531	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);	535	__out_it = __formatter::__fill(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);
532	if (!__zero_padding && __first != __buffer.begin())	536	if (!__zero_padding && __first != __buffer.begin())
533	__out_it++ = __buffer.begin();	537	__out_it++ = __buffer.begin();
534		538
535	// integral part	539	// integral part
536	if (__grouping.empty()) {	540	if (__grouping.empty()) {
537	__out_it = _VSTD::copy_n(__first, __digits, _VSTD::move(__out_it));	541	__out_it = __formatter::__copy(__first, __digits, _VSTD::move(__out_it));
538	} else {	542	} else {
539	auto __r = __grouping.rbegin();	543	auto __r = __grouping.rbegin();
540	auto __e = __grouping.rend() - 1;	544	auto __e = __grouping.rend() - 1;
...	@@ -546,7 +550,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(	...	@@ -546,7 +550,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(
546	// This loop achieves that process by testing the termination condition	550	// This loop achieves that process by testing the termination condition
547	// midway in the loop.	551	// midway in the loop.
548	while (true) {	552	while (true) {
549	__out_it = _VSTD::copy_n(__first, *__r, _VSTD::move(__out_it));	553	__out_it = __formatter::__copy(__first, *__r, _VSTD::move(__out_it));
550	__first += *__r;	554	__first += *__r;
551		555
552	if (__r == __e)	556	if (__r == __e)
...	@@ -560,16 +564,16 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(	...	@@ -560,16 +564,16 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __format_locale_specific_form(
560	// fractional part	564	// fractional part
561	if (__result.__radix_point != __result.__last) {	565	if (__result.__radix_point != __result.__last) {
562	*__out_it++ = __np.decimal_point();	566	*__out_it++ = __np.decimal_point();
563	__out_it = _VSTD::copy(__result.__radix_point + 1, __result.__exponent, _VSTD::move(__out_it));	567	__out_it = __formatter::__copy(__result.__radix_point + 1, __result.__exponent, _VSTD::move(__out_it));
564	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __buffer.__num_trailing_zeros(), _CharT('0'));	568	__out_it = __formatter::__fill(_VSTD::move(__out_it), __buffer.__num_trailing_zeros(), _CharT('0'));
565	}	569	}
566		570
567	// exponent	571	// exponent
568	if (__result.__exponent != __result.__last)	572	if (__result.__exponent != __result.__last)
569	__out_it = _VSTD::copy(__result.__exponent, __result.__last, _VSTD::move(__out_it));	573	__out_it = __formatter::__copy(__result.__exponent, __result.__last, _VSTD::move(__out_it));
570		574
571	// alignment	575	// alignment
572	return _VSTD::fill_n(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);	576	return __formatter::__fill(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);
573	}	577	}
574	# endif // _LIBCPP_HAS_NO_LOCALIZATION	578	# endif // _LIBCPP_HAS_NO_LOCALIZATION
575		579
...	@@ -625,20 +629,51 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif	...	@@ -625,20 +629,51 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif
625	__float_result __result = __formatter::__format_buffer(	629	__float_result __result = __formatter::__format_buffer(
626	__buffer, __value, __negative, (__specs.__has_precision()), __specs.__std_.__sign_, __specs.__std_.__type_);	630	__buffer, __value, __negative, (__specs.__has_precision()), __specs.__std_.__sign_, __specs.__std_.__type_);
627		631
628	if (__specs.__std_.__alternate_form_ && __result.__radix_point == __result.__last) {	632	if (__specs.__std_.__alternate_form_) {
629	*__result.__last++ = '.';	633	if (__result.__radix_point == __result.__last) {
630		634	*__result.__last++ = '.';
631	// When there is an exponent the point needs to be moved before the	635
632	// exponent. When there's no exponent the rotate does nothing. Since	636	// When there is an exponent the point needs to be moved before the
633	// rotate tests whether the operation is a nop, call it unconditionally.	637	// exponent. When there's no exponent the rotate does nothing. Since
634	_VSTD::rotate(__result.__exponent, __result.__last - 1, __result.__last);	638	// rotate tests whether the operation is a nop, call it unconditionally.
635	__result.__radix_point = __result.__exponent;	639	_VSTD::rotate(__result.__exponent, __result.__last - 1, __result.__last);
		640	__result.__radix_point = __result.__exponent;
		641
		642	// The radix point is always placed before the exponent.
		643	// - No exponent needs to point to the new last.
		644	// - An exponent needs to move one position to the right.
		645	// So it's safe to increment the value unconditionally.
		646	++__result.__exponent;
		647	}
636		648
637	// The radix point is always placed before the exponent.	649	// [format.string.std]/6
638	// - No exponent needs to point to the new last.	650	// In addition, for g and G conversions, trailing zeros are not removed
639	// - An exponent needs to move one position to the right.	651	// from the result.
640	// So it's safe to increment the value unconditionally.	652	//
641	++__result.__exponent;	653	// If the type option for a floating-point type is none it may use the
		654	// general formatting, but it's not a g or G conversion. So in that case
		655	// the formatting should not append trailing zeros.
		656	bool __is_general = __specs.__std_.__type_ == __format_spec::__type::__general_lower_case \|\|
		657	__specs.__std_.__type_ == __format_spec::__type::__general_upper_case;
		658
		659	if (__is_general) {
		660	// https://en.cppreference.com/w/c/io/fprintf
		661	// Let P equal the precision if nonzero, 6 if the precision is not
		662	// specified, or 1 if the precision is 0. Then, if a conversion with
		663	// style E would have an exponent of X:
		664	int __p = _VSTD::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6));
		665	if (__result.__exponent == __result.__last)
		666	// if P > X >= -4, the conversion is with style f or F and precision P - 1 - X.
		667	// By including the radix point it calculates P - (1 + X)
		668	__p -= __result.__radix_point - __buffer.begin();
		669	else
		670	// otherwise, the conversion is with style e or E and precision P - 1.
		671	--__p;
		672
		673	ptrdiff_t __precision = (__result.__exponent - __result.__radix_point) - 1;
		674	if (__precision < __p)
		675	__buffer.__add_trailing_zeros(__p - __precision);
		676	}
642	}	677	}
643		678
644	# ifndef _LIBCPP_HAS_NO_LOCALIZATION	679	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
...	@@ -651,14 +686,15 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif	...	@@ -651,14 +686,15 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif
651	if (__size + __num_trailing_zeros >= __specs.__width_) {	686	if (__size + __num_trailing_zeros >= __specs.__width_) {
652	if (__num_trailing_zeros && __result.__exponent != __result.__last)	687	if (__num_trailing_zeros && __result.__exponent != __result.__last)
653	// Insert trailing zeros before exponent character.	688	// Insert trailing zeros before exponent character.
654	return _VSTD::copy(	689	return __formatter::__copy(
655	__result.__exponent,	690	__result.__exponent,
656	__result.__last,	691	__result.__last,
657	_VSTD::fill_n(	692	__formatter::__fill(__formatter::__copy(__buffer.begin(), __result.__exponent, __ctx.out()),
658	_VSTD::copy(__buffer.begin(), __result.__exponent, __ctx.out()), __num_trailing_zeros, _CharT('0')));	693	__num_trailing_zeros,
		694	_CharT('0')));
659		695
660	return _VSTD::fill_n(	696	return __formatter::__fill(
661	_VSTD::copy(__buffer.begin(), __result.__last, __ctx.out()), __num_trailing_zeros, _CharT('0'));	697	__formatter::__copy(__buffer.begin(), __result.__last, __ctx.out()), __num_trailing_zeros, _CharT('0'));
662	}	698	}
663		699
664	auto __out_it = __ctx.out();	700	auto __out_it = __ctx.out();
...	@@ -684,7 +720,7 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif	...	@@ -684,7 +720,7 @@ __format_floating_point(_Tp __value, auto& __ctx, __format_spec::__parsed_specif
684		720
685	} // namespace __formatter	721	} // namespace __formatter
686		722
687	template <__formatter::__char_type _CharT>	723	template <__fmt_char_type _CharT>
688	struct _LIBCPP_TEMPLATE_VIS __formatter_floating_point {	724	struct _LIBCPP_TEMPLATE_VIS __formatter_floating_point {
689	public:	725	public:
690	_LIBCPP_HIDE_FROM_ABI constexpr auto	726	_LIBCPP_HIDE_FROM_ABI constexpr auto
...	@@ -702,13 +738,13 @@ public:	...	@@ -702,13 +738,13 @@ public:
702	__format_spec::__parser<_CharT> __parser_;	738	__format_spec::__parser<_CharT> __parser_;
703	};	739	};
704		740
705	template <__formatter::__char_type _CharT>	741	template <__fmt_char_type _CharT>
706	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<float, _CharT>	742	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<float, _CharT>
707	: public __formatter_floating_point<_CharT> {};	743	: public __formatter_floating_point<_CharT> {};
708	template <__formatter::__char_type _CharT>	744	template <__fmt_char_type _CharT>
709	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<double, _CharT>	745	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<double, _CharT>
710	: public __formatter_floating_point<_CharT> {};	746	: public __formatter_floating_point<_CharT> {};
711	template <__formatter::__char_type _CharT>	747	template <__fmt_char_type _CharT>
712	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long double, _CharT>	748	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long double, _CharT>
713	: public __formatter_floating_point<_CharT> {};	749	: public __formatter_floating_point<_CharT> {};
714		750

lib/libcxx/include/__format/formatter_integer.h+14-14

...	@@ -13,7 +13,7 @@	...	@@ -13,7 +13,7 @@
13	#include <__availability>	13	#include <__availability>
14	#include <__concepts/arithmetic.h>	14	#include <__concepts/arithmetic.h>
15	#include <__config>	15	#include <__config>
16	#include <__format/format_fwd.h>	16	#include <__format/concepts.h>
17	#include <__format/format_parse_context.h>	17	#include <__format/format_parse_context.h>
18	#include <__format/formatter.h>	18	#include <__format/formatter.h>
19	#include <__format/formatter_integral.h>	19	#include <__format/formatter_integral.h>
...	@@ -30,7 +30,7 @@	...	@@ -30,7 +30,7 @@
30		30
31	#if _LIBCPP_STD_VER > 17	31	#if _LIBCPP_STD_VER > 17
32		32
33	template <__formatter::__char_type _CharT>	33	template <__fmt_char_type _CharT>
34	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_integer {	34	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_integer {
35		35
36	public:	36	public:
...	@@ -59,43 +59,43 @@ public:	...	@@ -59,43 +59,43 @@ public:
59	};	59	};
60		60
61	// Signed integral types.	61	// Signed integral types.
62	template <__formatter::__char_type _CharT>	62	template <__fmt_char_type _CharT>
63	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<signed char, _CharT>	63	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<signed char, _CharT>
64	: public __formatter_integer<_CharT> {};	64	: public __formatter_integer<_CharT> {};
65	template <__formatter::__char_type _CharT>	65	template <__fmt_char_type _CharT>
66	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<short, _CharT> : public __formatter_integer<_CharT> {	66	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<short, _CharT> : public __formatter_integer<_CharT> {
67	};	67	};
68	template <__formatter::__char_type _CharT>	68	template <__fmt_char_type _CharT>
69	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<int, _CharT> : public __formatter_integer<_CharT> {};	69	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<int, _CharT> : public __formatter_integer<_CharT> {};
70	template <__formatter::__char_type _CharT>	70	template <__fmt_char_type _CharT>
71	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long, _CharT> : public __formatter_integer<_CharT> {};	71	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long, _CharT> : public __formatter_integer<_CharT> {};
72	template <__formatter::__char_type _CharT>	72	template <__fmt_char_type _CharT>
73	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long long, _CharT>	73	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<long long, _CharT>
74	: public __formatter_integer<_CharT> {};	74	: public __formatter_integer<_CharT> {};
75	# ifndef _LIBCPP_HAS_NO_INT128	75	# ifndef _LIBCPP_HAS_NO_INT128
76	template <__formatter::__char_type _CharT>	76	template <__fmt_char_type _CharT>
77	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<__int128_t, _CharT>	77	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<__int128_t, _CharT>
78	: public __formatter_integer<_CharT> {};	78	: public __formatter_integer<_CharT> {};
79	# endif	79	# endif
80		80
81	// Unsigned integral types.	81	// Unsigned integral types.
82	template <__formatter::__char_type _CharT>	82	template <__fmt_char_type _CharT>
83	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned char, _CharT>	83	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned char, _CharT>
84	: public __formatter_integer<_CharT> {};	84	: public __formatter_integer<_CharT> {};
85	template <__formatter::__char_type _CharT>	85	template <__fmt_char_type _CharT>
86	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned short, _CharT>	86	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned short, _CharT>
87	: public __formatter_integer<_CharT> {};	87	: public __formatter_integer<_CharT> {};
88	template <__formatter::__char_type _CharT>	88	template <__fmt_char_type _CharT>
89	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned, _CharT>	89	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned, _CharT>
90	: public __formatter_integer<_CharT> {};	90	: public __formatter_integer<_CharT> {};
91	template <__formatter::__char_type _CharT>	91	template <__fmt_char_type _CharT>
92	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned long, _CharT>	92	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned long, _CharT>
93	: public __formatter_integer<_CharT> {};	93	: public __formatter_integer<_CharT> {};
94	template <__formatter::__char_type _CharT>	94	template <__fmt_char_type _CharT>
95	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned long long, _CharT>	95	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<unsigned long long, _CharT>
96	: public __formatter_integer<_CharT> {};	96	: public __formatter_integer<_CharT> {};
97	# ifndef _LIBCPP_HAS_NO_INT128	97	# ifndef _LIBCPP_HAS_NO_INT128
98	template <__formatter::__char_type _CharT>	98	template <__fmt_char_type _CharT>
99	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<__uint128_t, _CharT>	99	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<__uint128_t, _CharT>
100	: public __formatter_integer<_CharT> {};	100	: public __formatter_integer<_CharT> {};
101	# endif	101	# endif

lib/libcxx/include/__format/formatter_integral.h+7-6

lib/libcxx/include/__format/formatter_output.h+308-46

...	@@ -10,16 +10,23 @@	...	@@ -10,16 +10,23 @@
10	#ifndef _LIBCPP___FORMAT_FORMATTER_OUTPUT_H	10	#ifndef _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
11	#define _LIBCPP___FORMAT_FORMATTER_OUTPUT_H	11	#define _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
12		12
13	#include <__algorithm/copy.h>	13	#include <__algorithm/ranges_copy.h>
14	#include <__algorithm/copy_n.h>	14	#include <__algorithm/ranges_fill_n.h>
15	#include <__algorithm/fill_n.h>	15	#include <__algorithm/ranges_transform.h>
16	#include <__algorithm/transform.h>	16	#include <__chrono/statically_widen.h>
		17	#include <__concepts/same_as.h>
17	#include <__config>	18	#include <__config>
		19	#include <__format/buffer.h>
		20	#include <__format/concepts.h>
		21	#include <__format/escaped_output_table.h>
18	#include <__format/formatter.h>	22	#include <__format/formatter.h>
19	#include <__format/parser_std_format_spec.h>	23	#include <__format/parser_std_format_spec.h>
20	#include <__format/unicode.h>	24	#include <__format/unicode.h>
		25	#include <__iterator/back_insert_iterator.h>
		26	#include <__type_traits/make_unsigned.h>
21	#include <__utility/move.h>	27	#include <__utility/move.h>
22	#include <__utility/unreachable.h>	28	#include <__utility/unreachable.h>
		29	#include <charconv>
23	#include <cstddef>	30	#include <cstddef>
24	#include <string>	31	#include <string>
25	#include <string_view>	32	#include <string_view>
...	@@ -86,6 +93,74 @@ __padding_size(size_t __size, size_t __width, __format_spec::__alignment __align	...	@@ -86,6 +93,74 @@ __padding_size(size_t __size, size_t __width, __format_spec::__alignment __align
86	__libcpp_unreachable();	93	__libcpp_unreachable();
87	}	94	}
88		95
		96	/// Copy wrapper.
		97	///
		98	/// This uses a "mass output function" of __format::__output_buffer when possible.
		99	template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT>
		100	_LIBCPP_HIDE_FROM_ABI auto __copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto __out_it)
		101	-> decltype(__out_it) {
		102	if constexpr (_VSTD::same_as<decltype(__out_it), _VSTD::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
		103	__out_it.__get_container()->__copy(__str);
		104	return __out_it;
		105	} else if constexpr (_VSTD::same_as<decltype(__out_it),
		106	typename __format::__retarget_buffer<_OutCharT>::__iterator>) {
		107	__out_it.__buffer_->__copy(__str);
		108	return __out_it;
		109	} else {
		110	return std::ranges::copy(__str, _VSTD::move(__out_it)).out;
		111	}
		112	}
		113
		114	template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT>
		115	_LIBCPP_HIDE_FROM_ABI auto
		116	__copy(const _CharT* __first, const _CharT* __last, output_iterator<const _OutCharT&> auto __out_it)
		117	-> decltype(__out_it) {
		118	return __formatter::__copy(basic_string_view{__first, __last}, _VSTD::move(__out_it));
		119	}
		120
		121	template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT>
		122	_LIBCPP_HIDE_FROM_ABI auto __copy(const _CharT* __first, size_t __n, output_iterator<const _OutCharT&> auto __out_it)
		123	-> decltype(__out_it) {
		124	return __formatter::__copy(basic_string_view{__first, __n}, _VSTD::move(__out_it));
		125	}
		126
		127	/// Transform wrapper.
		128	///
		129	/// This uses a "mass output function" of __format::__output_buffer when possible.
		130	template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT, class _UnaryOperation>
		131	_LIBCPP_HIDE_FROM_ABI auto
		132	__transform(const _CharT* __first,
		133	const _CharT* __last,
		134	output_iterator<const _OutCharT&> auto __out_it,
		135	_UnaryOperation __operation) -> decltype(__out_it) {
		136	if constexpr (_VSTD::same_as<decltype(__out_it), _VSTD::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
		137	__out_it.__get_container()->__transform(__first, __last, _VSTD::move(__operation));
		138	return __out_it;
		139	} else if constexpr (_VSTD::same_as<decltype(__out_it),
		140	typename __format::__retarget_buffer<_OutCharT>::__iterator>) {
		141	__out_it.__buffer_->__transform(__first, __last, _VSTD::move(__operation));
		142	return __out_it;
		143	} else {
		144	return std::ranges::transform(__first, __last, _VSTD::move(__out_it), __operation).out;
		145	}
		146	}
		147
		148	/// Fill wrapper.
		149	///
		150	/// This uses a "mass output function" of __format::__output_buffer when possible.
		151	template <__fmt_char_type _CharT, output_iterator<const _CharT&> _OutIt>
		152	_LIBCPP_HIDE_FROM_ABI _OutIt __fill(_OutIt __out_it, size_t __n, _CharT __value) {
		153	if constexpr (_VSTD::same_as<decltype(__out_it), _VSTD::back_insert_iterator<__format::__output_buffer<_CharT>>>) {
		154	__out_it.__get_container()->__fill(__n, __value);
		155	return __out_it;
		156	} else if constexpr (_VSTD::same_as<decltype(__out_it), typename __format::__retarget_buffer<_CharT>::__iterator>) {
		157	__out_it.__buffer_->__fill(__n, __value);
		158	return __out_it;
		159	} else {
		160	return std::ranges::fill_n(_VSTD::move(__out_it), __n, __value);
		161	}
		162	}
		163
89	template <class _OutIt, class _CharT>	164	template <class _OutIt, class _CharT>
90	_LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, const char* __begin, const char* __first,	165	_LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, const char* __begin, const char* __first,
91	const char* __last, string&& __grouping, _CharT __sep,	166	const char* __last, string&& __grouping, _CharT __sep,
...	@@ -97,22 +172,22 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c	...	@@ -97,22 +172,22 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c
97	__padding_size_result __padding = {0, 0};	172	__padding_size_result __padding = {0, 0};
98	if (__specs.__alignment_ == __format_spec::__alignment::__zero_padding) {	173	if (__specs.__alignment_ == __format_spec::__alignment::__zero_padding) {
99	// Write [sign][prefix].	174	// Write [sign][prefix].
100	__out_it = _VSTD::copy(__begin, __first, _VSTD::move(__out_it));	175	__out_it = __formatter::__copy(__begin, __first, _VSTD::move(__out_it));
101		176
102	if (__specs.__width_ > __size) {	177	if (__specs.__width_ > __size) {
103	// Write zero padding.	178	// Write zero padding.
104	__padding.__before_ = __specs.__width_ - __size;	179	__padding.__before_ = __specs.__width_ - __size;
105	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __specs.__width_ - __size, _CharT('0'));	180	__out_it = __formatter::__fill(_VSTD::move(__out_it), __specs.__width_ - __size, _CharT('0'));
106	}	181	}
107	} else {	182	} else {
108	if (__specs.__width_ > __size) {	183	if (__specs.__width_ > __size) {
109	// Determine padding and write padding.	184	// Determine padding and write padding.
110	__padding = __padding_size(__size, __specs.__width_, __specs.__alignment_);	185	__padding = __formatter::__padding_size(__size, __specs.__width_, __specs.__alignment_);
111		186
112	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);	187	__out_it = __formatter::__fill(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);
113	}	188	}
114	// Write [sign][prefix].	189	// Write [sign][prefix].
115	__out_it = _VSTD::copy(__begin, __first, _VSTD::move(__out_it));	190	__out_it = __formatter::__copy(__begin, __first, _VSTD::move(__out_it));
116	}	191	}
117		192
118	auto __r = __grouping.rbegin();	193	auto __r = __grouping.rbegin();
...	@@ -133,10 +208,10 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c	...	@@ -133,10 +208,10 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c
133	while (true) {	208	while (true) {
134	if (__specs.__std_.__type_ == __format_spec::__type::__hexadecimal_upper_case) {	209	if (__specs.__std_.__type_ == __format_spec::__type::__hexadecimal_upper_case) {
135	__last = __first + *__r;	210	__last = __first + *__r;
136	__out_it = _VSTD::transform(__first, __last, _VSTD::move(__out_it), __hex_to_upper);	211	__out_it = __formatter::__transform(__first, __last, _VSTD::move(__out_it), __hex_to_upper);
137	__first = __last;	212	__first = __last;
138	} else {	213	} else {
139	__out_it = _VSTD::copy_n(__first, *__r, _VSTD::move(__out_it));	214	__out_it = __formatter::__copy(__first, *__r, _VSTD::move(__out_it));
140	__first += *__r;	215	__first += *__r;
141	}	216	}
142		217
...	@@ -147,7 +222,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c	...	@@ -147,7 +222,7 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c
147	*__out_it++ = __sep;	222	*__out_it++ = __sep;
148	}	223	}
149		224
150	return _VSTD::fill_n(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);	225	return __formatter::__fill(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);
151	}	226	}
152		227
153	/// Writes the input to the output with the required padding.	228	/// Writes the input to the output with the required padding.
...	@@ -155,12 +230,10 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c	...	@@ -155,12 +230,10 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c
155	/// Since the output column width is specified the function can be used for	230	/// Since the output column width is specified the function can be used for
156	/// ASCII and Unicode output.	231	/// ASCII and Unicode output.
157	///	232	///
158	/// \pre [\a __first, \a __last) is a valid range.
159	/// \pre \a __size <= \a __width. Using this function when this pre-condition	233	/// \pre \a __size <= \a __width. Using this function when this pre-condition
160	/// doesn't hold incurs an unwanted overhead.	234	/// doesn't hold incurs an unwanted overhead.
161	///	235	///
162	/// \param __first Pointer to the first element to write.	236	/// \param __str The string to write.
163	/// \param __last Pointer beyond the last element to write.
164	/// \param __out_it The output iterator to write to.	237	/// \param __out_it The output iterator to write to.
165	/// \param __specs The parsed formatting specifications.	238	/// \param __specs The parsed formatting specifications.
166	/// \param __size The (estimated) output column width. When the elements	239	/// \param __size The (estimated) output column width. When the elements
...	@@ -174,31 +247,42 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c	...	@@ -174,31 +247,42 @@ _LIBCPP_HIDE_FROM_ABI _OutIt __write_using_decimal_separators(_OutIt __out_it, c
174	/// conversion, which means the [\a __first, \a __last) always contains elements	247	/// conversion, which means the [\a __first, \a __last) always contains elements
175	/// of the type \c char.	248	/// of the type \c char.
176	template <class _CharT, class _ParserCharT>	249	template <class _CharT, class _ParserCharT>
177	_LIBCPP_HIDE_FROM_ABI auto __write(	250	_LIBCPP_HIDE_FROM_ABI auto
178	const _CharT* __first,	251	__write(basic_string_view<_CharT> __str,
179	const _CharT* __last,	252	output_iterator<const _CharT&> auto __out_it,
180	output_iterator<const _CharT&> auto __out_it,	253	__format_spec::__parsed_specifications<_ParserCharT> __specs,
181	__format_spec::__parsed_specifications<_ParserCharT> __specs,	254	ptrdiff_t __size) -> decltype(__out_it) {
182	ptrdiff_t __size) -> decltype(__out_it) {
183	_LIBCPP_ASSERT(__first <= __last, "Not a valid range");
184
185	if (__size >= __specs.__width_)	255	if (__size >= __specs.__width_)
186	return _VSTD::copy(__first, __last, _VSTD::move(__out_it));	256	return __formatter::__copy(__str, _VSTD::move(__out_it));
187		257
188	__padding_size_result __padding = __formatter::__padding_size(__size, __specs.__width_, __specs.__std_.__alignment_);	258	__padding_size_result __padding = __formatter::__padding_size(__size, __specs.__width_, __specs.__std_.__alignment_);
189	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);	259	__out_it = __formatter::__fill(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);
190	__out_it = _VSTD::copy(__first, __last, _VSTD::move(__out_it));	260	__out_it = __formatter::__copy(__str, _VSTD::move(__out_it));
191	return _VSTD::fill_n(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);	261	return __formatter::__fill(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);
		262	}
		263
		264	template <class _CharT, class _ParserCharT>
		265	_LIBCPP_HIDE_FROM_ABI auto
		266	__write(const _CharT* __first,
		267	const _CharT* __last,
		268	output_iterator<const _CharT&> auto __out_it,
		269	__format_spec::__parsed_specifications<_ParserCharT> __specs,
		270	ptrdiff_t __size) -> decltype(__out_it) {
		271	_LIBCPP_ASSERT(__first <= __last, "Not a valid range");
		272	return __formatter::__write(basic_string_view{__first, __last}, _VSTD::move(__out_it), __specs, __size);
192	}	273	}
193		274
194	/// \overload	275	/// \overload
195	///	276	///
196	/// Calls the function above where \a __size = \a __last - \a __first.	277	/// Calls the function above where \a __size = \a __last - \a __first.
197	template <class _CharT, class _ParserCharT>	278	template <class _CharT, class _ParserCharT>
198	_LIBCPP_HIDE_FROM_ABI auto __write(const _CharT* __first, const _CharT* __last,	279	_LIBCPP_HIDE_FROM_ABI auto
199	output_iterator<const _CharT&> auto __out_it,	280	__write(const _CharT* __first,
200	__format_spec::__parsed_specifications<_ParserCharT> __specs) -> decltype(__out_it) {	281	const _CharT* __last,
201	return __write(__first, __last, _VSTD::move(__out_it), __specs, __last - __first);	282	output_iterator<const _CharT&> auto __out_it,
		283	__format_spec::__parsed_specifications<_ParserCharT> __specs) -> decltype(__out_it) {
		284	_LIBCPP_ASSERT(__first <= __last, "Not a valid range");
		285	return __formatter::__write(__first, __last, _VSTD::move(__out_it), __specs, __last - __first);
202	}	286	}
203		287
204	template <class _CharT, class _ParserCharT, class _UnaryOperation>	288	template <class _CharT, class _ParserCharT, class _UnaryOperation>
...	@@ -210,12 +294,12 @@ _LIBCPP_HIDE_FROM_ABI auto __write_transformed(const _CharT* __first, const _Cha	...	@@ -210,12 +294,12 @@ _LIBCPP_HIDE_FROM_ABI auto __write_transformed(const _CharT* __first, const _Cha
210		294
211	ptrdiff_t __size = __last - __first;	295	ptrdiff_t __size = __last - __first;
212	if (__size >= __specs.__width_)	296	if (__size >= __specs.__width_)
213	return _VSTD::transform(__first, __last, _VSTD::move(__out_it), __op);	297	return __formatter::__transform(__first, __last, _VSTD::move(__out_it), __op);
214		298
215	__padding_size_result __padding = __padding_size(__size, __specs.__width_, __specs.__alignment_);	299	__padding_size_result __padding = __formatter::__padding_size(__size, __specs.__width_, __specs.__alignment_);
216	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);	300	__out_it = __formatter::__fill(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);
217	__out_it = _VSTD::transform(__first, __last, _VSTD::move(__out_it), __op);	301	__out_it = __formatter::__transform(__first, __last, _VSTD::move(__out_it), __op);
218	return _VSTD::fill_n(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);	302	return __formatter::__fill(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);
219	}	303	}
220		304
221	/// Writes additional zero's for the precision before the exponent.	305	/// Writes additional zero's for the precision before the exponent.
...	@@ -239,12 +323,12 @@ _LIBCPP_HIDE_FROM_ABI auto __write_using_trailing_zeros(	...	@@ -239,12 +323,12 @@ _LIBCPP_HIDE_FROM_ABI auto __write_using_trailing_zeros(
239	_LIBCPP_ASSERT(__num_trailing_zeros > 0, "The overload not writing trailing zeros should have been used");	323	_LIBCPP_ASSERT(__num_trailing_zeros > 0, "The overload not writing trailing zeros should have been used");
240		324
241	__padding_size_result __padding =	325	__padding_size_result __padding =
242	__padding_size(__size + __num_trailing_zeros, __specs.__width_, __specs.__alignment_);	326	__formatter::__padding_size(__size + __num_trailing_zeros, __specs.__width_, __specs.__alignment_);
243	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);	327	__out_it = __formatter::__fill(_VSTD::move(__out_it), __padding.__before_, __specs.__fill_);
244	__out_it = _VSTD::copy(__first, __exponent, _VSTD::move(__out_it));	328	__out_it = __formatter::__copy(__first, __exponent, _VSTD::move(__out_it));
245	__out_it = _VSTD::fill_n(_VSTD::move(__out_it), __num_trailing_zeros, _CharT('0'));	329	__out_it = __formatter::__fill(_VSTD::move(__out_it), __num_trailing_zeros, _CharT('0'));
246	__out_it = _VSTD::copy(__exponent, __last, _VSTD::move(__out_it));	330	__out_it = __formatter::__copy(__exponent, __last, _VSTD::move(__out_it));
247	return _VSTD::fill_n(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);	331	return __formatter::__fill(_VSTD::move(__out_it), __padding.__after_, __specs.__fill_);
248	}	332	}
249		333
250	/// Writes a string using format's width estimation algorithm.	334	/// Writes a string using format's width estimation algorithm.
...	@@ -262,7 +346,7 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string_no_precision(	...	@@ -262,7 +346,7 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string_no_precision(
262		346
263	// No padding -> copy the string	347	// No padding -> copy the string
264	if (!__specs.__has_width())	348	if (!__specs.__has_width())
265	return _VSTD::copy(__str.begin(), __str.end(), _VSTD::move(__out_it));	349	return __formatter::__copy(__str, _VSTD::move(__out_it));
266		350
267	// Note when the estimated width is larger than size there's no padding. So	351	// Note when the estimated width is larger than size there's no padding. So
268	// there's no reason to get the real size when the estimate is larger than or	352	// there's no reason to get the real size when the estimate is larger than or
...	@@ -270,8 +354,7 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string_no_precision(	...	@@ -270,8 +354,7 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string_no_precision(
270	size_t __size =	354	size_t __size =
271	__format_spec::__estimate_column_width(__str, __specs.__width_, __format_spec::__column_width_rounding::__up)	355	__format_spec::__estimate_column_width(__str, __specs.__width_, __format_spec::__column_width_rounding::__up)
272	.__width_;	356	.__width_;
273		357	return __formatter::__write(__str, _VSTD::move(__out_it), __specs, __size);
274	return __formatter::__write(__str.begin(), __str.end(), _VSTD::move(__out_it), __specs, __size);
275	}	358	}
276		359
277	template <class _CharT>	360	template <class _CharT>
...	@@ -296,9 +379,188 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string(	...	@@ -296,9 +379,188 @@ _LIBCPP_HIDE_FROM_ABI auto __write_string(
296		379
297	int __size = __formatter::__truncate(__str, __specs.__precision_);	380	int __size = __formatter::__truncate(__str, __specs.__precision_);
298		381
299	return __write(__str.begin(), __str.end(), _VSTD::move(__out_it), __specs, __size);	382	return __formatter::__write(__str.begin(), __str.end(), _VSTD::move(__out_it), __specs, __size);
		383	}
		384
		385	# if _LIBCPP_STD_VER > 20
		386
		387	struct __nul_terminator {};
		388
		389	template <class _CharT>
		390	_LIBCPP_HIDE_FROM_ABI bool operator==(const _CharT* __cstr, __nul_terminator) {
		391	return *__cstr == _CharT('\0');
		392	}
		393
		394	template <class _CharT>
		395	_LIBCPP_HIDE_FROM_ABI void
		396	__write_escaped_code_unit(basic_string<_CharT>& __str, char32_t __value, const _CharT* __prefix) {
		397	back_insert_iterator __out_it{__str};
		398	std::ranges::copy(__prefix, __nul_terminator{}, __out_it);
		399
		400	char __buffer[8];
		401	to_chars_result __r = std::to_chars(std::begin(__buffer), std::end(__buffer), __value, 16);
		402	_LIBCPP_ASSERT(__r.ec == errc(0), "Internal buffer too small");
		403	std::ranges::copy(std::begin(__buffer), __r.ptr, __out_it);
		404
		405	__str += _CharT('}');
		406	}
		407
		408	// [format.string.escaped]/2.2.1.2
		409	// ...
		410	// then the sequence \u{hex-digit-sequence} is appended to E, where
		411	// hex-digit-sequence is the shortest hexadecimal representation of C using
		412	// lower-case hexadecimal digits.
		413	template <class _CharT>
		414	_LIBCPP_HIDE_FROM_ABI void __write_well_formed_escaped_code_unit(basic_string<_CharT>& __str, char32_t __value) {
		415	__formatter::__write_escaped_code_unit(__str, __value, _LIBCPP_STATICALLY_WIDEN(_CharT, "\\u{"));
		416	}
		417
		418	// [format.string.escaped]/2.2.3
		419	// Otherwise (X is a sequence of ill-formed code units), each code unit U is
		420	// appended to E in order as the sequence \x{hex-digit-sequence}, where
		421	// hex-digit-sequence is the shortest hexadecimal representation of U using
		422	// lower-case hexadecimal digits.
		423	template <class _CharT>
		424	_LIBCPP_HIDE_FROM_ABI void __write_escape_ill_formed_code_unit(basic_string<_CharT>& __str, char32_t __value) {
		425	__formatter::__write_escaped_code_unit(__str, __value, _LIBCPP_STATICALLY_WIDEN(_CharT, "\\x{"));
		426	}
		427
		428	template <class _CharT>
		429	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool __is_escaped_sequence_written(basic_string<_CharT>& __str, char32_t __value) {
		430	# ifdef _LIBCPP_HAS_NO_UNICODE
		431	// For ASCII assume everything above 127 is printable.
		432	if (__value > 127)
		433	return false;
		434	# endif
		435
		436	if (!__escaped_output_table::__needs_escape(__value))
		437	return false;
		438
		439	__formatter::__write_well_formed_escaped_code_unit(__str, __value);
		440	return true;
		441	}
		442
		443	template <class _CharT>
		444	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr char32_t __to_char32(_CharT __value) {
		445	return static_cast<make_unsigned_t<_CharT>>(__value);
		446	}
		447
		448	enum class _LIBCPP_ENUM_VIS __escape_quotation_mark { __apostrophe, __double_quote };
		449
		450	// [format.string.escaped]/2
		451	template <class _CharT>
		452	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool
		453	__is_escaped_sequence_written(basic_string<_CharT>& __str, char32_t __value, __escape_quotation_mark __mark) {
		454	// 2.2.1.1 - Mapped character in [tab:format.escape.sequences]
		455	switch (__value) {
		456	case _CharT('\t'):
		457	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, "\\t");
		458	return true;
		459	case _CharT('\n'):
		460	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, "\\n");
		461	return true;
		462	case _CharT('\r'):
		463	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, "\\r");
		464	return true;
		465	case _CharT('\''):
		466	if (__mark == __escape_quotation_mark::__apostrophe)
		467	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, R"(\')");
		468	else
		469	__str += __value;
		470	return true;
		471	case _CharT('"'):
		472	if (__mark == __escape_quotation_mark::__double_quote)
		473	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, R"(\")");
		474	else
		475	__str += __value;
		476	return true;
		477	case _CharT('\\'):
		478	__str += _LIBCPP_STATICALLY_WIDEN(_CharT, R"(\\)");
		479	return true;
		480
		481	// 2.2.1.2 - Space
		482	case _CharT(' '):
		483	__str += __value;
		484	return true;
		485	}
		486
		487	// 2.2.2
		488	// Otherwise, if X is a shift sequence, the effect on E and further
		489	// decoding of S is unspecified.
		490	// For now shift sequences are ignored and treated as Unicode. Other parts
		491	// of the format library do the same. It's unknown how ostream treats them.
		492	// TODO FMT determine what to do with shift sequences.
		493
		494	// 2.2.1.2.1 and 2.2.1.2.2 - Escape
		495	return __formatter::__is_escaped_sequence_written(__str, __formatter::__to_char32(__value));
300	}	496	}
301		497
		498	template <class _CharT>
		499	_LIBCPP_HIDE_FROM_ABI void
		500	__escape(basic_string<_CharT>& __str, basic_string_view<_CharT> __values, __escape_quotation_mark __mark) {
		501	__unicode::__code_point_view<_CharT> __view{__values.begin(), __values.end()};
		502
		503	while (!__view.__at_end()) {
		504	const _CharT* __first = __view.__position();
		505	typename __unicode::__consume_p2286_result __result = __view.__consume_p2286();
		506	if (__result.__ill_formed_size == 0) {
		507	if (!__formatter::__is_escaped_sequence_written(__str, __result.__value, __mark))
		508	// 2.2.1.3 - Add the character
		509	ranges::copy(__first, __view.__position(), std::back_insert_iterator(__str));
		510
		511	} else {
		512	// 2.2.3 sequence of ill-formed code units
		513	// The number of code-units in __result.__value depends on the character type being used.
		514	if constexpr (sizeof(_CharT) == 1) {
		515	_LIBCPP_ASSERT(__result.__ill_formed_size == 1 \|\| __result.__ill_formed_size == 4,
		516	"illegal number of invalid code units.");
		517	if (__result.__ill_formed_size == 1) // ill-formed, one code unit
		518	__formatter::__write_escape_ill_formed_code_unit(__str, __result.__value & 0xff);
		519	else { // out of valid range, four code units
		520	// The code point was properly encoded, decode the value.
		521	__formatter::__write_escape_ill_formed_code_unit(__str, __result.__value >> 18 \| 0xf0);
		522	__formatter::__write_escape_ill_formed_code_unit(__str, (__result.__value >> 12 & 0x3f) \| 0x80);
		523	__formatter::__write_escape_ill_formed_code_unit(__str, (__result.__value >> 6 & 0x3f) \| 0x80);
		524	__formatter::__write_escape_ill_formed_code_unit(__str, (__result.__value & 0x3f) \| 0x80);
		525	}
		526	} else if constexpr (sizeof(_CharT) == 2) {
		527	_LIBCPP_ASSERT(__result.__ill_formed_size == 1, "for UTF-16 at most one invalid code unit");
		528	__formatter::__write_escape_ill_formed_code_unit(__str, __result.__value & 0xffff);
		529	} else {
		530	static_assert(sizeof(_CharT) == 4, "unsupported character width");
		531	_LIBCPP_ASSERT(__result.__ill_formed_size == 1, "for UTF-32 one code unit is one code point");
		532	__formatter::__write_escape_ill_formed_code_unit(__str, __result.__value);
		533	}
		534	}
		535	}
		536	}
		537
		538	template <class _CharT>
		539	_LIBCPP_HIDE_FROM_ABI auto
		540	__format_escaped_char(_CharT __value,
		541	output_iterator<const _CharT&> auto __out_it,
		542	__format_spec::__parsed_specifications<_CharT> __specs) -> decltype(__out_it) {
		543	basic_string<_CharT> __str;
		544	__str += _CharT('\'');
		545	__formatter::__escape(__str, basic_string_view{std::addressof(__value), 1}, __escape_quotation_mark::__apostrophe);
		546	__str += _CharT('\'');
		547	return __formatter::__write(__str.data(), __str.data() + __str.size(), _VSTD::move(__out_it), __specs, __str.size());
		548	}
		549
		550	template <class _CharT>
		551	_LIBCPP_HIDE_FROM_ABI auto
		552	__format_escaped_string(basic_string_view<_CharT> __values,
		553	output_iterator<const _CharT&> auto __out_it,
		554	__format_spec::__parsed_specifications<_CharT> __specs) -> decltype(__out_it) {
		555	basic_string<_CharT> __str;
		556	__str += _CharT('"');
		557	__formatter::__escape(__str, __values, __escape_quotation_mark::__double_quote);
		558	__str += _CharT('"');
		559	return __formatter::__write_string(basic_string_view{__str}, _VSTD::move(__out_it), __specs);
		560	}
		561
		562	# endif // _LIBCPP_STD_VER > 20
		563
302	} // namespace __formatter	564	} // namespace __formatter
303		565
304	#endif //_LIBCPP_STD_VER > 17	566	#endif //_LIBCPP_STD_VER > 17

lib/libcxx/include/__format/formatter_pointer.h+5-5

...	@@ -12,7 +12,7 @@	...	@@ -12,7 +12,7 @@
12		12
13	#include <__availability>	13	#include <__availability>
14	#include <__config>	14	#include <__config>
15	#include <__format/format_fwd.h>	15	#include <__format/concepts.h>
16	#include <__format/format_parse_context.h>	16	#include <__format/format_parse_context.h>
17	#include <__format/formatter.h>	17	#include <__format/formatter.h>
18	#include <__format/formatter_integral.h>	18	#include <__format/formatter_integral.h>
...	@@ -29,7 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -29,7 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
29		29
30	#if _LIBCPP_STD_VER > 17	30	#if _LIBCPP_STD_VER > 17
31		31
32	template <__formatter::__char_type _CharT>	32	template <__fmt_char_type _CharT>
33	struct _LIBCPP_TEMPLATE_VIS __formatter_pointer {	33	struct _LIBCPP_TEMPLATE_VIS __formatter_pointer {
34	public:	34	public:
35	constexpr __formatter_pointer() { __parser_.__alignment_ = __format_spec::__alignment::__right; }	35	constexpr __formatter_pointer() { __parser_.__alignment_ = __format_spec::__alignment::__right; }
...	@@ -56,13 +56,13 @@ public:	...	@@ -56,13 +56,13 @@ public:
56	// - struct formatter<nullptr_t, charT>;	56	// - struct formatter<nullptr_t, charT>;
57	// - template<> struct formatter<void*, charT>;	57	// - template<> struct formatter<void*, charT>;
58	// - template<> struct formatter<const void*, charT>;	58	// - template<> struct formatter<const void*, charT>;
59	template <__formatter::__char_type _CharT>	59	template <__fmt_char_type _CharT>
60	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<nullptr_t, _CharT>	60	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<nullptr_t, _CharT>
61	: public __formatter_pointer<_CharT> {};	61	: public __formatter_pointer<_CharT> {};
62	template <__formatter::__char_type _CharT>	62	template <__fmt_char_type _CharT>
63	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<void*, _CharT> : public __formatter_pointer<_CharT> {	63	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<void*, _CharT> : public __formatter_pointer<_CharT> {
64	};	64	};
65	template <__formatter::__char_type _CharT>	65	template <__fmt_char_type _CharT>
66	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const void*, _CharT>	66	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const void*, _CharT>
67	: public __formatter_pointer<_CharT> {};	67	: public __formatter_pointer<_CharT> {};
68		68

lib/libcxx/include/__format/formatter_string.h+24-10

 @@ -12,7 +12,7 @@
 #include <__availability>
 #include <__config>
-#include <__format/format_fwd.h>
+#include <__format/concepts.h>
 #include <__format/format_parse_context.h>
 #include <__format/formatter.h>
 #include <__format/formatter_output.h>
 @@ -29,7 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 17
-template <__formatter::__char_type _CharT>
+template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS __formatter_string {
 public:
   _LIBCPP_HIDE_FROM_ABI constexpr auto parse(basic_format_parse_context<_CharT>& __parse_ctx)
 @@ -40,14 +40,23 @@ public:
   }
   _LIBCPP_HIDE_FROM_ABI auto format(basic_string_view<_CharT> __str, auto& __ctx) const -> decltype(__ctx.out()) {
+#  if _LIBCPP_STD_VER > 20
+    if (__parser_.__type_ == __format_spec::__type::__debug)
+      return __formatter::__format_escaped_string(__str, __ctx.out(), __parser_.__get_parsed_std_specifications(__ctx));
+#  endif
     return __formatter::__write_string(__str, __ctx.out(), __parser_.__get_parsed_std_specifications(__ctx));
   }
-  __format_spec::__parser<_CharT> __parser_;
+#  if _LIBCPP_STD_VER > 20
+  _LIBCPP_HIDE_FROM_ABI constexpr void set_debug_format() { __parser_.__type_ = __format_spec::__type::__debug; }
+#  endif
+  __format_spec::__parser<_CharT> __parser_{.__alignment_ = __format_spec::__alignment::__left};
 };
 // Formatter const char*.
-template <__formatter::__char_type _CharT>
+template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT*, _CharT>
     : public __formatter_string<_CharT> {
   using _Base = __formatter_string<_CharT>;
 @@ -56,6 +65,12 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT*,
     _LIBCPP_ASSERT(__str, "The basic_format_arg constructor should have "
                           "prevented an invalid pointer.");
+    __format_spec::__parsed_specifications<_CharT> __specs = _Base::__parser_.__get_parsed_std_specifications(__ctx);
+#  if _LIBCPP_STD_VER > 20
+    if (_Base::__parser_.__type_ == __format_spec::__type::__debug)
+      return __formatter::__format_escaped_string(basic_string_view<_CharT>{__str}, __ctx.out(), __specs);
+#  endif
     // When using a center or right alignment and the width option the length
     // of __str must be known to add the padding upfront. This case is handled
     // by the base class by converting the argument to a basic_string_view.
 @@ -67,7 +82,6 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT*,
     // now these optimizations aren't implemented. Instead the base class
     // handles these options.
     // TODO FMT Implement these improvements.
-    __format_spec::__parsed_specifications<_CharT> __specs = _Base::__parser_.__get_parsed_std_specifications(__ctx);
     if (__specs.__has_width() || __specs.__has_precision())
       return __formatter::__write_string(basic_string_view<_CharT>{__str}, __ctx.out(), __specs);
 @@ -80,7 +94,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT*,
 };
 // Formatter char*.
-template <__formatter::__char_type _CharT>
+template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_CharT*, _CharT>
     : public formatter<const _CharT*, _CharT> {
   using _Base = formatter<const _CharT*, _CharT>;
 @@ -91,7 +105,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_CharT*, _Char
 };
 // Formatter char[].
-template <__formatter::__char_type _CharT, size_t _Size>
+template <__fmt_char_type _CharT, size_t _Size>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_CharT[_Size], _CharT>
     : public __formatter_string<_CharT> {
   using _Base = __formatter_string<_CharT>;
 @@ -102,7 +116,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_CharT[_Size],
 };
 // Formatter const char[].
-template <__formatter::__char_type _CharT, size_t _Size>
+template <__fmt_char_type _CharT, size_t _Size>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT[_Size], _CharT>
     : public __formatter_string<_CharT> {
   using _Base = __formatter_string<_CharT>;
 @@ -113,7 +127,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<const _CharT[_
 };
 // Formatter std::string.
-template <__formatter::__char_type _CharT, class _Traits, class _Allocator>
+template <__fmt_char_type _CharT, class _Traits, class _Allocator>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<basic_string<_CharT, _Traits, _Allocator>, _CharT>
     : public __formatter_string<_CharT> {
   using _Base = __formatter_string<_CharT>;
 @@ -126,7 +140,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<basic_string<_
 };
 // Formatter std::string_view.
-template <__formatter::__char_type _CharT, class _Traits>
+template <__fmt_char_type _CharT, class _Traits>
 struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<basic_string_view<_CharT, _Traits>, _CharT>
     : public __formatter_string<_CharT> {
   using _Base = __formatter_string<_CharT>;

lib/libcxx/include/__format/formatter_tuple.h created+178

...	@@ -0,0 +1,178 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_FORMATTER_TUPLE_H
11	#define _LIBCPP___FORMAT_FORMATTER_TUPLE_H
12
13	#include <__algorithm/ranges_copy.h>
14	#include <__availability>
15	#include <__chrono/statically_widen.h>
16	#include <__config>
17	#include <__format/concepts.h>
18	#include <__format/format_args.h>
19	#include <__format/format_context.h>
20	#include <__format/format_error.h>
21	#include <__format/format_parse_context.h>
22	#include <__format/formatter.h>
23	#include <__format/formatter_output.h>
24	#include <__format/parser_std_format_spec.h>
25	#include <__iterator/back_insert_iterator.h>
26	#include <__type_traits/remove_cvref.h>
27	#include <__utility/integer_sequence.h>
28	#include <__utility/pair.h>
29	#include <string_view>
30	#include <tuple>
31
32	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
33	# pragma GCC system_header
34	#endif
35
36	_LIBCPP_BEGIN_NAMESPACE_STD
37
38	#if _LIBCPP_STD_VER > 20
39
40	template <__fmt_char_type _CharT, class _Tuple, formattable<_CharT>... _Args>
41	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __formatter_tuple {
42	_LIBCPP_HIDE_FROM_ABI constexpr void set_separator(basic_string_view<_CharT> __separator) {
43	__separator_ = __separator;
44	}
45	_LIBCPP_HIDE_FROM_ABI constexpr void
46	set_brackets(basic_string_view<_CharT> __opening_bracket, basic_string_view<_CharT> __closing_bracket) {
47	__opening_bracket_ = __opening_bracket;
48	__closing_bracket_ = __closing_bracket;
49	}
50
51	template <class _ParseContext>
52	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __parse_ctx) {
53	const _CharT* __begin = __parser_.__parse(__parse_ctx, __format_spec::__fields_tuple);
54
55	// [format.tuple]/7
56	// ... For each element e in underlying_, if e.set_debug_format()
57	// is a valid expression, calls e.set_debug_format().
58	// TODO FMT this can be removed when P2733 is accepted.
59	std::__for_each_index_sequence(make_index_sequence<sizeof...(_Args)>(), [&]<size_t _Index> {
60	std::__set_debug_format(std::get<_Index>(__underlying_));
61	});
62
63	const _CharT* __end = __parse_ctx.end();
64	if (__begin == __end)
65	return __begin;
66
67	if (*__begin == _CharT('m')) {
68	if constexpr (sizeof...(_Args) == 2) {
69	set_separator(_LIBCPP_STATICALLY_WIDEN(_CharT, ": "));
70	set_brackets({}, {});
71	++__begin;
72	} else
73	std::__throw_format_error("The format specifier m requires a pair or a two-element tuple");
74	} else if (*__begin == _CharT('n')) {
75	set_brackets({}, {});
76	++__begin;
77	}
78
79	if (__begin != __end && *__begin != _CharT('}'))
80	std::__throw_format_error("The format-spec should consume the input or end with a '}'");
81
82	return __begin;
83	}
84
85	template <class _FormatContext>
86	typename _FormatContext::iterator _LIBCPP_HIDE_FROM_ABI
87	format(conditional_t<(formattable<const _Args, _CharT> && ...), const _Tuple&, _Tuple&> __tuple,
88	_FormatContext& __ctx) const {
89	__format_spec::__parsed_specifications<_CharT> __specs = __parser_.__get_parsed_std_specifications(__ctx);
90
91	if (!__specs.__has_width())
92	return __format_tuple(__tuple, __ctx);
93
94	basic_string<_CharT> __str;
95
96	// Since the output is written to a different iterator a new context is
97	// created. Since the underlying formatter uses the default formatting it
98	// doesn't need a locale or the formatting arguments. So creating a new
99	// context works.
100	//
101	// This solution works for this formatter, but it will not work for the
102	// range_formatter. In that patch a generic solution is work in progress.
103	// Once that is finished it can be used here. (The range_formatter will use
104	// these features so it's easier to add it there and then port it.)
105	//
106	// TODO FMT Use formatting wrapping used in the range_formatter.
107	basic_format_context __c = std::__format_context_create(
108	back_insert_iterator{__str},
109	basic_format_args<basic_format_context<back_insert_iterator<basic_string<_CharT>>, _CharT>>{});
110
111	__format_tuple(__tuple, __c);
112
113	return __formatter::__write_string_no_precision(basic_string_view{__str}, __ctx.out(), __specs);
114	}
115
116	template <class _FormatContext>
117	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator __format_tuple(auto&& __tuple, _FormatContext& __ctx) const {
118	__ctx.advance_to(std::ranges::copy(__opening_bracket_, __ctx.out()).out);
119
120	std::__for_each_index_sequence(make_index_sequence<sizeof...(_Args)>(), [&]<size_t _Index> {
121	if constexpr (_Index)
122	__ctx.advance_to(std::ranges::copy(__separator_, __ctx.out()).out);
123
124	// During review Victor suggested to make the exposition only
125	// __underlying_ member a local variable. Currently the Standard
126	// requires nested debug-enabled formatter specializations not to
127	// output escaped output. P2733 fixes that bug, once accepted the
128	// code below can be used.
129	// (Note when a paper allows parsing a tuple-underlying-spec the
130	// exposition only member needs to be a class member. Earlier
131	// revisions of P2286 proposed that, but this was not pursued,
132	// due to time constrains and complexity of the matter.)
133	// TODO FMT This can be updated after P2733 is accepted.
134	# if 0
135	// P2286 uses an exposition only member in the formatter
136	// tuple<formatter<remove_cvref_t<_Args>, _CharT>...> __underlying_;
137	// This was used in earlier versions of the paper since
138	// __underlying_.parse(...) was called. This is no longer the case
139	// so we can reduce the scope of the formatter.
140	//
141	// It does require the underlying's parse effect to be moved here too.
142	using _Arg = tuple_element<_Index, decltype(__tuple)>;
143	formatter<remove_cvref_t<_Args>, _CharT> __underlying;
144
145	// [format.tuple]/7
146	// ... For each element e in underlying_, if e.set_debug_format()
147	// is a valid expression, calls e.set_debug_format().
148	std::__set_debug_format(__underlying);
149	# else
150	__ctx.advance_to(std::get<_Index>(__underlying_).format(std::get<_Index>(__tuple), __ctx));
151	# endif
152	});
153
154	return std::ranges::copy(__closing_bracket_, __ctx.out()).out;
155	}
156
157	__format_spec::__parser<_CharT> __parser_{.__alignment_ = __format_spec::__alignment::__left};
158
159	private:
160	tuple<formatter<remove_cvref_t<_Args>, _CharT>...> __underlying_;
161	basic_string_view<_CharT> __separator_ = _LIBCPP_STATICALLY_WIDEN(_CharT, ", ");
162	basic_string_view<_CharT> __opening_bracket_ = _LIBCPP_STATICALLY_WIDEN(_CharT, "(");
163	basic_string_view<_CharT> __closing_bracket_ = _LIBCPP_STATICALLY_WIDEN(_CharT, ")");
164	};
165
166	template <__fmt_char_type _CharT, formattable<_CharT>... _Args>
167	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<pair<_Args...>, _CharT>
168	: public __formatter_tuple<_CharT, pair<_Args...>, _Args...> {};
169
170	template <__fmt_char_type _CharT, formattable<_CharT>... _Args>
171	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<tuple<_Args...>, _CharT>
172	: public __formatter_tuple<_CharT, tuple<_Args...>, _Args...> {};
173
174	#endif //_LIBCPP_STD_VER > 20
175
176	_LIBCPP_END_NAMESPACE_STD
177
178	#endif // _LIBCPP___FORMAT_FORMATTER_TUPLE_H

lib/libcxx/include/__format/parser_std_format_spec.h+90-42

 @@ -19,6 +19,8 @@
 #include <__algorithm/find_if.h>
 #include <__algorithm/min.h>
 #include <__assert>
+#include <__concepts/arithmetic.h>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__debug>
 #include <__format/format_arg.h>
 @@ -28,7 +30,6 @@
 #include <__format/unicode.h>
 #include <__variant/monostate.h>
 #include <bit>
-#include <concepts>
 #include <cstdint>
 #include <string_view>
 #include <type_traits>
 @@ -52,13 +53,12 @@ __parse_arg_id(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {
   // This function is a wrapper to call the real parser. But it does the
   // validation for the pre-conditions and post-conditions.
   if (__begin == __end)
-    __throw_format_error("End of input while parsing format-spec arg-id");
+    std::__throw_format_error("End of input while parsing format-spec arg-id");
-  __format::__parse_number_result __r =
+  __format::__parse_number_result __r = __format::__parse_arg_id(__begin, __end, __parse_ctx);
-      __format::__parse_arg_id(__begin, __end, __parse_ctx);
   if (__r.__ptr == __end || *__r.__ptr != _CharT('}'))
-    __throw_format_error("Invalid arg-id");
+    std::__throw_format_error("Invalid arg-id");
   ++__r.__ptr;
   return __r;
 @@ -67,28 +67,33 @@ __parse_arg_id(const _CharT* __begin, const _CharT* __end, auto& __parse_ctx) {
 template <class _Context>
 _LIBCPP_HIDE_FROM_ABI constexpr uint32_t
 __substitute_arg_id(basic_format_arg<_Context> __format_arg) {
-  return visit_format_arg(
+  // [format.string.std]/8
+  //   If the corresponding formatting argument is not of integral type...
+  // This wording allows char and bool too. LWG-3720 changes the wording to
+  //    If the corresponding formatting argument is not of standard signed or
+  //    unsigned integer type,
+  // This means the 128-bit will not be valid anymore.
+  // TODO FMT Verify this resolution is accepted and add a test to verify
+  //          128-bit integrals fail and switch to visit_format_arg.
+  return _VSTD::__visit_format_arg(
       [](auto __arg) -> uint32_t {
         using _Type = decltype(__arg);
         if constexpr (integral<_Type>) {
           if constexpr (signed_integral<_Type>) {
             if (__arg < 0)
-              __throw_format_error("A format-spec arg-id replacement shouldn't "
+              std::__throw_format_error("A format-spec arg-id replacement shouldn't have a negative value");
-                                   "have a negative value");
           }
           using _CT = common_type_t<_Type, decltype(__format::__number_max)>;
           if (static_cast<_CT>(__arg) >
               static_cast<_CT>(__format::__number_max))
-            __throw_format_error("A format-spec arg-id replacement exceeds "
+            std::__throw_format_error("A format-spec arg-id replacement exceeds the maximum supported value");
-                                 "the maximum supported value");
           return __arg;
         } else if constexpr (same_as<_Type, monostate>)
-          __throw_format_error("Argument index out of bounds");
+          std::__throw_format_error("Argument index out of bounds");
         else
-          __throw_format_error("A format-spec arg-id replacement argument "
+          std::__throw_format_error("A format-spec arg-id replacement argument isn't an integral type");
-                               "isn't an integral type");
       },
       __format_arg);
 }
 @@ -97,6 +102,7 @@ __substitute_arg_id(basic_format_arg<_Context> __format_arg) {
 ///
 /// They default to false so when a new field is added it needs to be opted in
 /// explicitly.
+// TODO FMT Use an ABI tag for this struct.
 struct __fields {
   uint8_t __sign_ : 1 {false};
   uint8_t __alternate_form_ : 1 {false};
 @@ -104,6 +110,13 @@ struct __fields {
   uint8_t __precision_ : 1 {false};
   uint8_t __locale_specific_form_ : 1 {false};
   uint8_t __type_ : 1 {false};
+  // Determines the valid values for fill.
+  //
+  // Originally the fill could be any character except { and }. Range-based
+  // formatters use the colon to mark the beginning of the
+  // underlying-format-spec. To avoid parsing ambiguities these formatter
+  // specializations prohibit the use of the colon as a fill character.
+  uint8_t __allow_colon_in_fill_ : 1 {false};
 };
 // By not placing this constant in the formatter class it's not duplicated for
 @@ -124,6 +137,11 @@ inline constexpr __fields __fields_floating_point{
 inline constexpr __fields __fields_string{.__precision_ = true, .__type_ = true};
 inline constexpr __fields __fields_pointer{.__type_ = true};
+#  if _LIBCPP_STD_VER > 20
+inline constexpr __fields __fields_tuple{.__type_ = false, .__allow_colon_in_fill_ = true};
+inline constexpr __fields __fields_range{.__type_ = false, .__allow_colon_in_fill_ = true};
+#  endif
 enum class _LIBCPP_ENUM_VIS __alignment : uint8_t {
   /// No alignment is set in the format string.
   __default,
 @@ -163,7 +181,8 @@ enum class _LIBCPP_ENUM_VIS __type : uint8_t {
   __fixed_lower_case,
   __fixed_upper_case,
   __general_lower_case,
-  __general_upper_case
+  __general_upper_case,
+  __debug
 };
 struct __std {
 @@ -176,7 +195,11 @@ struct __std {
 struct __chrono {
   __alignment __alignment_ : 3;
+  bool __locale_specific_form_ : 1;
   bool __weekday_name_ : 1;
+  bool __weekday_              : 1;
+  bool __day_of_year_          : 1;
+  bool __week_of_year_         : 1;
   bool __month_name_ : 1;
 };
 @@ -250,7 +273,7 @@ public:
     if (__begin == __end)
       return __begin;
-    if (__parse_fill_align(__begin, __end) && __begin == __end)
+    if (__parse_fill_align(__begin, __end, __fields.__allow_colon_in_fill_) && __begin == __end)
       return __begin;
     if (__fields.__sign_ && __parse_sign(__begin) && __begin == __end)
 @@ -278,7 +301,7 @@ public:
       // parsing. In that case that parser should do the end of format string
       // validation.
       if (__begin != __end && *__begin != _CharT('}'))
-        __throw_format_error("The format-spec should consume the input or end with a '}'");
+        std::__throw_format_error("The format-spec should consume the input or end with a '}'");
     }
     return __begin;
 @@ -288,12 +311,26 @@ public:
   _LIBCPP_HIDE_FROM_ABI
   __parsed_specifications<_CharT> __get_parsed_std_specifications(auto& __ctx) const {
     return __parsed_specifications<_CharT>{
-        .__std_ =
+        .__std_ = __std{.__alignment_            = __alignment_,
-            __std{.__alignment_            = __alignment_,
+                        .__sign_                 = __sign_,
-                  .__sign_                 = __sign_,
+                        .__alternate_form_       = __alternate_form_,
-                  .__alternate_form_       = __alternate_form_,
+                        .__locale_specific_form_ = __locale_specific_form_,
-                  .__locale_specific_form_ = __locale_specific_form_,
+                        .__type_                 = __type_},
-                  .__type_                 = __type_},
+        .__width_{__get_width(__ctx)},
+        .__precision_{__get_precision(__ctx)},
+        .__fill_{__fill_}};
+  }
+  _LIBCPP_HIDE_FROM_ABI __parsed_specifications<_CharT> __get_parsed_chrono_specifications(auto& __ctx) const {
+    return __parsed_specifications<_CharT>{
+        .__chrono_ =
+            __chrono{.__alignment_            = __alignment_,
+                     .__locale_specific_form_ = __locale_specific_form_,
+                     .__weekday_name_         = __weekday_name_,
+                     .__weekday_              = __weekday_,
+                     .__day_of_year_          = __day_of_year_,
+                     .__week_of_year_         = __week_of_year_,
+                     .__month_name_           = __month_name_},
         .__width_{__get_width(__ctx)},
         .__precision_{__get_precision(__ctx)},
         .__fill_{__fill_}};
 @@ -306,12 +343,17 @@ public:
   bool __reserved_0_ : 1 {false};
   __type __type_{__type::__default};
-  // These two flags are used for formatting chrono. Since the struct has
+  // These flags are only used for formatting chrono. Since the struct has
   // padding space left it's added to this structure.
   bool __weekday_name_ : 1 {false};
+  bool __weekday_      : 1 {false};
+  bool __day_of_year_  : 1 {false};
+  bool __week_of_year_ : 1 {false};
   bool __month_name_ : 1 {false};
-  uint8_t __reserved_1_ : 6 {0};
+  uint8_t __reserved_1_ : 3 {0};
   uint8_t __reserved_2_ : 6 {0};
   // These two flags are only used internally and not part of the
   // __parsed_specifications. Therefore put them at the end.
 @@ -348,13 +390,17 @@ private:
     return false;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr bool __parse_fill_align(const _CharT*& __begin, const _CharT* __end) {
+  // range-fill and tuple-fill are identical
+  _LIBCPP_HIDE_FROM_ABI constexpr bool
+  __parse_fill_align(const _CharT*& __begin, const _CharT* __end, bool __use_range_fill) {
     _LIBCPP_ASSERT(__begin != __end, "when called with an empty input the function will cause "
                                      "undefined behavior by evaluating data not in the input");
     if (__begin + 1 != __end) {
       if (__parse_alignment(*(__begin + 1))) {
-        if (*__begin == _CharT('{') || *__begin == _CharT('}'))
+        if (__use_range_fill && (*__begin == _CharT('{') || *__begin == _CharT('}') || *__begin == _CharT(':')))
-          __throw_format_error("The format-spec fill field contains an invalid character");
+          std::__throw_format_error("The format-spec range-fill field contains an invalid character");
+        else if (*__begin == _CharT('{') || *__begin == _CharT('}'))
+          std::__throw_format_error("The format-spec fill field contains an invalid character");
         __fill_ = *__begin;
         __begin += 2;
 @@ -408,7 +454,7 @@ private:
   _LIBCPP_HIDE_FROM_ABI constexpr bool __parse_width(const _CharT*& __begin, const _CharT* __end, auto& __parse_ctx) {
     if (*__begin == _CharT('0'))
-      __throw_format_error("A format-spec width field shouldn't have a leading zero");
+      std::__throw_format_error("A format-spec width field shouldn't have a leading zero");
     if (*__begin == _CharT('{')) {
       __format::__parse_number_result __r = __format_spec::__parse_arg_id(++__begin, __end, __parse_ctx);
 @@ -436,7 +482,7 @@ private:
     ++__begin;
     if (__begin == __end)
-      __throw_format_error("End of input while parsing format-spec precision");
+      std::__throw_format_error("End of input while parsing format-spec precision");
     if (*__begin == _CharT('{')) {
       __format::__parse_number_result __arg_id = __format_spec::__parse_arg_id(++__begin, __end, __parse_ctx);
 @@ -447,7 +493,7 @@ private:
     }
     if (*__begin < _CharT('0') || *__begin > _CharT('9'))
-      __throw_format_error("The format-spec precision field doesn't contain a value or arg-id");
+      std::__throw_format_error("The format-spec precision field doesn't contain a value or arg-id");
     __format::__parse_number_result __r = __format::__parse_number(__begin, __end);
     __precision_ = __r.__value;
 @@ -523,6 +569,11 @@ private:
     case 'x':
       __type_ = __type::__hexadecimal_lower_case;
       break;
+#  if _LIBCPP_STD_VER > 20
+    case '?':
+      __type_ = __type::__debug;
+      break;
+#  endif
     default:
       return;
     }
 @@ -534,10 +585,7 @@ private:
     if (!__width_as_arg_)
       return __width_;
-    int32_t __result = __format_spec::__substitute_arg_id(__ctx.arg(__width_));
+    return __format_spec::__substitute_arg_id(__ctx.arg(__width_));
-    if (__result == 0)
-      __throw_format_error("A format-spec width field replacement should have a positive value");
-    return __result;
   }
   _LIBCPP_HIDE_FROM_ABI
 @@ -559,6 +607,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __process_display_type_string(__format_spec
   switch (__type) {
   case __format_spec::__type::__default:
   case __format_spec::__type::__string:
+  case __format_spec::__type::__debug:
     break;
   default:
 @@ -612,6 +661,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __process_parsed_char(__parser<_CharT>& __p
   switch (__parser.__type_) {
   case __format_spec::__type::__default:
   case __format_spec::__type::__char:
+  case __format_spec::__type::__debug:
     __format_spec::__process_display_type_char(__parser);
     break;
 @@ -653,11 +703,6 @@ template <class _CharT>
 _LIBCPP_HIDE_FROM_ABI constexpr void __process_parsed_floating_point(__parser<_CharT>& __parser) {
   switch (__parser.__type_) {
   case __format_spec::__type::__default:
-    // When no precision specified then it keeps default since that
-    // formatting differs from the other types.
-    if (__parser.__precision_as_arg_ || __parser.__precision_ != -1)
-      __parser.__type_ = __format_spec::__type::__general_lower_case;
-    break;
   case __format_spec::__type::__hexfloat_lower_case:
   case __format_spec::__type::__hexfloat_upper_case:
     // Precision specific behavior will be handled later.
 @@ -699,6 +744,9 @@ struct __column_width_result {
   const _CharT* __last_;
 };
+template <class _CharT>
+__column_width_result(size_t, const _CharT*) -> __column_width_result<_CharT>;
 /// Since a column width can be two it's possible that the requested column
 /// width can't be achieved. Depending on the intended usage the policy can be
 /// selected.
 @@ -857,7 +905,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr __column_width_result<_CharT> __estimate_column_
   // unit is non-ASCII we omit the current code unit and let the Grapheme
   // clustering algorithm do its work.
   const _CharT* __it = __str.begin();
-  if (__is_ascii(*__it)) {
+  if (__format_spec::__is_ascii(*__it)) {
     do {
       --__maximum;
       ++__it;
 @@ -865,12 +913,12 @@ _LIBCPP_HIDE_FROM_ABI constexpr __column_width_result<_CharT> __estimate_column_
         return {__str.size(), __str.end()};
       if (__maximum == 0) {
-        if (__is_ascii(*__it))
+        if (__format_spec::__is_ascii(*__it))
           return {static_cast<size_t>(__it - __str.begin()), __it};
         break;
       }
-    } while (__is_ascii(*__it));
+    } while (__format_spec::__is_ascii(*__it));
     --__it;
     ++__maximum;
   }

lib/libcxx/include/__format/range_default_formatter.h created+201

...	@@ -0,0 +1,201 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
11	#define _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
12
13	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
14	# pragma GCC system_header
15	#endif
16
17	#include <__availability>
18	#include <__chrono/statically_widen.h>
19	#include <__concepts/same_as.h>
20	#include <__config>
21	#include <__format/concepts.h>
22	#include <__format/formatter.h>
23	#include <__format/range_formatter.h>
24	#include <__ranges/concepts.h>
25	#include <__type_traits/remove_cvref.h>
26	#include <__utility/pair.h>
27	#include <string_view>
28	#include <tuple>
29
30	_LIBCPP_BEGIN_NAMESPACE_STD
31
32	#if _LIBCPP_STD_VER > 20
33
34	template <class _Rp, class _CharT>
35	concept __const_formattable_range =
36	ranges::input_range<const _Rp> && formattable<ranges::range_reference_t<const _Rp>, _CharT>;
37
38	template <class _Rp, class _CharT>
39	using __fmt_maybe_const = conditional_t<__const_formattable_range<_Rp, _CharT>, const _Rp, _Rp>;
40
41	_LIBCPP_DIAGNOSTIC_PUSH
42	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wshadow")
43	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wshadow")
44	// This shadows map, set, and string.
45	enum class range_format { disabled, map, set, sequence, string, debug_string };
46	_LIBCPP_DIAGNOSTIC_POP
47
48	// There is no definition of this struct, it's purely intended to be used to
49	// generate diagnostics.
50	template <class _Rp>
51	struct _LIBCPP_TEMPLATE_VIS __instantiated_the_primary_template_of_format_kind;
52
53	template <class _Rp>
54	constexpr range_format format_kind = [] {
55	// [format.range.fmtkind]/1
56	// A program that instantiates the primary template of format_kind is ill-formed.
57	static_assert(sizeof(_Rp) != sizeof(_Rp), "create a template specialization of format_kind for your type");
58	return range_format::disabled;
59	}();
60
61	template <ranges::input_range _Rp>
62	requires same_as<_Rp, remove_cvref_t<_Rp>>
63	inline constexpr range_format format_kind<_Rp> = [] {
64	// [format.range.fmtkind]/2
65
66	// 2.1 If same_as<remove_cvref_t<ranges::range_reference_t<R>>, R> is true,
67	// Otherwise format_kind<R> is range_format::disabled.
68	if constexpr (same_as<remove_cvref_t<ranges::range_reference_t<_Rp>>, _Rp>)
69	return range_format::disabled;
70	// 2.2 Otherwise, if the qualified-id R::key_type is valid and denotes a type:
71	else if constexpr (requires { typename _Rp::key_type; }) {
72	// 2.2.1 If the qualified-id R::mapped_type is valid and denotes a type ...
73	if constexpr (requires { typename _Rp::mapped_type; } &&
74	// 2.2.1 ... If either U is a specialization of pair or U is a specialization
75	// of tuple and tuple_size_v<U> == 2
76	__fmt_pair_like<remove_cvref_t<ranges::range_reference_t<_Rp>>>)
77	return range_format::map;
78	else
79	// 2.2.2 Otherwise format_kind<R> is range_format::set.
80	return range_format::set;
81	} else
82	// 2.3 Otherwise, format_kind<R> is range_format::sequence.
83	return range_format::sequence;
84	}();
85
86	// This is a non-standard work-around to fix instantiation of
87	// formatter<const _CharT[N], _CharT>
88	// const _CharT[N] satisfies the ranges::input_range concept.
89	// remove_cvref_t<const _CharT[N]> is _CharT[N] so it does not satisfy the
90	// requirement of the above specialization. Instead it will instantiate the
91	// primary template, which is ill-formed.
92	//
93	// An alternative solution is to remove the offending formatter.
94	//
95	// https://godbolt.org/z/bqjhhaexx
96	//
97	// The removal is proposed in LWG3833, but use the work-around until the issue
98	// has been adopted.
99	// TODO FMT Implement LWG3833.
100	template <class _CharT, size_t N>
101	inline constexpr range_format format_kind<const _CharT[N]> = range_format::disabled;
102
103	template <range_format _Kp, ranges::input_range _Rp, class _CharT>
104	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __range_default_formatter;
105
106	// Required specializations
107
108	template <ranges::input_range _Rp, class _CharT>
109	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __range_default_formatter<range_format::sequence, _Rp, _CharT> {
110	private:
111	using __maybe_const_r = __fmt_maybe_const<_Rp, _CharT>;
112	range_formatter<remove_cvref_t<ranges::range_reference_t<__maybe_const_r>>, _CharT> __underlying_;
113
114	public:
115	_LIBCPP_HIDE_FROM_ABI constexpr void set_separator(basic_string_view<_CharT> __separator) {
116	__underlying_.set_separator(__separator);
117	}
118	_LIBCPP_HIDE_FROM_ABI constexpr void
119	set_brackets(basic_string_view<_CharT> __opening_bracket, basic_string_view<_CharT> __closing_bracket) {
120	__underlying_.set_brackets(__opening_bracket, __closing_bracket);
121	}
122
123	template <class _ParseContext>
124	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
125	return __underlying_.parse(__ctx);
126	}
127
128	template <class FormatContext>
129	_LIBCPP_HIDE_FROM_ABI typename FormatContext::iterator format(__maybe_const_r& __range, FormatContext& __ctx) const {
130	return __underlying_.format(__range, __ctx);
131	}
132	};
133
134	template <ranges::input_range _Rp, class _CharT>
135	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __range_default_formatter<range_format::map, _Rp, _CharT> {
136	private:
137	using __maybe_const_map = __fmt_maybe_const<_Rp, _CharT>;
138	using __element_type = remove_cvref_t<ranges::range_reference_t<__maybe_const_map>>;
139	range_formatter<__element_type, _CharT> __underlying_;
140
141	public:
142	_LIBCPP_HIDE_FROM_ABI constexpr __range_default_formatter()
143	requires(__fmt_pair_like<__element_type>)
144	{
145	__underlying_.set_brackets(_LIBCPP_STATICALLY_WIDEN(_CharT, "{"), _LIBCPP_STATICALLY_WIDEN(_CharT, "}"));
146	__underlying_.underlying().set_brackets({}, {});
147	__underlying_.underlying().set_separator(_LIBCPP_STATICALLY_WIDEN(_CharT, ": "));
148	}
149
150	template <class _ParseContext>
151	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
152	return __underlying_.parse(__ctx);
153	}
154
155	template <class _FormatContext>
156	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
157	format(__maybe_const_map& __range, _FormatContext& __ctx) const {
158	return __underlying_.format(__range, __ctx);
159	}
160	};
161
162	template <ranges::input_range _Rp, class _CharT>
163	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __range_default_formatter<range_format::set, _Rp, _CharT> {
164	private:
165	using __maybe_const_set = __fmt_maybe_const<_Rp, _CharT>;
166	using __element_type = remove_cvref_t<ranges::range_reference_t<__maybe_const_set>>;
167	range_formatter<__element_type, _CharT> __underlying_;
168
169	public:
170	_LIBCPP_HIDE_FROM_ABI constexpr __range_default_formatter() {
171	__underlying_.set_brackets(_LIBCPP_STATICALLY_WIDEN(_CharT, "{"), _LIBCPP_STATICALLY_WIDEN(_CharT, "}"));
172	}
173
174	template <class _ParseContext>
175	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
176	return __underlying_.parse(__ctx);
177	}
178
179	template <class _FormatContext>
180	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
181	format(__maybe_const_set& __range, _FormatContext& __ctx) const {
182	return __underlying_.format(__range, __ctx);
183	}
184	};
185
186	template <range_format _Kp, ranges::input_range _Rp, class _CharT>
187	requires(_Kp == range_format::string \|\| _Kp == range_format::debug_string)
188	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT __range_default_formatter<_Kp, _Rp, _CharT> {
189	__range_default_formatter() = delete; // TODO FMT Implement
190	};
191
192	template <ranges::input_range _Rp, class _CharT>
193	requires(format_kind<_Rp> != range_format::disabled && formattable<ranges::range_reference_t<_Rp>, _CharT>)
194	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_Rp, _CharT>
195	: __range_default_formatter<format_kind<_Rp>, _Rp, _CharT> {};
196
197	#endif //_LIBCPP_STD_VER > 20
198
199	_LIBCPP_END_NAMESPACE_STD
200
201	#endif // _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H

lib/libcxx/include/__format/range_formatter.h created+255

...	@@ -0,0 +1,255 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_RANGE_FORMATTER_H
11	#define _LIBCPP___FORMAT_RANGE_FORMATTER_H
12
13	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
14	# pragma GCC system_header
15	#endif
16
17	#include <__algorithm/ranges_copy.h>
18	#include <__availability>
19	#include <__chrono/statically_widen.h>
20	#include <__concepts/same_as.h>
21	#include <__config>
22	#include <__format/buffer.h>
23	#include <__format/concepts.h>
24	#include <__format/format_args.h>
25	#include <__format/format_context.h>
26	#include <__format/format_error.h>
27	#include <__format/formatter.h>
28	#include <__format/formatter_output.h>
29	#include <__format/parser_std_format_spec.h>
30	#include <__iterator/back_insert_iterator.h>
31	#include <__ranges/concepts.h>
32	#include <__ranges/data.h>
33	#include <__ranges/size.h>
34	#include <__type_traits/remove_cvref.h>
35	#include <string_view>
36
37	_LIBCPP_BEGIN_NAMESPACE_STD
38
39	#if _LIBCPP_STD_VER > 20
40
41	template <class _Tp, class _CharT = char>
42	requires same_as<remove_cvref_t<_Tp>, _Tp> && formattable<_Tp, _CharT>
43	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT range_formatter {
44	_LIBCPP_HIDE_FROM_ABI constexpr void set_separator(basic_string_view<_CharT> __separator) {
45	__separator_ = __separator;
46	}
47	_LIBCPP_HIDE_FROM_ABI constexpr void
48	set_brackets(basic_string_view<_CharT> __opening_bracket, basic_string_view<_CharT> __closing_bracket) {
49	__opening_bracket_ = __opening_bracket;
50	__closing_bracket_ = __closing_bracket;
51	}
52
53	_LIBCPP_HIDE_FROM_ABI constexpr formatter<_Tp, _CharT>& underlying() { return __underlying_; }
54	_LIBCPP_HIDE_FROM_ABI constexpr const formatter<_Tp, _CharT>& underlying() const { return __underlying_; }
55
56	template <class _ParseContext>
57	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __parse_ctx) {
58	const _CharT* __begin = __parser_.__parse(__parse_ctx, __format_spec::__fields_range);
59	const _CharT* __end = __parse_ctx.end();
60	if (__begin == __end)
61	return __begin;
62
63	// The n field overrides a possible m type, therefore delay applying the
64	// effect of n until the type has been procesed.
65	bool __clear_brackets = (*__begin == _CharT('n'));
66	if (__clear_brackets) {
67	++__begin;
68	if (__begin == __end) {
69	// Since there is no more data, clear the brackets before returning.
70	set_brackets({}, {});
71	return __begin;
72	}
73	}
74
75	__parse_type(__begin, __end);
76	if (__clear_brackets)
77	set_brackets({}, {});
78	if (__begin == __end)
79	return __begin;
80
81	bool __has_range_underlying_spec = *__begin == _CharT(':');
82	if (__parser_.__type_ != __format_spec::__type::__default) {
83	// [format.range.formatter]/6
84	// If the range-type is s or ?s, then there shall be no n option and no
85	// range-underlying-spec.
86	if (__clear_brackets) {
87	if (__parser_.__type_ == __format_spec::__type::__string)
88	std::__throw_format_error("The n option and type s can't be used together");
89	std::__throw_format_error("The n option and type ?s can't be used together");
90	}
91	if (__has_range_underlying_spec) {
92	if (__parser_.__type_ == __format_spec::__type::__string)
93	std::__throw_format_error("Type s and an underlying format specification can't be used together");
94	std::__throw_format_error("Type ?s and an underlying format specification can't be used together");
95	}
96	} else if (!__has_range_underlying_spec)
97	std::__set_debug_format(__underlying_);
98
99	if (__has_range_underlying_spec) {
100	// range-underlying-spec:
101	// : format-spec
102	++__begin;
103	if (__begin == __end)
104	return __begin;
105
106	__parse_ctx.advance_to(__begin);
107	__begin = __underlying_.parse(__parse_ctx);
108	}
109
110	if (__begin != __end && *__begin != _CharT('}'))
111	std::__throw_format_error("The format-spec should consume the input or end with a '}'");
112
113	return __begin;
114	}
115
116	template <ranges::input_range _Rp, class _FormatContext>
117	requires formattable<ranges::range_reference_t<_Rp>, _CharT> &&
118	same_as<remove_cvref_t<ranges::range_reference_t<_Rp>>, _Tp>
119	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator format(_Rp&& __range, _FormatContext& __ctx) const {
120	__format_spec::__parsed_specifications<_CharT> __specs = __parser_.__get_parsed_std_specifications(__ctx);
121
122	if (!__specs.__has_width())
123	return __format_range(__range, __ctx, __specs);
124
125	// The size of the buffer needed is:
126	// - open bracket characters
127	// - close bracket character
128	// - n elements where every element may have a different size
129	// - (n -1) separators
130	// The size of the element is hard to predict, knowing the type helps but
131	// it depends on the format-spec. As an initial estimate we guess 6
132	// characters.
133	// Typically both brackets are 1 character and the separator is 2
134	// characters. Which means there will be
135	// (n - 1) * 2 + 1 + 1 = n * 2 character
136	// So estimate 8 times the range size as buffer.
137	std::size_t __capacity_hint = 0;
138	if constexpr (std::ranges::sized_range<_Rp>)
139	__capacity_hint = 8 * ranges::size(__range);
140	__format::__retarget_buffer<_CharT> __buffer{__capacity_hint};
141	basic_format_context<typename __format::__retarget_buffer<_CharT>::__iterator, _CharT> __c{
142	__buffer.__make_output_iterator(), __ctx};
143
144	__format_range(__range, __c, __specs);
145
146	return __formatter::__write_string_no_precision(__buffer.__view(), __ctx.out(), __specs);
147	}
148
149	template <ranges::input_range _Rp, class _FormatContext>
150	typename _FormatContext::iterator _LIBCPP_HIDE_FROM_ABI
151	__format_range(_Rp&& __range, _FormatContext& __ctx, __format_spec::__parsed_specifications<_CharT> __specs) const {
152	if constexpr (same_as<_Tp, _CharT>) {
153	switch (__specs.__std_.__type_) {
154	case __format_spec::__type::__string:
155	case __format_spec::__type::__debug:
156	return __format_as_string(__range, __ctx, __specs.__std_.__type_ == __format_spec::__type::__debug);
157	default:
158	return __format_as_sequence(__range, __ctx);
159	}
160	} else
161	return __format_as_sequence(__range, __ctx);
162	}
163
164	template <ranges::input_range _Rp, class _FormatContext>
165	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
166	__format_as_string(_Rp&& __range, _FormatContext& __ctx, bool __debug_format) const {
167	// When the range is contiguous use a basic_string_view instead to avoid a
168	// copy of the underlying data. The basic_string_view formatter
169	// specialization is the "basic" string formatter in libc++.
170	if constexpr (ranges::contiguous_range<_Rp> && std::ranges::sized_range<_Rp>) {
171	std::formatter<basic_string_view<_CharT>, _CharT> __formatter;
172	if (__debug_format)
173	__formatter.set_debug_format();
174	return __formatter.format(
175	basic_string_view<_CharT>{
176	ranges::data(__range),
177	ranges::size(__range),
178	},
179	__ctx);
180	} else {
181	std::formatter<basic_string<_CharT>, _CharT> __formatter;
182	if (__debug_format)
183	__formatter.set_debug_format();
184	// P2106's from_range has not been implemented yet. Instead use a simple
185	// copy operation.
186	// TODO FMT use basic_string's "from_range" constructor.
187	// return std::formatter<basic_string<_CharT>, _CharT>{}.format(basic_string<_CharT>{from_range, __range}, __ctx);
188	basic_string<_CharT> __str;
189	ranges::copy(__range, back_insert_iterator{__str});
190	return __formatter.format(__str, __ctx);
191	}
192	}
193
194	template <ranges::input_range _Rp, class _FormatContext>
195	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
196	__format_as_sequence(_Rp&& __range, _FormatContext& __ctx) const {
197	__ctx.advance_to(ranges::copy(__opening_bracket_, __ctx.out()).out);
198	bool __use_separator = false;
199	for (auto&& __e : __range) {
200	if (__use_separator)
201	__ctx.advance_to(ranges::copy(__separator_, __ctx.out()).out);
202	else
203	__use_separator = true;
204
205	__ctx.advance_to(__underlying_.format(__e, __ctx));
206	}
207
208	return ranges::copy(__closing_bracket_, __ctx.out()).out;
209	}
210
211	__format_spec::__parser<_CharT> __parser_{.__alignment_ = __format_spec::__alignment::__left};
212
213	private:
214	_LIBCPP_HIDE_FROM_ABI constexpr void __parse_type(const _CharT& __begin, const _CharT __end) {
215	switch (*__begin) {
216	case _CharT('m'):
217	if constexpr (__fmt_pair_like<_Tp>) {
218	set_brackets(_LIBCPP_STATICALLY_WIDEN(_CharT, "{"), _LIBCPP_STATICALLY_WIDEN(_CharT, "}"));
219	set_separator(_LIBCPP_STATICALLY_WIDEN(_CharT, ", "));
220	++__begin;
221	} else
222	std::__throw_format_error("The range-format-spec type m requires two elements for a pair or tuple");
223	break;
224
225	case _CharT('s'):
226	if constexpr (same_as<_Tp, _CharT>) {
227	__parser_.__type_ = __format_spec::__type::__string;
228	++__begin;
229	} else
230	std::__throw_format_error("The range-format-spec type s requires formatting a character type");
231	break;
232
233	case _CharT('?'):
234	++__begin;
235	if (__begin == __end \|\| *__begin != _CharT('s'))
236	std::__throw_format_error("The format-spec should consume the input or end with a '}'");
237	if constexpr (same_as<_Tp, _CharT>) {
238	__parser_.__type_ = __format_spec::__type::__debug;
239	++__begin;
240	} else
241	std::__throw_format_error("The range-format-spec type ?s requires formatting a character type");
242	}
243	}
244
245	formatter<_Tp, _CharT> __underlying_;
246	basic_string_view<_CharT> __separator_ = _LIBCPP_STATICALLY_WIDEN(_CharT, ", ");
247	basic_string_view<_CharT> __opening_bracket_ = _LIBCPP_STATICALLY_WIDEN(_CharT, "[");
248	basic_string_view<_CharT> __closing_bracket_ = _LIBCPP_STATICALLY_WIDEN(_CharT, "]");
249	};
250
251	#endif //_LIBCPP_STD_VER > 20
252
253	_LIBCPP_END_NAMESPACE_STD
254
255	#endif // _LIBCPP___FORMAT_RANGE_FORMATTER_H

lib/libcxx/include/__format/unicode.h+161-11

...	@@ -13,6 +13,7 @@	...	@@ -13,6 +13,7 @@
13	#include <__assert>	13	#include <__assert>
14	#include <__config>	14	#include <__config>
15	#include <__format/extended_grapheme_cluster_table.h>	15	#include <__format/extended_grapheme_cluster_table.h>
		16	#include <__type_traits/make_unsigned.h>
16	#include <__utility/unreachable.h>	17	#include <__utility/unreachable.h>
17	#include <bit>	18	#include <bit>
18		19
...	@@ -24,6 +25,26 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,6 +25,26 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24		25
25	#if _LIBCPP_STD_VER > 17	26	#if _LIBCPP_STD_VER > 17
26		27
		28	namespace __unicode {
		29
		30	# if _LIBCPP_STD_VER > 20
		31
		32	/// The result of consuming a code point using P2286' semantics
		33	///
		34	/// TODO FMT Combine __consume and __consume_p2286 in one function.
		35	struct __consume_p2286_result {
		36	// A size of 0 means well formed. This to differenciate between
		37	// a valid code point and a code unit that's invalid like 0b11111xxx.
		38	int __ill_formed_size;
		39
		40	// If well formed the consumed code point.
		41	// Otherwise the ill-formed code units as unsigned 8-bit values. They are
		42	// stored in reverse order, to make it easier to extract the values.
		43	char32_t __value;
		44	};
		45
		46	# endif // _LIBCPP_STD_VER > 20
		47
27	# ifndef _LIBCPP_HAS_NO_UNICODE	48	# ifndef _LIBCPP_HAS_NO_UNICODE
28		49
29	/// Implements the grapheme cluster boundary rules	50	/// Implements the grapheme cluster boundary rules
...	@@ -39,8 +60,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -39,8 +60,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
39	/// https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt	60	/// https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt
40	/// https://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt (for testing only)	61	/// https://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt (for testing only)
41		62
42	namespace __unicode {
43
44	inline constexpr char32_t __replacement_character = U'\ufffd';	63	inline constexpr char32_t __replacement_character = U'\ufffd';
45		64
46	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_continuation(const char* __char, int __count) {	65	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_continuation(const char* __char, int __count) {
...	@@ -123,18 +142,92 @@ public:	...	@@ -123,18 +142,92 @@ public:
123	return __replacement_character;	142	return __replacement_character;
124	}	143	}
125		144
		145	# if _LIBCPP_STD_VER > 20
		146	_LIBCPP_HIDE_FROM_ABI constexpr __consume_p2286_result __consume_p2286() noexcept {
		147	_LIBCPP_ASSERT(__first_ != __last_, "can't move beyond the end of input");
		148
		149	// Based on the number of leading 1 bits the number of code units in the
		150	// code point can be determined. See
		151	// https://en.wikipedia.org/wiki/UTF-8#Encoding
		152	switch (std::countl_one(static_cast<unsigned char>(*__first_))) {
		153	case 0:
		154	return {0, static_cast<unsigned char>(*__first_++)};
		155
		156	case 2:
		157	if (__last_ - __first_ < 2) [[unlikely]]
		158	break;
		159
		160	if (__unicode::__is_continuation(__first_ + 1, 1)) {
		161	char32_t __value = static_cast<unsigned char>(*__first_++) & 0x1f;
		162	__value <<= 6;
		163	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		164	return {0, __value};
		165	}
		166	break;
		167
		168	case 3:
		169	if (__last_ - __first_ < 3) [[unlikely]]
		170	break;
		171
		172	if (__unicode::__is_continuation(__first_ + 1, 2)) {
		173	char32_t __value = static_cast<unsigned char>(*__first_++) & 0x0f;
		174	__value <<= 6;
		175	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		176	__value <<= 6;
		177	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		178	return {0, __value};
		179	}
		180	break;
		181
		182	case 4:
		183	if (__last_ - __first_ < 4) [[unlikely]]
		184	break;
		185
		186	if (__unicode::__is_continuation(__first_ + 1, 3)) {
		187	char32_t __value = static_cast<unsigned char>(*__first_++) & 0x07;
		188	__value <<= 6;
		189	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		190	__value <<= 6;
		191	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		192	__value <<= 6;
		193	__value \|= static_cast<unsigned char>(*__first_++) & 0x3f;
		194
		195	if (__value > 0x10FFFF) // Outside the valid Unicode range?
		196	return {4, __value};
		197
		198	return {0, __value};
		199	}
		200	break;
		201	}
		202	// An invalid number of leading ones can be garbage or a code unit in the
		203	// middle of a code point. By consuming one code unit the parser may get
		204	// "in sync" after a few code units.
		205	return {1, static_cast<unsigned char>(*__first_++)};
		206	}
		207	# endif // _LIBCPP_STD_VER > 20
		208
126	private:	209	private:
127	const char* __first_;	210	const char* __first_;
128	const char* __last_;	211	const char* __last_;
129	};	212	};
130		213
131	# ifndef TEST_HAS_NO_WIDE_CHARACTERS	214	# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
		215	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_surrogate_pair_high(wchar_t __value) {
		216	return __value >= 0xd800 && __value <= 0xdbff;
		217	}
		218
		219	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_surrogate_pair_low(wchar_t __value) {
		220	return __value >= 0xdc00 && __value <= 0xdfff;
		221	}
		222
132	/// This specialization depends on the size of wchar_t	223	/// This specialization depends on the size of wchar_t
133	/// - 2 UTF-16 (for example Windows and AIX)	224	/// - 2 UTF-16 (for example Windows and AIX)
134	/// - 4 UTF-32 (for example Linux)	225	/// - 4 UTF-32 (for example Linux)
135	template <>	226	template <>
136	class __code_point_view<wchar_t> {	227	class __code_point_view<wchar_t> {
137	public:	228	public:
		229	static_assert(sizeof(wchar_t) == 2 \|\| sizeof(wchar_t) == 4, "sizeof(wchar_t) has a not implemented value");
		230
138	_LIBCPP_HIDE_FROM_ABI constexpr explicit __code_point_view(const wchar_t* __first, const wchar_t* __last)	231	_LIBCPP_HIDE_FROM_ABI constexpr explicit __code_point_view(const wchar_t* __first, const wchar_t* __last)
139	: __first_(__first), __last_(__last) {}	232	: __first_(__first), __last_(__last) {}
140		233
...	@@ -166,17 +259,43 @@ public:	...	@@ -166,17 +259,43 @@ public:
166	return __replacement_character;	259	return __replacement_character;
167	return __result;	260	return __result;
168	} else {	261	} else {
169	// TODO FMT P2593R0 Use static_assert(false, "sizeof(wchar_t) has a not implemented value");
170	_LIBCPP_ASSERT(sizeof(wchar_t) == 0, "sizeof(wchar_t) has a not implemented value");
171	__libcpp_unreachable();	262	__libcpp_unreachable();
172	}	263	}
173	}	264	}
174		265
		266	# if _LIBCPP_STD_VER > 20
		267	_LIBCPP_HIDE_FROM_ABI constexpr __consume_p2286_result __consume_p2286() noexcept {
		268	_LIBCPP_ASSERT(__first_ != __last_, "can't move beyond the end of input");
		269
		270	char32_t __result = *__first_++;
		271	if constexpr (sizeof(wchar_t) == 2) {
		272	// https://en.wikipedia.org/wiki/UTF-16#U+D800_to_U+DFFF
		273	if (__is_surrogate_pair_high(__result)) {
		274	// Malformed Unicode.
		275	if (__first_ == __last_ \|\| !__is_surrogate_pair_low(*(__first_ + 1))) [[unlikely]]
		276	return {1, __result};
		277
		278	__result -= 0xd800;
		279	__result <<= 10;
		280	__result += *__first_++ - 0xdc00;
		281	__result += 0x10000;
		282	} else if (__is_surrogate_pair_low(__result))
		283	// A code point shouldn't start with the low surrogate pair
		284	return {1, __result};
		285	} else {
		286	if (__result > 0x10FFFF) [[unlikely]]
		287	return {1, __result};
		288	}
		289
		290	return {0, __result};
		291	}
		292	# endif // _LIBCPP_STD_VER > 20
		293
175	private:	294	private:
176	const wchar_t* __first_;	295	const wchar_t* __first_;
177	const wchar_t* __last_;	296	const wchar_t* __last_;
178	};	297	};
179	# endif	298	# endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
180		299
181	_LIBCPP_HIDE_FROM_ABI constexpr bool __at_extended_grapheme_cluster_break(	300	_LIBCPP_HIDE_FROM_ABI constexpr bool __at_extended_grapheme_cluster_break(
182	bool& __ri_break_allowed,	301	bool& __ri_break_allowed,
...	@@ -251,10 +370,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __at_extended_grapheme_cluster_break(	...	@@ -251,10 +370,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __at_extended_grapheme_cluster_break(
251		370
252	if (__prev == __property::__Regional_Indicator && __next == __property::__Regional_Indicator) { // GB12 + GB13	371	if (__prev == __property::__Regional_Indicator && __next == __property::__Regional_Indicator) { // GB12 + GB13
253	__ri_break_allowed = !__ri_break_allowed;	372	__ri_break_allowed = !__ri_break_allowed;
254	if (__ri_break_allowed)	373	return __ri_break_allowed;
255	return true;
256
257	return false;
258	}	374	}
259		375
260	// * Otherwise, break everywhere. *	376	// * Otherwise, break everywhere. *
...	@@ -328,10 +444,44 @@ private:	...	@@ -328,10 +444,44 @@ private:
328	}	444	}
329	};	445	};
330		446
331	} // namespace __unicode	447	template <class _CharT>
		448	__extended_grapheme_cluster_view(const _CharT, const _CharT) -> __extended_grapheme_cluster_view<_CharT>;
		449
		450	# else // _LIBCPP_HAS_NO_UNICODE
		451
		452	// For ASCII every character is a "code point".
		453	// This makes it easier to write code agnostic of the _LIBCPP_HAS_NO_UNICODE define.
		454	template <class _CharT>
		455	class __code_point_view {
		456	public:
		457	_LIBCPP_HIDE_FROM_ABI constexpr explicit __code_point_view(const _CharT* __first, const _CharT* __last)
		458	: __first_(__first), __last_(__last) {}
		459
		460	_LIBCPP_HIDE_FROM_ABI constexpr bool __at_end() const noexcept { return __first_ == __last_; }
		461	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __position() const noexcept { return __first_; }
		462
		463	_LIBCPP_HIDE_FROM_ABI constexpr char32_t __consume() noexcept {
		464	_LIBCPP_ASSERT(__first_ != __last_, "can't move beyond the end of input");
		465	return *__first_++;
		466	}
		467
		468	# if _LIBCPP_STD_VER > 20
		469	_LIBCPP_HIDE_FROM_ABI constexpr __consume_p2286_result __consume_p2286() noexcept {
		470	_LIBCPP_ASSERT(__first_ != __last_, "can't move beyond the end of input");
		471
		472	return {0, std::make_unsigned_t<_CharT>(*__first_++)};
		473	}
		474	# endif // _LIBCPP_STD_VER > 20
		475
		476	private:
		477	const _CharT* __first_;
		478	const _CharT* __last_;
		479	};
332		480
333	# endif // _LIBCPP_HAS_NO_UNICODE	481	# endif // _LIBCPP_HAS_NO_UNICODE
334		482
		483	} // namespace __unicode
		484
335	#endif //_LIBCPP_STD_VER > 17	485	#endif //_LIBCPP_STD_VER > 17
336		486
337	_LIBCPP_END_NAMESPACE_STD	487	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__functional/binary_negate.h+3-3

...	@@ -29,17 +29,17 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 binary_negate	...	@@ -29,17 +29,17 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 binary_negate
29	{	29	{
30	_Predicate __pred_;	30	_Predicate __pred_;
31	public:	31	public:
32	_LIBCPP_INLINE_VISIBILITY explicit _LIBCPP_CONSTEXPR_AFTER_CXX11	32	_LIBCPP_INLINE_VISIBILITY explicit _LIBCPP_CONSTEXPR_SINCE_CXX14
33	binary_negate(const _Predicate& __pred) : __pred_(__pred) {}	33	binary_negate(const _Predicate& __pred) : __pred_(__pred) {}
34		34
35	_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	35	_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
36	bool operator()(const typename _Predicate::first_argument_type& __x,	36	bool operator()(const typename _Predicate::first_argument_type& __x,
37	const typename _Predicate::second_argument_type& __y) const	37	const typename _Predicate::second_argument_type& __y) const
38	{return !__pred_(__x, __y);}	38	{return !__pred_(__x, __y);}
39	};	39	};
40		40
41	template <class _Predicate>	41	template <class _Predicate>
42	_LIBCPP_DEPRECATED_IN_CXX17 inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	42	_LIBCPP_DEPRECATED_IN_CXX17 inline _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
43	binary_negate<_Predicate>	43	binary_negate<_Predicate>
44	not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);}	44	not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);}
45		45

lib/libcxx/include/__functional/bind.h+14-14

...	@@ -25,9 +25,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -25,9 +25,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
25		25
26	template<class _Tp>	26	template<class _Tp>
27	struct is_bind_expression : _If<	27	struct is_bind_expression : _If<
28	_IsSame<_Tp, __uncvref_t<_Tp> >::value,	28	_IsSame<_Tp, __remove_cvref_t<_Tp> >::value,
29	false_type,	29	false_type,
30	is_bind_expression<__uncvref_t<_Tp> >	30	is_bind_expression<__remove_cvref_t<_Tp> >
31	> {};	31	> {};
32		32
33	#if _LIBCPP_STD_VER > 14	33	#if _LIBCPP_STD_VER > 14
...	@@ -37,9 +37,9 @@ inline constexpr size_t is_bind_expression_v = is_bind_expression<_Tp>::value;	...	@@ -37,9 +37,9 @@ inline constexpr size_t is_bind_expression_v = is_bind_expression<_Tp>::value;
37		37
38	template<class _Tp>	38	template<class _Tp>
39	struct is_placeholder : _If<	39	struct is_placeholder : _If<
40	_IsSame<_Tp, __uncvref_t<_Tp> >::value,	40	_IsSame<_Tp, __remove_cvref_t<_Tp> >::value,
41	integral_constant<int, 0>,	41	integral_constant<int, 0>,
42	is_placeholder<__uncvref_t<_Tp> >	42	is_placeholder<__remove_cvref_t<_Tp> >
43	> {};	43	> {};
44		44
45	#if _LIBCPP_STD_VER > 14	45	#if _LIBCPP_STD_VER > 14
...	@@ -279,16 +279,16 @@ public:	...	@@ -279,16 +279,16 @@ public:
279	class = typename enable_if	279	class = typename enable_if
280	<	280	<
281	is_constructible<_Fd, _Gp>::value &&	281	is_constructible<_Fd, _Gp>::value &&
282	!is_same<typename remove_reference<_Gp>::type,	282	!is_same<__libcpp_remove_reference_t<_Gp>,
283	__bind>::value	283	__bind>::value
284	>::type>	284	>::type>
285	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	285	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
286	explicit __bind(_Gp&& __f, _BA&& ...__bound_args)	286	explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
287	: __f_(_VSTD::forward<_Gp>(__f)),	287	: __f_(_VSTD::forward<_Gp>(__f)),
288	__bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}	288	__bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}
289		289
290	template <class ..._Args>	290	template <class ..._Args>
291	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	291	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
292	typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type	292	typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type
293	operator()(_Args&& ...__args)	293	operator()(_Args&& ...__args)
294	{	294	{
...	@@ -297,7 +297,7 @@ public:	...	@@ -297,7 +297,7 @@ public:
297	}	297	}
298		298
299	template <class ..._Args>	299	template <class ..._Args>
300	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	300	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
301	typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type	301	typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
302	operator()(_Args&& ...__args) const	302	operator()(_Args&& ...__args) const
303	{	303	{
...	@@ -324,16 +324,16 @@ public:	...	@@ -324,16 +324,16 @@ public:
324	class = typename enable_if	324	class = typename enable_if
325	<	325	<
326	is_constructible<_Fd, _Gp>::value &&	326	is_constructible<_Fd, _Gp>::value &&
327	!is_same<typename remove_reference<_Gp>::type,	327	!is_same<__libcpp_remove_reference_t<_Gp>,
328	__bind_r>::value	328	__bind_r>::value
329	>::type>	329	>::type>
330	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	330	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
331	explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)	331	explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
332	: base(_VSTD::forward<_Gp>(__f),	332	: base(_VSTD::forward<_Gp>(__f),
333	_VSTD::forward<_BA>(__bound_args)...) {}	333	_VSTD::forward<_BA>(__bound_args)...) {}
334		334
335	template <class ..._Args>	335	template <class ..._Args>
336	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	336	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
337	typename enable_if	337	typename enable_if
338	<	338	<
339	is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type,	339	is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type,
...	@@ -347,7 +347,7 @@ public:	...	@@ -347,7 +347,7 @@ public:
347	}	347	}
348		348
349	template <class ..._Args>	349	template <class ..._Args>
350	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	350	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
351	typename enable_if	351	typename enable_if
352	<	352	<
353	is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type,	353	is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type,
...	@@ -365,7 +365,7 @@ template<class _Rp, class _Fp, class ..._BoundArgs>	...	@@ -365,7 +365,7 @@ template<class _Rp, class _Fp, class ..._BoundArgs>
365	struct is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};	365	struct is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};
366		366
367	template<class _Fp, class ..._BoundArgs>	367	template<class _Fp, class ..._BoundArgs>
368	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	368	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
369	__bind<_Fp, _BoundArgs...>	369	__bind<_Fp, _BoundArgs...>
370	bind(_Fp&& __f, _BoundArgs&&... __bound_args)	370	bind(_Fp&& __f, _BoundArgs&&... __bound_args)
371	{	371	{
...	@@ -374,7 +374,7 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args)	...	@@ -374,7 +374,7 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args)
374	}	374	}
375		375
376	template<class _Rp, class _Fp, class ..._BoundArgs>	376	template<class _Rp, class _Fp, class ..._BoundArgs>
377	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	377	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
378	__bind_r<_Rp, _Fp, _BoundArgs...>	378	__bind_r<_Rp, _Fp, _BoundArgs...>
379	bind(_Fp&& __f, _BoundArgs&&... __bound_args)	379	bind(_Fp&& __f, _BoundArgs&&... __bound_args)
380	{	380	{

lib/libcxx/include/__functional/boyer_moore_searcher.h+2

...	@@ -223,6 +223,7 @@ private:	...	@@ -223,6 +223,7 @@ private:
223	}	223	}
224	}	224	}
225	};	225	};
		226	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(boyer_moore_searcher);
226		227
227	template <class _RandomAccessIterator1,	228	template <class _RandomAccessIterator1,
228	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,	229	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,
...	@@ -303,6 +304,7 @@ private:	...	@@ -303,6 +304,7 @@ private:
303	return std::make_pair(__l, __l);	304	return std::make_pair(__l, __l);
304	}	305	}
305	};	306	};
		307	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(boyer_moore_horspool_searcher);
306		308
307	_LIBCPP_END_NAMESPACE_STD	309	_LIBCPP_END_NAMESPACE_STD
308		310

lib/libcxx/include/__functional/default_searcher.h+3-2

 @@ -29,13 +29,13 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>
 class _LIBCPP_TEMPLATE_VIS default_searcher {
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     default_searcher(_ForwardIterator __f, _ForwardIterator __l,
                        _BinaryPredicate __p = _BinaryPredicate())
         : __first_(__f), __last_(__l), __pred_(__p) {}
     template <typename _ForwardIterator2>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     pair<_ForwardIterator2, _ForwardIterator2>
     operator () (_ForwardIterator2 __f, _ForwardIterator2 __l) const
     {
 @@ -48,6 +48,7 @@ private:
     _ForwardIterator __last_;
     _BinaryPredicate __pred_;
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(default_searcher);
 #endif // _LIBCPP_STD_VER > 14

lib/libcxx/include/__functional/function.h+29-1636

...	@@ -17,20 +17,29 @@	...	@@ -17,20 +17,29 @@
17	#include <__functional/unary_function.h>	17	#include <__functional/unary_function.h>
18	#include <__iterator/iterator_traits.h>	18	#include <__iterator/iterator_traits.h>
19	#include <__memory/addressof.h>	19	#include <__memory/addressof.h>
		20	#include <__memory/allocator.h>
		21	#include <__memory/allocator_destructor.h>
20	#include <__memory/allocator_traits.h>	22	#include <__memory/allocator_traits.h>
		23	#include <__memory/builtin_new_allocator.h>
21	#include <__memory/compressed_pair.h>	24	#include <__memory/compressed_pair.h>
22	#include <__memory/shared_ptr.h>	25	#include <__memory/unique_ptr.h>
		26	#include <__type_traits/strip_signature.h>
23	#include <__utility/forward.h>	27	#include <__utility/forward.h>
24	#include <__utility/move.h>	28	#include <__utility/move.h>
		29	#include <__utility/piecewise_construct.h>
25	#include <__utility/swap.h>	30	#include <__utility/swap.h>
26	#include <exception>	31	#include <exception>
27	#include <memory> // TODO: replace with <__memory/__builtin_new_allocator.h>	32	#include <new>
		33	#include <tuple>
28	#include <type_traits>	34	#include <type_traits>
		35	#include <typeinfo>
29		36
30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	37	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
31	# pragma GCC system_header	38	# pragma GCC system_header
32	#endif	39	#endif
33		40
		41	#ifndef _LIBCPP_CXX03_LANG
		42
34	_LIBCPP_BEGIN_NAMESPACE_STD	43	_LIBCPP_BEGIN_NAMESPACE_STD
35		44
36	// bad_function_call	45	// bad_function_call
...	@@ -45,13 +54,13 @@ public:	...	@@ -45,13 +54,13 @@ public:
45	// bad_function_call will end up containing a weak definition of the vtable and	54	// bad_function_call will end up containing a weak definition of the vtable and
46	// typeinfo.	55	// typeinfo.
47	#ifdef _LIBCPP_ABI_BAD_FUNCTION_CALL_KEY_FUNCTION	56	#ifdef _LIBCPP_ABI_BAD_FUNCTION_CALL_KEY_FUNCTION
48	virtual ~bad_function_call() _NOEXCEPT;	57	~bad_function_call() _NOEXCEPT override;
49	#else	58	#else
50	virtual ~bad_function_call() _NOEXCEPT {}	59	~bad_function_call() _NOEXCEPT override {}
51	#endif	60	#endif
52		61
53	#ifdef _LIBCPP_ABI_BAD_FUNCTION_CALL_GOOD_WHAT_MESSAGE	62	#ifdef _LIBCPP_ABI_BAD_FUNCTION_CALL_GOOD_WHAT_MESSAGE
54	virtual const char* what() const _NOEXCEPT;	63	const char* what() const _NOEXCEPT override;
55	#endif	64	#endif
56	};	65	};
57	_LIBCPP_DIAGNOSTIC_POP	66	_LIBCPP_DIAGNOSTIC_POP
...	@@ -66,14 +75,7 @@ void __throw_bad_function_call()	...	@@ -66,14 +75,7 @@ void __throw_bad_function_call()
66	#endif	75	#endif
67	}	76	}
68		77
69	#if defined(_LIBCPP_CXX03_LANG) && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS) && __has_attribute(deprecated)	78	template<class _Fp> class _LIBCPP_TEMPLATE_VIS function; // undefined
70	# define _LIBCPP_DEPRECATED_CXX03_FUNCTION \
71	__attribute__((deprecated("Using std::function in C++03 is not supported anymore. Please upgrade to C++11 or later, or use a different type")))
72	#else
73	# define _LIBCPP_DEPRECATED_CXX03_FUNCTION /* nothing */
74	#endif
75
76	template<class _Fp> class _LIBCPP_DEPRECATED_CXX03_FUNCTION _LIBCPP_TEMPLATE_VIS function; // undefined
77		79
78	namespace __function	80	namespace __function
79	{	81	{
...	@@ -124,8 +126,6 @@ bool __not_null(_Rp (^__p)(_Args...)) { return __p; }	...	@@ -124,8 +126,6 @@ bool __not_null(_Rp (^__p)(_Args...)) { return __p; }
124		126
125	} // namespace __function	127	} // namespace __function
126		128
127	#ifndef _LIBCPP_CXX03_LANG
128
129	namespace __function {	129	namespace __function {
130		130
131	// __alloc_func holds a functor and an allocator.	131	// __alloc_func holds a functor and an allocator.
...	@@ -190,9 +190,7 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>	...	@@ -190,9 +190,7 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>
190	__alloc_func* __clone() const	190	__alloc_func* __clone() const
191	{	191	{
192	typedef allocator_traits<_Alloc> __alloc_traits;	192	typedef allocator_traits<_Alloc> __alloc_traits;
193	typedef	193	typedef __rebind_alloc<__alloc_traits, __alloc_func> _AA;
194	typename __rebind_alloc_helper<__alloc_traits, __alloc_func>::type
195	_AA;
196	_AA __a(__f_.second());	194	_AA __a(__f_.second());
197	typedef __allocator_destructor<_AA> _Dp;	195	typedef __allocator_destructor<_AA> _Dp;
198	unique_ptr<__alloc_func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));	196	unique_ptr<__alloc_func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
...	@@ -205,8 +203,7 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>	...	@@ -205,8 +203,7 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>
205		203
206	static void __destroy_and_delete(__alloc_func* __f) {	204	static void __destroy_and_delete(__alloc_func* __f) {
207	typedef allocator_traits<_Alloc> __alloc_traits;	205	typedef allocator_traits<_Alloc> __alloc_traits;
208	typedef typename __rebind_alloc_helper<__alloc_traits, __alloc_func>::type	206	typedef __rebind_alloc<__alloc_traits, __alloc_func> _FunAlloc;
209	_FunAlloc;
210	_FunAlloc __a(__f->__get_allocator());	207	_FunAlloc __a(__f->__get_allocator());
211	__f->destroy();	208	__f->destroy();
212	__a.deallocate(__f, 1);	209	__a.deallocate(__f, 1);
...	@@ -265,7 +262,7 @@ class __base<_Rp(_ArgTypes...)>	...	@@ -265,7 +262,7 @@ class __base<_Rp(_ArgTypes...)>
265	__base& operator=(const __base&);	262	__base& operator=(const __base&);
266	public:	263	public:
267	_LIBCPP_INLINE_VISIBILITY __base() {}	264	_LIBCPP_INLINE_VISIBILITY __base() {}
268	_LIBCPP_INLINE_VISIBILITY virtual ~__base() {}	265	_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual ~__base() {}
269	virtual __base* __clone() const = 0;	266	virtual __base* __clone() const = 0;
270	virtual void __clone(__base*) const = 0;	267	virtual void __clone(__base*) const = 0;
271	virtual void destroy() _NOEXCEPT = 0;	268	virtual void destroy() _NOEXCEPT = 0;
...	@@ -319,7 +316,7 @@ __base<_Rp(_ArgTypes...)>*	...	@@ -319,7 +316,7 @@ __base<_Rp(_ArgTypes...)>*
319	__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone() const	316	__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone() const
320	{	317	{
321	typedef allocator_traits<_Alloc> __alloc_traits;	318	typedef allocator_traits<_Alloc> __alloc_traits;
322	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;	319	typedef __rebind_alloc<__alloc_traits, __func> _Ap;
323	_Ap __a(__f_.__get_allocator());	320	_Ap __a(__f_.__get_allocator());
324	typedef __allocator_destructor<_Ap> _Dp;	321	typedef __allocator_destructor<_Ap> _Dp;
325	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));	322	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
...	@@ -346,7 +343,7 @@ void	...	@@ -346,7 +343,7 @@ void
346	__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate() _NOEXCEPT	343	__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate() _NOEXCEPT
347	{	344	{
348	typedef allocator_traits<_Alloc> __alloc_traits;	345	typedef allocator_traits<_Alloc> __alloc_traits;
349	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;	346	typedef __rebind_alloc<__alloc_traits, __func> _Ap;
350	_Ap __a(__f_.__get_allocator());	347	_Ap __a(__f_.__get_allocator());
351	__f_.destroy();	348	__f_.destroy();
352	__a.deallocate(this, 1);	349	__a.deallocate(this, 1);
...	@@ -385,7 +382,9 @@ template <class _Fp> class __value_func;	...	@@ -385,7 +382,9 @@ template <class _Fp> class __value_func;
385		382
386	template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>	383	template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>
387	{	384	{
		385	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
388	typename aligned_storage<3 * sizeof(void*)>::type __buf_;	386	typename aligned_storage<3 * sizeof(void*)>::type __buf_;
		387	_LIBCPP_SUPPRESS_DEPRECATED_POP
389		388
390	typedef __base<_Rp(_ArgTypes...)> __func;	389	typedef __base<_Rp(_ArgTypes...)> __func;
391	__func* __f_;	390	__func* __f_;
...	@@ -405,8 +404,7 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>	...	@@ -405,8 +404,7 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>
405	{	404	{
406	typedef allocator_traits<_Alloc> __alloc_traits;	405	typedef allocator_traits<_Alloc> __alloc_traits;
407	typedef __function::__func<_Fp, _Alloc, _Rp(_ArgTypes...)> _Fun;	406	typedef __function::__func<_Fp, _Alloc, _Rp(_ArgTypes...)> _Fun;
408	typedef typename __rebind_alloc_helper<__alloc_traits, _Fun>::type	407	typedef __rebind_alloc<__alloc_traits, _Fun> _FunAlloc;
409	_FunAlloc;
410		408
411	if (__function::__not_null(__f))	409	if (__function::__not_null(__f))
412	{	410	{
...	@@ -519,7 +517,9 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>	...	@@ -519,7 +517,9 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>
519	return;	517	return;
520	if ((void)__f_ == &__buf_ && (void)__f.__f_ == &__f.__buf_)	518	if ((void)__f_ == &__buf_ && (void)__f.__f_ == &__f.__buf_)
521	{	519	{
		520	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
522	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;	521	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
		522	_LIBCPP_SUPPRESS_DEPRECATED_POP
523	__func* __t = __as_base(&__tempbuf);	523	__func* __t = __as_base(&__tempbuf);
524	__f_->__clone(__t);	524	__f_->__clone(__t);
525	__f_->destroy();	525	__f_->destroy();
...	@@ -670,8 +670,7 @@ struct __policy	...	@@ -670,8 +670,7 @@ struct __policy
670	// Used to choose between perfect forwarding or pass-by-value. Pass-by-value is	670	// Used to choose between perfect forwarding or pass-by-value. Pass-by-value is
671	// faster for types that can be passed in registers.	671	// faster for types that can be passed in registers.
672	template <typename _Tp>	672	template <typename _Tp>
673	using __fast_forward =	673	using __fast_forward = __conditional_t<is_scalar<_Tp>::value, _Tp, _Tp&&>;
674	typename conditional<is_scalar<_Tp>::value, _Tp, _Tp&&>::type;
675		674
676	// __policy_invoker calls an instance of __alloc_func held in __policy_storage.	675	// __policy_invoker calls an instance of __alloc_func held in __policy_storage.
677		676
...	@@ -747,8 +746,7 @@ template <class _Rp, class... _ArgTypes> class __policy_func<_Rp(_ArgTypes...)>	...	@@ -747,8 +746,7 @@ template <class _Rp, class... _ArgTypes> class __policy_func<_Rp(_ArgTypes...)>
747	{	746	{
748	typedef __alloc_func<_Fp, _Alloc, _Rp(_ArgTypes...)> _Fun;	747	typedef __alloc_func<_Fp, _Alloc, _Rp(_ArgTypes...)> _Fun;
749	typedef allocator_traits<_Alloc> __alloc_traits;	748	typedef allocator_traits<_Alloc> __alloc_traits;
750	typedef typename __rebind_alloc_helper<__alloc_traits, _Fun>::type	749	typedef __rebind_alloc<__alloc_traits, _Fun> _FunAlloc;
751	_FunAlloc;
752		750
753	if (__function::__not_null(__f))	751	if (__function::__not_null(__f))
754	{	752	{
...	@@ -978,7 +976,7 @@ class _LIBCPP_TEMPLATE_VIS function<_Rp(_ArgTypes...)>	...	@@ -978,7 +976,7 @@ class _LIBCPP_TEMPLATE_VIS function<_Rp(_ArgTypes...)>
978	__func __f_;	976	__func __f_;
979		977
980	template <class _Fp, bool = _And<	978	template <class _Fp, bool = _And<
981	_IsNotSame<__uncvref_t<_Fp>, function>,	979	_IsNotSame<__remove_cvref_t<_Fp>, function>,
982	__invokable<_Fp, _ArgTypes...>	980	__invokable<_Fp, _ArgTypes...>
983	>::value>	981	>::value>
984	struct __callable;	982	struct __callable;
...	@@ -1070,45 +1068,6 @@ public:	...	@@ -1070,45 +1068,6 @@ public:
1070	template<class _Rp, class ..._Ap>	1068	template<class _Rp, class ..._Ap>
1071	function(_Rp(*)(_Ap...)) -> function<_Rp(_Ap...)>;	1069	function(_Rp(*)(_Ap...)) -> function<_Rp(_Ap...)>;
1072		1070
1073	template<class _Fp>
1074	struct __strip_signature;
1075
1076	template<class _Rp, class _Gp, class ..._Ap>
1077	struct __strip_signature<_Rp (_Gp::*) (_Ap...)> { using type = _Rp(_Ap...); };
1078	template<class _Rp, class _Gp, class ..._Ap>
1079	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const> { using type = _Rp(_Ap...); };
1080	template<class _Rp, class _Gp, class ..._Ap>
1081	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile> { using type = _Rp(_Ap...); };
1082	template<class _Rp, class _Gp, class ..._Ap>
1083	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile> { using type = _Rp(_Ap...); };
1084
1085	template<class _Rp, class _Gp, class ..._Ap>
1086	struct __strip_signature<_Rp (_Gp::*) (_Ap...) &> { using type = _Rp(_Ap...); };
1087	template<class _Rp, class _Gp, class ..._Ap>
1088	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const &> { using type = _Rp(_Ap...); };
1089	template<class _Rp, class _Gp, class ..._Ap>
1090	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile &> { using type = _Rp(_Ap...); };
1091	template<class _Rp, class _Gp, class ..._Ap>
1092	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile &> { using type = _Rp(_Ap...); };
1093
1094	template<class _Rp, class _Gp, class ..._Ap>
1095	struct __strip_signature<_Rp (_Gp::*) (_Ap...) noexcept> { using type = _Rp(_Ap...); };
1096	template<class _Rp, class _Gp, class ..._Ap>
1097	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const noexcept> { using type = _Rp(_Ap...); };
1098	template<class _Rp, class _Gp, class ..._Ap>
1099	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile noexcept> { using type = _Rp(_Ap...); };
1100	template<class _Rp, class _Gp, class ..._Ap>
1101	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile noexcept> { using type = _Rp(_Ap...); };
1102
1103	template<class _Rp, class _Gp, class ..._Ap>
1104	struct __strip_signature<_Rp (_Gp::*) (_Ap...) & noexcept> { using type = _Rp(_Ap...); };
1105	template<class _Rp, class _Gp, class ..._Ap>
1106	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const & noexcept> { using type = _Rp(_Ap...); };
1107	template<class _Rp, class _Gp, class ..._Ap>
1108	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile & noexcept> { using type = _Rp(_Ap...); };
1109	template<class _Rp, class _Gp, class ..._Ap>
1110	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile & noexcept> { using type = _Rp(_Ap...); };
1111
1112	template<class _Fp, class _Stripped = typename __strip_signature<decltype(&_Fp::operator())>::type>	1071	template<class _Fp, class _Stripped = typename __strip_signature<decltype(&_Fp::operator())>::type>
1113	function(_Fp) -> function<_Stripped>;	1072	function(_Fp) -> function<_Stripped>;
1114	#endif // _LIBCPP_STD_VER >= 17	1073	#endif // _LIBCPP_STD_VER >= 17
...	@@ -1250,1574 +1209,8 @@ void	...	@@ -1250,1574 +1209,8 @@ void
1250	swap(function<_Rp(_ArgTypes...)>& __x, function<_Rp(_ArgTypes...)>& __y) _NOEXCEPT	1209	swap(function<_Rp(_ArgTypes...)>& __x, function<_Rp(_ArgTypes...)>& __y) _NOEXCEPT
1251	{return __x.swap(__y);}	1210	{return __x.swap(__y);}
1252		1211
1253	#elif defined(_LIBCPP_ENABLE_CXX03_FUNCTION)	1212	_LIBCPP_END_NAMESPACE_STD
1254
1255	namespace __function {
1256
1257	template<class _Fp> class __base;
1258
1259	template<class _Rp>
1260	class __base<_Rp()>
1261	{
1262	__base(const __base&);
1263	__base& operator=(const __base&);
1264	public:
1265	__base() {}
1266	virtual ~__base() {}
1267	virtual __base* __clone() const = 0;
1268	virtual void __clone(__base*) const = 0;
1269	virtual void destroy() = 0;
1270	virtual void destroy_deallocate() = 0;
1271	virtual _Rp operator()() = 0;
1272	#ifndef _LIBCPP_NO_RTTI
1273	virtual const void* target(const type_info&) const = 0;
1274	virtual const std::type_info& target_type() const = 0;
1275	#endif // _LIBCPP_NO_RTTI
1276	};
1277
1278	template<class _Rp, class _A0>
1279	class __base<_Rp(_A0)>
1280	{
1281	__base(const __base&);
1282	__base& operator=(const __base&);
1283	public:
1284	__base() {}
1285	virtual ~__base() {}
1286	virtual __base* __clone() const = 0;
1287	virtual void __clone(__base*) const = 0;
1288	virtual void destroy() = 0;
1289	virtual void destroy_deallocate() = 0;
1290	virtual _Rp operator()(_A0) = 0;
1291	#ifndef _LIBCPP_NO_RTTI
1292	virtual const void* target(const type_info&) const = 0;
1293	virtual const std::type_info& target_type() const = 0;
1294	#endif // _LIBCPP_NO_RTTI
1295	};
1296
1297	template<class _Rp, class _A0, class _A1>
1298	class __base<_Rp(_A0, _A1)>
1299	{
1300	__base(const __base&);
1301	__base& operator=(const __base&);
1302	public:
1303	__base() {}
1304	virtual ~__base() {}
1305	virtual __base* __clone() const = 0;
1306	virtual void __clone(__base*) const = 0;
1307	virtual void destroy() = 0;
1308	virtual void destroy_deallocate() = 0;
1309	virtual _Rp operator()(_A0, _A1) = 0;
1310	#ifndef _LIBCPP_NO_RTTI
1311	virtual const void* target(const type_info&) const = 0;
1312	virtual const std::type_info& target_type() const = 0;
1313	#endif // _LIBCPP_NO_RTTI
1314	};
1315
1316	template<class _Rp, class _A0, class _A1, class _A2>
1317	class __base<_Rp(_A0, _A1, _A2)>
1318	{
1319	__base(const __base&);
1320	__base& operator=(const __base&);
1321	public:
1322	__base() {}
1323	virtual ~__base() {}
1324	virtual __base* __clone() const = 0;
1325	virtual void __clone(__base*) const = 0;
1326	virtual void destroy() = 0;
1327	virtual void destroy_deallocate() = 0;
1328	virtual _Rp operator()(_A0, _A1, _A2) = 0;
1329	#ifndef _LIBCPP_NO_RTTI
1330	virtual const void* target(const type_info&) const = 0;
1331	virtual const std::type_info& target_type() const = 0;
1332	#endif // _LIBCPP_NO_RTTI
1333	};
1334
1335	template<class _FD, class _Alloc, class _FB> class __func;
1336
1337	template<class _Fp, class _Alloc, class _Rp>
1338	class __func<_Fp, _Alloc, _Rp()>
1339	: public __base<_Rp()>
1340	{
1341	__compressed_pair<_Fp, _Alloc> __f_;
1342	public:
1343	explicit __func(_Fp __f) : __f_(_VSTD::move(__f), __default_init_tag()) {}
1344	explicit __func(_Fp __f, _Alloc __a) : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
1345	virtual __base<_Rp()>* __clone() const;
1346	virtual void __clone(__base<_Rp()>*) const;
1347	virtual void destroy();
1348	virtual void destroy_deallocate();
1349	virtual _Rp operator()();
1350	#ifndef _LIBCPP_NO_RTTI
1351	virtual const void* target(const type_info&) const;
1352	virtual const std::type_info& target_type() const;
1353	#endif // _LIBCPP_NO_RTTI
1354	};
1355
1356	template<class _Fp, class _Alloc, class _Rp>
1357	__base<_Rp()>*
1358	__func<_Fp, _Alloc, _Rp()>::__clone() const
1359	{
1360	typedef allocator_traits<_Alloc> __alloc_traits;
1361	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1362	_Ap __a(__f_.second());
1363	typedef __allocator_destructor<_Ap> _Dp;
1364	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1365	::new ((void*)__hold.get()) __func(__f_.first(), _Alloc(__a));
1366	return __hold.release();
1367	}
1368
1369	template<class _Fp, class _Alloc, class _Rp>
1370	void
1371	__func<_Fp, _Alloc, _Rp()>::__clone(__base<_Rp()>* __p) const
1372	{
1373	::new ((void*)__p) __func(__f_.first(), __f_.second());
1374	}
1375
1376	template<class _Fp, class _Alloc, class _Rp>
1377	void
1378	__func<_Fp, _Alloc, _Rp()>::destroy()
1379	{
1380	__f_.~__compressed_pair<_Fp, _Alloc>();
1381	}
1382
1383	template<class _Fp, class _Alloc, class _Rp>
1384	void
1385	__func<_Fp, _Alloc, _Rp()>::destroy_deallocate()
1386	{
1387	typedef allocator_traits<_Alloc> __alloc_traits;
1388	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1389	_Ap __a(__f_.second());
1390	__f_.~__compressed_pair<_Fp, _Alloc>();
1391	__a.deallocate(this, 1);
1392	}
1393
1394	template<class _Fp, class _Alloc, class _Rp>
1395	_Rp
1396	__func<_Fp, _Alloc, _Rp()>::operator()()
1397	{
1398	typedef __invoke_void_return_wrapper<_Rp> _Invoker;
1399	return _Invoker::__call(__f_.first());
1400	}
1401
1402	#ifndef _LIBCPP_NO_RTTI
1403
1404	template<class _Fp, class _Alloc, class _Rp>
1405	const void*
1406	__func<_Fp, _Alloc, _Rp()>::target(const type_info& __ti) const
1407	{
1408	if (__ti == typeid(_Fp))
1409	return _VSTD::addressof(__f_.first());
1410	return (const void*)0;
1411	}
1412
1413	template<class _Fp, class _Alloc, class _Rp>
1414	const std::type_info&
1415	__func<_Fp, _Alloc, _Rp()>::target_type() const
1416	{
1417	return typeid(_Fp);
1418	}
1419
1420	#endif // _LIBCPP_NO_RTTI
1421
1422	template<class _Fp, class _Alloc, class _Rp, class _A0>
1423	class __func<_Fp, _Alloc, _Rp(_A0)>
1424	: public __base<_Rp(_A0)>
1425	{
1426	__compressed_pair<_Fp, _Alloc> __f_;
1427	public:
1428	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f), __default_init_tag()) {}
1429	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
1430	: __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
1431	virtual __base<_Rp(_A0)>* __clone() const;
1432	virtual void __clone(__base<_Rp(_A0)>*) const;
1433	virtual void destroy();
1434	virtual void destroy_deallocate();
1435	virtual _Rp operator()(_A0);
1436	#ifndef _LIBCPP_NO_RTTI
1437	virtual const void* target(const type_info&) const;
1438	virtual const std::type_info& target_type() const;
1439	#endif // _LIBCPP_NO_RTTI
1440	};
1441
1442	template<class _Fp, class _Alloc, class _Rp, class _A0>
1443	__base<_Rp(_A0)>*
1444	__func<_Fp, _Alloc, _Rp(_A0)>::__clone() const
1445	{
1446	typedef allocator_traits<_Alloc> __alloc_traits;
1447	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1448	_Ap __a(__f_.second());
1449	typedef __allocator_destructor<_Ap> _Dp;
1450	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1451	::new ((void*)__hold.get()) __func(__f_.first(), _Alloc(__a));
1452	return __hold.release();
1453	}
1454
1455	template<class _Fp, class _Alloc, class _Rp, class _A0>
1456	void
1457	__func<_Fp, _Alloc, _Rp(_A0)>::__clone(__base<_Rp(_A0)>* __p) const
1458	{
1459	::new ((void*)__p) __func(__f_.first(), __f_.second());
1460	}
1461
1462	template<class _Fp, class _Alloc, class _Rp, class _A0>
1463	void
1464	__func<_Fp, _Alloc, _Rp(_A0)>::destroy()
1465	{
1466	__f_.~__compressed_pair<_Fp, _Alloc>();
1467	}
1468
1469	template<class _Fp, class _Alloc, class _Rp, class _A0>
1470	void
1471	__func<_Fp, _Alloc, _Rp(_A0)>::destroy_deallocate()
1472	{
1473	typedef allocator_traits<_Alloc> __alloc_traits;
1474	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1475	_Ap __a(__f_.second());
1476	__f_.~__compressed_pair<_Fp, _Alloc>();
1477	__a.deallocate(this, 1);
1478	}
1479
1480	template<class _Fp, class _Alloc, class _Rp, class _A0>
1481	_Rp
1482	__func<_Fp, _Alloc, _Rp(_A0)>::operator()(_A0 __a0)
1483	{
1484	typedef __invoke_void_return_wrapper<_Rp> _Invoker;
1485	return _Invoker::__call(__f_.first(), __a0);
1486	}
1487
1488	#ifndef _LIBCPP_NO_RTTI
1489
1490	template<class _Fp, class _Alloc, class _Rp, class _A0>
1491	const void*
1492	__func<_Fp, _Alloc, _Rp(_A0)>::target(const type_info& __ti) const
1493	{
1494	if (__ti == typeid(_Fp))
1495	return &__f_.first();
1496	return (const void*)0;
1497	}
1498
1499	template<class _Fp, class _Alloc, class _Rp, class _A0>
1500	const std::type_info&
1501	__func<_Fp, _Alloc, _Rp(_A0)>::target_type() const
1502	{
1503	return typeid(_Fp);
1504	}
1505
1506	#endif // _LIBCPP_NO_RTTI
1507
1508	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1509	class __func<_Fp, _Alloc, _Rp(_A0, _A1)>
1510	: public __base<_Rp(_A0, _A1)>
1511	{
1512	__compressed_pair<_Fp, _Alloc> __f_;
1513	public:
1514	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f), __default_init_tag()) {}
1515	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
1516	: __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
1517	virtual __base<_Rp(_A0, _A1)>* __clone() const;
1518	virtual void __clone(__base<_Rp(_A0, _A1)>*) const;
1519	virtual void destroy();
1520	virtual void destroy_deallocate();
1521	virtual _Rp operator()(_A0, _A1);
1522	#ifndef _LIBCPP_NO_RTTI
1523	virtual const void* target(const type_info&) const;
1524	virtual const std::type_info& target_type() const;
1525	#endif // _LIBCPP_NO_RTTI
1526	};
1527
1528	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1529	__base<_Rp(_A0, _A1)>*
1530	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone() const
1531	{
1532	typedef allocator_traits<_Alloc> __alloc_traits;
1533	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1534	_Ap __a(__f_.second());
1535	typedef __allocator_destructor<_Ap> _Dp;
1536	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1537	::new ((void*)__hold.get()) __func(__f_.first(), _Alloc(__a));
1538	return __hold.release();
1539	}
1540
1541	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1542	void
1543	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone(__base<_Rp(_A0, _A1)>* __p) const
1544	{
1545	::new ((void*)__p) __func(__f_.first(), __f_.second());
1546	}
1547
1548	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1549	void
1550	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy()
1551	{
1552	__f_.~__compressed_pair<_Fp, _Alloc>();
1553	}
1554
1555	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1556	void
1557	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy_deallocate()
1558	{
1559	typedef allocator_traits<_Alloc> __alloc_traits;
1560	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1561	_Ap __a(__f_.second());
1562	__f_.~__compressed_pair<_Fp, _Alloc>();
1563	__a.deallocate(this, 1);
1564	}
1565
1566	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1567	_Rp
1568	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1)
1569	{
1570	typedef __invoke_void_return_wrapper<_Rp> _Invoker;
1571	return _Invoker::__call(__f_.first(), __a0, __a1);
1572	}
1573
1574	#ifndef _LIBCPP_NO_RTTI
1575
1576	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1577	const void*
1578	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target(const type_info& __ti) const
1579	{
1580	if (__ti == typeid(_Fp))
1581	return &__f_.first();
1582	return (const void*)0;
1583	}
1584
1585	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
1586	const std::type_info&
1587	__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target_type() const
1588	{
1589	return typeid(_Fp);
1590	}
1591
1592	#endif // _LIBCPP_NO_RTTI
1593
1594	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1595	class __func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>
1596	: public __base<_Rp(_A0, _A1, _A2)>
1597	{
1598	__compressed_pair<_Fp, _Alloc> __f_;
1599	public:
1600	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f), __default_init_tag()) {}
1601	_LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
1602	: __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
1603	virtual __base<_Rp(_A0, _A1, _A2)>* __clone() const;
1604	virtual void __clone(__base<_Rp(_A0, _A1, _A2)>*) const;
1605	virtual void destroy();
1606	virtual void destroy_deallocate();
1607	virtual _Rp operator()(_A0, _A1, _A2);
1608	#ifndef _LIBCPP_NO_RTTI
1609	virtual const void* target(const type_info&) const;
1610	virtual const std::type_info& target_type() const;
1611	#endif // _LIBCPP_NO_RTTI
1612	};
1613
1614	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1615	__base<_Rp(_A0, _A1, _A2)>*
1616	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone() const
1617	{
1618	typedef allocator_traits<_Alloc> __alloc_traits;
1619	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1620	_Ap __a(__f_.second());
1621	typedef __allocator_destructor<_Ap> _Dp;
1622	unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1623	::new ((void*)__hold.get()) __func(__f_.first(), _Alloc(__a));
1624	return __hold.release();
1625	}
1626
1627	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1628	void
1629	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone(__base<_Rp(_A0, _A1, _A2)>* __p) const
1630	{
1631	::new ((void*)__p) __func(__f_.first(), __f_.second());
1632	}
1633
1634	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1635	void
1636	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy()
1637	{
1638	__f_.~__compressed_pair<_Fp, _Alloc>();
1639	}
1640
1641	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1642	void
1643	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy_deallocate()
1644	{
1645	typedef allocator_traits<_Alloc> __alloc_traits;
1646	typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
1647	_Ap __a(__f_.second());
1648	__f_.~__compressed_pair<_Fp, _Alloc>();
1649	__a.deallocate(this, 1);
1650	}
1651
1652	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1653	_Rp
1654	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2)
1655	{
1656	typedef __invoke_void_return_wrapper<_Rp> _Invoker;
1657	return _Invoker::__call(__f_.first(), __a0, __a1, __a2);
1658	}
1659
1660	#ifndef _LIBCPP_NO_RTTI
1661
1662	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1663	const void*
1664	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target(const type_info& __ti) const
1665	{
1666	if (__ti == typeid(_Fp))
1667	return &__f_.first();
1668	return (const void*)0;
1669	}
1670
1671	template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
1672	const std::type_info&
1673	__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target_type() const
1674	{
1675	return typeid(_Fp);
1676	}
1677
1678	#endif // _LIBCPP_NO_RTTI
1679
1680	} // namespace __function
1681
1682	template<class _Rp>
1683	class _LIBCPP_TEMPLATE_VIS function<_Rp()>
1684	{
1685	typedef __function::__base<_Rp()> __base;
1686	aligned_storage<3sizeof(void)>::type __buf_;
1687	__base* __f_;
1688
1689	public:
1690	typedef _Rp result_type;
1691
1692	// 20.7.16.2.1, construct/copy/destroy:
1693	_LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
1694	_LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
1695	function(const function&);
1696	template<class _Fp>
1697	function(_Fp,
1698	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
1699
1700	template<class _Alloc>
1701	_LIBCPP_INLINE_VISIBILITY
1702	function(allocator_arg_t, const _Alloc&) : __f_(0) {}
1703	template<class _Alloc>
1704	_LIBCPP_INLINE_VISIBILITY
1705	function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
1706	template<class _Alloc>
1707	function(allocator_arg_t, const _Alloc&, const function&);
1708	template<class _Fp, class _Alloc>
1709	function(allocator_arg_t, const _Alloc& __a, _Fp __f,
1710	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
1711
1712	function& operator=(const function&);
1713	function& operator=(nullptr_t);
1714	template<class _Fp>
1715	typename enable_if
1716	<
1717	!is_integral<_Fp>::value,
1718	function&
1719	>::type
1720	operator=(_Fp);
1721
1722	~function();
1723
1724	// 20.7.16.2.2, function modifiers:
1725	void swap(function&);
1726	template<class _Fp, class _Alloc>
1727	_LIBCPP_INLINE_VISIBILITY
1728	void assign(_Fp __f, const _Alloc& __a)
1729	{function(allocator_arg, __a, __f).swap(*this);}
1730
1731	// 20.7.16.2.3, function capacity:
1732	_LIBCPP_INLINE_VISIBILITY explicit operator bool() const {return __f_;}
1733
1734	template<class _R2>
1735	bool operator==(const function<_R2()>&) const = delete;
1736	template<class _R2>
1737	bool operator!=(const function<_R2()>&) const = delete;
1738
1739	// 20.7.16.2.4, function invocation:
1740	_Rp operator()() const;
1741
1742	#ifndef _LIBCPP_NO_RTTI
1743	// 20.7.16.2.5, function target access:
1744	const std::type_info& target_type() const;
1745	template <typename _Tp> _Tp* target();
1746	template <typename _Tp> const _Tp* target() const;
1747	#endif // _LIBCPP_NO_RTTI
1748	};
1749
1750	template<class _Rp>
1751	function<_Rp()>::function(const function& __f)
1752	{
1753	if (__f.__f_ == 0)
1754	__f_ = 0;
1755	else if (__f.__f_ == (const __base*)&__f.__buf_)
1756	{
1757	__f_ = (__base*)&__buf_;
1758	__f.__f_->__clone(__f_);
1759	}
1760	else
1761	__f_ = __f.__f_->__clone();
1762	}
1763
1764	template<class _Rp>
1765	template<class _Alloc>
1766	function<_Rp()>::function(allocator_arg_t, const _Alloc&, const function& __f)
1767	{
1768	if (__f.__f_ == 0)
1769	__f_ = 0;
1770	else if (__f.__f_ == (const __base*)&__f.__buf_)
1771	{
1772	__f_ = (__base*)&__buf_;
1773	__f.__f_->__clone(__f_);
1774	}
1775	else
1776	__f_ = __f.__f_->__clone();
1777	}
1778
1779	template<class _Rp>
1780	template <class _Fp>
1781	function<_Rp()>::function(_Fp __f,
1782	typename enable_if<!is_integral<_Fp>::value>::type*)
1783	: __f_(0)
1784	{
1785	if (__function::__not_null(__f))
1786	{
1787	typedef __function::__func<_Fp, allocator<_Fp>, _Rp()> _FF;
1788	if (sizeof(_FF) <= sizeof(__buf_))
1789	{
1790	__f_ = (__base*)&__buf_;
1791	::new ((void*)__f_) _FF(__f);
1792	}
1793	else
1794	{
1795	typedef allocator<_FF> _Ap;
1796	_Ap __a;
1797	typedef __allocator_destructor<_Ap> _Dp;
1798	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1799	::new ((void*)__hold.get()) _FF(__f, allocator<_Fp>(__a));
1800	__f_ = __hold.release();
1801	}
1802	}
1803	}
1804
1805	template<class _Rp>
1806	template <class _Fp, class _Alloc>
1807	function<_Rp()>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
1808	typename enable_if<!is_integral<_Fp>::value>::type*)
1809	: __f_(0)
1810	{
1811	typedef allocator_traits<_Alloc> __alloc_traits;
1812	if (__function::__not_null(__f))
1813	{
1814	typedef __function::__func<_Fp, _Alloc, _Rp()> _FF;
1815	if (sizeof(_FF) <= sizeof(__buf_))
1816	{
1817	__f_ = (__base*)&__buf_;
1818	::new ((void*)__f_) _FF(__f, __a0);
1819	}
1820	else
1821	{
1822	typedef typename __rebind_alloc_helper<__alloc_traits, _FF>::type _Ap;
1823	_Ap __a(__a0);
1824	typedef __allocator_destructor<_Ap> _Dp;
1825	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
1826	::new ((void*)__hold.get()) _FF(__f, _Alloc(__a));
1827	__f_ = __hold.release();
1828	}
1829	}
1830	}
1831
1832	template<class _Rp>
1833	function<_Rp()>&
1834	function<_Rp()>::operator=(const function& __f)
1835	{
1836	if (__f)
1837	function(__f).swap(*this);
1838	else
1839	*this = nullptr;
1840	return *this;
1841	}
1842
1843	template<class _Rp>
1844	function<_Rp()>&
1845	function<_Rp()>::operator=(nullptr_t)
1846	{
1847	__base* __t = __f_;
1848	__f_ = 0;
1849	if (__t == (__base*)&__buf_)
1850	__t->destroy();
1851	else if (__t)
1852	__t->destroy_deallocate();
1853	return *this;
1854	}
1855
1856	template<class _Rp>
1857	template <class _Fp>
1858	typename enable_if
1859	<
1860	!is_integral<_Fp>::value,
1861	function<_Rp()>&
1862	>::type
1863	function<_Rp()>::operator=(_Fp __f)
1864	{
1865	function(_VSTD::move(__f)).swap(*this);
1866	return *this;
1867	}
1868
1869	template<class _Rp>
1870	function<_Rp()>::~function()
1871	{
1872	if (__f_ == (__base*)&__buf_)
1873	__f_->destroy();
1874	else if (__f_)
1875	__f_->destroy_deallocate();
1876	}
1877
1878	template<class _Rp>
1879	void
1880	function<_Rp()>::swap(function& __f)
1881	{
1882	if (_VSTD::addressof(__f) == this)
1883	return;
1884	if (__f_ == (__base)&__buf_ && __f.__f_ == (__base)&__f.__buf_)
1885	{
1886	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
1887	__base* __t = (__base*)&__tempbuf;
1888	__f_->__clone(__t);
1889	__f_->destroy();
1890	__f_ = 0;
1891	__f.__f_->__clone((__base*)&__buf_);
1892	__f.__f_->destroy();
1893	__f.__f_ = 0;
1894	__f_ = (__base*)&__buf_;
1895	__t->__clone((__base*)&__f.__buf_);
1896	__t->destroy();
1897	__f.__f_ = (__base*)&__f.__buf_;
1898	}
1899	else if (__f_ == (__base*)&__buf_)
1900	{
1901	__f_->__clone((__base*)&__f.__buf_);
1902	__f_->destroy();
1903	__f_ = __f.__f_;
1904	__f.__f_ = (__base*)&__f.__buf_;
1905	}
1906	else if (__f.__f_ == (__base*)&__f.__buf_)
1907	{
1908	__f.__f_->__clone((__base*)&__buf_);
1909	__f.__f_->destroy();
1910	__f.__f_ = __f_;
1911	__f_ = (__base*)&__buf_;
1912	}
1913	else
1914	_VSTD::swap(__f_, __f.__f_);
1915	}
1916
1917	template<class _Rp>
1918	_Rp
1919	function<_Rp()>::operator()() const
1920	{
1921	if (__f_ == 0)
1922	__throw_bad_function_call();
1923	return (*__f_)();
1924	}
1925
1926	#ifndef _LIBCPP_NO_RTTI
1927
1928	template<class _Rp>
1929	const std::type_info&
1930	function<_Rp()>::target_type() const
1931	{
1932	if (__f_ == 0)
1933	return typeid(void);
1934	return __f_->target_type();
1935	}
1936
1937	template<class _Rp>
1938	template <typename _Tp>
1939	_Tp*
1940	function<_Rp()>::target()
1941	{
1942	if (__f_ == 0)
1943	return (_Tp*)0;
1944	return (_Tp) const_cast<void >(__f_->target(typeid(_Tp)));
1945	}
1946
1947	template<class _Rp>
1948	template <typename _Tp>
1949	const _Tp*
1950	function<_Rp()>::target() const
1951	{
1952	if (__f_ == 0)
1953	return (const _Tp*)0;
1954	return (const _Tp*)__f_->target(typeid(_Tp));
1955	}
1956
1957	#endif // _LIBCPP_NO_RTTI
1958
1959	template<class _Rp, class _A0>
1960	class _LIBCPP_TEMPLATE_VIS function<_Rp(_A0)>
1961	: public unary_function<_A0, _Rp>
1962	{
1963	typedef __function::__base<_Rp(_A0)> __base;
1964	aligned_storage<3sizeof(void)>::type __buf_;
1965	__base* __f_;
1966
1967	public:
1968	typedef _Rp result_type;
1969
1970	// 20.7.16.2.1, construct/copy/destroy:
1971	_LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
1972	_LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
1973	function(const function&);
1974	template<class _Fp>
1975	function(_Fp,
1976	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
1977
1978	template<class _Alloc>
1979	_LIBCPP_INLINE_VISIBILITY
1980	function(allocator_arg_t, const _Alloc&) : __f_(0) {}
1981	template<class _Alloc>
1982	_LIBCPP_INLINE_VISIBILITY
1983	function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
1984	template<class _Alloc>
1985	function(allocator_arg_t, const _Alloc&, const function&);
1986	template<class _Fp, class _Alloc>
1987	function(allocator_arg_t, const _Alloc& __a, _Fp __f,
1988	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
1989
1990	function& operator=(const function&);
1991	function& operator=(nullptr_t);
1992	template<class _Fp>
1993	typename enable_if
1994	<
1995	!is_integral<_Fp>::value,
1996	function&
1997	>::type
1998	operator=(_Fp);
1999
2000	~function();
2001
2002	// 20.7.16.2.2, function modifiers:
2003	void swap(function&);
2004	template<class _Fp, class _Alloc>
2005	_LIBCPP_INLINE_VISIBILITY
2006	void assign(_Fp __f, const _Alloc& __a)
2007	{function(allocator_arg, __a, __f).swap(*this);}
2008
2009	// 20.7.16.2.3, function capacity:
2010	_LIBCPP_INLINE_VISIBILITY explicit operator bool() const {return __f_;}
2011
2012	template<class _R2, class _B0>
2013	bool operator==(const function<_R2(_B0)>&) const = delete;
2014	template<class _R2, class _B0>
2015	bool operator!=(const function<_R2(_B0)>&) const = delete;
2016
2017	// 20.7.16.2.4, function invocation:
2018	_Rp operator()(_A0) const;
2019
2020	#ifndef _LIBCPP_NO_RTTI
2021	// 20.7.16.2.5, function target access:
2022	const std::type_info& target_type() const;
2023	template <typename _Tp> _Tp* target();
2024	template <typename _Tp> const _Tp* target() const;
2025	#endif // _LIBCPP_NO_RTTI
2026	};
2027
2028	template<class _Rp, class _A0>
2029	function<_Rp(_A0)>::function(const function& __f)
2030	{
2031	if (__f.__f_ == 0)
2032	__f_ = 0;
2033	else if (__f.__f_ == (const __base*)&__f.__buf_)
2034	{
2035	__f_ = (__base*)&__buf_;
2036	__f.__f_->__clone(__f_);
2037	}
2038	else
2039	__f_ = __f.__f_->__clone();
2040	}
2041
2042	template<class _Rp, class _A0>
2043	template<class _Alloc>
2044	function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc&, const function& __f)
2045	{
2046	if (__f.__f_ == 0)
2047	__f_ = 0;
2048	else if (__f.__f_ == (const __base*)&__f.__buf_)
2049	{
2050	__f_ = (__base*)&__buf_;
2051	__f.__f_->__clone(__f_);
2052	}
2053	else
2054	__f_ = __f.__f_->__clone();
2055	}
2056
2057	template<class _Rp, class _A0>
2058	template <class _Fp>
2059	function<_Rp(_A0)>::function(_Fp __f,
2060	typename enable_if<!is_integral<_Fp>::value>::type*)
2061	: __f_(0)
2062	{
2063	if (__function::__not_null(__f))
2064	{
2065	typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0)> _FF;
2066	if (sizeof(_FF) <= sizeof(__buf_))
2067	{
2068	__f_ = (__base*)&__buf_;
2069	::new ((void*)__f_) _FF(__f);
2070	}
2071	else
2072	{
2073	typedef allocator<_FF> _Ap;
2074	_Ap __a;
2075	typedef __allocator_destructor<_Ap> _Dp;
2076	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2077	::new ((void*)__hold.get()) _FF(__f, allocator<_Fp>(__a));
2078	__f_ = __hold.release();
2079	}
2080	}
2081	}
2082
2083	template<class _Rp, class _A0>
2084	template <class _Fp, class _Alloc>
2085	function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
2086	typename enable_if<!is_integral<_Fp>::value>::type*)
2087	: __f_(0)
2088	{
2089	typedef allocator_traits<_Alloc> __alloc_traits;
2090	if (__function::__not_null(__f))
2091	{
2092	typedef __function::__func<_Fp, _Alloc, _Rp(_A0)> _FF;
2093	if (sizeof(_FF) <= sizeof(__buf_))
2094	{
2095	__f_ = (__base*)&__buf_;
2096	::new ((void*)__f_) _FF(__f, __a0);
2097	}
2098	else
2099	{
2100	typedef typename __rebind_alloc_helper<__alloc_traits, _FF>::type _Ap;
2101	_Ap __a(__a0);
2102	typedef __allocator_destructor<_Ap> _Dp;
2103	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2104	::new ((void*)__hold.get()) _FF(__f, _Alloc(__a));
2105	__f_ = __hold.release();
2106	}
2107	}
2108	}
2109
2110	template<class _Rp, class _A0>
2111	function<_Rp(_A0)>&
2112	function<_Rp(_A0)>::operator=(const function& __f)
2113	{
2114	if (__f)
2115	function(__f).swap(*this);
2116	else
2117	*this = nullptr;
2118	return *this;
2119	}
2120
2121	template<class _Rp, class _A0>
2122	function<_Rp(_A0)>&
2123	function<_Rp(_A0)>::operator=(nullptr_t)
2124	{
2125	__base* __t = __f_;
2126	__f_ = 0;
2127	if (__t == (__base*)&__buf_)
2128	__t->destroy();
2129	else if (__t)
2130	__t->destroy_deallocate();
2131	return *this;
2132	}
2133
2134	template<class _Rp, class _A0>
2135	template <class _Fp>
2136	typename enable_if
2137	<
2138	!is_integral<_Fp>::value,
2139	function<_Rp(_A0)>&
2140	>::type
2141	function<_Rp(_A0)>::operator=(_Fp __f)
2142	{
2143	function(_VSTD::move(__f)).swap(*this);
2144	return *this;
2145	}
2146
2147	template<class _Rp, class _A0>
2148	function<_Rp(_A0)>::~function()
2149	{
2150	if (__f_ == (__base*)&__buf_)
2151	__f_->destroy();
2152	else if (__f_)
2153	__f_->destroy_deallocate();
2154	}
2155
2156	template<class _Rp, class _A0>
2157	void
2158	function<_Rp(_A0)>::swap(function& __f)
2159	{
2160	if (_VSTD::addressof(__f) == this)
2161	return;
2162	if (__f_ == (__base)&__buf_ && __f.__f_ == (__base)&__f.__buf_)
2163	{
2164	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
2165	__base* __t = (__base*)&__tempbuf;
2166	__f_->__clone(__t);
2167	__f_->destroy();
2168	__f_ = 0;
2169	__f.__f_->__clone((__base*)&__buf_);
2170	__f.__f_->destroy();
2171	__f.__f_ = 0;
2172	__f_ = (__base*)&__buf_;
2173	__t->__clone((__base*)&__f.__buf_);
2174	__t->destroy();
2175	__f.__f_ = (__base*)&__f.__buf_;
2176	}
2177	else if (__f_ == (__base*)&__buf_)
2178	{
2179	__f_->__clone((__base*)&__f.__buf_);
2180	__f_->destroy();
2181	__f_ = __f.__f_;
2182	__f.__f_ = (__base*)&__f.__buf_;
2183	}
2184	else if (__f.__f_ == (__base*)&__f.__buf_)
2185	{
2186	__f.__f_->__clone((__base*)&__buf_);
2187	__f.__f_->destroy();
2188	__f.__f_ = __f_;
2189	__f_ = (__base*)&__buf_;
2190	}
2191	else
2192	_VSTD::swap(__f_, __f.__f_);
2193	}
2194
2195	template<class _Rp, class _A0>
2196	_Rp
2197	function<_Rp(_A0)>::operator()(_A0 __a0) const
2198	{
2199	if (__f_ == 0)
2200	__throw_bad_function_call();
2201	return (*__f_)(__a0);
2202	}
2203
2204	#ifndef _LIBCPP_NO_RTTI
2205
2206	template<class _Rp, class _A0>
2207	const std::type_info&
2208	function<_Rp(_A0)>::target_type() const
2209	{
2210	if (__f_ == 0)
2211	return typeid(void);
2212	return __f_->target_type();
2213	}
2214
2215	template<class _Rp, class _A0>
2216	template <typename _Tp>
2217	_Tp*
2218	function<_Rp(_A0)>::target()
2219	{
2220	if (__f_ == 0)
2221	return (_Tp*)0;
2222	return (_Tp) const_cast<void >(__f_->target(typeid(_Tp)));
2223	}
2224
2225	template<class _Rp, class _A0>
2226	template <typename _Tp>
2227	const _Tp*
2228	function<_Rp(_A0)>::target() const
2229	{
2230	if (__f_ == 0)
2231	return (const _Tp*)0;
2232	return (const _Tp*)__f_->target(typeid(_Tp));
2233	}
2234
2235	#endif // _LIBCPP_NO_RTTI
2236
2237	template<class _Rp, class _A0, class _A1>
2238	class _LIBCPP_TEMPLATE_VIS function<_Rp(_A0, _A1)>
2239	: public binary_function<_A0, _A1, _Rp>
2240	{
2241	typedef __function::__base<_Rp(_A0, _A1)> __base;
2242	aligned_storage<3sizeof(void)>::type __buf_;
2243	__base* __f_;
2244
2245	public:
2246	typedef _Rp result_type;
2247
2248	// 20.7.16.2.1, construct/copy/destroy:
2249	_LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
2250	_LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
2251	function(const function&);
2252	template<class _Fp>
2253	function(_Fp,
2254	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
2255
2256	template<class _Alloc>
2257	_LIBCPP_INLINE_VISIBILITY
2258	function(allocator_arg_t, const _Alloc&) : __f_(0) {}
2259	template<class _Alloc>
2260	_LIBCPP_INLINE_VISIBILITY
2261	function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
2262	template<class _Alloc>
2263	function(allocator_arg_t, const _Alloc&, const function&);
2264	template<class _Fp, class _Alloc>
2265	function(allocator_arg_t, const _Alloc& __a, _Fp __f,
2266	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
2267
2268	function& operator=(const function&);
2269	function& operator=(nullptr_t);
2270	template<class _Fp>
2271	typename enable_if
2272	<
2273	!is_integral<_Fp>::value,
2274	function&
2275	>::type
2276	operator=(_Fp);
2277
2278	~function();
2279
2280	// 20.7.16.2.2, function modifiers:
2281	void swap(function&);
2282	template<class _Fp, class _Alloc>
2283	_LIBCPP_INLINE_VISIBILITY
2284	void assign(_Fp __f, const _Alloc& __a)
2285	{function(allocator_arg, __a, __f).swap(*this);}
2286
2287	// 20.7.16.2.3, function capacity:
2288	_LIBCPP_INLINE_VISIBILITY explicit operator bool() const {return __f_;}
2289
2290	template<class _R2, class _B0, class _B1>
2291	bool operator==(const function<_R2(_B0, _B1)>&) const = delete;
2292	template<class _R2, class _B0, class _B1>
2293	bool operator!=(const function<_R2(_B0, _B1)>&) const = delete;
2294
2295	// 20.7.16.2.4, function invocation:
2296	_Rp operator()(_A0, _A1) const;
2297
2298	#ifndef _LIBCPP_NO_RTTI
2299	// 20.7.16.2.5, function target access:
2300	const std::type_info& target_type() const;
2301	template <typename _Tp> _Tp* target();
2302	template <typename _Tp> const _Tp* target() const;
2303	#endif // _LIBCPP_NO_RTTI
2304	};
2305
2306	template<class _Rp, class _A0, class _A1>
2307	function<_Rp(_A0, _A1)>::function(const function& __f)
2308	{
2309	if (__f.__f_ == 0)
2310	__f_ = 0;
2311	else if (__f.__f_ == (const __base*)&__f.__buf_)
2312	{
2313	__f_ = (__base*)&__buf_;
2314	__f.__f_->__clone(__f_);
2315	}
2316	else
2317	__f_ = __f.__f_->__clone();
2318	}
2319
2320	template<class _Rp, class _A0, class _A1>
2321	template<class _Alloc>
2322	function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc&, const function& __f)
2323	{
2324	if (__f.__f_ == 0)
2325	__f_ = 0;
2326	else if (__f.__f_ == (const __base*)&__f.__buf_)
2327	{
2328	__f_ = (__base*)&__buf_;
2329	__f.__f_->__clone(__f_);
2330	}
2331	else
2332	__f_ = __f.__f_->__clone();
2333	}
2334
2335	template<class _Rp, class _A0, class _A1>
2336	template <class _Fp>
2337	function<_Rp(_A0, _A1)>::function(_Fp __f,
2338	typename enable_if<!is_integral<_Fp>::value>::type*)
2339	: __f_(0)
2340	{
2341	if (__function::__not_null(__f))
2342	{
2343	typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1)> _FF;
2344	if (sizeof(_FF) <= sizeof(__buf_))
2345	{
2346	__f_ = (__base*)&__buf_;
2347	::new ((void*)__f_) _FF(__f);
2348	}
2349	else
2350	{
2351	typedef allocator<_FF> _Ap;
2352	_Ap __a;
2353	typedef __allocator_destructor<_Ap> _Dp;
2354	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2355	::new ((void*)__hold.get()) _FF(__f, allocator<_Fp>(__a));
2356	__f_ = __hold.release();
2357	}
2358	}
2359	}
2360
2361	template<class _Rp, class _A0, class _A1>
2362	template <class _Fp, class _Alloc>
2363	function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
2364	typename enable_if<!is_integral<_Fp>::value>::type*)
2365	: __f_(0)
2366	{
2367	typedef allocator_traits<_Alloc> __alloc_traits;
2368	if (__function::__not_null(__f))
2369	{
2370	typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1)> _FF;
2371	if (sizeof(_FF) <= sizeof(__buf_))
2372	{
2373	__f_ = (__base*)&__buf_;
2374	::new ((void*)__f_) _FF(__f, __a0);
2375	}
2376	else
2377	{
2378	typedef typename __rebind_alloc_helper<__alloc_traits, _FF>::type _Ap;
2379	_Ap __a(__a0);
2380	typedef __allocator_destructor<_Ap> _Dp;
2381	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2382	::new ((void*)__hold.get()) _FF(__f, _Alloc(__a));
2383	__f_ = __hold.release();
2384	}
2385	}
2386	}
2387
2388	template<class _Rp, class _A0, class _A1>
2389	function<_Rp(_A0, _A1)>&
2390	function<_Rp(_A0, _A1)>::operator=(const function& __f)
2391	{
2392	if (__f)
2393	function(__f).swap(*this);
2394	else
2395	*this = nullptr;
2396	return *this;
2397	}
2398
2399	template<class _Rp, class _A0, class _A1>
2400	function<_Rp(_A0, _A1)>&
2401	function<_Rp(_A0, _A1)>::operator=(nullptr_t)
2402	{
2403	__base* __t = __f_;
2404	__f_ = 0;
2405	if (__t == (__base*)&__buf_)
2406	__t->destroy();
2407	else if (__t)
2408	__t->destroy_deallocate();
2409	return *this;
2410	}
2411
2412	template<class _Rp, class _A0, class _A1>
2413	template <class _Fp>
2414	typename enable_if
2415	<
2416	!is_integral<_Fp>::value,
2417	function<_Rp(_A0, _A1)>&
2418	>::type
2419	function<_Rp(_A0, _A1)>::operator=(_Fp __f)
2420	{
2421	function(_VSTD::move(__f)).swap(*this);
2422	return *this;
2423	}
2424
2425	template<class _Rp, class _A0, class _A1>
2426	function<_Rp(_A0, _A1)>::~function()
2427	{
2428	if (__f_ == (__base*)&__buf_)
2429	__f_->destroy();
2430	else if (__f_)
2431	__f_->destroy_deallocate();
2432	}
2433
2434	template<class _Rp, class _A0, class _A1>
2435	void
2436	function<_Rp(_A0, _A1)>::swap(function& __f)
2437	{
2438	if (_VSTD::addressof(__f) == this)
2439	return;
2440	if (__f_ == (__base)&__buf_ && __f.__f_ == (__base)&__f.__buf_)
2441	{
2442	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
2443	__base* __t = (__base*)&__tempbuf;
2444	__f_->__clone(__t);
2445	__f_->destroy();
2446	__f_ = 0;
2447	__f.__f_->__clone((__base*)&__buf_);
2448	__f.__f_->destroy();
2449	__f.__f_ = 0;
2450	__f_ = (__base*)&__buf_;
2451	__t->__clone((__base*)&__f.__buf_);
2452	__t->destroy();
2453	__f.__f_ = (__base*)&__f.__buf_;
2454	}
2455	else if (__f_ == (__base*)&__buf_)
2456	{
2457	__f_->__clone((__base*)&__f.__buf_);
2458	__f_->destroy();
2459	__f_ = __f.__f_;
2460	__f.__f_ = (__base*)&__f.__buf_;
2461	}
2462	else if (__f.__f_ == (__base*)&__f.__buf_)
2463	{
2464	__f.__f_->__clone((__base*)&__buf_);
2465	__f.__f_->destroy();
2466	__f.__f_ = __f_;
2467	__f_ = (__base*)&__buf_;
2468	}
2469	else
2470	_VSTD::swap(__f_, __f.__f_);
2471	}
2472
2473	template<class _Rp, class _A0, class _A1>
2474	_Rp
2475	function<_Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1) const
2476	{
2477	if (__f_ == 0)
2478	__throw_bad_function_call();
2479	return (*__f_)(__a0, __a1);
2480	}
2481
2482	#ifndef _LIBCPP_NO_RTTI
2483
2484	template<class _Rp, class _A0, class _A1>
2485	const std::type_info&
2486	function<_Rp(_A0, _A1)>::target_type() const
2487	{
2488	if (__f_ == 0)
2489	return typeid(void);
2490	return __f_->target_type();
2491	}
2492
2493	template<class _Rp, class _A0, class _A1>
2494	template <typename _Tp>
2495	_Tp*
2496	function<_Rp(_A0, _A1)>::target()
2497	{
2498	if (__f_ == 0)
2499	return (_Tp*)0;
2500	return (_Tp) const_cast<void >(__f_->target(typeid(_Tp)));
2501	}
2502
2503	template<class _Rp, class _A0, class _A1>
2504	template <typename _Tp>
2505	const _Tp*
2506	function<_Rp(_A0, _A1)>::target() const
2507	{
2508	if (__f_ == 0)
2509	return (const _Tp*)0;
2510	return (const _Tp*)__f_->target(typeid(_Tp));
2511	}
2512
2513	#endif // _LIBCPP_NO_RTTI
2514
2515	template<class _Rp, class _A0, class _A1, class _A2>
2516	class _LIBCPP_TEMPLATE_VIS function<_Rp(_A0, _A1, _A2)>
2517	{
2518	typedef __function::__base<_Rp(_A0, _A1, _A2)> __base;
2519	aligned_storage<3sizeof(void)>::type __buf_;
2520	__base* __f_;
2521
2522	public:
2523	typedef _Rp result_type;
2524
2525	// 20.7.16.2.1, construct/copy/destroy:
2526	_LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
2527	_LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
2528	function(const function&);
2529	template<class _Fp>
2530	function(_Fp,
2531	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
2532
2533	template<class _Alloc>
2534	_LIBCPP_INLINE_VISIBILITY
2535	function(allocator_arg_t, const _Alloc&) : __f_(0) {}
2536	template<class _Alloc>
2537	_LIBCPP_INLINE_VISIBILITY
2538	function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
2539	template<class _Alloc>
2540	function(allocator_arg_t, const _Alloc&, const function&);
2541	template<class _Fp, class _Alloc>
2542	function(allocator_arg_t, const _Alloc& __a, _Fp __f,
2543	typename enable_if<!is_integral<_Fp>::value>::type* = 0);
2544
2545	function& operator=(const function&);
2546	function& operator=(nullptr_t);
2547	template<class _Fp>
2548	typename enable_if
2549	<
2550	!is_integral<_Fp>::value,
2551	function&
2552	>::type
2553	operator=(_Fp);
2554
2555	~function();
2556
2557	// 20.7.16.2.2, function modifiers:
2558	void swap(function&);
2559	template<class _Fp, class _Alloc>
2560	_LIBCPP_INLINE_VISIBILITY
2561	void assign(_Fp __f, const _Alloc& __a)
2562	{function(allocator_arg, __a, __f).swap(*this);}
2563
2564	// 20.7.16.2.3, function capacity:
2565	_LIBCPP_INLINE_VISIBILITY explicit operator bool() const {return __f_;}
2566
2567	template<class _R2, class _B0, class _B1, class _B2>
2568	bool operator==(const function<_R2(_B0, _B1, _B2)>&) const = delete;
2569	template<class _R2, class _B0, class _B1, class _B2>
2570	bool operator!=(const function<_R2(_B0, _B1, _B2)>&) const = delete;
2571
2572	// 20.7.16.2.4, function invocation:
2573	_Rp operator()(_A0, _A1, _A2) const;
2574
2575	#ifndef _LIBCPP_NO_RTTI
2576	// 20.7.16.2.5, function target access:
2577	const std::type_info& target_type() const;
2578	template <typename _Tp> _Tp* target();
2579	template <typename _Tp> const _Tp* target() const;
2580	#endif // _LIBCPP_NO_RTTI
2581	};
2582
2583	template<class _Rp, class _A0, class _A1, class _A2>
2584	function<_Rp(_A0, _A1, _A2)>::function(const function& __f)
2585	{
2586	if (__f.__f_ == 0)
2587	__f_ = 0;
2588	else if (__f.__f_ == (const __base*)&__f.__buf_)
2589	{
2590	__f_ = (__base*)&__buf_;
2591	__f.__f_->__clone(__f_);
2592	}
2593	else
2594	__f_ = __f.__f_->__clone();
2595	}
2596
2597	template<class _Rp, class _A0, class _A1, class _A2>
2598	template<class _Alloc>
2599	function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc&,
2600	const function& __f)
2601	{
2602	if (__f.__f_ == 0)
2603	__f_ = 0;
2604	else if (__f.__f_ == (const __base*)&__f.__buf_)
2605	{
2606	__f_ = (__base*)&__buf_;
2607	__f.__f_->__clone(__f_);
2608	}
2609	else
2610	__f_ = __f.__f_->__clone();
2611	}
2612
2613	template<class _Rp, class _A0, class _A1, class _A2>
2614	template <class _Fp>
2615	function<_Rp(_A0, _A1, _A2)>::function(_Fp __f,
2616	typename enable_if<!is_integral<_Fp>::value>::type*)
2617	: __f_(0)
2618	{
2619	if (__function::__not_null(__f))
2620	{
2621	typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1, _A2)> _FF;
2622	if (sizeof(_FF) <= sizeof(__buf_))
2623	{
2624	__f_ = (__base*)&__buf_;
2625	::new ((void*)__f_) _FF(__f);
2626	}
2627	else
2628	{
2629	typedef allocator<_FF> _Ap;
2630	_Ap __a;
2631	typedef __allocator_destructor<_Ap> _Dp;
2632	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2633	::new ((void*)__hold.get()) _FF(__f, allocator<_Fp>(__a));
2634	__f_ = __hold.release();
2635	}
2636	}
2637	}
2638
2639	template<class _Rp, class _A0, class _A1, class _A2>
2640	template <class _Fp, class _Alloc>
2641	function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
2642	typename enable_if<!is_integral<_Fp>::value>::type*)
2643	: __f_(0)
2644	{
2645	typedef allocator_traits<_Alloc> __alloc_traits;
2646	if (__function::__not_null(__f))
2647	{
2648	typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)> _FF;
2649	if (sizeof(_FF) <= sizeof(__buf_))
2650	{
2651	__f_ = (__base*)&__buf_;
2652	::new ((void*)__f_) _FF(__f, __a0);
2653	}
2654	else
2655	{
2656	typedef typename __rebind_alloc_helper<__alloc_traits, _FF>::type _Ap;
2657	_Ap __a(__a0);
2658	typedef __allocator_destructor<_Ap> _Dp;
2659	unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
2660	::new ((void*)__hold.get()) _FF(__f, _Alloc(__a));
2661	__f_ = __hold.release();
2662	}
2663	}
2664	}
2665
2666	template<class _Rp, class _A0, class _A1, class _A2>
2667	function<_Rp(_A0, _A1, _A2)>&
2668	function<_Rp(_A0, _A1, _A2)>::operator=(const function& __f)
2669	{
2670	if (__f)
2671	function(__f).swap(*this);
2672	else
2673	*this = nullptr;
2674	return *this;
2675	}
2676
2677	template<class _Rp, class _A0, class _A1, class _A2>
2678	function<_Rp(_A0, _A1, _A2)>&
2679	function<_Rp(_A0, _A1, _A2)>::operator=(nullptr_t)
2680	{
2681	__base* __t = __f_;
2682	__f_ = 0;
2683	if (__t == (__base*)&__buf_)
2684	__t->destroy();
2685	else if (__t)
2686	__t->destroy_deallocate();
2687	return *this;
2688	}
2689
2690	template<class _Rp, class _A0, class _A1, class _A2>
2691	template <class _Fp>
2692	typename enable_if
2693	<
2694	!is_integral<_Fp>::value,
2695	function<_Rp(_A0, _A1, _A2)>&
2696	>::type
2697	function<_Rp(_A0, _A1, _A2)>::operator=(_Fp __f)
2698	{
2699	function(_VSTD::move(__f)).swap(*this);
2700	return *this;
2701	}
2702
2703	template<class _Rp, class _A0, class _A1, class _A2>
2704	function<_Rp(_A0, _A1, _A2)>::~function()
2705	{
2706	if (__f_ == (__base*)&__buf_)
2707	__f_->destroy();
2708	else if (__f_)
2709	__f_->destroy_deallocate();
2710	}
2711
2712	template<class _Rp, class _A0, class _A1, class _A2>
2713	void
2714	function<_Rp(_A0, _A1, _A2)>::swap(function& __f)
2715	{
2716	if (_VSTD::addressof(__f) == this)
2717	return;
2718	if (__f_ == (__base)&__buf_ && __f.__f_ == (__base)&__f.__buf_)
2719	{
2720	typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
2721	__base* __t = (__base*)&__tempbuf;
2722	__f_->__clone(__t);
2723	__f_->destroy();
2724	__f_ = 0;
2725	__f.__f_->__clone((__base*)&__buf_);
2726	__f.__f_->destroy();
2727	__f.__f_ = 0;
2728	__f_ = (__base*)&__buf_;
2729	__t->__clone((__base*)&__f.__buf_);
2730	__t->destroy();
2731	__f.__f_ = (__base*)&__f.__buf_;
2732	}
2733	else if (__f_ == (__base*)&__buf_)
2734	{
2735	__f_->__clone((__base*)&__f.__buf_);
2736	__f_->destroy();
2737	__f_ = __f.__f_;
2738	__f.__f_ = (__base*)&__f.__buf_;
2739	}
2740	else if (__f.__f_ == (__base*)&__f.__buf_)
2741	{
2742	__f.__f_->__clone((__base*)&__buf_);
2743	__f.__f_->destroy();
2744	__f.__f_ = __f_;
2745	__f_ = (__base*)&__buf_;
2746	}
2747	else
2748	_VSTD::swap(__f_, __f.__f_);
2749	}
2750
2751	template<class _Rp, class _A0, class _A1, class _A2>
2752	_Rp
2753	function<_Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2) const
2754	{
2755	if (__f_ == 0)
2756	__throw_bad_function_call();
2757	return (*__f_)(__a0, __a1, __a2);
2758	}
2759
2760	#ifndef _LIBCPP_NO_RTTI
2761
2762	template<class _Rp, class _A0, class _A1, class _A2>
2763	const std::type_info&
2764	function<_Rp(_A0, _A1, _A2)>::target_type() const
2765	{
2766	if (__f_ == 0)
2767	return typeid(void);
2768	return __f_->target_type();
2769	}
2770
2771	template<class _Rp, class _A0, class _A1, class _A2>
2772	template <typename _Tp>
2773	_Tp*
2774	function<_Rp(_A0, _A1, _A2)>::target()
2775	{
2776	if (__f_ == 0)
2777	return (_Tp*)0;
2778	return (_Tp) const_cast<void >(__f_->target(typeid(_Tp)));
2779	}
2780
2781	template<class _Rp, class _A0, class _A1, class _A2>
2782	template <typename _Tp>
2783	const _Tp*
2784	function<_Rp(_A0, _A1, _A2)>::target() const
2785	{
2786	if (__f_ == 0)
2787	return (const _Tp*)0;
2788	return (const _Tp*)__f_->target(typeid(_Tp));
2789	}
2790
2791	#endif // _LIBCPP_NO_RTTI
2792
2793	template <class _Fp>
2794	inline _LIBCPP_INLINE_VISIBILITY
2795	bool
2796	operator==(const function<_Fp>& __f, nullptr_t) {return !__f;}
2797
2798	template <class _Fp>
2799	inline _LIBCPP_INLINE_VISIBILITY
2800	bool
2801	operator==(nullptr_t, const function<_Fp>& __f) {return !__f;}
2802
2803	template <class _Fp>
2804	inline _LIBCPP_INLINE_VISIBILITY
2805	bool
2806	operator!=(const function<_Fp>& __f, nullptr_t) {return (bool)__f;}
2807
2808	template <class _Fp>
2809	inline _LIBCPP_INLINE_VISIBILITY
2810	bool
2811	operator!=(nullptr_t, const function<_Fp>& __f) {return (bool)__f;}
2812
2813	template <class _Fp>
2814	inline _LIBCPP_INLINE_VISIBILITY
2815	void
2816	swap(function<_Fp>& __x, function<_Fp>& __y)
2817	{return __x.swap(__y);}
2818		1213
2819	#endif // _LIBCPP_CXX03_LANG	1214	#endif // _LIBCPP_CXX03_LANG
2820		1215
2821	_LIBCPP_END_NAMESPACE_STD
2822
2823	#endif // _LIBCPP___FUNCTIONAL_FUNCTION_H	1216	#endif // _LIBCPP___FUNCTIONAL_FUNCTION_H

lib/libcxx/include/__functional/hash.h+41-35

 @@ -10,8 +10,15 @@
 #define _LIBCPP___FUNCTIONAL_HASH_H
 #include <__config>
+#include <__functional/invoke.h>
 #include <__functional/unary_function.h>
-#include <__tuple>
+#include <__fwd/hash.h>
+#include <__tuple_dir/sfinae_helpers.h>
+#include <__type_traits/is_copy_constructible.h>
+#include <__type_traits/is_default_constructible.h>
+#include <__type_traits/is_enum.h>
+#include <__type_traits/is_move_constructible.h>
+#include <__type_traits/underlying_type.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/pair.h>
 @@ -20,7 +27,6 @@
 #include <cstdint>
 #include <cstring>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -62,7 +68,7 @@ __murmur2_or_cityhash<_Size, 32>::operator()(const void* __key, _Size __len)
     const unsigned char* __data = static_cast<const unsigned char*>(__key);
     for (; __len >= 4; __data += 4, __len -= 4)
     {
-        _Size __k = __loadword<_Size>(__data);
+        _Size __k = std::__loadword<_Size>(__data);
         __k *= __m;
         __k ^= __k >> __r;
         __k *= __m;
 @@ -127,14 +133,14 @@ struct __murmur2_or_cityhash<_Size, 64>
      _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
   {
     if (__len > 8) {
-      const _Size __a = __loadword<_Size>(__s);
+      const _Size __a = std::__loadword<_Size>(__s);
-      const _Size __b = __loadword<_Size>(__s + __len - 8);
+      const _Size __b = std::__loadword<_Size>(__s + __len - 8);
       return __hash_len_16(__a, __rotate_by_at_least_1(__b + __len, __len)) ^ __b;
     }
     if (__len >= 4) {
-      const uint32_t __a = __loadword<uint32_t>(__s);
+      const uint32_t __a = std::__loadword<uint32_t>(__s);
-      const uint32_t __b = __loadword<uint32_t>(__s + __len - 4);
+      const uint32_t __b = std::__loadword<uint32_t>(__s + __len - 4);
-      return __hash_len_16(__len + (__a << 3), __b);
+      return __hash_len_16(__len + (static_cast<_Size>(__a) << 3), __b);
     }
     if (__len > 0) {
       const unsigned char __a = static_cast<unsigned char>(__s[0]);
 @@ -151,10 +157,10 @@ struct __murmur2_or_cityhash<_Size, 64>
   static _Size __hash_len_17_to_32(const char *__s, _Size __len)
      _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
   {
-    const _Size __a = __loadword<_Size>(__s) * __k1;
+    const _Size __a = std::__loadword<_Size>(__s) * __k1;
-    const _Size __b = __loadword<_Size>(__s + 8);
+    const _Size __b = std::__loadword<_Size>(__s + 8);
-    const _Size __c = __loadword<_Size>(__s + __len - 8) * __k2;
+    const _Size __c = std::__loadword<_Size>(__s + __len - 8) * __k2;
-    const _Size __d = __loadword<_Size>(__s + __len - 16) * __k0;
+    const _Size __d = std::__loadword<_Size>(__s + __len - 16) * __k0;
     return __hash_len_16(__rotate(__a - __b, 43) + __rotate(__c, 30) + __d,
                          __a + __rotate(__b ^ __k3, 20) - __c + __len);
   }
 @@ -179,10 +185,10 @@ struct __murmur2_or_cityhash<_Size, 64>
       const char* __s, _Size __a, _Size __b)
     _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
   {
-    return __weak_hash_len_32_with_seeds(__loadword<_Size>(__s),
+    return __weak_hash_len_32_with_seeds(std::__loadword<_Size>(__s),
-                                         __loadword<_Size>(__s + 8),
+                                         std::__loadword<_Size>(__s + 8),
-                                         __loadword<_Size>(__s + 16),
+                                         std::__loadword<_Size>(__s + 16),
-                                         __loadword<_Size>(__s + 24),
+                                         std::__loadword<_Size>(__s + 24),
                                          __a,
                                          __b);
   }
 @@ -191,23 +197,23 @@ struct __murmur2_or_cityhash<_Size, 64>
   static _Size __hash_len_33_to_64(const char *__s, size_t __len)
     _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
   {
-    _Size __z = __loadword<_Size>(__s + 24);
+    _Size __z = std::__loadword<_Size>(__s + 24);
-    _Size __a = __loadword<_Size>(__s) +
+    _Size __a = std::__loadword<_Size>(__s) +
-                (__len + __loadword<_Size>(__s + __len - 16)) * __k0;
+                (__len + std::__loadword<_Size>(__s + __len - 16)) * __k0;
     _Size __b = __rotate(__a + __z, 52);
     _Size __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + 8);
+    __a += std::__loadword<_Size>(__s + 8);
     __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + 16);
+    __a += std::__loadword<_Size>(__s + 16);
     _Size __vf = __a + __z;
     _Size __vs = __b + __rotate(__a, 31) + __c;
-    __a = __loadword<_Size>(__s + 16) + __loadword<_Size>(__s + __len - 32);
+    __a = std::__loadword<_Size>(__s + 16) + std::__loadword<_Size>(__s + __len - 32);
-    __z += __loadword<_Size>(__s + __len - 8);
+    __z += std::__loadword<_Size>(__s + __len - 8);
     __b = __rotate(__a + __z, 52);
     __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + __len - 24);
+    __a += std::__loadword<_Size>(__s + __len - 24);
     __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + __len - 16);
+    __a += std::__loadword<_Size>(__s + __len - 16);
     _Size __wf = __a + __z;
     _Size __ws = __b + __rotate(__a, 31) + __c;
     _Size __r = __shift_mix((__vf + __ws) * __k2 + (__wf + __vs) * __k0);
 @@ -233,26 +239,26 @@ __murmur2_or_cityhash<_Size, 64>::operator()(const void* __key, _Size __len)
   // For strings over 64 bytes we hash the end first, and then as we
   // loop we keep 56 bytes of state: v, w, x, y, and z.
-  _Size __x = __loadword<_Size>(__s + __len - 40);
+  _Size __x = std::__loadword<_Size>(__s + __len - 40);
-  _Size __y = __loadword<_Size>(__s + __len - 16) +
+  _Size __y = std::__loadword<_Size>(__s + __len - 16) +
-              __loadword<_Size>(__s + __len - 56);
+              std::__loadword<_Size>(__s + __len - 56);
-  _Size __z = __hash_len_16(__loadword<_Size>(__s + __len - 48) + __len,
+  _Size __z = __hash_len_16(std::__loadword<_Size>(__s + __len - 48) + __len,
-                          __loadword<_Size>(__s + __len - 24));
+                          std::__loadword<_Size>(__s + __len - 24));
   pair<_Size, _Size> __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z);
   pair<_Size, _Size> __w = __weak_hash_len_32_with_seeds(__s + __len - 32, __y + __k1, __x);
-  __x = __x * __k1 + __loadword<_Size>(__s);
+  __x = __x * __k1 + std::__loadword<_Size>(__s);
   // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
   __len = (__len - 1) & ~static_cast<_Size>(63);
   do {
-    __x = __rotate(__x + __y + __v.first + __loadword<_Size>(__s + 8), 37) * __k1;
+    __x = __rotate(__x + __y + __v.first + std::__loadword<_Size>(__s + 8), 37) * __k1;
-    __y = __rotate(__y + __v.second + __loadword<_Size>(__s + 48), 42) * __k1;
+    __y = __rotate(__y + __v.second + std::__loadword<_Size>(__s + 48), 42) * __k1;
     __x ^= __w.second;
-    __y += __v.first + __loadword<_Size>(__s + 40);
+    __y += __v.first + std::__loadword<_Size>(__s + 40);
     __z = __rotate(__z + __w.first, 33) * __k1;
     __v = __weak_hash_len_32_with_seeds(__s, __v.second * __k1, __x + __w.first);
     __w = __weak_hash_len_32_with_seeds(__s + 32, __z + __w.second,
-                                        __y + __loadword<_Size>(__s + 16));
+                                        __y + std::__loadword<_Size>(__s + 16));
     _VSTD::swap(__z, __x);
     __s += 64;
     __len -= 64;

lib/libcxx/include/__functional/invoke.h+16-8

 @@ -248,7 +248,7 @@ struct __member_pointer_traits_imp<_Rp _Class::*, false, true>
 template <class _MP>
 struct __member_pointer_traits
-    : public __member_pointer_traits_imp<typename remove_cv<_MP>::type,
+    : public __member_pointer_traits_imp<__remove_cv_t<_MP>,
                     is_member_function_pointer<_MP>::value,
                     is_member_object_pointer<_MP>::value>
 {
 @@ -398,7 +398,7 @@ template <class _Ret, class _Fp, class ..._Args>
 struct __invokable_r
 {
   template <class _XFp, class ..._XArgs>
-  static decltype(std::__invoke(declval<_XFp>(), declval<_XArgs>()...)) __try_call(int);
+  static decltype(std::__invoke(std::declval<_XFp>(), std::declval<_XArgs>()...)) __try_call(int);
   template <class _XFp, class ..._XArgs>
   static __nat __try_call(...);
 @@ -406,10 +406,10 @@ struct __invokable_r
   // or incomplete array types as required by the standard.
   using _Result = decltype(__try_call<_Fp, _Args...>(0));
-  using type = typename conditional<
+  using type = __conditional_t<
       _IsNotSame<_Result, __nat>::value,
-      typename conditional< is_void<_Ret>::value, true_type, __is_core_convertible<_Result, _Ret> >::type,
+      __conditional_t<is_void<_Ret>::value, true_type, __is_core_convertible<_Result, _Ret> >,
-      false_type >::type;
+      false_type>;
   static const bool value = type::value;
 };
 template <class _Fp, class ..._Args>
 @@ -428,15 +428,23 @@ struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...>
     template <class _Tp>
     static void __test_noexcept(_Tp) _NOEXCEPT;
+#ifdef _LIBCPP_CXX03_LANG
+    static const bool value = false;
+#else
     static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>(
-        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)));
+        _VSTD::__invoke(std::declval<_Fp>(), std::declval<_Args>()...)));
+#endif
 };
 template <class _Ret, class _Fp, class ..._Args>
 struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...>
 {
+#ifdef _LIBCPP_CXX03_LANG
+    static const bool value = false;
+#else
     static const bool value = noexcept(
-        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...));
+        _VSTD::__invoke(std::declval<_Fp>(), std::declval<_Args>()...));
+#endif
 };
 template <class _Ret, class _Fp, class ..._Args>
 @@ -524,7 +532,7 @@ template <class _Fn, class... _Args>
 using invoke_result_t = typename invoke_result<_Fn, _Args...>::type;
 template <class _Fn, class ..._Args>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 invoke_result_t<_Fn, _Args...>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 invoke_result_t<_Fn, _Args...>
 invoke(_Fn&& __f, _Args&&... __args)
     noexcept(is_nothrow_invocable_v<_Fn, _Args...>)
 {

lib/libcxx/include/__functional/is_transparent.h+1-2

...	@@ -25,8 +25,7 @@ template <class _Tp, class, class = void>	...	@@ -25,8 +25,7 @@ template <class _Tp, class, class = void>
25	struct __is_transparent : false_type {};	25	struct __is_transparent : false_type {};
26		26
27	template <class _Tp, class _Up>	27	template <class _Tp, class _Up>
28	struct __is_transparent<_Tp, _Up,	28	struct __is_transparent<_Tp, _Up, __void_t<typename _Tp::is_transparent> >
29	typename __void_t<typename _Tp::is_transparent>::type>
30	: true_type {};	29	: true_type {};
31		30
32	#endif	31	#endif

lib/libcxx/include/__functional/mem_fn.h+3-3

...	@@ -33,12 +33,12 @@ private:	...	@@ -33,12 +33,12 @@ private:
33	type __f_;	33	type __f_;
34		34
35	public:	35	public:
36	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	36	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
37	__mem_fn(type __f) _NOEXCEPT : __f_(__f) {}	37	__mem_fn(type __f) _NOEXCEPT : __f_(__f) {}
38		38
39	// invoke	39	// invoke
40	template <class... _ArgTypes>	40	template <class... _ArgTypes>
41	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	41	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
42		42
43	typename __invoke_return<type, _ArgTypes...>::type	43	typename __invoke_return<type, _ArgTypes...>::type
44	operator() (_ArgTypes&&... __args) const {	44	operator() (_ArgTypes&&... __args) const {
...	@@ -47,7 +47,7 @@ public:	...	@@ -47,7 +47,7 @@ public:
47	};	47	};
48		48
49	template<class _Rp, class _Tp>	49	template<class _Rp, class _Tp>
50	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	50	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
51	__mem_fn<_Rp _Tp::*>	51	__mem_fn<_Rp _Tp::*>
52	mem_fn(_Rp _Tp::* __pm) _NOEXCEPT	52	mem_fn(_Rp _Tp::* __pm) _NOEXCEPT
53	{	53	{

lib/libcxx/include/__functional/not_fn.h+2-2

...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
27	struct __not_fn_op {	27	struct __not_fn_op {
28	template <class... _Args>	28	template <class... _Args>
29	_LIBCPP_HIDE_FROM_ABI	29	_LIBCPP_HIDE_FROM_ABI
30	_LIBCPP_CONSTEXPR_AFTER_CXX17 auto operator()(_Args&&... __args) const	30	_LIBCPP_CONSTEXPR_SINCE_CXX20 auto operator()(_Args&&... __args) const
31	noexcept(noexcept(!_VSTD::invoke(_VSTD::forward<_Args>(__args)...)))	31	noexcept(noexcept(!_VSTD::invoke(_VSTD::forward<_Args>(__args)...)))
32	-> decltype( !_VSTD::invoke(_VSTD::forward<_Args>(__args)...))	32	-> decltype( !_VSTD::invoke(_VSTD::forward<_Args>(__args)...))
33	{ return !_VSTD::invoke(_VSTD::forward<_Args>(__args)...); }	33	{ return !_VSTD::invoke(_VSTD::forward<_Args>(__args)...); }
...	@@ -43,7 +43,7 @@ template <class _Fn, class = enable_if_t<	...	@@ -43,7 +43,7 @@ template <class _Fn, class = enable_if_t<
43	is_move_constructible_v<decay_t<_Fn>>	43	is_move_constructible_v<decay_t<_Fn>>
44	>>	44	>>
45	_LIBCPP_HIDE_FROM_ABI	45	_LIBCPP_HIDE_FROM_ABI
46	_LIBCPP_CONSTEXPR_AFTER_CXX17 auto not_fn(_Fn&& __f) {	46	_LIBCPP_CONSTEXPR_SINCE_CXX20 auto not_fn(_Fn&& __f) {
47	return __not_fn_t<decay_t<_Fn>>(_VSTD::forward<_Fn>(__f));	47	return __not_fn_t<decay_t<_Fn>>(_VSTD::forward<_Fn>(__f));
48	}	48	}
49		49

lib/libcxx/include/__functional/operations.h+57-38

 @@ -32,17 +32,18 @@ struct _LIBCPP_TEMPLATE_VIS plus
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x + __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(plus);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS plus<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u))
 @@ -60,17 +61,18 @@ struct _LIBCPP_TEMPLATE_VIS minus
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x - __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(minus);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS minus<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) - _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) - _VSTD::forward<_T2>(__u))
 @@ -88,17 +90,18 @@ struct _LIBCPP_TEMPLATE_VIS multiplies
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x * __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(multiplies);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS multiplies<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) * _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) * _VSTD::forward<_T2>(__u))
 @@ -116,17 +119,18 @@ struct _LIBCPP_TEMPLATE_VIS divides
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x / __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(divides);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS divides<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) / _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) / _VSTD::forward<_T2>(__u))
 @@ -144,17 +148,18 @@ struct _LIBCPP_TEMPLATE_VIS modulus
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x % __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(modulus);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS modulus<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) % _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) % _VSTD::forward<_T2>(__u))
 @@ -172,17 +177,18 @@ struct _LIBCPP_TEMPLATE_VIS negate
     : __unary_function<_Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x) const
         {return -__x;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(negate);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS negate<void>
 {
     template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_Tp&& __x) const
         noexcept(noexcept(- _VSTD::forward<_Tp>(__x)))
         -> decltype(      - _VSTD::forward<_Tp>(__x))
 @@ -202,17 +208,18 @@ struct _LIBCPP_TEMPLATE_VIS bit_and
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x & __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(bit_and);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS bit_and<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) & _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) & _VSTD::forward<_T2>(__u))
 @@ -226,16 +233,17 @@ template <class _Tp = void>
 struct _LIBCPP_TEMPLATE_VIS bit_not
     : __unary_function<_Tp, _Tp>
 {
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x) const
         {return ~__x;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(bit_not);
 template <>
 struct _LIBCPP_TEMPLATE_VIS bit_not<void>
 {
     template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_Tp&& __x) const
         noexcept(noexcept(~_VSTD::forward<_Tp>(__x)))
         -> decltype(      ~_VSTD::forward<_Tp>(__x))
 @@ -253,17 +261,18 @@ struct _LIBCPP_TEMPLATE_VIS bit_or
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x | __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(bit_or);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS bit_or<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) | _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) | _VSTD::forward<_T2>(__u))
 @@ -281,17 +290,18 @@ struct _LIBCPP_TEMPLATE_VIS bit_xor
     : __binary_function<_Tp, _Tp, _Tp>
 {
     typedef _Tp __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x ^ __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(bit_xor);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS bit_xor<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) ^ _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) ^ _VSTD::forward<_T2>(__u))
 @@ -311,17 +321,18 @@ struct _LIBCPP_TEMPLATE_VIS equal_to
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x == __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(equal_to);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS equal_to<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) == _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) == _VSTD::forward<_T2>(__u))
 @@ -339,17 +350,18 @@ struct _LIBCPP_TEMPLATE_VIS not_equal_to
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x != __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(not_equal_to);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS not_equal_to<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) != _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) != _VSTD::forward<_T2>(__u))
 @@ -367,17 +379,18 @@ struct _LIBCPP_TEMPLATE_VIS less
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x < __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(less);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS less<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u))
 @@ -395,17 +408,18 @@ struct _LIBCPP_TEMPLATE_VIS less_equal
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x <= __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(less_equal);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS less_equal<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) <= _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) <= _VSTD::forward<_T2>(__u))
 @@ -423,17 +437,18 @@ struct _LIBCPP_TEMPLATE_VIS greater_equal
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x >= __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(greater_equal);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS greater_equal<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) >= _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) >= _VSTD::forward<_T2>(__u))
 @@ -451,17 +466,18 @@ struct _LIBCPP_TEMPLATE_VIS greater
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x > __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(greater);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS greater<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) > _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) > _VSTD::forward<_T2>(__u))
 @@ -481,17 +497,18 @@ struct _LIBCPP_TEMPLATE_VIS logical_and
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x && __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(logical_and);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS logical_and<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) && _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) && _VSTD::forward<_T2>(__u))
 @@ -509,17 +526,18 @@ struct _LIBCPP_TEMPLATE_VIS logical_not
     : __unary_function<_Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x) const
         {return !__x;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(logical_not);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS logical_not<void>
 {
     template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_Tp&& __x) const
         noexcept(noexcept(!_VSTD::forward<_Tp>(__x)))
         -> decltype(      !_VSTD::forward<_Tp>(__x))
 @@ -537,17 +555,18 @@ struct _LIBCPP_TEMPLATE_VIS logical_or
     : __binary_function<_Tp, _Tp, bool>
 {
     typedef bool __result_type;  // used by valarray
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x || __y;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(logical_or);
 #if _LIBCPP_STD_VER > 11
 template <>
 struct _LIBCPP_TEMPLATE_VIS logical_or<void>
 {
     template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     auto operator()(_T1&& __t, _T2&& __u) const
         noexcept(noexcept(_VSTD::forward<_T1>(__t) || _VSTD::forward<_T2>(__u)))
         -> decltype(      _VSTD::forward<_T1>(__t) || _VSTD::forward<_T2>(__u))

lib/libcxx/include/__functional/ranges_operations.h+2-1

 @@ -10,9 +10,10 @@
 #ifndef _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
 #define _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
+#include <__concepts/equality_comparable.h>
+#include <__concepts/totally_ordered.h>
 #include <__config>
 #include <__utility/forward.h>
-#include <concepts>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__functional/reference_wrapper.h+14-11

 @@ -11,10 +11,13 @@
 #define _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
 #include <__config>
+#include <__functional/invoke.h>
 #include <__functional/weak_result_type.h>
 #include <__memory/addressof.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/remove_cvref.h>
+#include <__utility/declval.h>
 #include <__utility/forward.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -35,22 +38,22 @@ private:
     static void __fun(_Tp&&) = delete;
 public:
-    template <class _Up, class = __enable_if_t<!__is_same_uncvref<_Up, reference_wrapper>::value, decltype(__fun(declval<_Up>())) > >
+    template <class _Up, class = __enable_if_t<!__is_same_uncvref<_Up, reference_wrapper>::value, decltype(__fun(std::declval<_Up>())) > >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
-    reference_wrapper(_Up&& __u) _NOEXCEPT_(noexcept(__fun(declval<_Up>()))) {
+    reference_wrapper(_Up&& __u) _NOEXCEPT_(noexcept(__fun(std::declval<_Up>()))) {
         type& __f = static_cast<_Up&&>(__u);
         __f_ = _VSTD::addressof(__f);
     }
     // access
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     operator type&() const _NOEXCEPT {return *__f_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     type& get() const _NOEXCEPT {return *__f_;}
     // invoke
     template <class... _ArgTypes>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     typename __invoke_of<type&, _ArgTypes...>::type
     operator() (_ArgTypes&&... __args) const {
         return std::__invoke(get(), std::forward<_ArgTypes>(__args)...);
 @@ -63,7 +66,7 @@ reference_wrapper(_Tp&) -> reference_wrapper<_Tp>;
 #endif
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 reference_wrapper<_Tp>
 ref(_Tp& __t) _NOEXCEPT
 {
 @@ -71,7 +74,7 @@ ref(_Tp& __t) _NOEXCEPT
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 reference_wrapper<_Tp>
 ref(reference_wrapper<_Tp> __t) _NOEXCEPT
 {
 @@ -79,7 +82,7 @@ ref(reference_wrapper<_Tp> __t) _NOEXCEPT
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 reference_wrapper<const _Tp>
 cref(const _Tp& __t) _NOEXCEPT
 {
 @@ -87,7 +90,7 @@ cref(const _Tp& __t) _NOEXCEPT
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 reference_wrapper<const _Tp>
 cref(reference_wrapper<_Tp> __t) _NOEXCEPT
 {

lib/libcxx/include/__functional/unary_negate.h+3-3

...	@@ -27,16 +27,16 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 unary_negate	...	@@ -27,16 +27,16 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 unary_negate
27	{	27	{
28	_Predicate __pred_;	28	_Predicate __pred_;
29	public:	29	public:
30	_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	30	_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
31	explicit unary_negate(const _Predicate& __pred)	31	explicit unary_negate(const _Predicate& __pred)
32	: __pred_(__pred) {}	32	: __pred_(__pred) {}
33	_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	33	_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
34	bool operator()(const typename _Predicate::argument_type& __x) const	34	bool operator()(const typename _Predicate::argument_type& __x) const
35	{return !__pred_(__x);}	35	{return !__pred_(__x);}
36	};	36	};
37		37
38	template <class _Predicate>	38	template <class _Predicate>
39	_LIBCPP_DEPRECATED_IN_CXX17 inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	39	_LIBCPP_DEPRECATED_IN_CXX17 inline _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
40	unary_negate<_Predicate>	40	unary_negate<_Predicate>
41	not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);}	41	not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);}
42		42

lib/libcxx/include/__functional/unwrap_ref.h+1

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___FUNCTIONAL_UNWRAP_REF_H	10	#define _LIBCPP___FUNCTIONAL_UNWRAP_REF_H
11		11
12	#include <__config>	12	#include <__config>
		13	#include <__type_traits/decay.h>
13		14
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__functional/weak_result_type.h+5-2

 @@ -12,8 +12,11 @@
 #include <__config>
 #include <__functional/binary_function.h>
+#include <__functional/invoke.h>
 #include <__functional/unary_function.h>
-#include <type_traits>
+#include <__type_traits/integral_constant.h>
+#include <__type_traits/is_same.h>
+#include <__utility/declval.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -283,7 +286,7 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const volatile>
 template <class _Tp, class ..._Args>
 struct __invoke_return
 {
-    typedef decltype(_VSTD::__invoke(declval<_Tp>(), declval<_Args>()...)) type;
+    typedef decltype(_VSTD::__invoke(std::declval<_Tp>(), std::declval<_Args>()...)) type;
 };
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__fwd/array.h created+26

...	@@ -0,0 +1,26 @@
1	//===---------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===---------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_ARRAY_H
10	#define _LIBCPP___FWD_ARRAY_H
11
12	#include <__config>
13	#include <cstddef>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class _Tp, size_t _Size>
22	struct _LIBCPP_TEMPLATE_VIS array;
23
24	_LIBCPP_END_NAMESPACE_STD
25
26	#endif // _LIBCPP___FWD_ARRAY_H

lib/libcxx/include/__fwd/get.h created+115

...	@@ -0,0 +1,115 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_GET_H
10	#define _LIBCPP___FWD_GET_H
11
12	#include <__concepts/copyable.h>
13	#include <__config>
14	#include <__fwd/array.h>
15	#include <__fwd/pair.h>
16	#include <__fwd/subrange.h>
17	#include <__fwd/tuple.h>
18	#include <__tuple_dir/tuple_element.h>
19	#include <cstddef>
20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header
23	#endif
24
25	_LIBCPP_BEGIN_NAMESPACE_STD
26
27	#ifndef _LIBCPP_CXX03_LANG
28
29	template <size_t _Ip, class ..._Tp>
30	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
31	typename tuple_element<_Ip, tuple<_Tp...> >::type&
32	get(tuple<_Tp...>&) _NOEXCEPT;
33
34	template <size_t _Ip, class ..._Tp>
35	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
36	const typename tuple_element<_Ip, tuple<_Tp...> >::type&
37	get(const tuple<_Tp...>&) _NOEXCEPT;
38
39	template <size_t _Ip, class ..._Tp>
40	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
41	typename tuple_element<_Ip, tuple<_Tp...> >::type&&
42	get(tuple<_Tp...>&&) _NOEXCEPT;
43
44	template <size_t _Ip, class ..._Tp>
45	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
46	const typename tuple_element<_Ip, tuple<_Tp...> >::type&&
47	get(const tuple<_Tp...>&&) _NOEXCEPT;
48
49	#endif //_LIBCPP_CXX03_LANG
50
51	template <size_t _Ip, class _T1, class _T2>
52	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
53	typename tuple_element<_Ip, pair<_T1, _T2> >::type&
54	get(pair<_T1, _T2>&) _NOEXCEPT;
55
56	template <size_t _Ip, class _T1, class _T2>
57	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
58	const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
59	get(const pair<_T1, _T2>&) _NOEXCEPT;
60
61	#ifndef _LIBCPP_CXX03_LANG
62	template <size_t _Ip, class _T1, class _T2>
63	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
64	typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
65	get(pair<_T1, _T2>&&) _NOEXCEPT;
66
67	template <size_t _Ip, class _T1, class _T2>
68	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
69	const typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
70	get(const pair<_T1, _T2>&&) _NOEXCEPT;
71	#endif
72
73	template <size_t _Ip, class _Tp, size_t _Size>
74	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
75	_Tp&
76	get(array<_Tp, _Size>&) _NOEXCEPT;
77
78	template <size_t _Ip, class _Tp, size_t _Size>
79	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
80	const _Tp&
81	get(const array<_Tp, _Size>&) _NOEXCEPT;
82
83	#ifndef _LIBCPP_CXX03_LANG
84	template <size_t _Ip, class _Tp, size_t _Size>
85	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
86	_Tp&&
87	get(array<_Tp, _Size>&&) _NOEXCEPT;
88
89	template <size_t _Ip, class _Tp, size_t _Size>
90	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
91	const _Tp&&
92	get(const array<_Tp, _Size>&&) _NOEXCEPT;
93	#endif
94
95	#if _LIBCPP_STD_VER >= 20
96
97	namespace ranges {
98
99	template <size_t _Index, class _Iter, class _Sent, subrange_kind _Kind>
100	requires((_Index == 0 && copyable<_Iter>) \|\| _Index == 1)
101	_LIBCPP_HIDE_FROM_ABI constexpr auto get(const subrange<_Iter, _Sent, _Kind>& __subrange);
102
103	template <size_t _Index, class _Iter, class _Sent, subrange_kind _Kind>
104	requires(_Index < 2)
105	_LIBCPP_HIDE_FROM_ABI constexpr auto get(subrange<_Iter, _Sent, _Kind>&& __subrange);
106
107	} // namespace ranges
108
109	using ranges::get;
110
111	#endif // _LIBCPP_STD_VER >= 20
112
113	_LIBCPP_END_NAMESPACE_STD
114
115	#endif // _LIBCPP___FWD_GET_H

lib/libcxx/include/__fwd/hash.h created+25

...	@@ -0,0 +1,25 @@
1	//===---------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===---------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_HASH_H
10	#define _LIBCPP___FWD_HASH_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class>
21	struct _LIBCPP_TEMPLATE_VIS hash;
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___FWD_HASH_H

lib/libcxx/include/__fwd/memory_resource.h created+27

...	@@ -0,0 +1,27 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_MEMORY_RESOURCE_H
10	#define _LIBCPP___FWD_MEMORY_RESOURCE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	namespace pmr {
21	template <class _ValueType>
22	class _LIBCPP_TEMPLATE_VIS polymorphic_allocator;
23	} // namespace pmr
24
25	_LIBCPP_END_NAMESPACE_STD
26
27	#endif // _LIBCPP___FWD_MEMORY_RESOURCE_H

lib/libcxx/include/__fwd/pair.h created+25

...	@@ -0,0 +1,25 @@
1	//===---------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===---------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_PAIR_H
10	#define _LIBCPP___FWD_PAIR_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class, class>
21	struct _LIBCPP_TEMPLATE_VIS pair;
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___FWD_PAIR_H

lib/libcxx/include/__fwd/span.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===---------------------------------------------------------------------===//	8	//===---------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_FWD_SPAN_H	10	#ifndef _LIBCPP___FWD_SPAN_H
11	#define _LIBCPP_FWD_SPAN_H	11	#define _LIBCPP___FWD_SPAN_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <cstddef>	14	#include <cstddef>
...	@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
34		34
35	_LIBCPP_POP_MACROS	35	_LIBCPP_POP_MACROS
36		36
37	#endif // _LIBCPP_FWD_SPAN_H	37	#endif // _LIBCPP___FWD_SPAN_H

lib/libcxx/include/__fwd/string.h created+110

...	@@ -0,0 +1,110 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_STRING_H
10	#define _LIBCPP___FWD_STRING_H
11
12	#include <__config>
13	#include <__fwd/memory_resource.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class _CharT>
22	struct _LIBCPP_TEMPLATE_VIS char_traits;
23	template <>
24	struct char_traits<char>;
25
26	#ifndef _LIBCPP_HAS_NO_CHAR8_T
27	template <>
28	struct char_traits<char8_t>;
29	#endif
30
31	template <>
32	struct char_traits<char16_t>;
33	template <>
34	struct char_traits<char32_t>;
35
36	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
37	template <>
38	struct char_traits<wchar_t>;
39	#endif
40
41	template <class _Tp>
42	class _LIBCPP_TEMPLATE_VIS allocator;
43
44	template <class _CharT, class _Traits = char_traits<_CharT>, class _Allocator = allocator<_CharT> >
45	class _LIBCPP_TEMPLATE_VIS basic_string;
46
47	using string = basic_string<char>;
48
49	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
50	using wstring = basic_string<wchar_t>;
51	#endif
52
53	#ifndef _LIBCPP_HAS_NO_CHAR8_T
54	using u8string = basic_string<char8_t>;
55	#endif
56
57	using u16string = basic_string<char16_t>;
58	using u32string = basic_string<char32_t>;
59
60	#if _LIBCPP_STD_VER >= 17
61
62	namespace pmr {
63	template <class _CharT, class _Traits = char_traits<_CharT>>
64	using basic_string = std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>;
65
66	using string = basic_string<char>;
67
68	# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
69	using wstring = basic_string<wchar_t>;
70	# endif
71
72	# ifndef _LIBCPP_HAS_NO_CHAR8_T
73	using u8string = basic_string<char8_t>;
74	# endif
75
76	using u16string = basic_string<char16_t>;
77	using u32string = basic_string<char32_t>;
78
79	} // namespace pmr
80
81	#endif // _LIBCPP_STD_VER >= 17
82
83	// clang-format off
84	template <class _CharT, class _Traits, class _Allocator>
85	class _LIBCPP_PREFERRED_NAME(string)
86	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
87	_LIBCPP_PREFERRED_NAME(wstring)
88	#endif
89	#ifndef _LIBCPP_HAS_NO_CHAR8_T
90	_LIBCPP_PREFERRED_NAME(u8string)
91	#endif
92	_LIBCPP_PREFERRED_NAME(u16string)
93	_LIBCPP_PREFERRED_NAME(u32string)
94	#if _LIBCPP_STD_VER >= 17
95	_LIBCPP_PREFERRED_NAME(pmr::string)
96	# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
97	_LIBCPP_PREFERRED_NAME(pmr::wstring)
98	# endif
99	# ifndef _LIBCPP_HAS_NO_CHAR8_T
100	_LIBCPP_PREFERRED_NAME(pmr::u8string)
101	# endif
102	_LIBCPP_PREFERRED_NAME(pmr::u16string)
103	_LIBCPP_PREFERRED_NAME(pmr::u32string)
104	#endif
105	basic_string;
106	// clang-format on
107
108	_LIBCPP_END_NAMESPACE_STD
109
110	#endif // _LIBCPP___FWD_STRING_H

lib/libcxx/include/__fwd/string_view.h+16-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===---------------------------------------------------------------------===//	8	//===---------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_FWD_STRING_VIEW_H	10	#ifndef _LIBCPP___FWD_STRING_VIEW_H
11	#define _LIBCPP_FWD_STRING_VIEW_H	11	#define _LIBCPP___FWD_STRING_VIEW_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <iosfwd> // char_traits	14	#include <iosfwd> // char_traits
...	@@ -32,6 +32,19 @@ typedef basic_string_view<char32_t> u32string_view;	...	@@ -32,6 +32,19 @@ typedef basic_string_view<char32_t> u32string_view;
32	typedef basic_string_view<wchar_t> wstring_view;	32	typedef basic_string_view<wchar_t> wstring_view;
33	#endif	33	#endif
34		34
		35	// clang-format off
		36	template <class _CharT, class _Traits>
		37	class _LIBCPP_PREFERRED_NAME(string_view)
		38	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
		39	_LIBCPP_PREFERRED_NAME(wstring_view)
		40	#endif
		41	#ifndef _LIBCPP_HAS_NO_CHAR8_T
		42	_LIBCPP_PREFERRED_NAME(u8string_view)
		43	#endif
		44	_LIBCPP_PREFERRED_NAME(u16string_view)
		45	_LIBCPP_PREFERRED_NAME(u32string_view)
		46	basic_string_view;
		47	// clang-format on
35	_LIBCPP_END_NAMESPACE_STD	48	_LIBCPP_END_NAMESPACE_STD
36		49
37	#endif // _LIBCPP_FWD_STRING_VIEW_H	50	#endif // _LIBCPP___FWD_STRING_VIEW_H

lib/libcxx/include/__fwd/subrange.h created+38

...	@@ -0,0 +1,38 @@
1	//===---------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===---------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_SUBRANGE_H
10	#define _LIBCPP___FWD_SUBRANGE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	#if _LIBCPP_STD_VER >= 20
19
20	#include <__iterator/concepts.h>
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	namespace ranges {
25
26	enum class _LIBCPP_ENUM_VIS subrange_kind : bool { unsized, sized };
27
28	template <input_or_output_iterator _Iter, sentinel_for<_Iter> _Sent, subrange_kind _Kind>
29	requires(_Kind == subrange_kind::sized \|\| !sized_sentinel_for<_Sent, _Iter>)
30	class _LIBCPP_TEMPLATE_VIS subrange;
31
32	} // namespace ranges
33
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP_STD_VER >= 20
37
38	#endif // _LIBCPP___FWD_SUBRANGE_H

lib/libcxx/include/__fwd/tuple.h created+29

...	@@ -0,0 +1,29 @@
1	//===---------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===---------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_TUPLE_H
10	#define _LIBCPP___FWD_TUPLE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	#ifndef _LIBCPP_CXX03_LANG
21
22	template <class...>
23	class _LIBCPP_TEMPLATE_VIS tuple;
24
25	#endif // _LIBCPP_CXX03_LANG
26
27	_LIBCPP_END_NAMESPACE_STD
28
29	#endif // _LIBCPP___FWD_TUPLE_H

lib/libcxx/include/__hash_table+76-71

 @@ -13,16 +13,25 @@
 #include <__algorithm/max.h>
 #include <__algorithm/min.h>
 #include <__assert>
-#include <__bits> // __libcpp_clz
+#include <__bit/countl.h>
 #include <__config>
 #include <__debug>
 #include <__functional/hash.h>
 #include <__iterator/iterator_traits.h>
+#include <__memory/addressof.h>
+#include <__memory/allocator_traits.h>
+#include <__memory/compressed_pair.h>
+#include <__memory/pointer_traits.h>
 #include <__memory/swap_allocator.h>
+#include <__memory/unique_ptr.h>
+#include <__type_traits/can_extract_key.h>
+#include <__utility/forward.h>
+#include <__utility/move.h>
+#include <__utility/pair.h>
 #include <__utility/swap.h>
 #include <cmath>
+#include <cstring>
 #include <initializer_list>
-#include <memory>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -48,7 +57,7 @@ template <class ..._Args>
 struct __is_hash_value_type : false_type {};
 template <class _One>
-struct __is_hash_value_type<_One> : __is_hash_value_type_imp<__uncvref_t<_One> > {};
+struct __is_hash_value_type<_One> : __is_hash_value_type_imp<__remove_cvref_t<_One> > {};
 _LIBCPP_FUNC_VIS
 size_t __next_prime(size_t __n);
 @@ -58,16 +67,13 @@ struct __hash_node_base
 {
     typedef typename pointer_traits<_NodePtr>::element_type __node_type;
     typedef __hash_node_base __first_node;
-    typedef typename __rebind_pointer<_NodePtr, __first_node>::type __node_base_pointer;
+    typedef __rebind_pointer_t<_NodePtr, __first_node> __node_base_pointer;
     typedef _NodePtr __node_pointer;
 #if defined(_LIBCPP_ABI_FIX_UNORDERED_NODE_POINTER_UB)
   typedef __node_base_pointer __next_pointer;
 #else
-  typedef typename conditional<
+    typedef __conditional_t<is_pointer<__node_pointer>::value, __node_base_pointer, __node_pointer> __next_pointer;
-      is_pointer<__node_pointer>::value,
-      __node_base_pointer,
-      __node_pointer>::type   __next_pointer;
 #endif
     __next_pointer    __next_;
 @@ -96,7 +102,7 @@ template <class _Tp, class _VoidPtr>
 struct _LIBCPP_STANDALONE_DEBUG __hash_node
     : public __hash_node_base
              <
-                 typename __rebind_pointer<_VoidPtr, __hash_node<_Tp, _VoidPtr> >::type
+                 __rebind_pointer_t<_VoidPtr, __hash_node<_Tp, _VoidPtr> >
              >
 {
     typedef _Tp __node_value_type;
 @@ -208,9 +214,9 @@ struct __hash_map_pointer_types {};
 template <class _Tp, class _AllocPtr, class _KVTypes>
 struct __hash_map_pointer_types<_Tp, _AllocPtr, _KVTypes, true> {
   typedef typename _KVTypes::__map_value_type   _Mv;
-  typedef typename __rebind_pointer<_AllocPtr, _Mv>::type
+  typedef __rebind_pointer_t<_AllocPtr, _Mv>
                                                        __map_value_type_pointer;
-  typedef typename __rebind_pointer<_AllocPtr, const _Mv>::type
+  typedef __rebind_pointer_t<_AllocPtr, const _Mv>
                                                  __const_map_value_type_pointer;
 };
 @@ -228,21 +234,21 @@ public:
   typedef ptrdiff_t difference_type;
   typedef size_t size_type;
-  typedef typename __rebind_pointer<_NodePtr, void>::type       __void_pointer;
+  typedef __rebind_pointer_t<_NodePtr, void>       __void_pointer;
   typedef typename pointer_traits<_NodePtr>::element_type       __node_type;
   typedef _NodePtr                                              __node_pointer;
   typedef __hash_node_base<__node_pointer>                      __node_base_type;
-  typedef typename __rebind_pointer<_NodePtr, __node_base_type>::type
+  typedef __rebind_pointer_t<_NodePtr, __node_base_type>
                                                              __node_base_pointer;
   typedef typename __node_base_type::__next_pointer          __next_pointer;
   typedef _Tp                                                 __node_value_type;
-  typedef typename __rebind_pointer<_VoidPtr, __node_value_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, __node_value_type>
                                                       __node_value_type_pointer;
-  typedef typename __rebind_pointer<_VoidPtr, const __node_value_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, const __node_value_type>
                                                 __const_node_value_type_pointer;
 private:
 @@ -250,7 +256,7 @@ private:
                 "_NodePtr should never be a pointer to const");
     static_assert((is_same<typename pointer_traits<_VoidPtr>::element_type, void>::value),
                   "_VoidPtr does not point to unqualified void type");
-    static_assert((is_same<typename __rebind_pointer<_VoidPtr, __node_type>::type,
+    static_assert((is_same<__rebind_pointer_t<_VoidPtr, __node_type>,
                           _NodePtr>::value), "_VoidPtr does not rebind to _NodePtr.");
 };
 @@ -269,7 +275,7 @@ struct __hash_node_types_from_iterator<__hash_const_local_iterator<_NodePtr> > :
 template <class _NodeValueTp, class _VoidPtr>
 struct __make_hash_node_types {
   typedef __hash_node<_NodeValueTp, _VoidPtr> _NodeTp;
-  typedef typename __rebind_pointer<_VoidPtr, _NodeTp>::type _NodePtr;
+  typedef __rebind_pointer_t<_VoidPtr, _NodeTp> _NodePtr;
   typedef __hash_node_types<_NodePtr> type;
 };
 @@ -559,7 +565,7 @@ public:
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__dereferenceable(this),
                        "Attempted to increment a non-incrementable unordered container local_iterator");
         __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash(), __bucket_count_) != __bucket_)
+        if (__node_ != nullptr && std::__constrain_hash(__node_->__hash(), __bucket_count_) != __bucket_)
             __node_ = nullptr;
         return *this;
     }
 @@ -614,8 +620,8 @@ class _LIBCPP_TEMPLATE_VIS __hash_const_local_iterator
     typedef pointer_traits<__node_pointer>          __pointer_traits;
     typedef typename __pointer_traits::element_type __node;
-    typedef typename remove_const<__node>::type     __non_const_node;
+    typedef __remove_const_t<__node>                  __non_const_node;
-    typedef typename __rebind_pointer<__node_pointer, __non_const_node>::type
+    typedef __rebind_pointer_t<__node_pointer, __non_const_node>
         __non_const_node_pointer;
 public:
     typedef __hash_local_iterator<__non_const_node_pointer>
 @@ -692,7 +698,7 @@ public:
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__dereferenceable(this),
                        "Attempted to increment a non-incrementable unordered container const_local_iterator");
         __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash(), __bucket_count_) != __bucket_)
+        if (__node_ != nullptr && std::__constrain_hash(__node_->__hash(), __bucket_count_) != __bucket_)
             __node_ = nullptr;
         return *this;
     }
 @@ -892,7 +898,7 @@ public:
     // Create __node
     typedef typename _NodeTypes::__node_type __node;
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node>::type __node_allocator;
+    typedef __rebind_alloc<__alloc_traits, __node>   __node_allocator;
     typedef allocator_traits<__node_allocator>       __node_traits;
     typedef typename _NodeTypes::__void_pointer      __void_pointer;
     typedef typename _NodeTypes::__node_pointer      __node_pointer;
 @@ -907,15 +913,14 @@ private:
     // the pointer using 'pointer_traits'.
     static_assert((is_same<__node_pointer, typename __node_traits::pointer>::value),
                   "Allocator does not rebind pointers in a sane manner.");
-    typedef typename __rebind_alloc_helper<__node_traits, __first_node>::type
+    typedef __rebind_alloc<__node_traits, __first_node> __node_base_allocator;
-        __node_base_allocator;
     typedef allocator_traits<__node_base_allocator> __node_base_traits;
     static_assert((is_same<__node_base_pointer, typename __node_base_traits::pointer>::value),
                  "Allocator does not rebind pointers in a sane manner.");
 private:
-    typedef typename __rebind_alloc_helper<__node_traits, __next_pointer>::type __pointer_allocator;
+    typedef __rebind_alloc<__node_traits, __next_pointer>  __pointer_allocator;
     typedef __bucket_list_deallocator<__pointer_allocator> __bucket_list_deleter;
     typedef unique_ptr<__next_pointer[], __bucket_list_deleter> __bucket_list;
     typedef allocator_traits<__pointer_allocator>          __pointer_alloc_traits;
 @@ -1151,11 +1156,11 @@ public:
     _LIBCPP_INLINE_VISIBILITY void __rehash_multi(size_type __n) { __rehash<false>(__n); }
     _LIBCPP_INLINE_VISIBILITY void __reserve_unique(size_type __n)
     {
-        __rehash_unique(static_cast<size_type>(ceil(__n / max_load_factor())));
+        __rehash_unique(static_cast<size_type>(std::ceil(__n / max_load_factor())));
     }
     _LIBCPP_INLINE_VISIBILITY void __reserve_multi(size_type __n)
     {
-        __rehash_multi(static_cast<size_type>(ceil(__n / max_load_factor())));
+        __rehash_multi(static_cast<size_type>(std::ceil(__n / max_load_factor())));
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -1179,7 +1184,7 @@ public:
         {
             _LIBCPP_ASSERT(bucket_count() > 0,
                 "unordered container::bucket(key) called when bucket_count() == 0");
-            return __constrain_hash(hash_function()(__k), bucket_count());
+            return std::__constrain_hash(hash_function()(__k), bucket_count());
         }
     template <class _Key>
 @@ -1428,7 +1433,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u)
 {
     if (size() > 0)
     {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
+        __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
             __p1_.first().__ptr();
         __u.__p1_.first().__next_ = nullptr;
         __u.size() = 0;
 @@ -1452,7 +1457,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u,
         {
             __p1_.first().__next_ = __u.__p1_.first().__next_;
             __u.__p1_.first().__next_ = nullptr;
-            __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
+            __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
                 __p1_.first().__ptr();
             size() = __u.size();
             __u.size() = 0;
 @@ -1569,7 +1574,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(
     __p1_.first().__next_ = __u.__p1_.first().__next_;
     if (size() > 0)
     {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
+        __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
             __p1_.first().__ptr();
         __u.__p1_.first().__next_ = nullptr;
         __u.size() = 0;
 @@ -1784,12 +1789,12 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique_prepare(
     if (__bc != 0)
     {
-        size_t __chash = __constrain_hash(__hash, __bc);
+        size_t __chash = std::__constrain_hash(__hash, __bc);
         __next_pointer __ndptr = __bucket_list_[__chash];
         if (__ndptr != nullptr)
         {
             for (__ndptr = __ndptr->__next_; __ndptr != nullptr &&
-                                             __constrain_hash(__ndptr->__hash(), __bc) == __chash;
+                                             std::__constrain_hash(__ndptr->__hash(), __bc) == __chash;
                                                      __ndptr = __ndptr->__next_)
             {
                 if (key_eq()(__ndptr->__upcast()->__value_, __value))
 @@ -1799,8 +1804,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique_prepare(
     }
     if (size()+1 > __bc * max_load_factor() || __bc == 0)
     {
-        __rehash_unique(_VSTD::max<size_type>(2 * __bc + !__is_hash_power2(__bc),
+        __rehash_unique(_VSTD::max<size_type>(2 * __bc + !std::__is_hash_power2(__bc),
-                                     size_type(ceil(float(size() + 1) / max_load_factor()))));
+                                     size_type(std::ceil(float(size() + 1) / max_load_factor()))));
     }
     return nullptr;
 }
 @@ -1816,7 +1821,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique_perform(
     __node_pointer __nd) _NOEXCEPT
 {
     size_type __bc = bucket_count();
-    size_t __chash = __constrain_hash(__nd->__hash(), __bc);
+    size_t __chash = std::__constrain_hash(__nd->__hash(), __bc);
     // insert_after __bucket_list_[__chash], or __first_node if bucket is null
     __next_pointer __pn = __bucket_list_[__chash];
     if (__pn == nullptr)
 @@ -1827,7 +1832,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique_perform(
         // fix up __bucket_list_
         __bucket_list_[__chash] = __pn;
         if (__nd->__next_ != nullptr)
-            __bucket_list_[__constrain_hash(__nd->__next_->__hash(), __bc)] = __nd->__ptr();
+            __bucket_list_[std::__constrain_hash(__nd->__next_->__hash(), __bc)] = __nd->__ptr();
     }
     else
     {
 @@ -1871,16 +1876,16 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi_prepare(
     size_type __bc = bucket_count();
     if (size()+1 > __bc * max_load_factor() || __bc == 0)
     {
-        __rehash_multi(_VSTD::max<size_type>(2 * __bc + !__is_hash_power2(__bc),
+        __rehash_multi(_VSTD::max<size_type>(2 * __bc + !std::__is_hash_power2(__bc),
-                       size_type(ceil(float(size() + 1) / max_load_factor()))));
+                       size_type(std::ceil(float(size() + 1) / max_load_factor()))));
         __bc = bucket_count();
     }
-    size_t __chash = __constrain_hash(__cp_hash, __bc);
+    size_t __chash = std::__constrain_hash(__cp_hash, __bc);
     __next_pointer __pn = __bucket_list_[__chash];
     if (__pn != nullptr)
     {
         for (bool __found = false; __pn->__next_ != nullptr &&
-                                   __constrain_hash(__pn->__next_->__hash(), __bc) == __chash;
+                                   std::__constrain_hash(__pn->__next_->__hash(), __bc) == __chash;
                                                            __pn = __pn->__next_)
         {
             //      __found    key_eq()     action
 @@ -1912,7 +1917,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi_perform(
     __node_pointer __cp, __next_pointer __pn) _NOEXCEPT
 {
     size_type __bc = bucket_count();
-    size_t __chash = __constrain_hash(__cp->__hash_, __bc);
+    size_t __chash = std::__constrain_hash(__cp->__hash_, __bc);
     if (__pn == nullptr)
     {
         __pn =__p1_.first().__ptr();
 @@ -1921,7 +1926,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi_perform(
         // fix up __bucket_list_
         __bucket_list_[__chash] = __pn;
         if (__cp->__next_ != nullptr)
-            __bucket_list_[__constrain_hash(__cp->__next_->__hash(), __bc)]
+            __bucket_list_[std::__constrain_hash(__cp->__next_->__hash(), __bc)]
                 = __cp->__ptr();
     }
     else
 @@ -1930,7 +1935,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi_perform(
         __pn->__next_ = __cp->__ptr();
         if (__cp->__next_ != nullptr)
         {
-            size_t __nhash = __constrain_hash(__cp->__next_->__hash(), __bc);
+            size_t __nhash = std::__constrain_hash(__cp->__next_->__hash(), __bc);
             if (__nhash != __chash)
                 __bucket_list_[__nhash] = __cp->__ptr();
         }
 @@ -1965,11 +1970,11 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi(
         size_type __bc = bucket_count();
         if (size()+1 > __bc * max_load_factor() || __bc == 0)
         {
-            __rehash_multi(_VSTD::max<size_type>(2 * __bc + !__is_hash_power2(__bc),
+            __rehash_multi(_VSTD::max<size_type>(2 * __bc + !std::__is_hash_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
+                           size_type(std::ceil(float(size() + 1) / max_load_factor()))));
             __bc = bucket_count();
         }
-        size_t __chash = __constrain_hash(__cp->__hash_, __bc);
+        size_t __chash = std::__constrain_hash(__cp->__hash_, __bc);
         __next_pointer __pp = __bucket_list_[__chash];
         while (__pp->__next_ != __np)
             __pp = __pp->__next_;
 @@ -1996,12 +2001,12 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique_key_args(_Key const&
     size_t __chash;
     if (__bc != 0)
     {
-        __chash = __constrain_hash(__hash, __bc);
+        __chash = std::__constrain_hash(__hash, __bc);
         __nd = __bucket_list_[__chash];
         if (__nd != nullptr)
         {
             for (__nd = __nd->__next_; __nd != nullptr &&
-                (__nd->__hash() == __hash || __constrain_hash(__nd->__hash(), __bc) == __chash);
+                (__nd->__hash() == __hash || std::__constrain_hash(__nd->__hash(), __bc) == __chash);
                                                            __nd = __nd->__next_)
             {
                 if (key_eq()(__nd->__upcast()->__value_, __k))
 @@ -2013,10 +2018,10 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique_key_args(_Key const&
         __node_holder __h = __construct_node_hash(__hash, _VSTD::forward<_Args>(__args)...);
         if (size()+1 > __bc * max_load_factor() || __bc == 0)
         {
-            __rehash_unique(_VSTD::max<size_type>(2 * __bc + !__is_hash_power2(__bc),
+            __rehash_unique(_VSTD::max<size_type>(2 * __bc + !std::__is_hash_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
+                           size_type(std::ceil(float(size() + 1) / max_load_factor()))));
             __bc = bucket_count();
-            __chash = __constrain_hash(__hash, __bc);
+            __chash = std::__constrain_hash(__hash, __bc);
         }
         // insert_after __bucket_list_[__chash], or __first_node if bucket is null
         __next_pointer __pn = __bucket_list_[__chash];
 @@ -2028,7 +2033,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique_key_args(_Key const&
             // fix up __bucket_list_
             __bucket_list_[__chash] = __pn;
             if (__h->__next_ != nullptr)
-                __bucket_list_[__constrain_hash(__h->__next_->__hash(), __bc)]
+                __bucket_list_[std::__constrain_hash(__h->__next_->__hash(), __bc)]
                     = __h.get()->__ptr();
         }
         else
 @@ -2224,7 +2229,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
     if (__n == 1)
         __n = 2;
     else if (__n & (__n - 1))
-        __n = __next_prime(__n);
+        __n = std::__next_prime(__n);
     size_type __bc = bucket_count();
     if (__n > __bc)
         __do_rehash<_UniqueKeys>(__n);
 @@ -2233,8 +2238,8 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
         __n = _VSTD::max<size_type>
               (
                   __n,
-                  __is_hash_power2(__bc) ? __next_hash_pow2(size_t(ceil(float(size()) / max_load_factor()))) :
+                  std::__is_hash_power2(__bc) ? std::__next_hash_pow2(size_t(std::ceil(float(size()) / max_load_factor()))) :
-                                           __next_prime(size_t(ceil(float(size()) / max_load_factor())))
+                                           std::__next_prime(size_t(std::ceil(float(size()) / max_load_factor())))
               );
         if (__n < __bc)
             __do_rehash<_UniqueKeys>(__n);
 @@ -2259,13 +2264,13 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__do_rehash(size_type __nbc)
         __next_pointer __cp = __pp->__next_;
         if (__cp != nullptr)
         {
-            size_type __chash = __constrain_hash(__cp->__hash(), __nbc);
+            size_type __chash = std::__constrain_hash(__cp->__hash(), __nbc);
             __bucket_list_[__chash] = __pp;
             size_type __phash = __chash;
             for (__pp = __cp, void(), __cp = __cp->__next_; __cp != nullptr;
                                                            __cp = __pp->__next_)
             {
-                __chash = __constrain_hash(__cp->__hash(), __nbc);
+                __chash = std::__constrain_hash(__cp->__hash(), __nbc);
                 if (__chash == __phash)
                     __pp = __cp;
                 else
 @@ -2279,7 +2284,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__do_rehash(size_type __nbc)
                     else
                     {
                         __next_pointer __np = __cp;
-                        if _LIBCPP_CONSTEXPR_AFTER_CXX14 (!_UniqueKeys)
+                        if _LIBCPP_CONSTEXPR_SINCE_CXX17 (!_UniqueKeys)
                         {
                             for (; __np->__next_ != nullptr &&
                                    key_eq()(__cp->__upcast()->__value_,
 @@ -2307,13 +2312,13 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k)
     size_type __bc = bucket_count();
     if (__bc != 0)
     {
-        size_t __chash = __constrain_hash(__hash, __bc);
+        size_t __chash = std::__constrain_hash(__hash, __bc);
         __next_pointer __nd = __bucket_list_[__chash];
         if (__nd != nullptr)
         {
             for (__nd = __nd->__next_; __nd != nullptr &&
                 (__nd->__hash() == __hash
-                  || __constrain_hash(__nd->__hash(), __bc) == __chash);
+                  || std::__constrain_hash(__nd->__hash(), __bc) == __chash);
                                                            __nd = __nd->__next_)
             {
                 if ((__nd->__hash() == __hash)
 @@ -2334,13 +2339,13 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k) const
     size_type __bc = bucket_count();
     if (__bc != 0)
     {
-        size_t __chash = __constrain_hash(__hash, __bc);
+        size_t __chash = std::__constrain_hash(__hash, __bc);
         __next_pointer __nd = __bucket_list_[__chash];
         if (__nd != nullptr)
         {
             for (__nd = __nd->__next_; __nd != nullptr &&
                 (__hash == __nd->__hash()
-                    || __constrain_hash(__nd->__hash(), __bc) == __chash);
+                    || std::__constrain_hash(__nd->__hash(), __bc) == __chash);
                                                            __nd = __nd->__next_)
             {
                 if ((__nd->__hash() == __hash)
 @@ -2462,7 +2467,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT
     // current node
     __next_pointer __cn = __p.__node_;
     size_type __bc = bucket_count();
-    size_t __chash = __constrain_hash(__cn->__hash(), __bc);
+    size_t __chash = std::__constrain_hash(__cn->__hash(), __bc);
     // find previous node
     __next_pointer __pn = __bucket_list_[__chash];
     for (; __pn->__next_ != __cn; __pn = __pn->__next_)
 @@ -2471,16 +2476,16 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT
         // if __pn is not in same bucket (before begin is not in same bucket) &&
         //    if __cn->__next_ is not in same bucket (nullptr is not in same bucket)
     if (__pn == __p1_.first().__ptr()
-            || __constrain_hash(__pn->__hash(), __bc) != __chash)
+            || std::__constrain_hash(__pn->__hash(), __bc) != __chash)
     {
         if (__cn->__next_ == nullptr
-            || __constrain_hash(__cn->__next_->__hash(), __bc) != __chash)
+            || std::__constrain_hash(__cn->__next_->__hash(), __bc) != __chash)
             __bucket_list_[__chash] = nullptr;
     }
         // if __cn->__next_ is not in same bucket (nullptr is in same bucket)
     if (__cn->__next_ != nullptr)
     {
-        size_t __nhash = __constrain_hash(__cn->__next_->__hash(), __bc);
+        size_t __nhash = std::__constrain_hash(__cn->__next_->__hash(), __bc);
         if (__nhash != __chash)
             __bucket_list_[__nhash] = __pn;
     }
 @@ -2634,10 +2639,10 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)
     __p2_.swap(__u.__p2_);
     __p3_.swap(__u.__p3_);
     if (size() > 0)
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
+        __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] =
             __p1_.first().__ptr();
     if (__u.size() > 0)
-        __u.__bucket_list_[__constrain_hash(__u.__p1_.first().__next_->__hash(), __u.bucket_count())] =
+        __u.__bucket_list_[std::__constrain_hash(__u.__p1_.first().__next_->__hash(), __u.bucket_count())] =
             __u.__p1_.first().__ptr();
     std::__debug_db_swap(this, std::addressof(__u));
 }
 @@ -2654,8 +2659,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::bucket_size(size_type __n) const
     if (__np != nullptr)
     {
         for (__np = __np->__next_; __np != nullptr &&
-                                   __constrain_hash(__np->__hash(), __bc) == __n;
+                                   std::__constrain_hash(__np->__hash(), __bc) == __n;
-                                                    __np = __np->__next_, (void) ++__r)
+                                                         __np = __np->__next_, (void) ++__r)
             ;
     }
     return __r;

lib/libcxx/include/__iterator/access.h+8-8

lib/libcxx/include/__iterator/advance.h+13-9

 @@ -11,16 +11,20 @@
 #define _LIBCPP___ITERATOR_ADVANCE_H
 #include <__assert>
+#include <__concepts/assignable.h>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 #include <__iterator/iterator_traits.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_integral.h>
+#include <__utility/convert_to_integral.h>
+#include <__utility/declval.h>
 #include <__utility/move.h>
 #include <__utility/unreachable.h>
-#include <concepts>
 #include <cstdlib>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -29,14 +33,14 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _InputIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 void __advance(_InputIter& __i, typename iterator_traits<_InputIter>::difference_type __n, input_iterator_tag) {
   for (; __n > 0; --__n)
     ++__i;
 }
 template <class _BiDirIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 void __advance(_BiDirIter& __i, typename iterator_traits<_BiDirIter>::difference_type __n, bidirectional_iterator_tag) {
   if (__n >= 0)
     for (; __n > 0; --__n)
 @@ -47,16 +51,16 @@ void __advance(_BiDirIter& __i, typename iterator_traits<_BiDirIter>::difference
 }
 template <class _RandIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 void __advance(_RandIter& __i, typename iterator_traits<_RandIter>::difference_type __n, random_access_iterator_tag) {
   __i += __n;
 }
 template <
     class _InputIter, class _Distance,
-    class _IntegralDistance = decltype(_VSTD::__convert_to_integral(declval<_Distance>())),
+    class _IntegralDistance = decltype(_VSTD::__convert_to_integral(std::declval<_Distance>())),
     class = __enable_if_t<is_integral<_IntegralDistance>::value> >
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 void advance(_InputIter& __i, _Distance __orig_n) {
   typedef typename iterator_traits<_InputIter>::difference_type _Difference;
   _Difference __n = static_cast<_Difference>(_VSTD::__convert_to_integral(__orig_n));
 @@ -65,7 +69,7 @@ void advance(_InputIter& __i, _Distance __orig_n) {
   _VSTD::__advance(__i, __n, typename iterator_traits<_InputIter>::iterator_category());
 }
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 // [range.iter.op.advance]
 @@ -192,7 +196,7 @@ inline namespace __cpo {
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__iterator/back_insert_iterator.h+9-8

 @@ -45,22 +45,23 @@ public:
     typedef void reference;
     typedef _Container container_type;
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit back_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit back_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 back_insert_iterator& operator=(const typename _Container::value_type& __value)
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator=(const typename _Container::value_type& __value)
         {container->push_back(__value); return *this;}
 #ifndef _LIBCPP_CXX03_LANG
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 back_insert_iterator& operator=(typename _Container::value_type&& __value)
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator=(typename _Container::value_type&& __value)
         {container->push_back(_VSTD::move(__value)); return *this;}
 #endif // _LIBCPP_CXX03_LANG
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 back_insert_iterator& operator*()     {return *this;}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 back_insert_iterator& operator++()    {return *this;}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 back_insert_iterator  operator++(int) {return *this;}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator  operator++(int) {return *this;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Container* __get_container() const { return container; }
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Container* __get_container() const { return container; }
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(back_insert_iterator);
 template <class _Container>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 back_insert_iterator<_Container>
 back_inserter(_Container& __x)
 {

lib/libcxx/include/__iterator/bounded_iter.h+17-15

 @@ -14,8 +14,10 @@
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__memory/pointer_traits.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/integral_constant.h>
+#include <__type_traits/is_convertible.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -73,7 +75,7 @@ private:
   //
   // Since it is non-standard for iterators to have this constructor, __bounded_iter must
   // be created via `std::__make_bounded_iter`.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 explicit __bounded_iter(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit __bounded_iter(
       _Iterator __current, _Iterator __begin, _Iterator __end)
       : __current_(__current), __begin_(__begin), __end_(__end) {
     _LIBCPP_ASSERT(__begin <= __end, "__bounded_iter(current, begin, end): [begin, end) is not a valid range");
 @@ -86,19 +88,19 @@ public:
   // Dereference and indexing operations.
   //
   // These operations check that the iterator is dereferenceable, that is within [begin, end).
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference operator*() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
     _LIBCPP_ASSERT(
         __in_bounds(__current_), "__bounded_iter::operator*: Attempt to dereference an out-of-range iterator");
     return *__current_;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 pointer operator->() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pointer operator->() const _NOEXCEPT {
     _LIBCPP_ASSERT(
         __in_bounds(__current_), "__bounded_iter::operator->: Attempt to dereference an out-of-range iterator");
     return std::__to_address(__current_);
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference operator[](difference_type __n) const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator[](difference_type __n) const _NOEXCEPT {
     _LIBCPP_ASSERT(
         __in_bounds(__current_ + __n), "__bounded_iter::operator[]: Attempt to index an iterator out-of-range");
     return __current_[__n];
 @@ -108,54 +110,54 @@ public:
   //
   // These operations do not check that the resulting iterator is within the bounds, since that
   // would make it impossible to create a past-the-end iterator.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter& operator++() _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter& operator++() _NOEXCEPT {
     ++__current_;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter operator++(int) _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter operator++(int) _NOEXCEPT {
     __bounded_iter __tmp(*this);
     ++*this;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter& operator--() _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter& operator--() _NOEXCEPT {
     --__current_;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter operator--(int) _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter operator--(int) _NOEXCEPT {
     __bounded_iter __tmp(*this);
     --*this;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter& operator+=(difference_type __n) _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter& operator+=(difference_type __n) _NOEXCEPT {
     __current_ += __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 friend __bounded_iter
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator+(__bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp += __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 friend __bounded_iter
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator+(difference_type __n, __bounded_iter const& __self) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp += __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __bounded_iter& operator-=(difference_type __n) _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __bounded_iter& operator-=(difference_type __n) _NOEXCEPT {
     __current_ -= __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 friend __bounded_iter
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator-(__bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp -= __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 friend difference_type
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend difference_type
   operator-(__bounded_iter const& __x, __bounded_iter const& __y) _NOEXCEPT {
     return __x.__current_ - __y.__current_;
   }

lib/libcxx/include/__iterator/common_iterator.h+25-14

 @@ -11,6 +11,13 @@
 #define _LIBCPP___ITERATOR_COMMON_ITERATOR_H
 #include <__assert>
+#include <__concepts/assignable.h>
+#include <__concepts/constructible.h>
+#include <__concepts/convertible_to.h>
+#include <__concepts/copyable.h>
+#include <__concepts/derived_from.h>
+#include <__concepts/equality_comparable.h>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 @@ -18,7 +25,8 @@
 #include <__iterator/iter_swap.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
-#include <concepts>
+#include <__type_traits/is_pointer.h>
+#include <__utility/declval.h>
 #include <variant>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -95,14 +103,14 @@ public:
   constexpr decltype(auto) operator*()
   {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
     return *_VSTD::__unchecked_get<_Iter>(__hold_);
   }
   constexpr decltype(auto) operator*() const
     requires __dereferenceable<const _Iter>
   {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
     return *_VSTD::__unchecked_get<_Iter>(__hold_);
   }
 @@ -113,7 +121,7 @@ public:
      is_reference_v<iter_reference_t<_I2>> ||
      constructible_from<iter_value_t<_I2>, iter_reference_t<_I2>>)
   {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
     if constexpr (is_pointer_v<_Iter> || requires(const _Iter& __i) { __i.operator->(); })    {
       return _VSTD::__unchecked_get<_Iter>(__hold_);
     } else if constexpr (is_reference_v<iter_reference_t<_Iter>>) {
 @@ -125,12 +133,12 @@ public:
   }
   common_iterator& operator++() {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__hold_), "Attempted to increment a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__hold_), "Attempted to increment a non-dereferenceable common_iterator");
     ++_VSTD::__unchecked_get<_Iter>(__hold_); return *this;
   }
   decltype(auto) operator++(int) {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__hold_), "Attempted to increment a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__hold_), "Attempted to increment a non-dereferenceable common_iterator");
     if constexpr (forward_iterator<_Iter>) {
       auto __tmp = *this;
       ++*this;
 @@ -147,6 +155,7 @@ public:
   template<class _I2, sentinel_for<_Iter> _S2>
     requires sentinel_for<_Sent, _I2>
+  _LIBCPP_HIDE_FROM_ABI
   friend constexpr bool operator==(const common_iterator& __x, const common_iterator<_I2, _S2>& __y) {
     _LIBCPP_ASSERT(!__x.__hold_.valueless_by_exception(), "Attempted to compare a valueless common_iterator");
     _LIBCPP_ASSERT(!__y.__hold_.valueless_by_exception(), "Attempted to compare a valueless common_iterator");
 @@ -165,6 +174,7 @@ public:
   template<class _I2, sentinel_for<_Iter> _S2>
     requires sentinel_for<_Sent, _I2> && equality_comparable_with<_Iter, _I2>
+  _LIBCPP_HIDE_FROM_ABI
   friend constexpr bool operator==(const common_iterator& __x, const common_iterator<_I2, _S2>& __y) {
     _LIBCPP_ASSERT(!__x.__hold_.valueless_by_exception(), "Attempted to compare a valueless common_iterator");
     _LIBCPP_ASSERT(!__y.__hold_.valueless_by_exception(), "Attempted to compare a valueless common_iterator");
 @@ -186,6 +196,7 @@ public:
   template<sized_sentinel_for<_Iter> _I2, sized_sentinel_for<_Iter> _S2>
     requires sized_sentinel_for<_Sent, _I2>
+  _LIBCPP_HIDE_FROM_ABI
   friend constexpr iter_difference_t<_I2> operator-(const common_iterator& __x, const common_iterator<_I2, _S2>& __y) {
     _LIBCPP_ASSERT(!__x.__hold_.valueless_by_exception(), "Attempted to subtract from a valueless common_iterator");
     _LIBCPP_ASSERT(!__y.__hold_.valueless_by_exception(), "Attempted to subtract a valueless common_iterator");
 @@ -205,20 +216,20 @@ public:
     return _VSTD::__unchecked_get<_Sent>(__x.__hold_) - _VSTD::__unchecked_get<_I2>(__y.__hold_);
   }
-  friend constexpr iter_rvalue_reference_t<_Iter> iter_move(const common_iterator& __i)
+  _LIBCPP_HIDE_FROM_ABI friend constexpr iter_rvalue_reference_t<_Iter> iter_move(const common_iterator& __i)
-    noexcept(noexcept(ranges::iter_move(declval<const _Iter&>())))
+    noexcept(noexcept(ranges::iter_move(std::declval<const _Iter&>())))
       requires input_iterator<_Iter>
   {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__i.__hold_), "Attempted to iter_move a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__i.__hold_), "Attempted to iter_move a non-dereferenceable common_iterator");
     return ranges::iter_move( _VSTD::__unchecked_get<_Iter>(__i.__hold_));
   }
   template<indirectly_swappable<_Iter> _I2, class _S2>
-  friend constexpr void iter_swap(const common_iterator& __x, const common_iterator<_I2, _S2>& __y)
+  _LIBCPP_HIDE_FROM_ABI friend constexpr void iter_swap(const common_iterator& __x, const common_iterator<_I2, _S2>& __y)
-      noexcept(noexcept(ranges::iter_swap(declval<const _Iter&>(), declval<const _I2&>())))
+      noexcept(noexcept(ranges::iter_swap(std::declval<const _Iter&>(), std::declval<const _I2&>())))
   {
-    _LIBCPP_ASSERT(holds_alternative<_Iter>(__x.__hold_), "Attempted to iter_swap a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_Iter>(__x.__hold_), "Attempted to iter_swap a non-dereferenceable common_iterator");
-    _LIBCPP_ASSERT(holds_alternative<_I2>(__y.__hold_), "Attempted to iter_swap a non-dereferenceable common_iterator");
+    _LIBCPP_ASSERT(std::holds_alternative<_I2>(__y.__hold_), "Attempted to iter_swap a non-dereferenceable common_iterator");
     return ranges::iter_swap(_VSTD::__unchecked_get<_Iter>(__x.__hold_), _VSTD::__unchecked_get<_I2>(__y.__hold_));
   }
 };
 @@ -246,7 +257,7 @@ struct __arrow_type_or_void {
 template<class _Iter, class _Sent>
   requires __common_iter_has_ptr_op<_Iter, _Sent>
 struct __arrow_type_or_void<_Iter, _Sent> {
-    using type = decltype(declval<const common_iterator<_Iter, _Sent>&>().operator->());
+    using type = decltype(std::declval<const common_iterator<_Iter, _Sent>&>().operator->());
 };
 template<input_iterator _Iter, class _Sent>

lib/libcxx/include/__iterator/concepts.h+22-2

...	@@ -10,15 +10,35 @@	...	@@ -10,15 +10,35 @@
10	#ifndef _LIBCPP___ITERATOR_CONCEPTS_H	10	#ifndef _LIBCPP___ITERATOR_CONCEPTS_H
11	#define _LIBCPP___ITERATOR_CONCEPTS_H	11	#define _LIBCPP___ITERATOR_CONCEPTS_H
12		12
		13	#include <__concepts/arithmetic.h>
		14	#include <__concepts/assignable.h>
		15	#include <__concepts/common_reference_with.h>
		16	#include <__concepts/constructible.h>
		17	#include <__concepts/copyable.h>
		18	#include <__concepts/derived_from.h>
		19	#include <__concepts/equality_comparable.h>
		20	#include <__concepts/invocable.h>
		21	#include <__concepts/movable.h>
		22	#include <__concepts/predicate.h>
		23	#include <__concepts/regular.h>
		24	#include <__concepts/relation.h>
		25	#include <__concepts/same_as.h>
		26	#include <__concepts/semiregular.h>
		27	#include <__concepts/totally_ordered.h>
13	#include <__config>	28	#include <__config>
		29	#include <__functional/invoke.h>
14	#include <__iterator/incrementable_traits.h>	30	#include <__iterator/incrementable_traits.h>
15	#include <__iterator/iter_move.h>	31	#include <__iterator/iter_move.h>
16	#include <__iterator/iterator_traits.h>	32	#include <__iterator/iterator_traits.h>
17	#include <__iterator/readable_traits.h>	33	#include <__iterator/readable_traits.h>
18	#include <__memory/pointer_traits.h>	34	#include <__memory/pointer_traits.h>
		35	#include <__type_traits/add_pointer.h>
		36	#include <__type_traits/common_reference.h>
		37	#include <__type_traits/is_pointer.h>
		38	#include <__type_traits/is_reference.h>
		39	#include <__type_traits/remove_cv.h>
		40	#include <__type_traits/remove_cvref.h>
19	#include <__utility/forward.h>	41	#include <__utility/forward.h>
20	#include <concepts>
21	#include <type_traits>
22		42
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	43	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
24	# pragma GCC system_header	44	# pragma GCC system_header

lib/libcxx/include/__iterator/counted_iterator.h+10-3

 @@ -6,10 +6,16 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
 #define _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
 #include <__assert>
+#include <__concepts/assignable.h>
+#include <__concepts/common_with.h>
+#include <__concepts/constructible.h>
+#include <__concepts/convertible_to.h>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/default_sentinel.h>
 @@ -19,10 +25,10 @@
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
 #include <__memory/pointer_traits.h>
+#include <__type_traits/add_pointer.h>
+#include <__type_traits/conditional.h>
 #include <__utility/move.h>
 #include <compare>
-#include <concepts>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -263,7 +269,7 @@ public:
   }
   template<common_with<_Iter> _I2>
-  friend constexpr strong_ordering operator<=>(
+  _LIBCPP_HIDE_FROM_ABI friend constexpr strong_ordering operator<=>(
     const counted_iterator& __lhs, const counted_iterator<_I2>& __rhs)
   {
     return __rhs.__count_ <=> __lhs.__count_;
 @@ -288,6 +294,7 @@ public:
     return ranges::iter_swap(__x.__current_, __y.__current_);
   }
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(counted_iterator);
 template<input_iterator _Iter>
   requires same_as<_ITER_TRAITS<_Iter>, iterator_traits<_Iter>>

lib/libcxx/include/__iterator/distance.h+8-7

...	@@ -17,7 +17,8 @@	...	@@ -17,7 +17,8 @@
17	#include <__ranges/access.h>	17	#include <__ranges/access.h>
18	#include <__ranges/concepts.h>	18	#include <__ranges/concepts.h>
19	#include <__ranges/size.h>	19	#include <__ranges/size.h>
20	#include <type_traits>	20	#include <__type_traits/decay.h>
		21	#include <__type_traits/remove_cvref.h>
21		22
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	24	# pragma GCC system_header
...	@@ -26,7 +27,7 @@	...	@@ -26,7 +27,7 @@
26	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
27		28
28	template <class _InputIter>	29	template <class _InputIter>
29	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	30	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
30	typename iterator_traits<_InputIter>::difference_type	31	typename iterator_traits<_InputIter>::difference_type
31	__distance(_InputIter __first, _InputIter __last, input_iterator_tag)	32	__distance(_InputIter __first, _InputIter __last, input_iterator_tag)
32	{	33	{
...	@@ -37,7 +38,7 @@ __distance(_InputIter __first, _InputIter __last, input_iterator_tag)	...	@@ -37,7 +38,7 @@ __distance(_InputIter __first, _InputIter __last, input_iterator_tag)
37	}	38	}
38		39
39	template <class _RandIter>	40	template <class _RandIter>
40	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	41	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
41	typename iterator_traits<_RandIter>::difference_type	42	typename iterator_traits<_RandIter>::difference_type
42	__distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)	43	__distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)
43	{	44	{
...	@@ -45,14 +46,14 @@ __distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)	...	@@ -45,14 +46,14 @@ __distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)
45	}	46	}
46		47
47	template <class _InputIter>	48	template <class _InputIter>
48	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	49	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
49	typename iterator_traits<_InputIter>::difference_type	50	typename iterator_traits<_InputIter>::difference_type
50	distance(_InputIter __first, _InputIter __last)	51	distance(_InputIter __first, _InputIter __last)
51	{	52	{
52	return _VSTD::__distance(__first, __last, typename iterator_traits<_InputIter>::iterator_category());	53	return _VSTD::__distance(__first, __last, typename iterator_traits<_InputIter>::iterator_category());
53	}	54	}
54		55
55	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	56	#if _LIBCPP_STD_VER > 17
56		57
57	// [range.iter.op.distance]	58	// [range.iter.op.distance]
58		59
...	@@ -75,7 +76,7 @@ struct __fn {	...	@@ -75,7 +76,7 @@ struct __fn {
75	template<class _Ip, sized_sentinel_for<decay_t<_Ip>> _Sp>	76	template<class _Ip, sized_sentinel_for<decay_t<_Ip>> _Sp>
76	_LIBCPP_HIDE_FROM_ABI	77	_LIBCPP_HIDE_FROM_ABI
77	constexpr iter_difference_t<_Ip> operator()(_Ip&& __first, _Sp __last) const {	78	constexpr iter_difference_t<_Ip> operator()(_Ip&& __first, _Sp __last) const {
78	if constexpr (sized_sentinel_for<_Sp, __uncvref_t<_Ip>>) {	79	if constexpr (sized_sentinel_for<_Sp, __remove_cvref_t<_Ip>>) {
79	return __last - __first;	80	return __last - __first;
80	} else {	81	} else {
81	return __last - decay_t<_Ip>(__first);	82	return __last - decay_t<_Ip>(__first);
...	@@ -100,7 +101,7 @@ inline namespace __cpo {	...	@@ -100,7 +101,7 @@ inline namespace __cpo {
100	} // namespace __cpo	101	} // namespace __cpo
101	} // namespace ranges	102	} // namespace ranges
102		103
103	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	104	#endif // _LIBCPP_STD_VER > 17
104		105
105	_LIBCPP_END_NAMESPACE_STD	106	_LIBCPP_END_NAMESPACE_STD
106		107

lib/libcxx/include/__iterator/front_insert_iterator.h+8-7

 @@ -45,20 +45,21 @@ public:
     typedef void reference;
     typedef _Container container_type;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit front_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit front_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 front_insert_iterator& operator=(const typename _Container::value_type& __value)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator=(const typename _Container::value_type& __value)
         {container->push_front(__value); return *this;}
 #ifndef _LIBCPP_CXX03_LANG
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 front_insert_iterator& operator=(typename _Container::value_type&& __value)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator=(typename _Container::value_type&& __value)
         {container->push_front(_VSTD::move(__value)); return *this;}
 #endif // _LIBCPP_CXX03_LANG
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 front_insert_iterator& operator*()     {return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 front_insert_iterator& operator++()    {return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 front_insert_iterator  operator++(int) {return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator  operator++(int) {return *this;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(front_insert_iterator);
 template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 front_insert_iterator<_Container>
 front_inserter(_Container& __x)
 {

lib/libcxx/include/__iterator/incrementable_traits.h+7-3

 @@ -10,11 +10,15 @@
 #ifndef _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
 #define _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
+#include <__concepts/arithmetic.h>
 #include <__config>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_object.h>
 #include <__type_traits/is_primary_template.h>
-#include <concepts>
+#include <__type_traits/make_signed.h>
+#include <__type_traits/remove_cvref.h>
+#include <__utility/declval.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -53,7 +57,7 @@ concept __has_integral_minus =
 template<__has_integral_minus _Tp>
 requires (!__has_member_difference_type<_Tp>)
 struct incrementable_traits<_Tp> {
-  using difference_type = make_signed_t<decltype(declval<_Tp>() - declval<_Tp>())>;
+  using difference_type = make_signed_t<decltype(std::declval<_Tp>() - std::declval<_Tp>())>;
 };
 template <class>

lib/libcxx/include/__iterator/insert_iterator.h+8-8

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28	template <class _Container>	28	template <class _Container>
29	using __insert_iterator_iter_t = ranges::iterator_t<_Container>;	29	using __insert_iterator_iter_t = ranges::iterator_t<_Container>;
30	#else	30	#else
...	@@ -55,21 +55,21 @@ public:	...	@@ -55,21 +55,21 @@ public:
55	typedef void reference;	55	typedef void reference;
56	typedef _Container container_type;	56	typedef _Container container_type;
57		57
58	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator(_Container& __x, __insert_iterator_iter_t<_Container> __i)	58	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator(_Container& __x, __insert_iterator_iter_t<_Container> __i)
59	: container(_VSTD::addressof(__x)), iter(__i) {}	59	: container(_VSTD::addressof(__x)), iter(__i) {}
60	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator& operator=(const typename _Container::value_type& __value)	60	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator=(const typename _Container::value_type& __value)
61	{iter = container->insert(iter, __value); ++iter; return *this;}	61	{iter = container->insert(iter, __value); ++iter; return *this;}
62	#ifndef _LIBCPP_CXX03_LANG	62	#ifndef _LIBCPP_CXX03_LANG
63	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator& operator=(typename _Container::value_type&& __value)	63	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator=(typename _Container::value_type&& __value)
64	{iter = container->insert(iter, _VSTD::move(__value)); ++iter; return *this;}	64	{iter = container->insert(iter, _VSTD::move(__value)); ++iter; return *this;}
65	#endif // _LIBCPP_CXX03_LANG	65	#endif // _LIBCPP_CXX03_LANG
66	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator& operator() {return this;}	66	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator() {return this;}
67	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator& operator++() {return *this;}	67	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++() {return *this;}
68	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 insert_iterator& operator++(int) {return *this;}	68	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++(int) {return *this;}
69	};	69	};
70		70
71	template <class _Container>	71	template <class _Container>
72	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	72	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
73	insert_iterator<_Container>	73	insert_iterator<_Container>
74	inserter(_Container& __x, __insert_iterator_iter_t<_Container> __i)	74	inserter(_Container& __x, __insert_iterator_iter_t<_Container> __i)
75	{	75	{

lib/libcxx/include/__iterator/iter_move.h+7-2

...	@@ -13,9 +13,11 @@	...	@@ -13,9 +13,11 @@
13	#include <__concepts/class_or_enum.h>	13	#include <__concepts/class_or_enum.h>
14	#include <__config>	14	#include <__config>
15	#include <__iterator/iterator_traits.h>	15	#include <__iterator/iterator_traits.h>
		16	#include <__type_traits/is_reference.h>
		17	#include <__type_traits/remove_cvref.h>
		18	#include <__utility/declval.h>
16	#include <__utility/forward.h>	19	#include <__utility/forward.h>
17	#include <__utility/move.h>	20	#include <__utility/move.h>
18	#include <type_traits>
19		21
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header	23	# pragma GCC system_header
...	@@ -36,6 +38,7 @@ template <class _Tp>	...	@@ -36,6 +38,7 @@ template <class _Tp>
36	concept __unqualified_iter_move =	38	concept __unqualified_iter_move =
37	__class_or_enum<remove_cvref_t<_Tp>> &&	39	__class_or_enum<remove_cvref_t<_Tp>> &&
38	requires (_Tp&& __t) {	40	requires (_Tp&& __t) {
		41	// NOLINTNEXTLINE(libcpp-robust-against-adl) iter_swap ADL calls should only be made through ranges::iter_swap
39	iter_move(std::forward<_Tp>(__t));	42	iter_move(std::forward<_Tp>(__t));
40	};	43	};
41		44
...	@@ -59,6 +62,7 @@ concept __just_deref =	...	@@ -59,6 +62,7 @@ concept __just_deref =
59	// [iterator.cust.move]	62	// [iterator.cust.move]
60		63
61	struct __fn {	64	struct __fn {
		65	// NOLINTBEGIN(libcpp-robust-against-adl) iter_move ADL calls should only be made through ranges::iter_move
62	template<class _Ip>	66	template<class _Ip>
63	requires __unqualified_iter_move<_Ip>	67	requires __unqualified_iter_move<_Ip>
64	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Ip&& __i) const	68	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Ip&& __i) const
...	@@ -66,6 +70,7 @@ struct __fn {	...	@@ -66,6 +70,7 @@ struct __fn {
66	{	70	{
67	return iter_move(std::forward<_Ip>(__i));	71	return iter_move(std::forward<_Ip>(__i));
68	}	72	}
		73	// NOLINTEND(libcpp-robust-against-adl)
69		74
70	template<class _Ip>	75	template<class _Ip>
71	requires __move_deref<_Ip>	76	requires __move_deref<_Ip>
...	@@ -90,7 +95,7 @@ inline namespace __cpo {	...	@@ -90,7 +95,7 @@ inline namespace __cpo {
90		95
91	template<__dereferenceable _Tp>	96	template<__dereferenceable _Tp>
92	requires requires(_Tp& __t) { { ranges::iter_move(__t) } -> __can_reference; }	97	requires requires(_Tp& __t) { { ranges::iter_move(__t) } -> __can_reference; }
93	using iter_rvalue_reference_t = decltype(ranges::iter_move(declval<_Tp&>()));	98	using iter_rvalue_reference_t = decltype(ranges::iter_move(std::declval<_Tp&>()));
94		99
95	#endif // _LIBCPP_STD_VER > 17	100	#endif // _LIBCPP_STD_VER > 17
96		101

lib/libcxx/include/__iterator/iter_swap.h+10-3

 @@ -6,18 +6,21 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___ITERATOR_ITER_SWAP_H
 #define _LIBCPP___ITERATOR_ITER_SWAP_H
+#include <__concepts/class_or_enum.h>
+#include <__concepts/swappable.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/iter_move.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
+#include <__type_traits/remove_cvref.h>
+#include <__utility/declval.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <concepts>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -38,6 +41,7 @@ namespace __iter_swap {
   concept __unqualified_iter_swap =
     (__class_or_enum<remove_cvref_t<_T1>> || __class_or_enum<remove_cvref_t<_T2>>) &&
     requires (_T1&& __x, _T2&& __y) {
+      // NOLINTNEXTLINE(libcpp-robust-against-adl) iter_swap ADL calls should only be made through ranges::iter_swap
       iter_swap(_VSTD::forward<_T1>(__x), _VSTD::forward<_T2>(__y));
     };
 @@ -46,7 +50,9 @@ namespace __iter_swap {
     indirectly_readable<_T1> && indirectly_readable<_T2> &&
     swappable_with<iter_reference_t<_T1>, iter_reference_t<_T2>>;
   struct __fn {
+    // NOLINTBEGIN(libcpp-robust-against-adl) iter_swap ADL calls should only be made through ranges::iter_swap
     template <class _T1, class _T2>
       requires __unqualified_iter_swap<_T1, _T2>
     _LIBCPP_HIDE_FROM_ABI
 @@ -55,6 +61,7 @@ namespace __iter_swap {
     {
       (void)iter_swap(_VSTD::forward<_T1>(__x), _VSTD::forward<_T2>(__y));
     }
+    // NOLINTEND(libcpp-robust-against-adl)
     template <class _T1, class _T2>
       requires (!__unqualified_iter_swap<_T1, _T2>) &&
 @@ -75,7 +82,7 @@ namespace __iter_swap {
     constexpr void operator()(_T1&& __x, _T2&& __y) const
       noexcept(noexcept(iter_value_t<_T2>(ranges::iter_move(__y))) &&
                noexcept(*__y = ranges::iter_move(__x)) &&
-               noexcept(*_VSTD::forward<_T1>(__x) = declval<iter_value_t<_T2>>()))
+               noexcept(*_VSTD::forward<_T1>(__x) = std::declval<iter_value_t<_T2>>()))
     {
       iter_value_t<_T2> __old(ranges::iter_move(__y));
       *__y = ranges::iter_move(__x);

lib/libcxx/include/__iterator/iterator_traits.h+31-11

 @@ -10,12 +10,32 @@
 #ifndef _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
 #define _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
+#include <__concepts/arithmetic.h>
+#include <__concepts/constructible.h>
+#include <__concepts/convertible_to.h>
+#include <__concepts/copyable.h>
+#include <__concepts/equality_comparable.h>
+#include <__concepts/same_as.h>
+#include <__concepts/totally_ordered.h>
 #include <__config>
+#include <__fwd/pair.h>
 #include <__iterator/incrementable_traits.h>
 #include <__iterator/readable_traits.h>
-#include <concepts>
+#include <__type_traits/add_const.h>
+#include <__type_traits/common_reference.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/disjunction.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_object.h>
+#include <__type_traits/is_primary_template.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/is_valid_expansion.h>
+#include <__type_traits/remove_const.h>
+#include <__type_traits/remove_cv.h>
+#include <__type_traits/remove_cvref.h>
+#include <__type_traits/void_t.h>
+#include <__utility/declval.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -40,7 +60,7 @@ concept __dereferenceable = requires(_Tp& __t) {
 // [iterator.traits]
 template<__dereferenceable _Tp>
-using iter_reference_t = decltype(*declval<_Tp&>());
+using iter_reference_t = decltype(*std::declval<_Tp&>());
 #endif // _LIBCPP_STD_VER > 17
 @@ -107,11 +127,11 @@ struct __has_iterator_typedefs
 {
 private:
     template <class _Up> static false_type __test(...);
-    template <class _Up> static true_type __test(typename __void_t<typename _Up::iterator_category>::type* = 0,
+    template <class _Up> static true_type __test(__void_t<typename _Up::iterator_category>* = nullptr,
-                                                 typename __void_t<typename _Up::difference_type>::type* = 0,
+                                                 __void_t<typename _Up::difference_type>* = nullptr,
-                                                 typename __void_t<typename _Up::value_type>::type* = 0,
+                                                 __void_t<typename _Up::value_type>* = nullptr,
-                                                 typename __void_t<typename _Up::reference>::type* = 0,
+                                                 __void_t<typename _Up::reference>* = nullptr,
-                                                 typename __void_t<typename _Up::pointer>::type* = 0);
+                                                 __void_t<typename _Up::pointer>* = nullptr);
 public:
     static const bool value = decltype(__test<_Tp>(0,0,0,0,0))::value;
 };
 @@ -253,7 +273,7 @@ struct __iterator_traits_member_pointer_or_arrow_or_void<_Ip> { using type = typ
 template<class _Ip>
   requires requires(_Ip& __i) { __i.operator->(); } && (!__has_member_pointer<_Ip>)
 struct __iterator_traits_member_pointer_or_arrow_or_void<_Ip> {
-  using type = decltype(declval<_Ip&>().operator->());
+  using type = decltype(std::declval<_Ip&>().operator->());
 };
 // Otherwise, `reference` names `iter-reference-t<I>`.
 @@ -407,7 +427,7 @@ requires is_object_v<_Tp>
 struct _LIBCPP_TEMPLATE_VIS iterator_traits<_Tp*>
 {
     typedef ptrdiff_t difference_type;
-    typedef typename remove_cv<_Tp>::type value_type;
+    typedef __remove_cv_t<_Tp> value_type;
     typedef _Tp* pointer;
     typedef _Tp& reference;
     typedef random_access_iterator_tag iterator_category;
 @@ -492,7 +512,7 @@ template<class _InputIterator>
 using __iter_value_type = typename iterator_traits<_InputIterator>::value_type;
 template<class _InputIterator>
-using __iter_key_type = typename remove_const<typename iterator_traits<_InputIterator>::value_type::first_type>::type;
+using __iter_key_type = __remove_const_t<typename iterator_traits<_InputIterator>::value_type::first_type>;
 template<class _InputIterator>
 using __iter_mapped_type = typename iterator_traits<_InputIterator>::value_type::second_type;

lib/libcxx/include/__iterator/iterator_with_data.h created+100

...	@@ -0,0 +1,100 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H
10	#define _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H
11
12	#include <__compare/compare_three_way_result.h>
13	#include <__compare/three_way_comparable.h>
14	#include <__config>
15	#include <__iterator/concepts.h>
16	#include <__iterator/incrementable_traits.h>
17	#include <__iterator/iter_move.h>
18	#include <__iterator/iter_swap.h>
19	#include <__iterator/iterator_traits.h>
20	#include <__iterator/readable_traits.h>
21	#include <__utility/move.h>
22
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
24	# pragma GCC system_header
25	#endif
26
27	#if _LIBCPP_STD_VER >= 20
28
29	_LIBCPP_BEGIN_NAMESPACE_STD
30
31	template <forward_iterator _Iterator, class _Data>
32	class __iterator_with_data {
33	_Iterator __iter_{};
34	_Data __data_{};
35
36	public:
37	using value_type = iter_value_t<_Iterator>;
38	using difference_type = iter_difference_t<_Iterator>;
39
40	_LIBCPP_HIDE_FROM_ABI __iterator_with_data() = default;
41
42	constexpr _LIBCPP_HIDE_FROM_ABI __iterator_with_data(_Iterator __iter, _Data __data)
43	: __iter_(std::move(__iter)), __data_(std::move(__data)) {}
44
45	constexpr _LIBCPP_HIDE_FROM_ABI _Iterator __get_iter() const { return __iter_; }
46
47	constexpr _LIBCPP_HIDE_FROM_ABI _Data __get_data() && { return std::move(__data_); }
48
49	friend constexpr _LIBCPP_HIDE_FROM_ABI bool
50	operator==(const __iterator_with_data& __lhs, const __iterator_with_data& __rhs) {
51	return __lhs.__iter_ == __rhs.__iter_;
52	}
53
54	constexpr _LIBCPP_HIDE_FROM_ABI __iterator_with_data& operator++() {
55	++__iter_;
56	return *this;
57	}
58
59	constexpr _LIBCPP_HIDE_FROM_ABI __iterator_with_data operator++(int) {
60	auto __tmp = *this;
61	__iter_++;
62	return __tmp;
63	}
64
65	constexpr _LIBCPP_HIDE_FROM_ABI __iterator_with_data& operator--()
66	requires bidirectional_iterator<_Iterator>
67	{
68	--__iter_;
69	return *this;
70	}
71
72	constexpr _LIBCPP_HIDE_FROM_ABI __iterator_with_data operator--(int)
73	requires bidirectional_iterator<_Iterator>
74	{
75	auto __tmp = *this;
76	--__iter_;
77	return __tmp;
78	}
79
80	constexpr _LIBCPP_HIDE_FROM_ABI iter_reference_t<_Iterator> operator() const { return __iter_; }
81
82	_LIBCPP_HIDE_FROM_ABI friend constexpr iter_rvalue_reference_t<_Iterator>
83	iter_move(const __iterator_with_data& __iter) noexcept(noexcept(ranges::iter_move(__iter.__iter_))) {
84	return ranges::iter_move(__iter.__iter_);
85	}
86
87	_LIBCPP_HIDE_FROM_ABI friend constexpr void
88	iter_swap(const __iterator_with_data& __lhs,
89	const __iterator_with_data& __rhs) noexcept(noexcept(ranges::iter_swap(__lhs.__iter_, __rhs.__iter_)))
90	requires indirectly_swappable<_Iterator>
91	{
92	return ranges::iter_swap(__lhs.__data_, __rhs.__iter_);
93	}
94	};
95
96	_LIBCPP_END_NAMESPACE_STD
97
98	#endif // _LIBCPP_STD_VER >= 20
99
100	#endif // _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H

lib/libcxx/include/__iterator/move_iterator.h+37-28

 @@ -24,8 +24,16 @@
 #include <__iterator/iterator_traits.h>
 #include <__iterator/move_sentinel.h>
 #include <__iterator/readable_traits.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/remove_reference.h>
+#include <__utility/declval.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -49,7 +57,7 @@ struct __move_iter_category_base<_Iter> {
 template<class _Iter, class _Sent>
 concept __move_iter_comparable = requires {
-    { declval<const _Iter&>() == declval<_Sent>() } -> convertible_to<bool>;
+    { std::declval<const _Iter&>() == std::declval<_Sent>() } -> convertible_to<bool>;
 };
 #endif // _LIBCPP_STD_VER > 17
 @@ -82,18 +90,18 @@ public:
     typedef typename iterator_traits<iterator_type>::reference __reference;
     typedef typename conditional<
             is_reference<__reference>::value,
-            typename remove_reference<__reference>::type&&,
+            __libcpp_remove_reference_t<__reference>&&,
             __reference
         >::type reference;
 #endif // _LIBCPP_STD_VER > 17
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     explicit move_iterator(_Iter __i) : __current_(std::move(__i)) {}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator& operator++() { ++__current_; return *this; }
-    _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     pointer operator->() const { return __current_; }
 #if _LIBCPP_STD_VER > 17
 @@ -133,13 +141,13 @@ public:
     _LIBCPP_HIDE_FROM_ABI constexpr
     void operator++(int) { ++__current_; }
 #else
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator() : __current_() {}
     template <class _Up, class = __enable_if_t<
         !is_same<_Up, _Iter>::value && is_convertible<const _Up&, _Iter>::value
     > >
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator(const move_iterator<_Up>& __u) : __current_(__u.base()) {}
     template <class _Up, class = __enable_if_t<
 @@ -147,35 +155,35 @@ public:
         is_convertible<const _Up&, _Iter>::value &&
         is_assignable<_Iter&, const _Up&>::value
     > >
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator& operator=(const move_iterator<_Up>& __u) {
         __current_ = __u.base();
         return *this;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     _Iter base() const { return __current_; }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator*() const { return static_cast<reference>(*__current_); }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator[](difference_type __n) const { return static_cast<reference>(__current_[__n]); }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator operator++(int) { move_iterator __tmp(*this); ++__current_; return __tmp; }
 #endif // _LIBCPP_STD_VER > 17
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator& operator--() { --__current_; return *this; }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator operator--(int) { move_iterator __tmp(*this); --__current_; return __tmp; }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator operator+(difference_type __n) const { return move_iterator(__current_ + __n); }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator& operator+=(difference_type __n) { __current_ += __n; return *this; }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator operator-(difference_type __n) const { return move_iterator(__current_ - __n); }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
     move_iterator& operator-=(difference_type __n) { __current_ -= __n; return *this; }
 #if _LIBCPP_STD_VER > 17
 @@ -222,9 +230,10 @@ private:
     _Iter __current_;
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(move_iterator);
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() == __y.base();
 @@ -232,7 +241,7 @@ bool operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& _
 #if _LIBCPP_STD_VER <= 17
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() != __y.base();
 @@ -240,28 +249,28 @@ bool operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& _
 #endif // _LIBCPP_STD_VER <= 17
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator<(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() < __y.base();
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() > __y.base();
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() <= __y.base();
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool operator>=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
 {
     return __x.base() >= __y.base();
 @@ -279,7 +288,7 @@ auto operator<=>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>&
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 auto operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
     -> decltype(__x.base() - __y.base())
 {
 @@ -305,7 +314,7 @@ move_iterator<_Iter> operator+(iter_difference_t<_Iter> __n, const move_iterator
 }
 #else
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 move_iterator<_Iter>
 operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x)
 {
 @@ -314,7 +323,7 @@ operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterato
 #endif // _LIBCPP_STD_VER > 17
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
 move_iterator<_Iter>
 make_move_iterator(_Iter __i)
 {

lib/libcxx/include/__iterator/move_sentinel.h+2

...	@@ -50,6 +50,8 @@ private:	...	@@ -50,6 +50,8 @@ private:
50	_Sent __last_ = _Sent();	50	_Sent __last_ = _Sent();
51	};	51	};
52		52
		53	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(move_sentinel);
		54
53	#endif // _LIBCPP_STD_VER > 17	55	#endif // _LIBCPP_STD_VER > 17
54		56
55	_LIBCPP_END_NAMESPACE_STD	57	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__iterator/next.h+4-4

...	@@ -16,7 +16,7 @@	...	@@ -16,7 +16,7 @@
16	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
17	#include <__iterator/incrementable_traits.h>	17	#include <__iterator/incrementable_traits.h>
18	#include <__iterator/iterator_traits.h>	18	#include <__iterator/iterator_traits.h>
19	#include <type_traits>	19	#include <__type_traits/enable_if.h>
20		20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	template <class _InputIter>	27	template <class _InputIter>
28	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	28	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
29	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value, _InputIter>::type	29	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value, _InputIter>::type
30	next(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n = 1) {	30	next(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n = 1) {
31	_LIBCPP_ASSERT(__n >= 0 \|\| __is_cpp17_bidirectional_iterator<_InputIter>::value,	31	_LIBCPP_ASSERT(__n >= 0 \|\| __is_cpp17_bidirectional_iterator<_InputIter>::value,
...	@@ -35,7 +35,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	...	@@ -35,7 +35,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
35	return __x;	35	return __x;
36	}	36	}
37		37
38	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	38	#if _LIBCPP_STD_VER > 17
39		39
40	// [range.iter.op.next]	40	// [range.iter.op.next]
41		41
...	@@ -77,7 +77,7 @@ inline namespace __cpo {	...	@@ -77,7 +77,7 @@ inline namespace __cpo {
77	} // namespace __cpo	77	} // namespace __cpo
78	} // namespace ranges	78	} // namespace ranges
79		79
80	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	80	#endif // _LIBCPP_STD_VER > 17
81		81
82	_LIBCPP_END_NAMESPACE_STD	82	_LIBCPP_END_NAMESPACE_STD
83		83

lib/libcxx/include/__iterator/ostreambuf_iterator.h+1-1

...	@@ -65,7 +65,7 @@ public:	...	@@ -65,7 +65,7 @@ public:
65		65
66	template <class _Ch, class _Tr>	66	template <class _Ch, class _Tr>
67	friend	67	friend
68	_LIBCPP_HIDDEN	68	_LIBCPP_HIDE_FROM_ABI
69	ostreambuf_iterator<_Ch, _Tr>	69	ostreambuf_iterator<_Ch, _Tr>
70	__pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,	70	__pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,
71	const _Ch* __ob, const _Ch* __op, const _Ch* __oe,	71	const _Ch* __ob, const _Ch* __op, const _Ch* __oe,

lib/libcxx/include/__iterator/prev.h+4-4

...	@@ -16,7 +16,7 @@	...	@@ -16,7 +16,7 @@
16	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
17	#include <__iterator/incrementable_traits.h>	17	#include <__iterator/incrementable_traits.h>
18	#include <__iterator/iterator_traits.h>	18	#include <__iterator/iterator_traits.h>
19	#include <type_traits>	19	#include <__type_traits/enable_if.h>
20		20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	template <class _InputIter>	27	template <class _InputIter>
28	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	28	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
29	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value, _InputIter>::type	29	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value, _InputIter>::type
30	prev(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n = 1) {	30	prev(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n = 1) {
31	_LIBCPP_ASSERT(__n <= 0 \|\| __is_cpp17_bidirectional_iterator<_InputIter>::value,	31	_LIBCPP_ASSERT(__n <= 0 \|\| __is_cpp17_bidirectional_iterator<_InputIter>::value,
...	@@ -34,7 +34,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	...	@@ -34,7 +34,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
34	return __x;	34	return __x;
35	}	35	}
36		36
37	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	37	#if _LIBCPP_STD_VER > 17
38		38
39	// [range.iter.op.prev]	39	// [range.iter.op.prev]
40		40
...	@@ -70,7 +70,7 @@ inline namespace __cpo {	...	@@ -70,7 +70,7 @@ inline namespace __cpo {
70	} // namespace __cpo	70	} // namespace __cpo
71	} // namespace ranges	71	} // namespace ranges
72		72
73	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	73	#endif // _LIBCPP_STD_VER > 17
74		74
75	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
76		76

lib/libcxx/include/__iterator/projected.h+2-1

...	@@ -6,13 +6,14 @@	...	@@ -6,13 +6,14 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___ITERATOR_PROJECTED_H	10	#ifndef _LIBCPP___ITERATOR_PROJECTED_H
10	#define _LIBCPP___ITERATOR_PROJECTED_H	11	#define _LIBCPP___ITERATOR_PROJECTED_H
11		12
12	#include <__config>	13	#include <__config>
13	#include <__iterator/concepts.h>	14	#include <__iterator/concepts.h>
14	#include <__iterator/incrementable_traits.h>	15	#include <__iterator/incrementable_traits.h>
15	#include <type_traits>	16	#include <__type_traits/remove_cvref.h>
16		17
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	19	# pragma GCC system_header

lib/libcxx/include/__iterator/readable_traits.h+8-2

 @@ -10,9 +10,15 @@
 #ifndef _LIBCPP___ITERATOR_READABLE_TRAITS_H
 #define _LIBCPP___ITERATOR_READABLE_TRAITS_H
+#include <__concepts/same_as.h>
 #include <__config>
-#include <concepts>
+#include <__type_traits/conditional.h>
-#include <type_traits>
+#include <__type_traits/is_array.h>
+#include <__type_traits/is_object.h>
+#include <__type_traits/is_primary_template.h>
+#include <__type_traits/remove_cv.h>
+#include <__type_traits/remove_cvref.h>
+#include <__type_traits/remove_extent.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__iterator/reverse_access.h+10-10

lib/libcxx/include/__iterator/reverse_iterator.h+47-48

 @@ -25,12 +25,20 @@
 #include <__iterator/next.h>
 #include <__iterator/prev.h>
 #include <__iterator/readable_traits.h>
+#include <__iterator/segmented_iterator.h>
 #include <__memory/addressof.h>
 #include <__ranges/access.h>
 #include <__ranges/concepts.h>
 #include <__ranges/subrange.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_nothrow_copy_constructible.h>
+#include <__type_traits/is_pointer.h>
+#include <__type_traits/is_same.h>
+#include <__utility/declval.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -52,7 +60,7 @@ class _LIBCPP_TEMPLATE_VIS reverse_iterator
 _LIBCPP_SUPPRESS_DEPRECATED_POP
 private:
 #ifndef _LIBCPP_ABI_NO_ITERATOR_BASES
-    _Iter __t; // no longer used as of LWG #2360, not removed due to ABI break
+    _Iter __t_; // no longer used as of LWG #2360, not removed due to ABI break
 #endif
 #if _LIBCPP_STD_VER > 17
 @@ -81,18 +89,18 @@ public:
 #endif
 #ifndef _LIBCPP_ABI_NO_ITERATOR_BASES
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
-    reverse_iterator() : __t(), current() {}
+    reverse_iterator() : __t_(), current() {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
-    explicit reverse_iterator(_Iter __x) : __t(__x), current(__x) {}
+    explicit reverse_iterator(_Iter __x) : __t_(__x), current(__x) {}
     template <class _Up, class = __enable_if_t<
         !is_same<_Up, _Iter>::value && is_convertible<_Up const&, _Iter>::value
     > >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator(const reverse_iterator<_Up>& __u)
-        : __t(__u.base()), current(__u.base())
+        : __t_(__u.base()), current(__u.base())
     { }
     template <class _Up, class = __enable_if_t<
 @@ -100,22 +108,22 @@ public:
         is_convertible<_Up const&, _Iter>::value &&
         is_assignable<_Iter&, _Up const&>::value
     > >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator=(const reverse_iterator<_Up>& __u) {
-        __t = current = __u.base();
+        __t_ = current = __u.base();
         return *this;
     }
 #else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator() : current() {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     explicit reverse_iterator(_Iter __x) : current(__x) {}
     template <class _Up, class = __enable_if_t<
         !is_same<_Up, _Iter>::value && is_convertible<_Up const&, _Iter>::value
     > >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator(const reverse_iterator<_Up>& __u)
         : current(__u.base())
     { }
 @@ -125,15 +133,15 @@ public:
         is_convertible<_Up const&, _Iter>::value &&
         is_assignable<_Iter&, _Up const&>::value
     > >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator=(const reverse_iterator<_Up>& __u) {
         current = __u.base();
         return *this;
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     _Iter base() const {return current;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator*() const {_Iter __tmp = current; return *--__tmp;}
 #if _LIBCPP_STD_VER > 17
 @@ -148,36 +156,36 @@ public:
       }
     }
 #else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     pointer operator->() const {
       return std::addressof(operator*());
     }
 #endif // _LIBCPP_STD_VER > 17
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator++() {--current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator operator++(int) {reverse_iterator __tmp(*this); --current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator--() {++current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator operator--(int) {reverse_iterator __tmp(*this); ++current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator operator+(difference_type __n) const {return reverse_iterator(current - __n);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator+=(difference_type __n) {current -= __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator operator-(difference_type __n) const {return reverse_iterator(current + __n);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator& operator-=(difference_type __n) {current += __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator[](difference_type __n) const {return *(*this + __n);}
 #if _LIBCPP_STD_VER > 17
     _LIBCPP_HIDE_FROM_ABI friend constexpr
     iter_rvalue_reference_t<_Iter> iter_move(const reverse_iterator& __i)
       noexcept(is_nothrow_copy_constructible_v<_Iter> &&
-          noexcept(ranges::iter_move(--declval<_Iter&>()))) {
+          noexcept(ranges::iter_move(--std::declval<_Iter&>()))) {
       auto __tmp = __i.base();
       return ranges::iter_move(--__tmp);
     }
 @@ -187,7 +195,7 @@ public:
     void iter_swap(const reverse_iterator& __x, const reverse_iterator<_Iter2>& __y)
       noexcept(is_nothrow_copy_constructible_v<_Iter> &&
           is_nothrow_copy_constructible_v<_Iter2> &&
-          noexcept(ranges::iter_swap(--declval<_Iter&>(), --declval<_Iter2&>()))) {
+          noexcept(ranges::iter_swap(--std::declval<_Iter&>(), --std::declval<_Iter2&>()))) {
       auto __xtmp = __x.base();
       auto __ytmp = __y.base();
       ranges::iter_swap(--__xtmp, --__ytmp);
 @@ -195,14 +203,8 @@ public:
 #endif // _LIBCPP_STD_VER > 17
 };
-template <class _Iter>
-struct __is_reverse_iterator : false_type {};
-template <class _Iter>
-struct __is_reverse_iterator<reverse_iterator<_Iter> > : true_type {};
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -215,7 +217,7 @@ operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -228,7 +230,7 @@ operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& _
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -241,7 +243,7 @@ operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -254,7 +256,7 @@ operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& _
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -267,7 +269,7 @@ operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
 }
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 bool
 operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 #if _LIBCPP_STD_VER > 17
 @@ -291,7 +293,7 @@ operator<=>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 auto
 operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
 -> decltype(__y.base() - __x.base())
 @@ -309,7 +311,7 @@ operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& _
 #endif
 template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 reverse_iterator<_Iter>
 operator+(typename reverse_iterator<_Iter>::difference_type __n, const reverse_iterator<_Iter>& __x)
 {
 @@ -324,7 +326,7 @@ inline constexpr bool disable_sized_sentinel_for<reverse_iterator<_Iter1>, rever
 #if _LIBCPP_STD_VER > 11
 template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
 reverse_iterator<_Iter> make_reverse_iterator(_Iter __i)
 {
     return reverse_iterator<_Iter>(__i);
 @@ -394,7 +396,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI friend constexpr
   iter_rvalue_reference_t<_Iter> iter_move(const __unconstrained_reverse_iterator& __i)
     noexcept(is_nothrow_copy_constructible_v<_Iter> &&
-        noexcept(ranges::iter_move(--declval<_Iter&>()))) {
+        noexcept(ranges::iter_move(--std::declval<_Iter&>()))) {
     auto __tmp = __i.base();
     return ranges::iter_move(--__tmp);
   }
 @@ -478,9 +480,6 @@ public:
   }
 };
-template <class _Iter>
-struct __is_reverse_iterator<__unconstrained_reverse_iterator<_Iter>> : true_type {};
 #endif // _LIBCPP_STD_VER <= 17
 template <template <class> class _RevIter1, template <class> class _RevIter2, class _Iter>
 @@ -499,7 +498,7 @@ struct __unwrap_reverse_iter_impl {
   }
 };
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 template <ranges::bidirectional_range _Range>
 _LIBCPP_HIDE_FROM_ABI constexpr ranges::
     subrange<reverse_iterator<ranges::iterator_t<_Range>>, reverse_iterator<ranges::iterator_t<_Range>>>

lib/libcxx/include/__iterator/segmented_iterator.h created+79

...	@@ -0,0 +1,79 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___SEGMENTED_ITERATOR_H
10	#define _LIBCPP___SEGMENTED_ITERATOR_H
11
12	// Segmented iterators are iterators over (not necessarily contiguous) sub-ranges.
13	//
14	// For example, std::deque stores its data into multiple blocks of contiguous memory,
15	// which are not stored contiguously themselves. The concept of segmented iterators
16	// allows algorithms to operate over these multi-level iterators natively, opening the
17	// door to various optimizations. See http://lafstern.org/matt/segmented.pdf for details.
18	//
19	// If __segmented_iterator_traits can be instantiated, the following functions and associated types must be provided:
20	// - Traits::__local_iterator
21	// The type of iterators used to iterate inside a segment.
22	//
23	// - Traits::__segment_iterator
24	// The type of iterators used to iterate over segments.
25	// Segment iterators can be forward iterators or bidirectional iterators, depending on the
26	// underlying data structure.
27	//
28	// - static __segment_iterator Traits::__segment(It __it)
29	// Returns an iterator to the segment that the provided iterator is in.
30	//
31	// - static __local_iterator Traits::__local(It __it)
32	// Returns the local iterator pointing to the element that the provided iterator points to.
33	//
34	// - static __local_iterator Traits::__begin(__segment_iterator __it)
35	// Returns the local iterator to the beginning of the segment that the provided iterator is pointing into.
36	//
37	// - static __local_iterator Traits::__end(__segment_iterator __it)
38	// Returns the one-past-the-end local iterator to the segment that the provided iterator is pointing into.
39	//
40	// - static It Traits::__compose(__segment_iterator, __local_iterator)
41	// Returns the iterator composed of the segment iterator and local iterator.
42
43	#include <__config>
44	#include <__type_traits/integral_constant.h>
45	#include <cstddef>
46
47	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
48	# pragma GCC system_header
49	#endif
50
51	_LIBCPP_BEGIN_NAMESPACE_STD
52
53	template <class _Iterator>
54	struct __segmented_iterator_traits;
55	/* exposition-only:
56	{
57	using __segment_iterator = ...;
58	using __local_iterator = ...;
59
60	static __segment_iterator __segment(_Iterator);
61	static __local_iterator __local(_Iterator);
62	static __local_iterator __begin(__segment_iterator);
63	static __local_iterator __end(__segment_iterator);
64	static _Iterator __compose(__segment_iterator, __local_iterator);
65	};
66	*/
67
68	template <class _Tp, size_t = 0>
69	struct __has_specialization : false_type {};
70
71	template <class _Tp>
72	struct __has_specialization<_Tp, sizeof(_Tp) * 0> : true_type {};
73
74	template <class _Iterator>
75	using __is_segmented_iterator = __has_specialization<__segmented_iterator_traits<_Iterator> >;
76
77	_LIBCPP_END_NAMESPACE_STD
78
79	#endif // _LIBCPP___SEGMENTED_ITERATOR_H

lib/libcxx/include/__iterator/size.h+2-1

 @@ -11,8 +11,9 @@
 #define _LIBCPP___ITERATOR_SIZE_H
 #include <__config>
+#include <__type_traits/common_type.h>
+#include <__type_traits/make_signed.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__iterator/wrap_iter.h+36-35

 @@ -15,7 +15,8 @@
 #include <__iterator/iterator_traits.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
-#include <type_traits>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_convertible.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -38,17 +39,17 @@ public:
 #endif
 private:
-    iterator_type __i;
+    iterator_type __i_;
 public:
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter() _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter() _NOEXCEPT
-                : __i()
+                : __i_()
     {
         _VSTD::__debug_db_insert_i(this);
     }
-    template <class _Up> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+    template <class _Up> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
         __wrap_iter(const __wrap_iter<_Up>& __u,
             typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = nullptr) _NOEXCEPT
-            : __i(__u.base())
+            : __i_(__u.base())
     {
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
       if (!__libcpp_is_constant_evaluated())
 @@ -56,87 +57,87 @@ public:
 #endif
     }
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
     __wrap_iter(const __wrap_iter& __x)
-        : __i(__x.base())
+        : __i_(__x.base())
     {
       if (!__libcpp_is_constant_evaluated())
         __get_db()->__iterator_copy(this, _VSTD::addressof(__x));
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
     __wrap_iter& operator=(const __wrap_iter& __x)
     {
         if (this != _VSTD::addressof(__x))
         {
             if (!__libcpp_is_constant_evaluated())
                 __get_db()->__iterator_copy(this, _VSTD::addressof(__x));
-            __i = __x.__i;
+            __i_ = __x.__i_;
         }
         return *this;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
     ~__wrap_iter()
     {
       if (!__libcpp_is_constant_evaluated())
         __get_db()->__erase_i(this);
     }
 #endif
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference operator*() const _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__dereferenceable(this),
                              "Attempted to dereference a non-dereferenceable iterator");
-        return *__i;
+        return *__i_;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 pointer operator->() const _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pointer operator->() const _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__dereferenceable(this),
                              "Attempted to dereference a non-dereferenceable iterator");
-        return _VSTD::__to_address(__i);
+        return _VSTD::__to_address(__i_);
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter& operator++() _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator++() _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__dereferenceable(this),
                              "Attempted to increment a non-incrementable iterator");
-        ++__i;
+        ++__i_;
         return *this;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter  operator++(int) _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter  operator++(int) _NOEXCEPT
         {__wrap_iter __tmp(*this); ++(*this); return __tmp;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter& operator--() _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator--() _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__decrementable(this),
                              "Attempted to decrement a non-decrementable iterator");
-        --__i;
+        --__i_;
         return *this;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter  operator--(int) _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter  operator--(int) _NOEXCEPT
         {__wrap_iter __tmp(*this); --(*this); return __tmp;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT
         {__wrap_iter __w(*this); __w += __n; return __w;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter& operator+=(difference_type __n) _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator+=(difference_type __n) _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__addable(this, __n),
                              "Attempted to add/subtract an iterator outside its valid range");
-        __i += __n;
+        __i_ += __n;
         return *this;
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter  operator- (difference_type __n) const _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter  operator- (difference_type __n) const _NOEXCEPT
         {return *this + (-__n);}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter& operator-=(difference_type __n) _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator-=(difference_type __n) _NOEXCEPT
         {*this += -__n; return *this;}
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference    operator[](difference_type __n) const _NOEXCEPT
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference    operator[](difference_type __n) const _NOEXCEPT
     {
         _LIBCPP_DEBUG_ASSERT(__get_const_db()->__subscriptable(this, __n),
                              "Attempted to subscript an iterator outside its valid range");
-        return __i[__n];
+        return __i_[__n];
     }
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 iterator_type base() const _NOEXCEPT {return __i;}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 iterator_type base() const _NOEXCEPT {return __i_;}
 private:
-    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
-    explicit __wrap_iter(const void* __p, iterator_type __x) _NOEXCEPT : __i(__x)
+    explicit __wrap_iter(const void* __p, iterator_type __x) _NOEXCEPT : __i_(__x)
     {
         (void)__p;
 #ifdef _LIBCPP_ENABLE_DEBUG_MODE
 @@ -166,7 +167,7 @@ bool operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y)
 }
 template <class _Iter1>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
 {
     _LIBCPP_DEBUG_ASSERT(__get_const_db()->__less_than_comparable(_VSTD::addressof(__x), _VSTD::addressof(__y)),
 @@ -175,7 +176,7 @@ bool operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _
 }
 template <class _Iter1, class _Iter2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     _LIBCPP_DEBUG_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
 @@ -240,7 +241,7 @@ bool operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y)
 }
 template <class _Iter1, class _Iter2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 #ifndef _LIBCPP_CXX03_LANG
 auto operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
     -> decltype(__x.base() - __y.base())
 @@ -255,7 +256,7 @@ operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXC
 }
 template <class _Iter1>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 __wrap_iter<_Iter1> operator+(typename __wrap_iter<_Iter1>::difference_type __n, __wrap_iter<_Iter1> __x) _NOEXCEPT
 {
     __x += __n;

lib/libcxx/include/__locale+76-72

...	@@ -15,13 +15,15 @@	...	@@ -15,13 +15,15 @@
15	#include <cctype>	15	#include <cctype>
16	#include <cstdint>	16	#include <cstdint>
17	#include <locale.h>	17	#include <locale.h>
18	#include <memory>
19	#include <mutex>	18	#include <mutex>
20	#include <string>	19	#include <string>
21		20
		21	// Some platforms require more includes than others. Keep the includes on all plaforms for now.
		22	#include <cstddef>
		23	#include <cstring>
		24
22	#if defined(_LIBCPP_MSVCRT_LIKE)	25	#if defined(_LIBCPP_MSVCRT_LIKE)
23	# include <__support/win32/locale_win32.h>	26	# include <__support/win32/locale_win32.h>
24	# include <cstring>
25	#elif defined(_AIX) \|\| defined(__MVS__)	27	#elif defined(_AIX) \|\| defined(__MVS__)
26	# include <__support/ibm/xlocale.h>	28	# include <__support/ibm/xlocale.h>
27	#elif defined(__ANDROID__)	29	#elif defined(__ANDROID__)
...	@@ -33,7 +35,7 @@	...	@@ -33,7 +35,7 @@
33	# include <__support/newlib/xlocale.h>	35	# include <__support/newlib/xlocale.h>
34	#elif defined(__OpenBSD__)	36	#elif defined(__OpenBSD__)
35	# include <__support/openbsd/xlocale.h>	37	# include <__support/openbsd/xlocale.h>
36	#elif (defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__DragonFly__))	38	#elif (defined(__APPLE__) \|\| defined(__FreeBSD__))
37	# include <xlocale.h>	39	# include <xlocale.h>
38	#elif defined(__Fuchsia__)	40	#elif defined(__Fuchsia__)
39	# include <__support/fuchsia/xlocale.h>	41	# include <__support/fuchsia/xlocale.h>
...	@@ -191,12 +193,12 @@ protected:	...	@@ -191,12 +193,12 @@ protected:
191	explicit facet(size_t __refs = 0)	193	explicit facet(size_t __refs = 0)
192	: __shared_count(static_cast<long>(__refs)-1) {}	194	: __shared_count(static_cast<long>(__refs)-1) {}
193		195
194	virtual ~facet();	196	~facet() override;
195		197
196	// facet(const facet&) = delete; // effectively done in __shared_count	198	// facet(const facet&) = delete; // effectively done in __shared_count
197	// void operator=(const facet&) = delete;	199	// void operator=(const facet&) = delete;
198	private:	200	private:
199	virtual void __on_zero_shared() _NOEXCEPT;	201	void __on_zero_shared() _NOEXCEPT override;
200	};	202	};
201		203
202	class _LIBCPP_TYPE_VIS locale::id	204	class _LIBCPP_TYPE_VIS locale::id
...	@@ -291,7 +293,7 @@ public:	...	@@ -291,7 +293,7 @@ public:
291	static locale::id id;	293	static locale::id id;
292		294
293	protected:	295	protected:
294	~collate();	296	~collate() override;
295	virtual int do_compare(const char_type* __lo1, const char_type* __hi1,	297	virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
296	const char_type* __lo2, const char_type* __hi2) const;	298	const char_type* __lo2, const char_type* __hi2) const;
297	virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const	299	virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const
...	@@ -350,7 +352,7 @@ template <>	...	@@ -350,7 +352,7 @@ template <>
350	class _LIBCPP_TYPE_VIS collate_byname<char>	352	class _LIBCPP_TYPE_VIS collate_byname<char>
351	: public collate<char>	353	: public collate<char>
352	{	354	{
353	locale_t __l;	355	locale_t __l_;
354	public:	356	public:
355	typedef char char_type;	357	typedef char char_type;
356	typedef basic_string<char_type> string_type;	358	typedef basic_string<char_type> string_type;
...	@@ -359,10 +361,10 @@ public:	...	@@ -359,10 +361,10 @@ public:
359	explicit collate_byname(const string& __n, size_t __refs = 0);	361	explicit collate_byname(const string& __n, size_t __refs = 0);
360		362
361	protected:	363	protected:
362	~collate_byname();	364	~collate_byname() override;
363	virtual int do_compare(const char_type* __lo1, const char_type* __hi1,	365	int do_compare(const char_type* __lo1, const char_type* __hi1,
364	const char_type* __lo2, const char_type* __hi2) const;	366	const char_type* __lo2, const char_type* __hi2) const override;
365	virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;	367	string_type do_transform(const char_type* __lo, const char_type* __hi) const override;
366	};	368	};
367		369
368	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	370	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
...	@@ -370,7 +372,7 @@ template <>	...	@@ -370,7 +372,7 @@ template <>
370	class _LIBCPP_TYPE_VIS collate_byname<wchar_t>	372	class _LIBCPP_TYPE_VIS collate_byname<wchar_t>
371	: public collate<wchar_t>	373	: public collate<wchar_t>
372	{	374	{
373	locale_t __l;	375	locale_t __l_;
374	public:	376	public:
375	typedef wchar_t char_type;	377	typedef wchar_t char_type;
376	typedef basic_string<char_type> string_type;	378	typedef basic_string<char_type> string_type;
...	@@ -379,11 +381,11 @@ public:	...	@@ -379,11 +381,11 @@ public:
379	explicit collate_byname(const string& __n, size_t __refs = 0);	381	explicit collate_byname(const string& __n, size_t __refs = 0);
380		382
381	protected:	383	protected:
382	~collate_byname();	384	~collate_byname() override;
383		385
384	virtual int do_compare(const char_type* __lo1, const char_type* __hi1,	386	int do_compare(const char_type* __lo1, const char_type* __hi1,
385	const char_type* __lo2, const char_type* __hi2) const;	387	const char_type* __lo2, const char_type* __hi2) const override;
386	virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;	388	string_type do_transform(const char_type* __lo, const char_type* __hi) const override;
387	};	389	};
388	#endif	390	#endif
389		391
...	@@ -453,10 +455,10 @@ public:	...	@@ -453,10 +455,10 @@ public:
453	static const mask __regex_word = 0x4000; // 0x8000 and 0x0100 and 0x00ff are used	455	static const mask __regex_word = 0x4000; // 0x8000 and 0x0100 and 0x00ff are used
454	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT	456	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT
455	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA	457	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA
456	#elif defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__EMSCRIPTEN__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__)	458	#elif defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__EMSCRIPTEN__) \|\| defined(__NetBSD__)
457	# ifdef __APPLE__	459	# ifdef __APPLE__
458	typedef __uint32_t mask;	460	typedef __uint32_t mask;
459	# elif defined(__FreeBSD__) \|\| defined(__DragonFly__)	461	# elif defined(__FreeBSD__)
460	typedef unsigned long mask;	462	typedef unsigned long mask;
461	# elif defined(__EMSCRIPTEN__) \|\| defined(__NetBSD__)	463	# elif defined(__EMSCRIPTEN__) \|\| defined(__NetBSD__)
462	typedef unsigned short mask;	464	typedef unsigned short mask;
...	@@ -510,7 +512,8 @@ public:	...	@@ -510,7 +512,8 @@ public:
510	static const mask punct = _P;	512	static const mask punct = _P;
511	static const mask xdigit = _X \| _N;	513	static const mask xdigit = _X \| _N;
512	static const mask blank = _B;	514	static const mask blank = _B;
513	static const mask __regex_word = 0x80;	515	// mask is already fully saturated, use a different type in regex_type_traits.
		516	static const unsigned short __regex_word = 0x100;
514	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT	517	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT
515	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA	518	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA
516	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_XDIGIT	519	# define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_XDIGIT
...	@@ -549,7 +552,8 @@ public:	...	@@ -549,7 +552,8 @@ public:
549		552
550	_LIBCPP_INLINE_VISIBILITY ctype_base() {}	553	_LIBCPP_INLINE_VISIBILITY ctype_base() {}
551		554
552	static_assert((__regex_word & ~(space \| print \| cntrl \| upper \| lower \| alpha \| digit \| punct \| xdigit \| blank)) == __regex_word,	555	static_assert((__regex_word & ~(std::make_unsigned<mask>::type)(space \| print \| cntrl \| upper \| lower \| alpha \|
		556	digit \| punct \| xdigit \| blank)) == __regex_word,
553	"__regex_word can't overlap other bits");	557	"__regex_word can't overlap other bits");
554	};	558	};
555		559
...	@@ -643,7 +647,7 @@ public:	...	@@ -643,7 +647,7 @@ public:
643	static locale::id id;	647	static locale::id id;
644		648
645	protected:	649	protected:
646	~ctype();	650	~ctype() override;
647	virtual bool do_is(mask __m, char_type __c) const;	651	virtual bool do_is(mask __m, char_type __c) const;
648	virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;	652	virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;
649	virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;	653	virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;
...	@@ -697,7 +701,7 @@ public:	...	@@ -697,7 +701,7 @@ public:
697	const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const	701	const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const
698	{	702	{
699	for (; __low != __high; ++__low)	703	for (; __low != __high; ++__low)
700	if (!(isascii(__low) && (__tab_[static_cast<int>(__low)] & __m)))	704	if (!isascii(__low) \|\| !(__tab_[static_cast<int>(__low)] & __m))
701	break;	705	break;
702	return __low;	706	return __low;
703	}	707	}
...	@@ -773,7 +777,7 @@ public:	...	@@ -773,7 +777,7 @@ public:
773	#endif	777	#endif
774		778
775	protected:	779	protected:
776	~ctype();	780	~ctype() override;
777	virtual char_type do_toupper(char_type __c) const;	781	virtual char_type do_toupper(char_type __c) const;
778	virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;	782	virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
779	virtual char_type do_tolower(char_type __c) const;	783	virtual char_type do_tolower(char_type __c) const;
...	@@ -792,18 +796,18 @@ template <>	...	@@ -792,18 +796,18 @@ template <>
792	class _LIBCPP_TYPE_VIS ctype_byname<char>	796	class _LIBCPP_TYPE_VIS ctype_byname<char>
793	: public ctype<char>	797	: public ctype<char>
794	{	798	{
795	locale_t __l;	799	locale_t __l_;
796		800
797	public:	801	public:
798	explicit ctype_byname(const char*, size_t = 0);	802	explicit ctype_byname(const char*, size_t = 0);
799	explicit ctype_byname(const string&, size_t = 0);	803	explicit ctype_byname(const string&, size_t = 0);
800		804
801	protected:	805	protected:
802	~ctype_byname();	806	~ctype_byname() override;
803	virtual char_type do_toupper(char_type) const;	807	char_type do_toupper(char_type) const override;
804	virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;	808	const char_type* do_toupper(char_type* __low, const char_type* __high) const override;
805	virtual char_type do_tolower(char_type) const;	809	char_type do_tolower(char_type) const override;
806	virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;	810	const char_type* do_tolower(char_type* __low, const char_type* __high) const override;
807	};	811	};
808		812
809	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	813	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
...	@@ -811,26 +815,26 @@ template <>	...	@@ -811,26 +815,26 @@ template <>
811	class _LIBCPP_TYPE_VIS ctype_byname<wchar_t>	815	class _LIBCPP_TYPE_VIS ctype_byname<wchar_t>
812	: public ctype<wchar_t>	816	: public ctype<wchar_t>
813	{	817	{
814	locale_t __l;	818	locale_t __l_;
815		819
816	public:	820	public:
817	explicit ctype_byname(const char*, size_t = 0);	821	explicit ctype_byname(const char*, size_t = 0);
818	explicit ctype_byname(const string&, size_t = 0);	822	explicit ctype_byname(const string&, size_t = 0);
819		823
820	protected:	824	protected:
821	~ctype_byname();	825	~ctype_byname() override;
822	virtual bool do_is(mask __m, char_type __c) const;	826	bool do_is(mask __m, char_type __c) const override;
823	virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;	827	const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const override;
824	virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;	828	const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const override;
825	virtual const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const;	829	const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const override;
826	virtual char_type do_toupper(char_type) const;	830	char_type do_toupper(char_type) const override;
827	virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;	831	const char_type* do_toupper(char_type* __low, const char_type* __high) const override;
828	virtual char_type do_tolower(char_type) const;	832	char_type do_tolower(char_type) const override;
829	virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;	833	const char_type* do_tolower(char_type* __low, const char_type* __high) const override;
830	virtual char_type do_widen(char) const;	834	char_type do_widen(char) const override;
831	virtual const char* do_widen(const char* __low, const char* __high, char_type* __dest) const;	835	const char* do_widen(const char* __low, const char* __high, char_type* __dest) const override;
832	virtual char do_narrow(char_type, char __dfault) const;	836	char do_narrow(char_type, char __dfault) const override;
833	virtual const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const;	837	const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const override;
834	};	838	};
835	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS	839	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
836		840
...	@@ -839,7 +843,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -839,7 +843,7 @@ inline _LIBCPP_INLINE_VISIBILITY
839	bool	843	bool
840	isspace(_CharT __c, const locale& __loc)	844	isspace(_CharT __c, const locale& __loc)
841	{	845	{
842	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c);	846	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c);
843	}	847	}
844		848
845	template <class _CharT>	849	template <class _CharT>
...	@@ -847,7 +851,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -847,7 +851,7 @@ inline _LIBCPP_INLINE_VISIBILITY
847	bool	851	bool
848	isprint(_CharT __c, const locale& __loc)	852	isprint(_CharT __c, const locale& __loc)
849	{	853	{
850	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c);	854	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c);
851	}	855	}
852		856
853	template <class _CharT>	857	template <class _CharT>
...	@@ -855,7 +859,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -855,7 +859,7 @@ inline _LIBCPP_INLINE_VISIBILITY
855	bool	859	bool
856	iscntrl(_CharT __c, const locale& __loc)	860	iscntrl(_CharT __c, const locale& __loc)
857	{	861	{
858	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c);	862	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c);
859	}	863	}
860		864
861	template <class _CharT>	865	template <class _CharT>
...	@@ -863,7 +867,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -863,7 +867,7 @@ inline _LIBCPP_INLINE_VISIBILITY
863	bool	867	bool
864	isupper(_CharT __c, const locale& __loc)	868	isupper(_CharT __c, const locale& __loc)
865	{	869	{
866	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c);	870	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c);
867	}	871	}
868		872
869	template <class _CharT>	873	template <class _CharT>
...	@@ -871,7 +875,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -871,7 +875,7 @@ inline _LIBCPP_INLINE_VISIBILITY
871	bool	875	bool
872	islower(_CharT __c, const locale& __loc)	876	islower(_CharT __c, const locale& __loc)
873	{	877	{
874	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c);	878	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c);
875	}	879	}
876		880
877	template <class _CharT>	881	template <class _CharT>
...	@@ -879,7 +883,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -879,7 +883,7 @@ inline _LIBCPP_INLINE_VISIBILITY
879	bool	883	bool
880	isalpha(_CharT __c, const locale& __loc)	884	isalpha(_CharT __c, const locale& __loc)
881	{	885	{
882	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c);	886	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c);
883	}	887	}
884		888
885	template <class _CharT>	889	template <class _CharT>
...	@@ -887,7 +891,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -887,7 +891,7 @@ inline _LIBCPP_INLINE_VISIBILITY
887	bool	891	bool
888	isdigit(_CharT __c, const locale& __loc)	892	isdigit(_CharT __c, const locale& __loc)
889	{	893	{
890	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c);	894	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c);
891	}	895	}
892		896
893	template <class _CharT>	897	template <class _CharT>
...	@@ -895,7 +899,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -895,7 +899,7 @@ inline _LIBCPP_INLINE_VISIBILITY
895	bool	899	bool
896	ispunct(_CharT __c, const locale& __loc)	900	ispunct(_CharT __c, const locale& __loc)
897	{	901	{
898	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c);	902	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c);
899	}	903	}
900		904
901	template <class _CharT>	905	template <class _CharT>
...	@@ -903,7 +907,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -903,7 +907,7 @@ inline _LIBCPP_INLINE_VISIBILITY
903	bool	907	bool
904	isxdigit(_CharT __c, const locale& __loc)	908	isxdigit(_CharT __c, const locale& __loc)
905	{	909	{
906	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c);	910	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c);
907	}	911	}
908		912
909	template <class _CharT>	913	template <class _CharT>
...	@@ -911,7 +915,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -911,7 +915,7 @@ inline _LIBCPP_INLINE_VISIBILITY
911	bool	915	bool
912	isalnum(_CharT __c, const locale& __loc)	916	isalnum(_CharT __c, const locale& __loc)
913	{	917	{
914	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c);	918	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c);
915	}	919	}
916		920
917	template <class _CharT>	921	template <class _CharT>
...	@@ -919,7 +923,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -919,7 +923,7 @@ inline _LIBCPP_INLINE_VISIBILITY
919	bool	923	bool
920	isgraph(_CharT __c, const locale& __loc)	924	isgraph(_CharT __c, const locale& __loc)
921	{	925	{
922	return use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c);	926	return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c);
923	}	927	}
924		928
925	template <class _CharT>	929	template <class _CharT>
...	@@ -927,7 +931,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -927,7 +931,7 @@ inline _LIBCPP_INLINE_VISIBILITY
927	_CharT	931	_CharT
928	toupper(_CharT __c, const locale& __loc)	932	toupper(_CharT __c, const locale& __loc)
929	{	933	{
930	return use_facet<ctype<_CharT> >(__loc).toupper(__c);	934	return std::use_facet<ctype<_CharT> >(__loc).toupper(__c);
931	}	935	}
932		936
933	template <class _CharT>	937	template <class _CharT>
...	@@ -935,7 +939,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -935,7 +939,7 @@ inline _LIBCPP_INLINE_VISIBILITY
935	_CharT	939	_CharT
936	tolower(_CharT __c, const locale& __loc)	940	tolower(_CharT __c, const locale& __loc)
937	{	941	{
938	return use_facet<ctype<_CharT> >(__loc).tolower(__c);	942	return std::use_facet<ctype<_CharT> >(__loc).tolower(__c);
939	}	943	}
940		944
941	// codecvt_base	945	// codecvt_base
...	@@ -1021,7 +1025,7 @@ protected:	...	@@ -1021,7 +1025,7 @@ protected:
1021	explicit codecvt(const char*, size_t __refs = 0)	1025	explicit codecvt(const char*, size_t __refs = 0)
1022	: locale::facet(__refs) {}	1026	: locale::facet(__refs) {}
1023		1027
1024	~codecvt();	1028	~codecvt() override;
1025		1029
1026	virtual result do_out(state_type& __st,	1030	virtual result do_out(state_type& __st,
1027	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1031	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1045,7 +1049,7 @@ class _LIBCPP_TYPE_VIS codecvt<wchar_t, char, mbstate_t>	...	@@ -1045,7 +1049,7 @@ class _LIBCPP_TYPE_VIS codecvt<wchar_t, char, mbstate_t>
1045	: public locale::facet,	1049	: public locale::facet,
1046	public codecvt_base	1050	public codecvt_base
1047	{	1051	{
1048	locale_t __l;	1052	locale_t __l_;
1049	public:	1053	public:
1050	typedef wchar_t intern_type;	1054	typedef wchar_t intern_type;
1051	typedef char extern_type;	1055	typedef char extern_type;
...	@@ -1105,7 +1109,7 @@ public:	...	@@ -1105,7 +1109,7 @@ public:
1105	protected:	1109	protected:
1106	explicit codecvt(const char*, size_t __refs = 0);	1110	explicit codecvt(const char*, size_t __refs = 0);
1107		1111
1108	~codecvt();	1112	~codecvt() override;
1109		1113
1110	virtual result do_out(state_type& __st,	1114	virtual result do_out(state_type& __st,
1111	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1115	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1192,7 +1196,7 @@ protected:	...	@@ -1192,7 +1196,7 @@ protected:
1192	explicit codecvt(const char*, size_t __refs = 0)	1196	explicit codecvt(const char*, size_t __refs = 0)
1193	: locale::facet(__refs) {}	1197	: locale::facet(__refs) {}
1194		1198
1195	~codecvt();	1199	~codecvt() override;
1196		1200
1197	virtual result do_out(state_type& __st,	1201	virtual result do_out(state_type& __st,
1198	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1202	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1280,7 +1284,7 @@ protected:	...	@@ -1280,7 +1284,7 @@ protected:
1280	explicit codecvt(const char*, size_t __refs = 0)	1284	explicit codecvt(const char*, size_t __refs = 0)
1281	: locale::facet(__refs) {}	1285	: locale::facet(__refs) {}
1282		1286
1283	~codecvt();	1287	~codecvt() override;
1284		1288
1285	virtual result do_out(state_type& __st,	1289	virtual result do_out(state_type& __st,
1286	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1290	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1368,7 +1372,7 @@ protected:	...	@@ -1368,7 +1372,7 @@ protected:
1368	explicit codecvt(const char*, size_t __refs = 0)	1372	explicit codecvt(const char*, size_t __refs = 0)
1369	: locale::facet(__refs) {}	1373	: locale::facet(__refs) {}
1370		1374
1371	~codecvt();	1375	~codecvt() override;
1372		1376
1373	virtual result do_out(state_type& __st,	1377	virtual result do_out(state_type& __st,
1374	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1378	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1456,7 +1460,7 @@ protected:	...	@@ -1456,7 +1460,7 @@ protected:
1456	explicit codecvt(const char*, size_t __refs = 0)	1460	explicit codecvt(const char*, size_t __refs = 0)
1457	: locale::facet(__refs) {}	1461	: locale::facet(__refs) {}
1458		1462
1459	~codecvt();	1463	~codecvt() override;
1460		1464
1461	virtual result do_out(state_type& __st,	1465	virtual result do_out(state_type& __st,
1462	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	1466	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
...	@@ -1488,7 +1492,7 @@ public:	...	@@ -1488,7 +1492,7 @@ public:
1488	explicit codecvt_byname(const string& __nm, size_t __refs = 0)	1492	explicit codecvt_byname(const string& __nm, size_t __refs = 0)
1489	: codecvt<_InternT, _ExternT, _StateT>(__nm.c_str(), __refs) {}	1493	: codecvt<_InternT, _ExternT, _StateT>(__nm.c_str(), __refs) {}
1490	protected:	1494	protected:
1491	~codecvt_byname();	1495	~codecvt_byname() override;
1492	};	1496	};
1493		1497
1494	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	1498	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -1540,7 +1544,7 @@ struct _LIBCPP_TYPE_VIS __narrow_to_utf8<16>	...	@@ -1540,7 +1544,7 @@ struct _LIBCPP_TYPE_VIS __narrow_to_utf8<16>
1540	__narrow_to_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}	1544	__narrow_to_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
1541	_LIBCPP_SUPPRESS_DEPRECATED_POP	1545	_LIBCPP_SUPPRESS_DEPRECATED_POP
1542		1546
1543	~__narrow_to_utf8();	1547	~__narrow_to_utf8() override;
1544		1548
1545	template <class _OutputIterator, class _CharT>	1549	template <class _OutputIterator, class _CharT>
1546	_LIBCPP_INLINE_VISIBILITY	1550	_LIBCPP_INLINE_VISIBILITY
...	@@ -1576,7 +1580,7 @@ struct _LIBCPP_TYPE_VIS __narrow_to_utf8<32>	...	@@ -1576,7 +1580,7 @@ struct _LIBCPP_TYPE_VIS __narrow_to_utf8<32>
1576	__narrow_to_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}	1580	__narrow_to_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
1577	_LIBCPP_SUPPRESS_DEPRECATED_POP	1581	_LIBCPP_SUPPRESS_DEPRECATED_POP
1578		1582
1579	~__narrow_to_utf8();	1583	~__narrow_to_utf8() override;
1580		1584
1581	template <class _OutputIterator, class _CharT>	1585	template <class _OutputIterator, class _CharT>
1582	_LIBCPP_INLINE_VISIBILITY	1586	_LIBCPP_INLINE_VISIBILITY
...	@@ -1634,7 +1638,7 @@ struct _LIBCPP_TYPE_VIS __widen_from_utf8<16>	...	@@ -1634,7 +1638,7 @@ struct _LIBCPP_TYPE_VIS __widen_from_utf8<16>
1634	__widen_from_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}	1638	__widen_from_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
1635	_LIBCPP_SUPPRESS_DEPRECATED_POP	1639	_LIBCPP_SUPPRESS_DEPRECATED_POP
1636		1640
1637	~__widen_from_utf8();	1641	~__widen_from_utf8() override;
1638		1642
1639	template <class _OutputIterator>	1643	template <class _OutputIterator>
1640	_LIBCPP_INLINE_VISIBILITY	1644	_LIBCPP_INLINE_VISIBILITY
...	@@ -1670,7 +1674,7 @@ struct _LIBCPP_TYPE_VIS __widen_from_utf8<32>	...	@@ -1670,7 +1674,7 @@ struct _LIBCPP_TYPE_VIS __widen_from_utf8<32>
1670	__widen_from_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}	1674	__widen_from_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
1671	_LIBCPP_SUPPRESS_DEPRECATED_POP	1675	_LIBCPP_SUPPRESS_DEPRECATED_POP
1672		1676
1673	~__widen_from_utf8();	1677	~__widen_from_utf8() override;
1674		1678
1675	template <class _OutputIterator>	1679	template <class _OutputIterator>
1676	_LIBCPP_INLINE_VISIBILITY	1680	_LIBCPP_INLINE_VISIBILITY
...	@@ -1720,7 +1724,7 @@ public:	...	@@ -1720,7 +1724,7 @@ public:
1720	static locale::id id;	1724	static locale::id id;
1721		1725
1722	protected:	1726	protected:
1723	~numpunct();	1727	~numpunct() override;
1724	virtual char_type do_decimal_point() const;	1728	virtual char_type do_decimal_point() const;
1725	virtual char_type do_thousands_sep() const;	1729	virtual char_type do_thousands_sep() const;
1726	virtual string do_grouping() const;	1730	virtual string do_grouping() const;
...	@@ -1752,7 +1756,7 @@ public:	...	@@ -1752,7 +1756,7 @@ public:
1752	static locale::id id;	1756	static locale::id id;
1753		1757
1754	protected:	1758	protected:
1755	~numpunct();	1759	~numpunct() override;
1756	virtual char_type do_decimal_point() const;	1760	virtual char_type do_decimal_point() const;
1757	virtual char_type do_thousands_sep() const;	1761	virtual char_type do_thousands_sep() const;
1758	virtual string do_grouping() const;	1762	virtual string do_grouping() const;
...	@@ -1781,7 +1785,7 @@ public:	...	@@ -1781,7 +1785,7 @@ public:
1781	explicit numpunct_byname(const string& __nm, size_t __refs = 0);	1785	explicit numpunct_byname(const string& __nm, size_t __refs = 0);
1782		1786
1783	protected:	1787	protected:
1784	~numpunct_byname();	1788	~numpunct_byname() override;
1785		1789
1786	private:	1790	private:
1787	void __init(const char*);	1791	void __init(const char*);
...	@@ -1800,7 +1804,7 @@ public:	...	@@ -1800,7 +1804,7 @@ public:
1800	explicit numpunct_byname(const string& __nm, size_t __refs = 0);	1804	explicit numpunct_byname(const string& __nm, size_t __refs = 0);
1801		1805
1802	protected:	1806	protected:
1803	~numpunct_byname();	1807	~numpunct_byname() override;
1804		1808
1805	private:	1809	private:
1806	void __init(const char*);	1810	void __init(const char*);

lib/libcxx/include/__memory/addressof.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _Tp>	21	template <class _Tp>
22	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	22	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
23	_LIBCPP_NO_CFI _LIBCPP_INLINE_VISIBILITY	23	_LIBCPP_NO_CFI _LIBCPP_INLINE_VISIBILITY
24	_Tp*	24	_Tp*
25	addressof(_Tp& __x) _NOEXCEPT	25	addressof(_Tp& __x) _NOEXCEPT

lib/libcxx/include/__memory/align.h created+25

...	@@ -0,0 +1,25 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_ALIGN_H
10	#define _LIBCPP___MEMORY_ALIGN_H
11
12	#include <__config>
13	#include <cstddef>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	_LIBCPP_FUNC_VIS void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___MEMORY_ALIGN_H

lib/libcxx/include/__memory/allocate_at_least.h+1

...	@@ -25,6 +25,7 @@ struct allocation_result {	...	@@ -25,6 +25,7 @@ struct allocation_result {
25	_Pointer ptr;	25	_Pointer ptr;
26	size_t count;	26	size_t count;
27	};	27	};
		28	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(allocation_result);
28		29
29	template <class _Alloc>	30	template <class _Alloc>
30	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr	31	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr

lib/libcxx/include/__memory/allocator.h+14-11

 @@ -13,11 +13,14 @@
 #include <__config>
 #include <__memory/allocate_at_least.h>
 #include <__memory/allocator_traits.h>
+#include <__type_traits/is_constant_evaluated.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_void.h>
+#include <__type_traits/is_volatile.h>
 #include <__utility/forward.h>
 #include <cstddef>
 #include <new>
 #include <stdexcept>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -95,14 +98,14 @@ public:
     typedef true_type   propagate_on_container_move_assignment;
     typedef true_type   is_always_equal;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     allocator() _NOEXCEPT = default;
     template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     allocator(const allocator<_Up>&) _NOEXCEPT { }
-    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     _Tp* allocate(size_t __n) {
         if (__n > allocator_traits<allocator>::max_size(*this))
             __throw_bad_array_new_length();
 @@ -120,7 +123,7 @@ public:
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void deallocate(_Tp* __p, size_t __n) _NOEXCEPT {
         if (__libcpp_is_constant_evaluated()) {
             ::operator delete(__p);
 @@ -184,14 +187,14 @@ public:
     typedef true_type   propagate_on_container_move_assignment;
     typedef true_type   is_always_equal;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     allocator() _NOEXCEPT = default;
     template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     allocator(const allocator<_Up>&) _NOEXCEPT { }
-    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     const _Tp* allocate(size_t __n) {
         if (__n > allocator_traits<allocator>::max_size(*this))
             __throw_bad_array_new_length();
 @@ -209,7 +212,7 @@ public:
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void deallocate(const _Tp* __p, size_t __n) {
         if (__libcpp_is_constant_evaluated()) {
             ::operator delete(const_cast<_Tp*>(__p));
 @@ -258,11 +261,11 @@ public:
 };
 template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool operator==(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return true;}
 template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 bool operator!=(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return false;}
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__memory/allocator_arg_t.h+4-2

 @@ -12,8 +12,10 @@
 #include <__config>
 #include <__memory/uses_allocator.h>
+#include <__type_traits/integral_constant.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/forward.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -36,7 +38,7 @@ extern _LIBCPP_EXPORTED_FROM_ABI const allocator_arg_t allocator_arg;
 template <class _Tp, class _Alloc, class ..._Args>
 struct __uses_alloc_ctor_imp
 {
-    typedef _LIBCPP_NODEBUG __uncvref_t<_Alloc> _RawAlloc;
+    typedef _LIBCPP_NODEBUG __remove_cvref_t<_Alloc> _RawAlloc;
     static const bool __ua = uses_allocator<_Tp, _RawAlloc>::value;
     static const bool __ic =
         is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;

lib/libcxx/include/__memory/allocator_destructor.h created+42

...	@@ -0,0 +1,42 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
10	#define _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
11
12	#include <__config>
13	#include <__memory/allocator_traits.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class _Alloc>
22	class __allocator_destructor
23	{
24	typedef _LIBCPP_NODEBUG allocator_traits<_Alloc> __alloc_traits;
25	public:
26	typedef _LIBCPP_NODEBUG typename __alloc_traits::pointer pointer;
27	typedef _LIBCPP_NODEBUG typename __alloc_traits::size_type size_type;
28	private:
29	_Alloc& __alloc_;
30	size_type __s_;
31	public:
32	_LIBCPP_INLINE_VISIBILITY __allocator_destructor(_Alloc& __a, size_type __s)
33	_NOEXCEPT
34	: __alloc_(__a), __s_(__s) {}
35	_LIBCPP_INLINE_VISIBILITY
36	void operator()(pointer __p) _NOEXCEPT
37	{__alloc_traits::deallocate(__alloc_, __p, __s_);}
38	};
39
40	_LIBCPP_END_NAMESPACE_STD
41
42	#endif // _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H

lib/libcxx/include/__memory/allocator_traits.h+34-29

 @@ -13,9 +13,16 @@
 #include <__config>
 #include <__memory/construct_at.h>
 #include <__memory/pointer_traits.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_copy_constructible.h>
+#include <__type_traits/is_empty.h>
+#include <__type_traits/is_move_constructible.h>
+#include <__type_traits/make_unsigned.h>
+#include <__type_traits/remove_reference.h>
+#include <__type_traits/void_t.h>
+#include <__utility/declval.h>
 #include <__utility/forward.h>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -28,12 +35,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #define _LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(NAME, PROPERTY)                \
     template <class _Tp, class = void> struct NAME : false_type { };    \
-    template <class _Tp>               struct NAME<_Tp, typename __void_t<typename _Tp:: PROPERTY >::type> : true_type { }
+    template <class _Tp>               struct NAME<_Tp, __void_t<typename _Tp:: PROPERTY > > : true_type { }
 // __pointer
 _LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_pointer, pointer);
 template <class _Tp, class _Alloc,
-          class _RawAlloc = typename remove_reference<_Alloc>::type,
+          class _RawAlloc = __libcpp_remove_reference_t<_Alloc>,
           bool = __has_pointer<_RawAlloc>::value>
 struct __pointer {
     using type _LIBCPP_NODEBUG = typename _RawAlloc::pointer;
 @@ -152,13 +159,12 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 template <class _Tp, class _Up, class = void>
 struct __has_rebind_other : false_type { };
 template <class _Tp, class _Up>
-struct __has_rebind_other<_Tp, _Up, typename __void_t<
+struct __has_rebind_other<_Tp, _Up, __void_t<typename _Tp::template rebind<_Up>::other> > : true_type { };
-    typename _Tp::template rebind<_Up>::other
->::type> : true_type { };
 template <class _Tp, class _Up, bool = __has_rebind_other<_Tp, _Up>::value>
 struct __allocator_traits_rebind {
-    using type _LIBCPP_NODEBUG = typename _Tp::template rebind<_Up>::other;
+  static_assert(__has_rebind_other<_Tp, _Up>::value, "This allocator has to implement rebind");
+  using type _LIBCPP_NODEBUG = typename _Tp::template rebind<_Up>::other;
 };
 template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
 struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, true> {
 @@ -181,7 +187,7 @@ struct __has_allocate_hint : false_type { };
 template <class _Alloc, class _SizeType, class _ConstVoidPtr>
 struct __has_allocate_hint<_Alloc, _SizeType, _ConstVoidPtr, decltype(
-    (void)declval<_Alloc>().allocate(declval<_SizeType>(), declval<_ConstVoidPtr>())
+    (void)std::declval<_Alloc>().allocate(std::declval<_SizeType>(), std::declval<_ConstVoidPtr>())
 )> : true_type { };
 // __has_construct
 @@ -190,7 +196,7 @@ struct __has_construct_impl : false_type { };
 template <class _Alloc, class ..._Args>
 struct __has_construct_impl<decltype(
-    (void)declval<_Alloc>().construct(declval<_Args>()...)
+    (void)std::declval<_Alloc>().construct(std::declval<_Args>()...)
 ), _Alloc, _Args...> : true_type { };
 template <class _Alloc, class ..._Args>
 @@ -202,7 +208,7 @@ struct __has_destroy : false_type { };
 template <class _Alloc, class _Pointer>
 struct __has_destroy<_Alloc, _Pointer, decltype(
-    (void)declval<_Alloc>().destroy(declval<_Pointer>())
+    (void)std::declval<_Alloc>().destroy(std::declval<_Pointer>())
 )> : true_type { };
 // __has_max_size
 @@ -211,7 +217,7 @@ struct __has_max_size : false_type { };
 template <class _Alloc>
 struct __has_max_size<_Alloc, decltype(
-    (void)declval<_Alloc&>().max_size()
+    (void)std::declval<_Alloc&>().max_size()
 )> : true_type { };
 // __has_select_on_container_copy_construction
 @@ -220,7 +226,7 @@ struct __has_select_on_container_copy_construction : false_type { };
 template <class _Alloc>
 struct __has_select_on_container_copy_construction<_Alloc, decltype(
-    (void)declval<_Alloc>().select_on_container_copy_construction()
+    (void)std::declval<_Alloc>().select_on_container_copy_construction()
 )> : true_type { };
 _LIBCPP_SUPPRESS_DEPRECATED_POP
 @@ -257,14 +263,14 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     };
 #endif // _LIBCPP_CXX03_LANG
-    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static pointer allocate(allocator_type& __a, size_type __n) {
         return __a.allocate(__n);
     }
     template <class _Ap = _Alloc, class =
         __enable_if_t<__has_allocate_hint<_Ap, size_type, const_void_pointer>::value> >
-    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer __hint) {
         _LIBCPP_SUPPRESS_DEPRECATED_PUSH
         return __a.allocate(__n, __hint);
 @@ -272,19 +278,19 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     }
     template <class _Ap = _Alloc, class = void, class =
         __enable_if_t<!__has_allocate_hint<_Ap, size_type, const_void_pointer>::value> >
-    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer) {
         return __a.allocate(__n);
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static void deallocate(allocator_type& __a, pointer __p, size_type __n) _NOEXCEPT {
         __a.deallocate(__p, __n);
     }
     template <class _Tp, class... _Args, class =
         __enable_if_t<__has_construct<allocator_type, _Tp*, _Args...>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static void construct(allocator_type& __a, _Tp* __p, _Args&&... __args) {
         _LIBCPP_SUPPRESS_DEPRECATED_PUSH
         __a.construct(__p, _VSTD::forward<_Args>(__args)...);
 @@ -292,7 +298,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     }
     template <class _Tp, class... _Args, class = void, class =
         __enable_if_t<!__has_construct<allocator_type, _Tp*, _Args...>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static void construct(allocator_type&, _Tp* __p, _Args&&... __args) {
 #if _LIBCPP_STD_VER > 17
         _VSTD::construct_at(__p, _VSTD::forward<_Args>(__args)...);
 @@ -303,7 +309,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     template <class _Tp, class =
         __enable_if_t<__has_destroy<allocator_type, _Tp*>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static void destroy(allocator_type& __a, _Tp* __p) {
         _LIBCPP_SUPPRESS_DEPRECATED_PUSH
         __a.destroy(__p);
 @@ -311,7 +317,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     }
     template <class _Tp, class = void, class =
         __enable_if_t<!__has_destroy<allocator_type, _Tp*>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static void destroy(allocator_type&, _Tp* __p) {
 #if _LIBCPP_STD_VER > 17
         _VSTD::destroy_at(__p);
 @@ -322,7 +328,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     template <class _Ap = _Alloc, class =
         __enable_if_t<__has_max_size<const _Ap>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static size_type max_size(const allocator_type& __a) _NOEXCEPT {
         _LIBCPP_SUPPRESS_DEPRECATED_PUSH
         return __a.max_size();
 @@ -330,33 +336,32 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
     }
     template <class _Ap = _Alloc, class = void, class =
         __enable_if_t<!__has_max_size<const _Ap>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static size_type max_size(const allocator_type&) _NOEXCEPT {
         return numeric_limits<size_type>::max() / sizeof(value_type);
     }
     template <class _Ap = _Alloc, class =
         __enable_if_t<__has_select_on_container_copy_construction<const _Ap>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static allocator_type select_on_container_copy_construction(const allocator_type& __a) {
         return __a.select_on_container_copy_construction();
     }
     template <class _Ap = _Alloc, class = void, class =
         __enable_if_t<!__has_select_on_container_copy_construction<const _Ap>::value> >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     static allocator_type select_on_container_copy_construction(const allocator_type& __a) {
         return __a;
     }
 };
-template <class _Traits, class _Tp>
-struct __rebind_alloc_helper {
 #ifndef _LIBCPP_CXX03_LANG
-    using type _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>;
+template <class _Traits, class _Tp>
+using __rebind_alloc _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>;
 #else
-    using type = typename _Traits::template rebind_alloc<_Tp>::other;
+template <class _Traits, class _Tp>
+using __rebind_alloc = typename _Traits::template rebind_alloc<_Tp>::other;
 #endif
-};
 // __is_default_allocator
 template <class _Tp>

lib/libcxx/include/__memory/assume_aligned.h+1-1

 @@ -12,9 +12,9 @@
 #include <__assert>
 #include <__config>
+#include <__type_traits/is_constant_evaluated.h>
 #include <cstddef>
 #include <cstdint>
-#include <type_traits> // for is_constant_evaluated()
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__memory/builtin_new_allocator.h created+70

...	@@ -0,0 +1,70 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H
10	#define _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H
11
12	#include <__config>
13	#include <__memory/unique_ptr.h>
14	#include <cstddef>
15	#include <new>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	// __builtin_new_allocator -- A non-templated helper for allocating and
24	// deallocating memory using __builtin_operator_new and
25	// __builtin_operator_delete. It should be used in preference to
26	// `std::allocator<T>` to avoid additional instantiations.
27	struct __builtin_new_allocator {
28	struct __builtin_new_deleter {
29	typedef void* pointer_type;
30
31	_LIBCPP_CONSTEXPR explicit __builtin_new_deleter(size_t __size, size_t __align)
32	: __size_(__size), __align_(__align) {}
33
34	void operator()(void* __p) const _NOEXCEPT {
35	_VSTD::__libcpp_deallocate(__p, __size_, __align_);
36	}
37
38	private:
39	size_t __size_;
40	size_t __align_;
41	};
42
43	typedef unique_ptr<void, __builtin_new_deleter> __holder_t;
44
45	static __holder_t __allocate_bytes(size_t __s, size_t __align) {
46	return __holder_t(_VSTD::__libcpp_allocate(__s, __align),
47	__builtin_new_deleter(__s, __align));
48	}
49
50	static void __deallocate_bytes(void* __p, size_t __s,
51	size_t __align) _NOEXCEPT {
52	_VSTD::__libcpp_deallocate(__p, __s, __align);
53	}
54
55	template <class _Tp>
56	_LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
57	static __holder_t __allocate_type(size_t __n) {
58	return __allocate_bytes(__n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
59	}
60
61	template <class _Tp>
62	_LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
63	static void __deallocate_type(void* __p, size_t __n) _NOEXCEPT {
64	__deallocate_bytes(__p, __n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
65	}
66	};
67
68	_LIBCPP_END_NAMESPACE_STD
69
70	#endif // _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H

lib/libcxx/include/__memory/compressed_pair.h+22-11

 @@ -11,10 +11,21 @@
 #define _LIBCPP___MEMORY_COMPRESSED_PAIR_H
 #include <__config>
+#include <__fwd/get.h>
+#include <__fwd/tuple.h>
+#include <__tuple_dir/tuple_indices.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/dependent_type.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_default_constructible.h>
+#include <__type_traits/is_empty.h>
+#include <__type_traits/is_final.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_swappable.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <tuple> // needed in c++03 for some constructors
+#include <__utility/piecewise_construct.h>
-#include <type_traits>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -41,12 +52,12 @@ struct __compressed_pair_elem {
 #ifndef _LIBCPP_CXX03_LANG
   template <class... _Args, size_t... _Indices>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
   explicit __compressed_pair_elem(piecewise_construct_t, tuple<_Args...> __args, __tuple_indices<_Indices...>)
       : __value_(std::forward<_Args>(std::get<_Indices>(__args))...) {}
 #endif
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference __get() _NOEXCEPT { return __value_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference __get() _NOEXCEPT { return __value_; }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR const_reference __get() const _NOEXCEPT { return __value_; }
 private:
 @@ -70,12 +81,12 @@ struct __compressed_pair_elem<_Tp, _Idx, true> : private _Tp {
 #ifndef _LIBCPP_CXX03_LANG
   template <class... _Args, size_t... _Indices>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
   __compressed_pair_elem(piecewise_construct_t, tuple<_Args...> __args, __tuple_indices<_Indices...>)
       : __value_type(std::forward<_Args>(std::get<_Indices>(__args))...) {}
 #endif
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 reference __get() _NOEXCEPT { return *this; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference __get() _NOEXCEPT { return *this; }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR const_reference __get() const _NOEXCEPT { return *this; }
 };
 @@ -109,14 +120,14 @@ public:
 #ifndef _LIBCPP_CXX03_LANG
   template <class... _Args1, class... _Args2>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
   explicit __compressed_pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
                              tuple<_Args2...> __second_args)
       : _Base1(__pc, std::move(__first_args), typename __make_tuple_indices<sizeof...(_Args1)>::type()),
         _Base2(__pc, std::move(__second_args), typename __make_tuple_indices<sizeof...(_Args2)>::type()) {}
 #endif
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   typename _Base1::reference first() _NOEXCEPT {
     return static_cast<_Base1&>(*this).__get();
   }
 @@ -126,7 +137,7 @@ public:
     return static_cast<_Base1 const&>(*this).__get();
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   typename _Base2::reference second() _NOEXCEPT {
     return static_cast<_Base2&>(*this).__get();
   }
 @@ -145,7 +156,7 @@ public:
     return static_cast<_Base2*>(__pair);
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   void swap(__compressed_pair& __x)
       _NOEXCEPT_(__is_nothrow_swappable<_T1>::value && __is_nothrow_swappable<_T2>::value) {
     using std::swap;
 @@ -155,7 +166,7 @@ public:
 };
 template <class _T1, class _T2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 void swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y)
     _NOEXCEPT_(__is_nothrow_swappable<_T1>::value && __is_nothrow_swappable<_T2>::value) {
   __x.swap(__y);

lib/libcxx/include/__memory/concepts.h+5-4

 @@ -10,14 +10,15 @@
 #ifndef _LIBCPP___MEMORY_CONCEPTS_H
 #define _LIBCPP___MEMORY_CONCEPTS_H
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
 #include <__ranges/access.h>
 #include <__ranges/concepts.h>
-#include <concepts>
+#include <__type_traits/is_reference.h>
-#include <type_traits>
+#include <__type_traits/remove_cvref.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -25,7 +26,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
 @@ -61,7 +62,7 @@ concept __nothrow_forward_range =
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__memory/construct_at.h+14-11

 @@ -15,9 +15,12 @@
 #include <__iterator/access.h>
 #include <__memory/addressof.h>
 #include <__memory/voidify.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_array.h>
+#include <__utility/declval.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <type_traits>
+#include <new>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -29,7 +32,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 17
-template <class _Tp, class... _Args, class = decltype(::new(declval<void*>()) _Tp(declval<_Args>()...))>
+template <class _Tp, class... _Args, class = decltype(::new(std::declval<void*>()) _Tp(std::declval<_Args>()...))>
 _LIBCPP_HIDE_FROM_ABI constexpr _Tp* construct_at(_Tp* __location, _Args&&... __args) {
   _LIBCPP_ASSERT(__location != nullptr, "null pointer given to construct_at");
   return ::new (_VSTD::__voidify(*__location)) _Tp(_VSTD::forward<_Args>(__args)...);
 @@ -37,7 +40,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp* construct_at(_Tp* __location, _Args&&... __
 #endif
-template <class _Tp, class... _Args, class = decltype(::new(declval<void*>()) _Tp(declval<_Args>()...))>
+template <class _Tp, class... _Args, class = decltype(::new(std::declval<void*>()) _Tp(std::declval<_Args>()...))>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* __construct_at(_Tp* __location, _Args&&... __args) {
 #if _LIBCPP_STD_VER > 17
   return std::construct_at(__location, std::forward<_Args>(__args)...);
 @@ -53,11 +56,11 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* __construct_at(_Tp* __location, _Ar
 // taking an array).
 template <class _ForwardIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 _ForwardIterator __destroy(_ForwardIterator, _ForwardIterator);
 template <class _Tp, typename enable_if<!is_array<_Tp>::value, int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void __destroy_at(_Tp* __loc) {
     _LIBCPP_ASSERT(__loc != nullptr, "null pointer given to destroy_at");
     __loc->~_Tp();
 @@ -65,7 +68,7 @@ void __destroy_at(_Tp* __loc) {
 #if _LIBCPP_STD_VER > 17
 template <class _Tp, typename enable_if<is_array<_Tp>::value, int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void __destroy_at(_Tp* __loc) {
     _LIBCPP_ASSERT(__loc != nullptr, "null pointer given to destroy_at");
     _VSTD::__destroy(_VSTD::begin(*__loc), _VSTD::end(*__loc));
 @@ -73,7 +76,7 @@ void __destroy_at(_Tp* __loc) {
 #endif
 template <class _ForwardIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 _ForwardIterator __destroy(_ForwardIterator __first, _ForwardIterator __last) {
     for (; __first != __last; ++__first)
         _VSTD::__destroy_at(_VSTD::addressof(*__first));
 @@ -83,27 +86,27 @@ _ForwardIterator __destroy(_ForwardIterator __first, _ForwardIterator __last) {
 #if _LIBCPP_STD_VER > 14
 template <class _Tp, enable_if_t<!is_array_v<_Tp>, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void destroy_at(_Tp* __loc) {
     _VSTD::__destroy_at(__loc);
 }
 #if _LIBCPP_STD_VER > 17
 template <class _Tp, enable_if_t<is_array_v<_Tp>, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void destroy_at(_Tp* __loc) {
   _VSTD::__destroy_at(__loc);
 }
 #endif
 template <class _ForwardIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 void destroy(_ForwardIterator __first, _ForwardIterator __last) {
   (void)_VSTD::__destroy(_VSTD::move(__first), _VSTD::move(__last));
 }
 template <class _ForwardIterator, class _Size>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
 _ForwardIterator destroy_n(_ForwardIterator __first, _Size __n) {
     for (; __n > 0; (void)++__first, --__n)
         _VSTD::__destroy_at(_VSTD::addressof(*__first));

lib/libcxx/include/__memory/destruct_n.h created+64

...	@@ -0,0 +1,64 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_DESTRUCT_N_H
10	#define _LIBCPP___MEMORY_DESTRUCT_N_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/is_trivially_destructible.h>
15	#include <cstddef>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	struct __destruct_n
24	{
25	private:
26	size_t __size_;
27
28	template <class _Tp>
29	_LIBCPP_INLINE_VISIBILITY void __process(_Tp* __p, false_type) _NOEXCEPT
30	{for (size_t __i = 0; __i < __size_; ++__i, ++__p) __p->~_Tp();}
31
32	template <class _Tp>
33	_LIBCPP_INLINE_VISIBILITY void __process(_Tp*, true_type) _NOEXCEPT
34	{}
35
36	_LIBCPP_INLINE_VISIBILITY void __incr(false_type) _NOEXCEPT
37	{++__size_;}
38	_LIBCPP_INLINE_VISIBILITY void __incr(true_type) _NOEXCEPT
39	{}
40
41	_LIBCPP_INLINE_VISIBILITY void __set(size_t __s, false_type) _NOEXCEPT
42	{__size_ = __s;}
43	_LIBCPP_INLINE_VISIBILITY void __set(size_t, true_type) _NOEXCEPT
44	{}
45	public:
46	_LIBCPP_INLINE_VISIBILITY explicit __destruct_n(size_t __s) _NOEXCEPT
47	: __size_(__s) {}
48
49	template <class _Tp>
50	_LIBCPP_INLINE_VISIBILITY void __incr() _NOEXCEPT
51	{__incr(integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
52
53	template <class _Tp>
54	_LIBCPP_INLINE_VISIBILITY void __set(size_t __s, _Tp*) _NOEXCEPT
55	{__set(__s, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
56
57	template <class _Tp>
58	_LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) _NOEXCEPT
59	{__process(__p, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
60	};
61
62	_LIBCPP_END_NAMESPACE_STD
63
64	#endif // _LIBCPP___MEMORY_DESTRUCT_N_H

lib/libcxx/include/__memory/pointer_traits.h+24-22

 @@ -12,8 +12,15 @@
 #include <__config>
 #include <__memory/addressof.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/conjunction.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_class.h>
+#include <__type_traits/is_function.h>
+#include <__type_traits/is_void.h>
+#include <__type_traits/void_t.h>
+#include <__utility/declval.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -25,8 +32,7 @@ template <class _Tp, class = void>
 struct __has_element_type : false_type {};
 template <class _Tp>
-struct __has_element_type<_Tp,
+struct __has_element_type<_Tp, __void_t<typename _Tp::element_type> > : true_type {};
-              typename __void_t<typename _Tp::element_type>::type> : true_type {};
 template <class _Ptr, bool = __has_element_type<_Ptr>::value>
 struct __pointer_traits_element_type;
 @@ -53,8 +59,7 @@ template <class _Tp, class = void>
 struct __has_difference_type : false_type {};
 template <class _Tp>
-struct __has_difference_type<_Tp,
+struct __has_difference_type<_Tp, __void_t<typename _Tp::difference_type> > : true_type {};
-            typename __void_t<typename _Tp::difference_type>::type> : true_type {};
 template <class _Ptr, bool = __has_difference_type<_Ptr>::value>
 struct __pointer_traits_difference_type
 @@ -123,9 +128,8 @@ struct _LIBCPP_TEMPLATE_VIS pointer_traits
 private:
     struct __nat {};
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
+    static pointer pointer_to(__conditional_t<is_void<element_type>::value, __nat, element_type>& __r)
-                                           __nat, element_type>::type& __r)
         {return pointer::pointer_to(__r);}
 };
 @@ -145,20 +149,18 @@ struct _LIBCPP_TEMPLATE_VIS pointer_traits<_Tp*>
 private:
     struct __nat {};
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
+    static pointer pointer_to(__conditional_t<is_void<element_type>::value, __nat, element_type>& __r) _NOEXCEPT
-                                      __nat, element_type>::type& __r) _NOEXCEPT
         {return _VSTD::addressof(__r);}
 };
-template <class _From, class _To>
-struct __rebind_pointer {
 #ifndef _LIBCPP_CXX03_LANG
-    typedef typename pointer_traits<_From>::template rebind<_To>        type;
+template <class _From, class _To>
+using __rebind_pointer_t = typename pointer_traits<_From>::template rebind<_To>;
 #else
-    typedef typename pointer_traits<_From>::template rebind<_To>::other type;
+template <class _From, class _To>
+using __rebind_pointer_t = typename pointer_traits<_From>::template rebind<_To>::other;
 #endif
-};
 // to_address
 @@ -177,7 +179,7 @@ struct _HasToAddress : false_type {};
 template <class _Pointer>
 struct _HasToAddress<_Pointer,
-    decltype((void)pointer_traits<_Pointer>::to_address(declval<const _Pointer&>()))
+    decltype((void)pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))
 > : true_type {};
 template <class _Pointer, class = void>
 @@ -185,7 +187,7 @@ struct _HasArrow : false_type {};
 template <class _Pointer>
 struct _HasArrow<_Pointer,
-    decltype((void)declval<const _Pointer&>().operator->())
+    decltype((void)std::declval<const _Pointer&>().operator->())
 > : true_type {};
 template <class _Pointer>
 @@ -198,7 +200,7 @@ template <class _Pointer, class = __enable_if_t<
     _And<is_class<_Pointer>, _IsFancyPointer<_Pointer> >::value
 > >
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-typename decay<decltype(__to_address_helper<_Pointer>::__call(declval<const _Pointer&>()))>::type
+typename decay<decltype(__to_address_helper<_Pointer>::__call(std::declval<const _Pointer&>()))>::type
 __to_address(const _Pointer& __p) _NOEXCEPT {
     return __to_address_helper<_Pointer>::__call(__p);
 }
 @@ -206,16 +208,16 @@ __to_address(const _Pointer& __p) _NOEXCEPT {
 template <class _Pointer, class>
 struct __to_address_helper {
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    static decltype(_VSTD::__to_address(declval<const _Pointer&>().operator->()))
+    static decltype(_VSTD::__to_address(std::declval<const _Pointer&>().operator->()))
     __call(const _Pointer& __p) _NOEXCEPT {
         return _VSTD::__to_address(__p.operator->());
     }
 };
 template <class _Pointer>
-struct __to_address_helper<_Pointer, decltype((void)pointer_traits<_Pointer>::to_address(declval<const _Pointer&>()))> {
+struct __to_address_helper<_Pointer, decltype((void)pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))> {
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    static decltype(pointer_traits<_Pointer>::to_address(declval<const _Pointer&>()))
+    static decltype(pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))
     __call(const _Pointer& __p) _NOEXCEPT {
         return pointer_traits<_Pointer>::to_address(__p);
     }

lib/libcxx/include/__memory/ranges_construct_at.h+4-3

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	#include <__utility/declval.h>	22	#include <__utility/declval.h>
23	#include <__utility/forward.h>	23	#include <__utility/forward.h>
24	#include <__utility/move.h>	24	#include <__utility/move.h>
		25	#include <new>
25		26
26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
27	# pragma GCC system_header	28	# pragma GCC system_header
...	@@ -29,7 +30,7 @@	...	@@ -29,7 +30,7 @@
29		30
30	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
31		32
32	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	33	#if _LIBCPP_STD_VER > 17
33	namespace ranges {	34	namespace ranges {
34		35
35	// construct_at	36	// construct_at
...	@@ -38,7 +39,7 @@ namespace __construct_at {	...	@@ -38,7 +39,7 @@ namespace __construct_at {
38		39
39	struct __fn {	40	struct __fn {
40	template<class _Tp, class... _Args, class = decltype(	41	template<class _Tp, class... _Args, class = decltype(
41	::new (declval<void*>()) _Tp(declval<_Args>()...)	42	::new (std::declval<void*>()) _Tp(std::declval<_Args>()...)
42	)>	43	)>
43	_LIBCPP_HIDE_FROM_ABI	44	_LIBCPP_HIDE_FROM_ABI
44	constexpr _Tp* operator()(_Tp* __location, _Args&& ...__args) const {	45	constexpr _Tp* operator()(_Tp* __location, _Args&& ...__args) const {
...	@@ -117,7 +118,7 @@ inline namespace __cpo {	...	@@ -117,7 +118,7 @@ inline namespace __cpo {
117		118
118	} // namespace ranges	119	} // namespace ranges
119		120
120	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	121	#endif // _LIBCPP_STD_VER > 17
121		122
122	_LIBCPP_END_NAMESPACE_STD	123	_LIBCPP_END_NAMESPACE_STD
123		124

lib/libcxx/include/__memory/ranges_uninitialized_algorithms.h+7-6

lib/libcxx/include/__memory/raw_storage_iterator.h+1

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include <__memory/addressof.h>	16	#include <__memory/addressof.h>
17	#include <__utility/move.h>	17	#include <__utility/move.h>
18	#include <cstddef>	18	#include <cstddef>
		19	#include <new>
19		20
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header	22	# pragma GCC system_header

lib/libcxx/include/__memory/shared_ptr.h+159-65

 @@ -11,6 +11,8 @@
 #define _LIBCPP___MEMORY_SHARED_PTR_H
 #include <__availability>
+#include <__compare/compare_three_way.h>
+#include <__compare/ordering.h>
 #include <__config>
 #include <__functional/binary_function.h>
 #include <__functional/operations.h>
 @@ -19,6 +21,7 @@
 #include <__memory/addressof.h>
 #include <__memory/allocation_guard.h>
 #include <__memory/allocator.h>
+#include <__memory/allocator_destructor.h>
 #include <__memory/allocator_traits.h>
 #include <__memory/auto_ptr.h>
 #include <__memory/compressed_pair.h>
 @@ -32,39 +35,19 @@
 #include <cstddef>
 #include <cstdlib> // abort
 #include <iosfwd>
+#include <new>
 #include <stdexcept>
-#include <type_traits>
 #include <typeinfo>
 #if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
 #  include <atomic>
 #endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Alloc>
-class __allocator_destructor
-{
-    typedef _LIBCPP_NODEBUG allocator_traits<_Alloc> __alloc_traits;
-public:
-    typedef _LIBCPP_NODEBUG typename __alloc_traits::pointer pointer;
-    typedef _LIBCPP_NODEBUG typename __alloc_traits::size_type size_type;
-private:
-    _Alloc& __alloc_;
-    size_type __s_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __allocator_destructor(_Alloc& __a, size_type __s)
-             _NOEXCEPT
-        : __alloc_(__a), __s_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-        {__alloc_traits::deallocate(__alloc_, __p, __s_);}
-};
 // NOTE: Relaxed and acq/rel atomics (for increment and decrement respectively)
 // should be sufficient for thread safety.
 // See https://llvm.org/PR22803
 @@ -128,8 +111,8 @@ class _LIBCPP_EXCEPTION_ABI bad_weak_ptr
 public:
     bad_weak_ptr() _NOEXCEPT = default;
     bad_weak_ptr(const bad_weak_ptr&) _NOEXCEPT = default;
-    virtual ~bad_weak_ptr() _NOEXCEPT;
+    ~bad_weak_ptr() _NOEXCEPT override;
-    virtual const char* what() const  _NOEXCEPT;
+    const char* what() const  _NOEXCEPT override;
 };
 _LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
 @@ -194,7 +177,7 @@ public:
         : __shared_count(__refs),
           __shared_weak_owners_(__refs) {}
 protected:
-    virtual ~__shared_weak_count();
+    ~__shared_weak_count() override;
 public:
 #if defined(_LIBCPP_SHARED_PTR_DEFINE_LEGACY_INLINE_FUNCTIONS)
 @@ -237,12 +220,12 @@ public:
         :  __data_(__compressed_pair<_Tp, _Dp>(__p, _VSTD::move(__d)), _VSTD::move(__a)) {}
 #ifndef _LIBCPP_NO_RTTI
-    virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
+    const void* __get_deleter(const type_info&) const _NOEXCEPT override;
 #endif
 private:
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
-    virtual void __on_zero_shared_weak() _NOEXCEPT;
+    void __on_zero_shared_weak() _NOEXCEPT override;
 };
 #ifndef _LIBCPP_NO_RTTI
 @@ -277,6 +260,8 @@ __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
     __a.deallocate(_PTraits::pointer_to(*this), 1);
 }
+struct __default_initialize_tag {};
 template <class _Tp, class _Alloc>
 struct __shared_ptr_emplace
     : __shared_weak_count
 @@ -295,6 +280,16 @@ struct __shared_ptr_emplace
 #endif
     }
+#if _LIBCPP_STD_VER >= 20
+    _LIBCPP_HIDE_FROM_ABI
+    explicit __shared_ptr_emplace(__default_initialize_tag, _Alloc __a)
+        : __storage_(std::move(__a))
+    {
+        ::new ((void*)__get_elem()) _Tp;
+    }
+#endif
     _LIBCPP_HIDE_FROM_ABI
     _Alloc* __get_alloc() _NOEXCEPT { return __storage_.__get_alloc(); }
 @@ -302,7 +297,7 @@ struct __shared_ptr_emplace
     _Tp* __get_elem() _NOEXCEPT { return __storage_.__get_elem(); }
 private:
-    virtual void __on_zero_shared() _NOEXCEPT {
+    void __on_zero_shared() _NOEXCEPT override {
 #if _LIBCPP_STD_VER > 17
         using _TpAlloc = typename __allocator_traits_rebind<_Alloc, _Tp>::type;
         _TpAlloc __tmp(*__get_alloc());
 @@ -312,7 +307,7 @@ private:
 #endif
     }
-    virtual void __on_zero_shared_weak() _NOEXCEPT {
+    void __on_zero_shared_weak() _NOEXCEPT override {
         using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type;
         using _ControlBlockPointer = typename allocator_traits<_ControlBlockAlloc>::pointer;
         _ControlBlockAlloc __tmp(*__get_alloc());
 @@ -383,22 +378,22 @@ struct __compatible_with
 template <class _Ptr, class = void>
 struct __is_deletable : false_type { };
 template <class _Ptr>
-struct __is_deletable<_Ptr, decltype(delete declval<_Ptr>())> : true_type { };
+struct __is_deletable<_Ptr, decltype(delete std::declval<_Ptr>())> : true_type { };
 template <class _Ptr, class = void>
 struct __is_array_deletable : false_type { };
 template <class _Ptr>
-struct __is_array_deletable<_Ptr, decltype(delete[] declval<_Ptr>())> : true_type { };
+struct __is_array_deletable<_Ptr, decltype(delete[] std::declval<_Ptr>())> : true_type { };
 template <class _Dp, class _Pt,
-    class = decltype(declval<_Dp>()(declval<_Pt>()))>
+    class = decltype(std::declval<_Dp>()(std::declval<_Pt>()))>
 static true_type __well_formed_deleter_test(int);
 template <class, class>
 static false_type __well_formed_deleter_test(...);
 template <class _Dp, class _Pt>
-struct __well_formed_deleter : decltype(__well_formed_deleter_test<_Dp, _Pt>(0)) {};
+struct __well_formed_deleter : decltype(std::__well_formed_deleter_test<_Dp, _Pt>(0)) {};
 template<class _Dp, class _Tp, class _Yp>
 struct __shared_ptr_deleter_ctor_reqs
 @@ -687,7 +682,7 @@ public:
         {
             typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;
             typedef __shared_ptr_pointer<typename unique_ptr<_Yp, _Dp>::pointer,
-                                        reference_wrapper<typename remove_reference<_Dp>::type>,
+                                        reference_wrapper<__libcpp_remove_reference_t<_Dp> >,
                                         _AllocT> _CntrlBlk;
             __cntrl_ = new _CntrlBlk(__r.get(), _VSTD::ref(__r.get_deleter()), _AllocT());
             __enable_weak_this(__r.get(), __r.get());
 @@ -802,7 +797,7 @@ public:
     }
     _LIBCPP_HIDE_FROM_ABI
-    typename add_lvalue_reference<element_type>::type operator*() const _NOEXCEPT
+    __add_lvalue_reference_t<element_type> operator*() const _NOEXCEPT
     {
         return *__ptr_;
     }
 @@ -855,7 +850,7 @@ public:
 #if _LIBCPP_STD_VER > 14
     _LIBCPP_HIDE_FROM_ABI
-    typename add_lvalue_reference<element_type>::type operator[](ptrdiff_t __i) const
+    __add_lvalue_reference_t<element_type> operator[](ptrdiff_t __i) const
     {
             static_assert(is_array<_Tp>::value,
                           "std::shared_ptr<T>::operator[] is only valid when T is an array type.");
 @@ -904,7 +899,7 @@ private:
     _LIBCPP_HIDE_FROM_ABI
     void __enable_weak_this(const enable_shared_from_this<_Yp>* __e, _OrigPtr* __ptr) _NOEXCEPT
     {
-        typedef typename remove_cv<_Yp>::type _RawYp;
+        typedef __remove_cv_t<_Yp> _RawYp;
         if (__e && __e->__weak_this_.expired())
         {
             __e->__weak_this_ = shared_ptr<_RawYp>(*this,
 @@ -962,6 +957,29 @@ shared_ptr<_Tp> make_shared(_Args&& ...__args)
     return _VSTD::allocate_shared<_Tp>(allocator<_Tp>(), _VSTD::forward<_Args>(__args)...);
 }
+#if _LIBCPP_STD_VER >= 20
+template<class _Tp, class _Alloc, __enable_if_t<!is_array<_Tp>::value, int> = 0>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> allocate_shared_for_overwrite(const _Alloc& __a)
+{
+    using _ControlBlock = __shared_ptr_emplace<_Tp, _Alloc>;
+    using _ControlBlockAllocator = typename __allocator_traits_rebind<_Alloc, _ControlBlock>::type;
+    __allocation_guard<_ControlBlockAllocator> __guard(__a, 1);
+    ::new ((void*)_VSTD::addressof(*__guard.__get())) _ControlBlock(__default_initialize_tag{}, __a);
+    auto __control_block = __guard.__release_ptr();
+    return shared_ptr<_Tp>::__create_with_control_block((*__control_block).__get_elem(), _VSTD::addressof(*__control_block));
+}
+template<class _Tp, __enable_if_t<!is_array<_Tp>::value, int> = 0>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> make_shared_for_overwrite()
+{
+    return std::allocate_shared_for_overwrite<_Tp>(allocator<_Tp>());
+}
+#endif // _LIBCPP_STD_VER >= 20
 #if _LIBCPP_STD_VER > 14
 template <size_t _Alignment>
 @@ -992,6 +1010,17 @@ struct __unbounded_array_control_block<_Tp[], _Alloc> : __shared_weak_count
         std::__uninitialized_allocator_value_construct_n(__alloc_, std::begin(__data_), __count_);
     }
+#if _LIBCPP_STD_VER >= 20
+    _LIBCPP_HIDE_FROM_ABI
+    explicit __unbounded_array_control_block(_Alloc const& __alloc, size_t __count, __default_initialize_tag)
+        : __alloc_(__alloc), __count_(__count)
+    {
+        // We are purposefully not using an allocator-aware default construction because the spec says so.
+        // There's currently no way of expressing default initialization in an allocator-aware manner anyway.
+        std::uninitialized_default_construct_n(std::begin(__data_), __count_);
+    }
+#endif
     // Returns the number of bytes required to store a control block followed by the given number
     // of elements of _Tp, with the whole storage being aligned to a multiple of _Tp's alignment.
     _LIBCPP_HIDE_FROM_ABI
 @@ -1008,7 +1037,7 @@ struct __unbounded_array_control_block<_Tp[], _Alloc> : __shared_weak_count
         return (__bytes + __align - 1) & ~(__align - 1);
     }
-    _LIBCPP_HIDE_FROM_ABI
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     ~__unbounded_array_control_block() override { } // can't be `= default` because of the sometimes-non-trivial union member __data_
 private:
 @@ -1075,7 +1104,16 @@ struct __bounded_array_control_block<_Tp[_Count], _Alloc>
         std::__uninitialized_allocator_value_construct_n(__alloc_, std::addressof(__data_[0]), _Count);
     }
+#if _LIBCPP_STD_VER >= 20
     _LIBCPP_HIDE_FROM_ABI
+    explicit __bounded_array_control_block(_Alloc const& __alloc, __default_initialize_tag) : __alloc_(__alloc) {
+        // We are purposefully not using an allocator-aware default construction because the spec says so.
+        // There's currently no way of expressing default initialization in an allocator-aware manner anyway.
+        std::uninitialized_default_construct_n(std::addressof(__data_[0]), _Count);
+    }
+#endif
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     ~__bounded_array_control_block() override { } // can't be `= default` because of the sometimes-non-trivial union member __data_
 private:
 @@ -1118,6 +1156,7 @@ shared_ptr<_Array> __allocate_shared_bounded_array(const _Alloc& __a, _Arg&& ...
 #if _LIBCPP_STD_VER > 17
+// bounded array variants
 template<class _Tp, class _Alloc, class = __enable_if_t<is_bounded_array<_Tp>::value>>
 _LIBCPP_HIDE_FROM_ABI
 shared_ptr<_Tp> allocate_shared(const _Alloc& __a)
 @@ -1132,18 +1171,11 @@ shared_ptr<_Tp> allocate_shared(const _Alloc& __a, const remove_extent_t<_Tp>& _
     return std::__allocate_shared_bounded_array<_Tp>(__a, __u);
 }
-template<class _Tp, class _Alloc, class = __enable_if_t<is_unbounded_array<_Tp>::value>>
+template<class _Tp, class _Alloc, __enable_if_t<is_bounded_array<_Tp>::value, int> = 0>
 _LIBCPP_HIDE_FROM_ABI
-shared_ptr<_Tp> allocate_shared(const _Alloc& __a, size_t __n)
+shared_ptr<_Tp> allocate_shared_for_overwrite(const _Alloc& __a)
 {
-    return std::__allocate_shared_unbounded_array<_Tp>(__a, __n);
+    return std::__allocate_shared_bounded_array<_Tp>(__a, __default_initialize_tag{});
-}
-template<class _Tp, class _Alloc, class = __enable_if_t<is_unbounded_array<_Tp>::value>>
-_LIBCPP_HIDE_FROM_ABI
-shared_ptr<_Tp> allocate_shared(const _Alloc& __a, size_t __n, const remove_extent_t<_Tp>& __u)
-{
-    return std::__allocate_shared_unbounded_array<_Tp>(__a, __n, __u);
 }
 template<class _Tp, class = __enable_if_t<is_bounded_array<_Tp>::value>>
 @@ -1160,6 +1192,35 @@ shared_ptr<_Tp> make_shared(const remove_extent_t<_Tp>& __u)
     return std::__allocate_shared_bounded_array<_Tp>(allocator<_Tp>(), __u);
 }
+template<class _Tp, __enable_if_t<is_bounded_array<_Tp>::value, int> = 0>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> make_shared_for_overwrite()
+{
+    return std::__allocate_shared_bounded_array<_Tp>(allocator<_Tp>(), __default_initialize_tag{});
+}
+// unbounded array variants
+template<class _Tp, class _Alloc, class = __enable_if_t<is_unbounded_array<_Tp>::value>>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> allocate_shared(const _Alloc& __a, size_t __n)
+{
+    return std::__allocate_shared_unbounded_array<_Tp>(__a, __n);
+}
+template<class _Tp, class _Alloc, class = __enable_if_t<is_unbounded_array<_Tp>::value>>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> allocate_shared(const _Alloc& __a, size_t __n, const remove_extent_t<_Tp>& __u)
+{
+    return std::__allocate_shared_unbounded_array<_Tp>(__a, __n, __u);
+}
+template<class _Tp, class _Alloc, __enable_if_t<is_unbounded_array<_Tp>::value, int> = 0>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> allocate_shared_for_overwrite(const _Alloc& __a, size_t __n)
+{
+    return std::__allocate_shared_unbounded_array<_Tp>(__a, __n, __default_initialize_tag{});
+}
 template<class _Tp, class = __enable_if_t<is_unbounded_array<_Tp>::value>>
 _LIBCPP_HIDE_FROM_ABI
 shared_ptr<_Tp> make_shared(size_t __n)
 @@ -1174,6 +1235,13 @@ shared_ptr<_Tp> make_shared(size_t __n, const remove_extent_t<_Tp>& __u)
     return std::__allocate_shared_unbounded_array<_Tp>(allocator<_Tp>(), __n, __u);
 }
+template<class _Tp, __enable_if_t<is_unbounded_array<_Tp>::value, int> = 0>
+_LIBCPP_HIDE_FROM_ABI
+shared_ptr<_Tp> make_shared_for_overwrite(size_t __n)
+{
+    return std::__allocate_shared_unbounded_array<_Tp>(allocator<_Tp>(), __n, __default_initialize_tag{});
+}
 #endif // _LIBCPP_STD_VER > 17
 template<class _Tp, class _Up>
 @@ -1184,6 +1252,8 @@ operator==(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
     return __x.get() == __y.get();
 }
+#if _LIBCPP_STD_VER <= 17
 template<class _Tp, class _Up>
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 @@ -1230,6 +1300,17 @@ operator>=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
     return !(__x < __y);
 }
+#endif // _LIBCPP_STD_VER <= 17
+#if _LIBCPP_STD_VER > 17
+template<class _Tp, class _Up>
+_LIBCPP_HIDE_FROM_ABI strong_ordering
+operator<=>(shared_ptr<_Tp> const& __x, shared_ptr<_Up> const& __y) noexcept
+{
+    return compare_three_way()(__x.get(), __y.get());
+}
+#endif
 template<class _Tp>
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 @@ -1238,6 +1319,8 @@ operator==(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
     return !__x;
 }
+#if _LIBCPP_STD_VER <= 17
 template<class _Tp>
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 @@ -1326,6 +1409,17 @@ operator>=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
     return !(nullptr < __x);
 }
+#endif // _LIBCPP_STD_VER <= 17
+#if _LIBCPP_STD_VER > 17
+template<class _Tp>
+_LIBCPP_HIDE_FROM_ABI strong_ordering
+operator<=>(shared_ptr<_Tp> const& __x, nullptr_t) noexcept
+{
+    return compare_three_way()(__x.get(), static_cast<typename shared_ptr<_Tp>::element_type*>(nullptr));
+}
+#endif
 template<class _Tp>
 inline _LIBCPP_INLINE_VISIBILITY
 void
 @@ -1355,7 +1449,7 @@ dynamic_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
 }
 template<class _Tp, class _Up>
-shared_ptr<_Tp>
+_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>
 const_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
 {
     typedef typename shared_ptr<_Tp>::element_type _RTp;
 @@ -1363,7 +1457,7 @@ const_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
 }
 template<class _Tp, class _Up>
-shared_ptr<_Tp>
+_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>
 reinterpret_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
 {
     return shared_ptr<_Tp>(__r,
 @@ -1771,7 +1865,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p);
 class _LIBCPP_TYPE_VIS __sp_mut
 {
-    void* __lx;
+    void* __lx_;
 public:
     void lock() _NOEXCEPT;
     void unlock() _NOEXCEPT;
 @@ -1797,10 +1891,10 @@ atomic_is_lock_free(const shared_ptr<_Tp>*)
 template <class _Tp>
 _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
-shared_ptr<_Tp>
+_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>
 atomic_load(const shared_ptr<_Tp>* __p)
 {
-    __sp_mut& __m = __get_sp_mut(__p);
+    __sp_mut& __m = std::__get_sp_mut(__p);
     __m.lock();
     shared_ptr<_Tp> __q = *__p;
     __m.unlock();
 @@ -1813,15 +1907,15 @@ _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
 shared_ptr<_Tp>
 atomic_load_explicit(const shared_ptr<_Tp>* __p, memory_order)
 {
-    return atomic_load(__p);
+    return std::atomic_load(__p);
 }
 template <class _Tp>
 _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
-void
+_LIBCPP_HIDE_FROM_ABI void
 atomic_store(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
 {
-    __sp_mut& __m = __get_sp_mut(__p);
+    __sp_mut& __m = std::__get_sp_mut(__p);
     __m.lock();
     __p->swap(__r);
     __m.unlock();
 @@ -1833,15 +1927,15 @@ _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
 void
 atomic_store_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
 {
-    atomic_store(__p, __r);
+    std::atomic_store(__p, __r);
 }
 template <class _Tp>
 _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
-shared_ptr<_Tp>
+_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>
 atomic_exchange(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
 {
-    __sp_mut& __m = __get_sp_mut(__p);
+    __sp_mut& __m = std::__get_sp_mut(__p);
     __m.lock();
     __p->swap(__r);
     __m.unlock();
 @@ -1854,16 +1948,16 @@ _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
 shared_ptr<_Tp>
 atomic_exchange_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
 {
-    return atomic_exchange(__p, __r);
+    return std::atomic_exchange(__p, __r);
 }
 template <class _Tp>
 _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 atomic_compare_exchange_strong(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
 {
     shared_ptr<_Tp> __temp;
-    __sp_mut& __m = __get_sp_mut(__p);
+    __sp_mut& __m = std::__get_sp_mut(__p);
     __m.lock();
     if (__p->__owner_equivalent(*__v))
     {
 @@ -1884,7 +1978,7 @@ _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
 bool
 atomic_compare_exchange_weak(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
 {
-    return atomic_compare_exchange_strong(__p, __v, __w);
+    return std::atomic_compare_exchange_strong(__p, __v, __w);
 }
 template <class _Tp>
 @@ -1894,7 +1988,7 @@ bool
 atomic_compare_exchange_strong_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
                                         shared_ptr<_Tp> __w, memory_order, memory_order)
 {
-    return atomic_compare_exchange_strong(__p, __v, __w);
+    return std::atomic_compare_exchange_strong(__p, __v, __w);
 }
 template <class _Tp>
 @@ -1904,7 +1998,7 @@ bool
 atomic_compare_exchange_weak_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
                                       shared_ptr<_Tp> __w, memory_order, memory_order)
 {
-    return atomic_compare_exchange_weak(__p, __v, __w);
+    return std::atomic_compare_exchange_weak(__p, __v, __w);
 }
 #endif // !defined(_LIBCPP_HAS_NO_THREADS)

lib/libcxx/include/__memory/swap_allocator.h+4-3

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	#include <__config>	12	#include <__config>
13	#include <__memory/allocator_traits.h>	13	#include <__memory/allocator_traits.h>
14	#include <__type_traits/integral_constant.h>	14	#include <__type_traits/integral_constant.h>
		15	#include <__type_traits/is_swappable.h>
15	#include <__utility/swap.h>	16	#include <__utility/swap.h>
16		17
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -21,7 +22,7 @@	...	@@ -21,7 +22,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
22		23
23	template <typename _Alloc>	24	template <typename _Alloc>
24	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void __swap_allocator(_Alloc& __a1, _Alloc& __a2, true_type)	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __swap_allocator(_Alloc& __a1, _Alloc& __a2, true_type)
25	#if _LIBCPP_STD_VER > 11	26	#if _LIBCPP_STD_VER > 11
26	_NOEXCEPT	27	_NOEXCEPT
27	#else	28	#else
...	@@ -33,11 +34,11 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void __swap_allocator(_Alloc	...	@@ -33,11 +34,11 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void __swap_allocator(_Alloc
33	}	34	}
34		35
35	template <typename _Alloc>	36	template <typename _Alloc>
36	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void	37	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void
37	__swap_allocator(_Alloc&, _Alloc&, false_type) _NOEXCEPT {}	38	__swap_allocator(_Alloc&, _Alloc&, false_type) _NOEXCEPT {}
38		39
39	template <typename _Alloc>	40	template <typename _Alloc>
40	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void __swap_allocator(_Alloc& __a1, _Alloc& __a2)	41	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __swap_allocator(_Alloc& __a1, _Alloc& __a2)
41	#if _LIBCPP_STD_VER > 11	42	#if _LIBCPP_STD_VER > 11
42	_NOEXCEPT	43	_NOEXCEPT
43	#else	44	#else

lib/libcxx/include/__memory/temp_value.h created+56

...	@@ -0,0 +1,56 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_TEMP_VALUE_H
10	#define _LIBCPP___MEMORY_TEMP_VALUE_H
11
12	#include <__config>
13	#include <__memory/addressof.h>
14	#include <__memory/allocator_traits.h>
15	#include <__type_traits/aligned_storage.h>
16	#include <__utility/forward.h>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template <class _Tp, class _Alloc>
25	struct __temp_value {
26	typedef allocator_traits<_Alloc> _Traits;
27
28	#ifdef _LIBCPP_CXX03_LANG
29	typename aligned_storage<sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp)>::type __v;
30	#else
31	union { _Tp __v; };
32	#endif
33	_Alloc &__a;
34
35	_LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp *__addr() {
36	#ifdef _LIBCPP_CXX03_LANG
37	return reinterpret_cast<_Tp*>(std::addressof(__v));
38	#else
39	return std::addressof(__v);
40	#endif
41	}
42
43	_LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp & get() { return *__addr(); }
44
45	template<class... _Args>
46	_LIBCPP_NO_CFI
47	_LIBCPP_CONSTEXPR_SINCE_CXX20 __temp_value(_Alloc &__alloc, _Args&& ... __args) : __a(__alloc) {
48	_Traits::construct(__a, __addr(), std::forward<_Args>(__args)...);
49	}
50
51	_LIBCPP_CONSTEXPR_SINCE_CXX20 ~__temp_value() { _Traits::destroy(__a, __addr()); }
52	};
53
54	_LIBCPP_END_NAMESPACE_STD
55
56	#endif // _LIBCPP___MEMORY_TEMP_VALUE_H

lib/libcxx/include/__memory/temporary_buffer.h+1-1

...	@@ -23,7 +23,7 @@	...	@@ -23,7 +23,7 @@
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	template <class _Tp>	25	template <class _Tp>
26	_LIBCPP_NODISCARD_EXT _LIBCPP_NO_CFI _LIBCPP_DEPRECATED_IN_CXX17	26	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI _LIBCPP_DEPRECATED_IN_CXX17
27	pair<_Tp*, ptrdiff_t>	27	pair<_Tp*, ptrdiff_t>
28	get_temporary_buffer(ptrdiff_t __n) _NOEXCEPT	28	get_temporary_buffer(ptrdiff_t __n) _NOEXCEPT
29	{	29	{

lib/libcxx/include/__memory/uninitialized_algorithms.h+37-33

 @@ -20,11 +20,21 @@
 #include <__memory/construct_at.h>
 #include <__memory/pointer_traits.h>
 #include <__memory/voidify.h>
+#include <__type_traits/extent.h>
+#include <__type_traits/is_array.h>
 #include <__type_traits/is_constant_evaluated.h>
+#include <__type_traits/is_trivially_copy_assignable.h>
+#include <__type_traits/is_trivially_copy_constructible.h>
+#include <__type_traits/is_trivially_move_assignable.h>
+#include <__type_traits/is_trivially_move_constructible.h>
+#include <__type_traits/is_unbounded_array.h>
+#include <__type_traits/negation.h>
+#include <__type_traits/remove_const.h>
+#include <__type_traits/remove_extent.h>
+#include <__utility/exception_guard.h>
 #include <__utility/move.h>
 #include <__utility/pair.h>
-#include <__utility/transaction.h>
+#include <new>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -64,6 +74,7 @@ __uninitialized_copy(_InputIterator __ifirst, _Sentinel1 __ilast,
 }
 template <class _InputIterator, class _ForwardIterator>
+_LIBCPP_HIDE_FROM_ABI
 _ForwardIterator uninitialized_copy(_InputIterator __ifirst, _InputIterator __ilast,
                                     _ForwardIterator __ofirst) {
   typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
 @@ -282,7 +293,7 @@ template <class _ForwardIterator, class _Size>
 inline _LIBCPP_HIDE_FROM_ABI
 _ForwardIterator uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
     using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
-    return __uninitialized_value_construct_n<_ValueType>(_VSTD::move(__first), __n);
+    return std::__uninitialized_value_construct_n<_ValueType>(_VSTD::move(__first), __n);
 }
 // uninitialized_move
 @@ -410,7 +421,10 @@ constexpr void __allocator_construct_at(_Alloc& __alloc, _Tp* __loc) {
         _Tp& __array = *__loc;
         // If an exception is thrown, destroy what we have constructed so far in reverse order.
-        __transaction __guard([&]() { std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i); });
+        __exception_guard __guard([&]() {
+          std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
+        });
         for (; __i != extent_v<_Tp>; ++__i) {
             std::__allocator_construct_at(__elem_alloc, std::addressof(__array[__i]));
         }
 @@ -447,7 +461,9 @@ constexpr void __allocator_construct_at(_Alloc& __alloc, _Tp* __loc, _Arg const&
         _Tp& __array = *__loc;
         // If an exception is thrown, destroy what we have constructed so far in reverse order.
-        __transaction __guard([&]() { std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i); });
+        __exception_guard __guard([&]() {
+          std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
+        });
         for (; __i != extent_v<_Tp>; ++__i) {
             std::__allocator_construct_at(__elem_alloc, std::addressof(__array[__i]), __arg[__i]);
         }
 @@ -472,7 +488,7 @@ constexpr void __uninitialized_allocator_fill_n(_Alloc& __alloc, _BidirIter __it
     _BidirIter __begin = __it;
     // If an exception is thrown, destroy what we have constructed so far in reverse order.
-    __transaction __guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
+    __exception_guard __guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
     for (; __n != 0; --__n, ++__it) {
         std::__allocator_construct_at(__value_alloc, std::addressof(*__it), __value);
     }
 @@ -489,7 +505,7 @@ constexpr void __uninitialized_allocator_value_construct_n(_Alloc& __alloc, _Bid
     _BidirIter __begin = __it;
     // If an exception is thrown, destroy what we have constructed so far in reverse order.
-    __transaction __guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
+    __exception_guard __guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
     for (; __n != 0; --__n, ++__it) {
         std::__allocator_construct_at(__value_alloc, std::addressof(*__it));
     }
 @@ -500,7 +516,7 @@ constexpr void __uninitialized_allocator_value_construct_n(_Alloc& __alloc, _Bid
 // Destroy all elements in [__first, __last) from left to right using allocator destruction.
 template <class _Alloc, class _Iter, class _Sent>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
 __allocator_destroy(_Alloc& __alloc, _Iter __first, _Sent __last) {
   for (; __first != __last; ++__first)
      allocator_traits<_Alloc>::destroy(__alloc, std::__to_address(__first));
 @@ -509,11 +525,11 @@ __allocator_destroy(_Alloc& __alloc, _Iter __first, _Sent __last) {
 template <class _Alloc, class _Iter>
 class _AllocatorDestroyRangeReverse {
 public:
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
   _AllocatorDestroyRangeReverse(_Alloc& __alloc, _Iter& __first, _Iter& __last)
       : __alloc_(__alloc), __first_(__first), __last_(__last) {}
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 void operator()() const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void operator()() const {
     std::__allocator_destroy(__alloc_, std::reverse_iterator<_Iter>(__last_), std::reverse_iterator<_Iter>(__first_));
   }
 @@ -528,23 +544,17 @@ private:
 // The caller has to ensure that __first2 can hold at least N uninitialized elements. If an exception is thrown the
 // already copied elements are destroyed in reverse order of their construction.
 template <class _Alloc, class _Iter1, class _Sent1, class _Iter2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter2
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter2
 __uninitialized_allocator_copy(_Alloc& __alloc, _Iter1 __first1, _Sent1 __last1, _Iter2 __first2) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
   auto __destruct_first = __first2;
-  try {
+  auto __guard =
-#endif
+      std::__make_exception_guard(_AllocatorDestroyRangeReverse<_Alloc, _Iter2>(__alloc, __destruct_first, __first2));
   while (__first1 != __last1) {
     allocator_traits<_Alloc>::construct(__alloc, std::__to_address(__first2), *__first1);
     ++__first1;
     ++__first2;
   }
-#ifndef _LIBCPP_NO_EXCEPTIONS
+  __guard.__complete();
-  } catch (...) {
-    _AllocatorDestroyRangeReverse<_Alloc, _Iter2>(__alloc, __destruct_first, __first2)();
-    throw;
-  }
-#endif
   return __first2;
 }
 @@ -556,12 +566,12 @@ struct __allocator_has_trivial_copy_construct<allocator<_Type>, _Type> : true_ty
 template <class _Alloc,
           class _Type,
-          class _RawType = typename remove_const<_Type>::type,
+          class _RawType = __remove_const_t<_Type>,
           __enable_if_t<
               // using _RawType because of the allocator<T const> extension
               is_trivially_copy_constructible<_RawType>::value && is_trivially_copy_assignable<_RawType>::value &&
               __allocator_has_trivial_copy_construct<_Alloc, _RawType>::value>* = nullptr>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Type*
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Type*
 __uninitialized_allocator_copy(_Alloc&, const _Type* __first1, const _Type* __last1, _Type* __first2) {
   // TODO: Remove the const_cast once we drop support for std::allocator<T const>
   if (__libcpp_is_constant_evaluated()) {
 @@ -582,14 +592,13 @@ __uninitialized_allocator_copy(_Alloc&, const _Type* __first1, const _Type* __la
 // Otherwise try to copy all elements. If an exception is thrown the already copied
 // elements are destroyed in reverse order of their construction.
 template <class _Alloc, class _Iter1, class _Sent1, class _Iter2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter2 __uninitialized_allocator_move_if_noexcept(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter2 __uninitialized_allocator_move_if_noexcept(
     _Alloc& __alloc, _Iter1 __first1, _Sent1 __last1, _Iter2 __first2) {
   static_assert(__is_cpp17_move_insertable<_Alloc>::value,
                 "The specified type does not meet the requirements of Cpp17MoveInsertable");
-#ifndef _LIBCPP_NO_EXCEPTIONS
   auto __destruct_first = __first2;
-  try {
+  auto __guard =
-#endif
+      std::__make_exception_guard(_AllocatorDestroyRangeReverse<_Alloc, _Iter2>(__alloc, __destruct_first, __first2));
   while (__first1 != __last1) {
 #ifndef _LIBCPP_NO_EXCEPTIONS
     allocator_traits<_Alloc>::construct(__alloc, std::__to_address(__first2), std::move_if_noexcept(*__first1));
 @@ -599,12 +608,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter2 __uninitialized_alloc
     ++__first1;
     ++__first2;
   }
-#ifndef _LIBCPP_NO_EXCEPTIONS
+  __guard.__complete();
-  } catch (...) {
-    _AllocatorDestroyRangeReverse<_Alloc, _Iter2>(__alloc, __destruct_first, __first2)();
-    throw;
-  }
-#endif
   return __first2;
 }
 @@ -622,7 +626,7 @@ template <
     class _Type = typename iterator_traits<_Iter1>::value_type,
     class = __enable_if_t<is_trivially_move_constructible<_Type>::value && is_trivially_move_assignable<_Type>::value &&
                           __allocator_has_trivial_move_construct<_Alloc, _Type>::value> >
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _Iter2
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter2
 __uninitialized_allocator_move_if_noexcept(_Alloc&, _Iter1 __first1, _Iter1 __last1, _Iter2 __first2) {
   if (__libcpp_is_constant_evaluated()) {
     while (__first1 != __last1) {

lib/libcxx/include/__memory/unique_ptr.h+197-208

...	@@ -10,16 +10,35 @@	...	@@ -10,16 +10,35 @@
10	#ifndef _LIBCPP___MEMORY_UNIQUE_PTR_H	10	#ifndef _LIBCPP___MEMORY_UNIQUE_PTR_H
11	#define _LIBCPP___MEMORY_UNIQUE_PTR_H	11	#define _LIBCPP___MEMORY_UNIQUE_PTR_H
12		12
		13	#include <__compare/compare_three_way.h>
		14	#include <__compare/compare_three_way_result.h>
		15	#include <__compare/three_way_comparable.h>
13	#include <__config>	16	#include <__config>
14	#include <__functional/hash.h>	17	#include <__functional/hash.h>
15	#include <__functional/operations.h>	18	#include <__functional/operations.h>
16	#include <__memory/allocator_traits.h> // __pointer	19	#include <__memory/allocator_traits.h> // __pointer
17	#include <__memory/auto_ptr.h>	20	#include <__memory/auto_ptr.h>
18	#include <__memory/compressed_pair.h>	21	#include <__memory/compressed_pair.h>
		22	#include <__type_traits/add_lvalue_reference.h>
		23	#include <__type_traits/common_type.h>
		24	#include <__type_traits/dependent_type.h>
		25	#include <__type_traits/integral_constant.h>
		26	#include <__type_traits/is_array.h>
		27	#include <__type_traits/is_assignable.h>
		28	#include <__type_traits/is_constructible.h>
		29	#include <__type_traits/is_convertible.h>
		30	#include <__type_traits/is_default_constructible.h>
		31	#include <__type_traits/is_function.h>
		32	#include <__type_traits/is_pointer.h>
		33	#include <__type_traits/is_reference.h>
		34	#include <__type_traits/is_same.h>
		35	#include <__type_traits/is_swappable.h>
		36	#include <__type_traits/is_void.h>
		37	#include <__type_traits/remove_extent.h>
		38	#include <__type_traits/type_identity.h>
19	#include <__utility/forward.h>	39	#include <__utility/forward.h>
20	#include <__utility/move.h>	40	#include <__utility/move.h>
21	#include <cstddef>	41	#include <cstddef>
22	#include <type_traits>
23		42
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	43	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header	44	# pragma GCC system_header
...	@@ -37,12 +56,10 @@ struct _LIBCPP_TEMPLATE_VIS default_delete {	...	@@ -37,12 +56,10 @@ struct _LIBCPP_TEMPLATE_VIS default_delete {
37	_LIBCPP_INLINE_VISIBILITY default_delete() {}	56	_LIBCPP_INLINE_VISIBILITY default_delete() {}
38	#endif	57	#endif
39	template <class _Up>	58	template <class _Up>
40	_LIBCPP_INLINE_VISIBILITY	59	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 default_delete(
41	default_delete(const default_delete<_Up>&,	60	const default_delete<_Up>&, typename enable_if<is_convertible<_Up, _Tp>::value>::type* = 0) _NOEXCEPT {}
42	typename enable_if<is_convertible<_Up, _Tp>::value>::type* =
43	0) _NOEXCEPT {}
44		61
45	_LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __ptr) const _NOEXCEPT {	62	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void operator()(_Tp* __ptr) const _NOEXCEPT {
46	static_assert(sizeof(_Tp) >= 0, "cannot delete an incomplete type");	63	static_assert(sizeof(_Tp) >= 0, "cannot delete an incomplete type");
47	static_assert(!is_void<_Tp>::value, "cannot delete an incomplete type");	64	static_assert(!is_void<_Tp>::value, "cannot delete an incomplete type");
48	delete __ptr;	65	delete __ptr;
...	@@ -64,13 +81,11 @@ public:	...	@@ -64,13 +81,11 @@ public:
64	#endif	81	#endif
65		82
66	template <class _Up>	83	template <class _Up>
67	_LIBCPP_INLINE_VISIBILITY	84	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
68	default_delete(const default_delete<_Up[]>&,	85	default_delete(const default_delete<_Up[]>&, typename _EnableIfConvertible<_Up>::type* = 0) _NOEXCEPT {}
69	typename _EnableIfConvertible<_Up>::type* = 0) _NOEXCEPT {}
70		86
71	template <class _Up>	87	template <class _Up>
72	_LIBCPP_INLINE_VISIBILITY	88	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 typename _EnableIfConvertible<_Up>::type
73	typename _EnableIfConvertible<_Up>::type
74	operator()(_Up* __ptr) const _NOEXCEPT {	89	operator()(_Up* __ptr) const _NOEXCEPT {
75	static_assert(sizeof(_Up) >= 0, "cannot delete an incomplete type");	90	static_assert(sizeof(_Up) >= 0, "cannot delete an incomplete type");
76	delete[] __ptr;	91	delete[] __ptr;
...	@@ -172,22 +187,17 @@ public:	...	@@ -172,22 +187,17 @@ public:
172	_LIBCPP_INLINE_VISIBILITY	187	_LIBCPP_INLINE_VISIBILITY
173	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(__value_init_tag(), __value_init_tag()) {}	188	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(__value_init_tag(), __value_init_tag()) {}
174		189
175	template <bool _Dummy = true,	190	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >
176	class = _EnableIfDeleterDefaultConstructible<_Dummy> >	191	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(pointer __p) _NOEXCEPT
177	_LIBCPP_INLINE_VISIBILITY	192	: __ptr_(__p, __value_init_tag()) {}
178	explicit unique_ptr(pointer __p) _NOEXCEPT : __ptr_(__p, __value_init_tag()) {}
179		193
180	template <bool _Dummy = true,	194	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >
181	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >	195	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer __p, _LValRefType<_Dummy> __d) _NOEXCEPT
182	_LIBCPP_INLINE_VISIBILITY
183	unique_ptr(pointer __p, _LValRefType<_Dummy> __d) _NOEXCEPT
184	: __ptr_(__p, __d) {}	196	: __ptr_(__p, __d) {}
185		197
186	template <bool _Dummy = true,	198	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >
187	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >	199	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
188	_LIBCPP_INLINE_VISIBILITY	200	unique_ptr(pointer __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT : __ptr_(__p, _VSTD::move(__d)) {
189	unique_ptr(pointer __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
190	: __ptr_(__p, _VSTD::move(__d)) {
191	static_assert(!is_reference<deleter_type>::value,	201	static_assert(!is_reference<deleter_type>::value,
192	"rvalue deleter bound to reference");	202	"rvalue deleter bound to reference");
193	}	203	}
...	@@ -197,17 +207,14 @@ public:	...	@@ -197,17 +207,14 @@ public:
197	_LIBCPP_INLINE_VISIBILITY	207	_LIBCPP_INLINE_VISIBILITY
198	unique_ptr(pointer __p, _BadRValRefType<_Dummy> __d) = delete;	208	unique_ptr(pointer __p, _BadRValRefType<_Dummy> __d) = delete;
199		209
200	_LIBCPP_INLINE_VISIBILITY	210	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT
201	unique_ptr(unique_ptr&& __u) _NOEXCEPT	211	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
202	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {
203	}
204		212
205	template <class _Up, class _Ep,	213	template <class _Up,
206	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,	214	class _Ep,
207	class = _EnableIfDeleterConvertible<_Ep>	215	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,
208	>	216	class = _EnableIfDeleterConvertible<_Ep> >
209	_LIBCPP_INLINE_VISIBILITY	217	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
210	unique_ptr(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
211	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {}	218	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {}
212		219
213	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)	220	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
...	@@ -220,19 +227,17 @@ public:	...	@@ -220,19 +227,17 @@ public:
220	: __ptr_(__p.release(), __value_init_tag()) {}	227	: __ptr_(__p.release(), __value_init_tag()) {}
221	#endif	228	#endif
222		229
223	_LIBCPP_INLINE_VISIBILITY	230	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
224	unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
225	reset(__u.release());	231	reset(__u.release());
226	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());	232	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
227	return *this;	233	return *this;
228	}	234	}
229		235
230	template <class _Up, class _Ep,	236	template <class _Up,
231	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,	237	class _Ep,
232	class = _EnableIfDeleterAssignable<_Ep>	238	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,
233	>	239	class = _EnableIfDeleterAssignable<_Ep> >
234	_LIBCPP_INLINE_VISIBILITY	240	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT {
235	unique_ptr& operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT {
236	reset(__u.release());	241	reset(__u.release());
237	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());	242	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
238	return *this;	243	return *this;
...	@@ -255,58 +260,44 @@ public:	...	@@ -255,58 +260,44 @@ public:
255	unique_ptr& operator=(unique_ptr const&) = delete;	260	unique_ptr& operator=(unique_ptr const&) = delete;
256	#endif	261	#endif
257		262
258	_LIBCPP_INLINE_VISIBILITY	263	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 ~unique_ptr() { reset(); }
259	~unique_ptr() { reset(); }
260		264
261	_LIBCPP_INLINE_VISIBILITY	265	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(nullptr_t) _NOEXCEPT {
262	unique_ptr& operator=(nullptr_t) _NOEXCEPT {
263	reset();	266	reset();
264	return *this;	267	return *this;
265	}	268	}
266		269
267	_LIBCPP_INLINE_VISIBILITY	270	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 __add_lvalue_reference_t<_Tp> operator*() const {
268	typename add_lvalue_reference<_Tp>::type
269	operator*() const {
270	return *__ptr_.first();	271	return *__ptr_.first();
271	}	272	}
272	_LIBCPP_INLINE_VISIBILITY	273	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 pointer operator->() const _NOEXCEPT {
273	pointer operator->() const _NOEXCEPT {
274	return __ptr_.first();
275	}
276	_LIBCPP_INLINE_VISIBILITY
277	pointer get() const _NOEXCEPT {
278	return __ptr_.first();	274	return __ptr_.first();
279	}	275	}
280	_LIBCPP_INLINE_VISIBILITY	276	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 pointer get() const _NOEXCEPT { return __ptr_.first(); }
281	deleter_type& get_deleter() _NOEXCEPT {	277	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 deleter_type& get_deleter() _NOEXCEPT {
282	return __ptr_.second();	278	return __ptr_.second();
283	}	279	}
284	_LIBCPP_INLINE_VISIBILITY	280	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 const deleter_type& get_deleter() const _NOEXCEPT {
285	const deleter_type& get_deleter() const _NOEXCEPT {
286	return __ptr_.second();	281	return __ptr_.second();
287	}	282	}
288	_LIBCPP_INLINE_VISIBILITY	283	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit operator bool() const _NOEXCEPT {
289	explicit operator bool() const _NOEXCEPT {
290	return __ptr_.first() != nullptr;	284	return __ptr_.first() != nullptr;
291	}	285	}
292		286
293	_LIBCPP_INLINE_VISIBILITY	287	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 pointer release() _NOEXCEPT {
294	pointer release() _NOEXCEPT {
295	pointer __t = __ptr_.first();	288	pointer __t = __ptr_.first();
296	__ptr_.first() = pointer();	289	__ptr_.first() = pointer();
297	return __t;	290	return __t;
298	}	291	}
299		292
300	_LIBCPP_INLINE_VISIBILITY	293	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void reset(pointer __p = pointer()) _NOEXCEPT {
301	void reset(pointer __p = pointer()) _NOEXCEPT {
302	pointer __tmp = __ptr_.first();	294	pointer __tmp = __ptr_.first();
303	__ptr_.first() = __p;	295	__ptr_.first() = __p;
304	if (__tmp)	296	if (__tmp)
305	__ptr_.second()(__tmp);	297	__ptr_.second()(__tmp);
306	}	298	}
307		299
308	_LIBCPP_INLINE_VISIBILITY	300	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void swap(unique_ptr& __u) _NOEXCEPT {
309	void swap(unique_ptr& __u) _NOEXCEPT {
310	__ptr_.swap(__u.__ptr_);	301	__ptr_.swap(__u.__ptr_);
311	}	302	}
312	};	303	};
...	@@ -394,40 +385,36 @@ public:	...	@@ -394,40 +385,36 @@ public:
394	_LIBCPP_INLINE_VISIBILITY	385	_LIBCPP_INLINE_VISIBILITY
395	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(__value_init_tag(), __value_init_tag()) {}	386	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(__value_init_tag(), __value_init_tag()) {}
396		387
397	template <class _Pp, bool _Dummy = true,	388	template <class _Pp,
398	class = _EnableIfDeleterDefaultConstructible<_Dummy>,	389	bool _Dummy = true,
399	class = _EnableIfPointerConvertible<_Pp> >	390	class = _EnableIfDeleterDefaultConstructible<_Dummy>,
400	_LIBCPP_INLINE_VISIBILITY	391	class = _EnableIfPointerConvertible<_Pp> >
401	explicit unique_ptr(_Pp __p) _NOEXCEPT	392	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(_Pp __p) _NOEXCEPT
402	: __ptr_(__p, __value_init_tag()) {}	393	: __ptr_(__p, __value_init_tag()) {}
403		394
404	template <class _Pp, bool _Dummy = true,	395	template <class _Pp,
405	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,	396	bool _Dummy = true,
406	class = _EnableIfPointerConvertible<_Pp> >	397	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,
407	_LIBCPP_INLINE_VISIBILITY	398	class = _EnableIfPointerConvertible<_Pp> >
408	unique_ptr(_Pp __p, _LValRefType<_Dummy> __d) _NOEXCEPT	399	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(_Pp __p, _LValRefType<_Dummy> __d) _NOEXCEPT
409	: __ptr_(__p, __d) {}	400	: __ptr_(__p, __d) {}
410		401
411	template <bool _Dummy = true,	402	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >
412	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >	403	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(nullptr_t, _LValRefType<_Dummy> __d) _NOEXCEPT
413	_LIBCPP_INLINE_VISIBILITY
414	unique_ptr(nullptr_t, _LValRefType<_Dummy> __d) _NOEXCEPT
415	: __ptr_(nullptr, __d) {}	404	: __ptr_(nullptr, __d) {}
416		405
417	template <class _Pp, bool _Dummy = true,	406	template <class _Pp,
418	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,	407	bool _Dummy = true,
419	class = _EnableIfPointerConvertible<_Pp> >	408	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,
420	_LIBCPP_INLINE_VISIBILITY	409	class = _EnableIfPointerConvertible<_Pp> >
421	unique_ptr(_Pp __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT	410	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(_Pp __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
422	: __ptr_(__p, _VSTD::move(__d)) {	411	: __ptr_(__p, _VSTD::move(__d)) {
423	static_assert(!is_reference<deleter_type>::value,	412	static_assert(!is_reference<deleter_type>::value,
424	"rvalue deleter bound to reference");	413	"rvalue deleter bound to reference");
425	}	414	}
426		415
427	template <bool _Dummy = true,	416	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >
428	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >	417	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(nullptr_t, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
429	_LIBCPP_INLINE_VISIBILITY
430	unique_ptr(nullptr_t, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
431	: __ptr_(nullptr, _VSTD::move(__d)) {	418	: __ptr_(nullptr, _VSTD::move(__d)) {
432	static_assert(!is_reference<deleter_type>::value,	419	static_assert(!is_reference<deleter_type>::value,
433	"rvalue deleter bound to reference");	420	"rvalue deleter bound to reference");
...	@@ -439,34 +426,27 @@ public:	...	@@ -439,34 +426,27 @@ public:
439	_LIBCPP_INLINE_VISIBILITY	426	_LIBCPP_INLINE_VISIBILITY
440	unique_ptr(_Pp __p, _BadRValRefType<_Dummy> __d) = delete;	427	unique_ptr(_Pp __p, _BadRValRefType<_Dummy> __d) = delete;
441		428
442	_LIBCPP_INLINE_VISIBILITY	429	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT
443	unique_ptr(unique_ptr&& __u) _NOEXCEPT	430	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
444	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {
445	}
446		431
447	_LIBCPP_INLINE_VISIBILITY	432	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
448	unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
449	reset(__u.release());	433	reset(__u.release());
450	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());	434	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
451	return *this;	435	return *this;
452	}	436	}
453		437
454	template <class _Up, class _Ep,	438	template <class _Up,
455	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,	439	class _Ep,
456	class = _EnableIfDeleterConvertible<_Ep>	440	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,
457	>	441	class = _EnableIfDeleterConvertible<_Ep> >
458	_LIBCPP_INLINE_VISIBILITY	442	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
459	unique_ptr(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT	443	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {}
460	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {
461	}
462		444
463	template <class _Up, class _Ep,	445	template <class _Up,
464	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,	446	class _Ep,
465	class = _EnableIfDeleterAssignable<_Ep>	447	class = _EnableIfMoveConvertible<unique_ptr<_Up, _Ep>, _Up>,
466	>	448	class = _EnableIfDeleterAssignable<_Ep> >
467	_LIBCPP_INLINE_VISIBILITY	449	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT {
468	unique_ptr&
469	operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT {
470	reset(__u.release());	450	reset(__u.release());
471	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());	451	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
472	return *this;	452	return *this;
...	@@ -477,90 +457,77 @@ public:	...	@@ -477,90 +457,77 @@ public:
477	unique_ptr& operator=(unique_ptr const&) = delete;	457	unique_ptr& operator=(unique_ptr const&) = delete;
478	#endif	458	#endif
479	public:	459	public:
480	_LIBCPP_INLINE_VISIBILITY	460	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 ~unique_ptr() { reset(); }
481	~unique_ptr() { reset(); }
482		461
483	_LIBCPP_INLINE_VISIBILITY	462	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(nullptr_t) _NOEXCEPT {
484	unique_ptr& operator=(nullptr_t) _NOEXCEPT {
485	reset();	463	reset();
486	return *this;	464	return *this;
487	}	465	}
488		466
489	_LIBCPP_INLINE_VISIBILITY	467	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 __add_lvalue_reference_t<_Tp>
490	typename add_lvalue_reference<_Tp>::type
491	operator[](size_t __i) const {	468	operator[](size_t __i) const {
492	return __ptr_.first()[__i];	469	return __ptr_.first()[__i];
493	}	470	}
494	_LIBCPP_INLINE_VISIBILITY	471	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 pointer get() const _NOEXCEPT { return __ptr_.first(); }
495	pointer get() const _NOEXCEPT {
496	return __ptr_.first();
497	}
498		472
499	_LIBCPP_INLINE_VISIBILITY	473	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 deleter_type& get_deleter() _NOEXCEPT {
500	deleter_type& get_deleter() _NOEXCEPT {
501	return __ptr_.second();	474	return __ptr_.second();
502	}	475	}
503		476
504	_LIBCPP_INLINE_VISIBILITY	477	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 const deleter_type& get_deleter() const _NOEXCEPT {
505	const deleter_type& get_deleter() const _NOEXCEPT {
506	return __ptr_.second();	478	return __ptr_.second();
507	}	479	}
508	_LIBCPP_INLINE_VISIBILITY	480	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit operator bool() const _NOEXCEPT {
509	explicit operator bool() const _NOEXCEPT {
510	return __ptr_.first() != nullptr;	481	return __ptr_.first() != nullptr;
511	}	482	}
512		483
513	_LIBCPP_INLINE_VISIBILITY	484	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 pointer release() _NOEXCEPT {
514	pointer release() _NOEXCEPT {
515	pointer __t = __ptr_.first();	485	pointer __t = __ptr_.first();
516	__ptr_.first() = pointer();	486	__ptr_.first() = pointer();
517	return __t;	487	return __t;
518	}	488	}
519		489
520	template <class _Pp>	490	template <class _Pp>
521	_LIBCPP_INLINE_VISIBILITY	491	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
522	typename enable_if<	492	typename enable_if< _CheckArrayPointerConversion<_Pp>::value >::type
523	_CheckArrayPointerConversion<_Pp>::value	493	reset(_Pp __p) _NOEXCEPT {
524	>::type
525	reset(_Pp __p) _NOEXCEPT {
526	pointer __tmp = __ptr_.first();	494	pointer __tmp = __ptr_.first();
527	__ptr_.first() = __p;	495	__ptr_.first() = __p;
528	if (__tmp)	496	if (__tmp)
529	__ptr_.second()(__tmp);	497	__ptr_.second()(__tmp);
530	}	498	}
531		499
532	_LIBCPP_INLINE_VISIBILITY	500	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void reset(nullptr_t = nullptr) _NOEXCEPT {
533	void reset(nullptr_t = nullptr) _NOEXCEPT {
534	pointer __tmp = __ptr_.first();	501	pointer __tmp = __ptr_.first();
535	__ptr_.first() = nullptr;	502	__ptr_.first() = nullptr;
536	if (__tmp)	503	if (__tmp)
537	__ptr_.second()(__tmp);	504	__ptr_.second()(__tmp);
538	}	505	}
539		506
540	_LIBCPP_INLINE_VISIBILITY	507	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void swap(unique_ptr& __u) _NOEXCEPT {
541	void swap(unique_ptr& __u) _NOEXCEPT {
542	__ptr_.swap(__u.__ptr_);	508	__ptr_.swap(__u.__ptr_);
543	}	509	}
544
545	};	510	};
546		511
547	template <class _Tp, class _Dp>	512	template <class _Tp, class _Dp>
548	inline _LIBCPP_INLINE_VISIBILITY	513	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
549	typename enable_if<	514	typename enable_if< __is_swappable<_Dp>::value, void >::type
550	__is_swappable<_Dp>::value,	515	swap(unique_ptr<_Tp, _Dp>& __x, unique_ptr<_Tp, _Dp>& __y) _NOEXCEPT {
551	void	516	__x.swap(__y);
552	>::type	517	}
553	swap(unique_ptr<_Tp, _Dp>& __x, unique_ptr<_Tp, _Dp>& __y) _NOEXCEPT {__x.swap(__y);}
554		518
555	template <class _T1, class _D1, class _T2, class _D2>	519	template <class _T1, class _D1, class _T2, class _D2>
556	inline _LIBCPP_INLINE_VISIBILITY	520	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
557	bool	521	operator==(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {
558	operator==(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return __x.get() == __y.get();}	522	return __x.get() == __y.get();
		523	}
559		524
		525	#if _LIBCPP_STD_VER <= 17
560	template <class _T1, class _D1, class _T2, class _D2>	526	template <class _T1, class _D1, class _T2, class _D2>
561	inline _LIBCPP_INLINE_VISIBILITY	527	inline _LIBCPP_INLINE_VISIBILITY
562	bool	528	bool
563	operator!=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x == __y);}	529	operator!=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x == __y);}
		530	#endif
564		531
565	template <class _T1, class _D1, class _T2, class _D2>	532	template <class _T1, class _D1, class _T2, class _D2>
566	inline _LIBCPP_INLINE_VISIBILITY	533	inline _LIBCPP_INLINE_VISIBILITY
...	@@ -588,14 +555,26 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -588,14 +555,26 @@ inline _LIBCPP_INLINE_VISIBILITY
588	bool	555	bool
589	operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x < __y);}	556	operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x < __y);}
590		557
		558
		559	#if _LIBCPP_STD_VER > 17
		560	template <class _T1, class _D1, class _T2, class _D2>
		561	requires three_way_comparable_with<typename unique_ptr<_T1, _D1>::pointer,
		562	typename unique_ptr<_T2, _D2>::pointer>
		563	_LIBCPP_HIDE_FROM_ABI
		564	compare_three_way_result_t<typename unique_ptr<_T1, _D1>::pointer,
		565	typename unique_ptr<_T2, _D2>::pointer>
		566	operator<=>(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {
		567	return compare_three_way()(__x.get(), __y.get());
		568	}
		569	#endif
		570
591	template <class _T1, class _D1>	571	template <class _T1, class _D1>
592	inline _LIBCPP_INLINE_VISIBILITY	572	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
593	bool	573	operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT {
594	operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT	574	return !__x;
595	{
596	return !__x;
597	}	575	}
598		576
		577	#if _LIBCPP_STD_VER <= 17
599	template <class _T1, class _D1>	578	template <class _T1, class _D1>
600	inline _LIBCPP_INLINE_VISIBILITY	579	inline _LIBCPP_INLINE_VISIBILITY
601	bool	580	bool
...	@@ -619,72 +598,67 @@ operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT	...	@@ -619,72 +598,67 @@ operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
619	{	598	{
620	return static_cast<bool>(__x);	599	return static_cast<bool>(__x);
621	}	600	}
		601	#endif // _LIBCPP_STD_VER <= 17
622		602
623	template <class _T1, class _D1>	603	template <class _T1, class _D1>
624	inline _LIBCPP_INLINE_VISIBILITY	604	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
625	bool	605	operator<(const unique_ptr<_T1, _D1>& __x, nullptr_t) {
626	operator<(const unique_ptr<_T1, _D1>& __x, nullptr_t)	606	typedef typename unique_ptr<_T1, _D1>::pointer _P1;
627	{	607	return less<_P1>()(__x.get(), nullptr);
628	typedef typename unique_ptr<_T1, _D1>::pointer _P1;
629	return less<_P1>()(__x.get(), nullptr);
630	}	608	}
631		609
632	template <class _T1, class _D1>	610	template <class _T1, class _D1>
633	inline _LIBCPP_INLINE_VISIBILITY	611	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
634	bool	612	operator<(nullptr_t, const unique_ptr<_T1, _D1>& __x) {
635	operator<(nullptr_t, const unique_ptr<_T1, _D1>& __x)	613	typedef typename unique_ptr<_T1, _D1>::pointer _P1;
636	{	614	return less<_P1>()(nullptr, __x.get());
637	typedef typename unique_ptr<_T1, _D1>::pointer _P1;
638	return less<_P1>()(nullptr, __x.get());
639	}	615	}
640		616
641	template <class _T1, class _D1>	617	template <class _T1, class _D1>
642	inline _LIBCPP_INLINE_VISIBILITY	618	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
643	bool	619	operator>(const unique_ptr<_T1, _D1>& __x, nullptr_t) {
644	operator>(const unique_ptr<_T1, _D1>& __x, nullptr_t)	620	return nullptr < __x;
645	{
646	return nullptr < __x;
647	}	621	}
648		622
649	template <class _T1, class _D1>	623	template <class _T1, class _D1>
650	inline _LIBCPP_INLINE_VISIBILITY	624	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
651	bool	625	operator>(nullptr_t, const unique_ptr<_T1, _D1>& __x) {
652	operator>(nullptr_t, const unique_ptr<_T1, _D1>& __x)	626	return __x < nullptr;
653	{
654	return __x < nullptr;
655	}	627	}
656		628
657	template <class _T1, class _D1>	629	template <class _T1, class _D1>
658	inline _LIBCPP_INLINE_VISIBILITY	630	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
659	bool	631	operator<=(const unique_ptr<_T1, _D1>& __x, nullptr_t) {
660	operator<=(const unique_ptr<_T1, _D1>& __x, nullptr_t)	632	return !(nullptr < __x);
661	{
662	return !(nullptr < __x);
663	}	633	}
664		634
665	template <class _T1, class _D1>	635	template <class _T1, class _D1>
666	inline _LIBCPP_INLINE_VISIBILITY	636	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
667	bool	637	operator<=(nullptr_t, const unique_ptr<_T1, _D1>& __x) {
668	operator<=(nullptr_t, const unique_ptr<_T1, _D1>& __x)	638	return !(__x < nullptr);
669	{
670	return !(__x < nullptr);
671	}	639	}
672		640
673	template <class _T1, class _D1>	641	template <class _T1, class _D1>
674	inline _LIBCPP_INLINE_VISIBILITY	642	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
675	bool	643	operator>=(const unique_ptr<_T1, _D1>& __x, nullptr_t) {
676	operator>=(const unique_ptr<_T1, _D1>& __x, nullptr_t)	644	return !(__x < nullptr);
677	{
678	return !(__x < nullptr);
679	}	645	}
680		646
681	template <class _T1, class _D1>	647	template <class _T1, class _D1>
682	inline _LIBCPP_INLINE_VISIBILITY	648	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
683	bool	649	operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x) {
684	operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x)	650	return !(nullptr < __x);
685	{	651	}
686	return !(nullptr < __x);	652
		653	#if _LIBCPP_STD_VER > 17
		654	template <class _T1, class _D1>
		655	requires three_way_comparable<
		656	typename unique_ptr<_T1, _D1>::pointer> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
		657	compare_three_way_result_t<typename unique_ptr<_T1, _D1>::pointer>
		658	operator<=>(const unique_ptr<_T1, _D1>& __x, nullptr_t) {
		659	return compare_three_way()(__x.get(), static_cast<typename unique_ptr<_T1, _D1>::pointer>(nullptr));
687	}	660	}
		661	#endif
688		662
689	#if _LIBCPP_STD_VER > 11	663	#if _LIBCPP_STD_VER > 11
690		664
...	@@ -706,21 +680,17 @@ struct __unique_if<_Tp[_Np]>	...	@@ -706,21 +680,17 @@ struct __unique_if<_Tp[_Np]>
706	typedef void __unique_array_known_bound;	680	typedef void __unique_array_known_bound;
707	};	681	};
708		682
709	template<class _Tp, class... _Args>	683	template <class _Tp, class... _Args>
710	inline _LIBCPP_INLINE_VISIBILITY	684	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 typename __unique_if<_Tp>::__unique_single
711	typename __unique_if<_Tp>::__unique_single	685	make_unique(_Args&&... __args) {
712	make_unique(_Args&&... __args)	686	return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
713	{
714	return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
715	}	687	}
716		688
717	template<class _Tp>	689	template <class _Tp>
718	inline _LIBCPP_INLINE_VISIBILITY	690	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 typename __unique_if<_Tp>::__unique_array_unknown_bound
719	typename __unique_if<_Tp>::__unique_array_unknown_bound	691	make_unique(size_t __n) {
720	make_unique(size_t __n)	692	typedef __remove_extent_t<_Tp> _Up;
721	{	693	return unique_ptr<_Tp>(new _Up[__n]());
722	typedef typename remove_extent<_Tp>::type _Up;
723	return unique_ptr<_Tp>(new _Up[__n]());
724	}	694	}
725		695
726	template<class _Tp, class... _Args>	696	template<class _Tp, class... _Args>
...	@@ -729,6 +699,25 @@ template<class _Tp, class... _Args>	...	@@ -729,6 +699,25 @@ template<class _Tp, class... _Args>
729		699
730	#endif // _LIBCPP_STD_VER > 11	700	#endif // _LIBCPP_STD_VER > 11
731		701
		702	#if _LIBCPP_STD_VER >= 20
		703
		704	template <class _Tp>
		705	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 typename __unique_if<_Tp>::__unique_single
		706	make_unique_for_overwrite() {
		707	return unique_ptr<_Tp>(new _Tp);
		708	}
		709
		710	template <class _Tp>
		711	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 typename __unique_if<_Tp>::__unique_array_unknown_bound
		712	make_unique_for_overwrite(size_t __n) {
		713	return unique_ptr<_Tp>(new __remove_extent_t<_Tp>[__n]);
		714	}
		715
		716	template<class _Tp, class... _Args>
		717	typename __unique_if<_Tp>::__unique_array_known_bound make_unique_for_overwrite(_Args&&...) = delete;
		718
		719	#endif // _LIBCPP_STD_VER >= 20
		720
732	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS hash;	721	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS hash;
733		722
734	template <class _Tp, class _Dp>	723	template <class _Tp, class _Dp>

lib/libcxx/include/__memory/uses_allocator.h+1-1

 @@ -11,8 +11,8 @@
 #define _LIBCPP___MEMORY_USES_ALLOCATOR_H
 #include <__config>
+#include <__type_traits/is_convertible.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__memory/uses_allocator_construction.h created+221

...	@@ -0,0 +1,221 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
10	#define _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
11
12	#include <__config>
13	#include <__memory/construct_at.h>
14	#include <__memory/uses_allocator.h>
15	#include <__type_traits/enable_if.h>
16	#include <__type_traits/is_same.h>
17	#include <__type_traits/remove_cv.h>
18	#include <__utility/declval.h>
19	#include <__utility/pair.h>
20	#include <tuple>
21
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header
24	#endif
25
26	_LIBCPP_BEGIN_NAMESPACE_STD
27
28	#if _LIBCPP_STD_VER >= 17
29
30	template <class _Type>
31	inline constexpr bool __is_std_pair = false;
32
33	template <class _Type1, class _Type2>
34	inline constexpr bool __is_std_pair<pair<_Type1, _Type2>> = true;
35
36	template <class _Type, class _Alloc, class... _Args, __enable_if_t<!__is_std_pair<_Type>, int> = 0>
37	_LIBCPP_HIDE_FROM_ABI constexpr auto
38	__uses_allocator_construction_args(const _Alloc& __alloc, _Args&&... __args) noexcept {
39	if constexpr (!uses_allocator_v<_Type, _Alloc> && is_constructible_v<_Type, _Args...>) {
40	return std::forward_as_tuple(std::forward<_Args>(__args)...);
41	} else if constexpr (uses_allocator_v<_Type, _Alloc> &&
42	is_constructible_v<_Type, allocator_arg_t, const _Alloc&, _Args...>) {
43	return tuple<allocator_arg_t, const _Alloc&, _Args&&...>(allocator_arg, __alloc, std::forward<_Args>(__args)...);
44	} else if constexpr (uses_allocator_v<_Type, _Alloc> && is_constructible_v<_Type, _Args..., const _Alloc&>) {
45	return std::forward_as_tuple(std::forward<_Args>(__args)..., __alloc);
46	} else {
47	static_assert(
48	sizeof(_Type) + 1 == 0, "If uses_allocator_v<Type> is true, the type has to be allocator-constructible");
49	}
50	}
51
52	template <class _Pair, class _Alloc, class _Tuple1, class _Tuple2, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
53	_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(
54	const _Alloc& __alloc, piecewise_construct_t, _Tuple1&& __x, _Tuple2&& __y) noexcept {
55	return std::make_tuple(
56	piecewise_construct,
57	std::apply(
58	[&__alloc](auto&&... __args1) {
59	return std::__uses_allocator_construction_args<typename _Pair::first_type>(
60	__alloc, std::forward<decltype(__args1)>(__args1)...);
61	},
62	std::forward<_Tuple1>(__x)),
63	std::apply(
64	[&__alloc](auto&&... __args2) {
65	return std::__uses_allocator_construction_args<typename _Pair::second_type>(
66	__alloc, std::forward<decltype(__args2)>(__args2)...);
67	},
68	std::forward<_Tuple2>(__y)));
69	}
70
71	template <class _Pair, class _Alloc, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
72	_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(const _Alloc& __alloc) noexcept {
73	return std::__uses_allocator_construction_args<_Pair>(__alloc, piecewise_construct, tuple<>{}, tuple<>{});
74	}
75
76	template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
77	_LIBCPP_HIDE_FROM_ABI constexpr auto
78	__uses_allocator_construction_args(const _Alloc& __alloc, _Up&& __u, _Vp&& __v) noexcept {
79	return std::__uses_allocator_construction_args<_Pair>(
80	__alloc,
81	piecewise_construct,
82	std::forward_as_tuple(std::forward<_Up>(__u)),
83	std::forward_as_tuple(std::forward<_Vp>(__v)));
84	}
85
86	# if _LIBCPP_STD_VER > 20
87	template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
88	_LIBCPP_HIDE_FROM_ABI constexpr auto
89	__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>& __pair) noexcept {
90	return std::__uses_allocator_construction_args<_Pair>(
91	__alloc, piecewise_construct, std::forward_as_tuple(__pair.first), std::forward_as_tuple(__pair.second));
92	}
93	# endif
94
95	template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
96	_LIBCPP_HIDE_FROM_ABI constexpr auto
97	__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>& __pair) noexcept {
98	return std::__uses_allocator_construction_args<_Pair>(
99	__alloc, piecewise_construct, std::forward_as_tuple(__pair.first), std::forward_as_tuple(__pair.second));
100	}
101
102	template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
103	_LIBCPP_HIDE_FROM_ABI constexpr auto
104	__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>&& __pair) noexcept {
105	return std::__uses_allocator_construction_args<_Pair>(
106	__alloc,
107	piecewise_construct,
108	std::forward_as_tuple(std::get<0>(std::move(__pair))),
109	std::forward_as_tuple(std::get<1>(std::move(__pair))));
110	}
111
112	# if _LIBCPP_STD_VER > 20
113	template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_std_pair<_Pair>, int> = 0>
114	_LIBCPP_HIDE_FROM_ABI constexpr auto
115	__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>&& __pair) noexcept {
116	return std::__uses_allocator_construction_args<_Pair>(
117	__alloc,
118	piecewise_construct,
119	std::forward_as_tuple(std::get<0>(std::move(__pair))),
120	std::forward_as_tuple(std::get<1>(std::move(__pair))));
121	}
122	# endif
123
124	namespace __uses_allocator_detail {
125
126	template <class _Ap, class _Bp>
127	void __fun(const pair<_Ap, _Bp>&);
128
129	template <class _Tp>
130	decltype(__uses_allocator_detail::__fun(std::declval<_Tp>()), true_type()) __convertible_to_const_pair_ref_impl(int);
131
132	template <class>
133	false_type __convertible_to_const_pair_ref_impl(...);
134
135	template <class _Tp>
136	inline constexpr bool __convertible_to_const_pair_ref =
137	decltype(__uses_allocator_detail::__convertible_to_const_pair_ref_impl<_Tp>(0))::value;
138
139	} // namespace __uses_allocator_detail
140
141	template <
142	class _Pair,
143	class _Alloc,
144	class _Type,
145	__enable_if_t<__is_std_pair<_Pair> && !__uses_allocator_detail::__convertible_to_const_pair_ref<_Type>, int> = 0>
146	_LIBCPP_HIDE_FROM_ABI constexpr auto
147	__uses_allocator_construction_args(const _Alloc& __alloc, _Type&& __value) noexcept;
148
149	template <class _Type, class _Alloc, class... _Args>
150	_LIBCPP_HIDE_FROM_ABI constexpr _Type __make_obj_using_allocator(const _Alloc& __alloc, _Args&&... __args);
151
152	template <class _Pair,
153	class _Alloc,
154	class _Type,
155	__enable_if_t<__is_std_pair<_Pair> && !__uses_allocator_detail::__convertible_to_const_pair_ref<_Type>, int>>
156	_LIBCPP_HIDE_FROM_ABI constexpr auto
157	__uses_allocator_construction_args(const _Alloc& __alloc, _Type&& __value) noexcept {
158	struct __pair_constructor {
159	using _PairMutable = remove_cv_t<_Pair>;
160
161	_LIBCPP_HIDE_FROM_ABI constexpr auto __do_construct(const _PairMutable& __pair) const {
162	return std::__make_obj_using_allocator<_PairMutable>(__alloc_, __pair);
163	}
164
165	_LIBCPP_HIDE_FROM_ABI constexpr auto __do_construct(_PairMutable&& __pair) const {
166	return std::__make_obj_using_allocator<_PairMutable>(__alloc_, std::move(__pair));
167	}
168
169	const _Alloc& __alloc_;
170	_Type& __value_;
171
172	_LIBCPP_HIDE_FROM_ABI constexpr operator _PairMutable() const {
173	return __do_construct(std::forward<_Type>(this->__value_));
174	}
175	};
176
177	return std::make_tuple(__pair_constructor{__alloc, __value});
178	}
179
180	template <class _Type, class _Alloc, class... _Args>
181	_LIBCPP_HIDE_FROM_ABI constexpr _Type __make_obj_using_allocator(const _Alloc& __alloc, _Args&&... __args) {
182	return std::make_from_tuple<_Type>(
183	std::__uses_allocator_construction_args<_Type>(__alloc, std::forward<_Args>(__args)...));
184	}
185
186	template <class _Type, class _Alloc, class... _Args>
187	_LIBCPP_HIDE_FROM_ABI constexpr _Type*
188	__uninitialized_construct_using_allocator(_Type* __ptr, const _Alloc& __alloc, _Args&&... __args) {
189	return std::apply(
190	[&__ptr](auto&&... __xs) { return std::__construct_at(__ptr, std::forward<decltype(__xs)>(__xs)...); },
191	std::__uses_allocator_construction_args<_Type>(__alloc, std::forward<_Args>(__args)...));
192	}
193
194	#endif // _LIBCPP_STD_VER >= 17
195
196	#if _LIBCPP_STD_VER >= 20
197
198	template <class _Type, class _Alloc, class... _Args>
199	_LIBCPP_HIDE_FROM_ABI constexpr auto uses_allocator_construction_args(const _Alloc& __alloc, _Args&&... __args) noexcept
200	-> decltype(std::__uses_allocator_construction_args<_Type>(__alloc, std::forward<_Args>(__args)...)) {
201	return /--/ std::__uses_allocator_construction_args<_Type>(__alloc, std::forward<_Args>(__args)...);
202	}
203
204	template <class _Type, class _Alloc, class... _Args>
205	_LIBCPP_HIDE_FROM_ABI constexpr auto make_obj_using_allocator(const _Alloc& __alloc, _Args&&... __args)
206	-> decltype(std::__make_obj_using_allocator<_Type>(__alloc, std::forward<_Args>(__args)...)) {
207	return /--/ std::__make_obj_using_allocator<_Type>(__alloc, std::forward<_Args>(__args)...);
208	}
209
210	template <class _Type, class _Alloc, class... _Args>
211	_LIBCPP_HIDE_FROM_ABI constexpr auto
212	uninitialized_construct_using_allocator(_Type* __ptr, const _Alloc& __alloc, _Args&&... __args)
213	-> decltype(std::__uninitialized_construct_using_allocator(__ptr, __alloc, std::forward<_Args>(__args)...)) {
214	return /--/ std::__uninitialized_construct_using_allocator(__ptr, __alloc, std::forward<_Args>(__args)...);
215	}
216
217	#endif // _LIBCPP_STD_VER >= 20
218
219	_LIBCPP_END_NAMESPACE_STD
220
221	#endif // _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H

lib/libcxx/include/__memory/voidify.h+1-1

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <typename _Tp>	22	template <typename _Tp>
23	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void* __voidify(_Tp& __from) {	23	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void* __voidify(_Tp& __from) {
24	// Cast away cv-qualifiers to allow modifying elements of a range through const iterators.	24	// Cast away cv-qualifiers to allow modifying elements of a range through const iterators.
25	return const_cast<void>(static_cast<const volatile void>(_VSTD::addressof(__from)));	25	return const_cast<void>(static_cast<const volatile void>(_VSTD::addressof(__from)));
26	}	26	}

lib/libcxx/include/__memory_resource/memory_resource.h created+75

...	@@ -0,0 +1,75 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
10	#define _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
11
12	#include <__config>
13	#include <cstddef>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	#if _LIBCPP_STD_VER > 14
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	namespace pmr {
24
25	// [mem.res.class]
26
27	class _LIBCPP_TYPE_VIS memory_resource {
28	static const size_t __max_align = alignof(max_align_t);
29
30	public:
31	virtual ~memory_resource();
32
33	_LIBCPP_NODISCARD_AFTER_CXX17
34	[[using __gnu__: __returns_nonnull__, __alloc_size__(2), __alloc_align__(3)]] _LIBCPP_HIDE_FROM_ABI void*
35	allocate(size_t __bytes, size_t __align = __max_align) {
36	return do_allocate(__bytes, __align);
37	}
38
39	[[__gnu__::__nonnull__]] _LIBCPP_HIDE_FROM_ABI void
40	deallocate(void* __p, size_t __bytes, size_t __align = __max_align) {
41	do_deallocate(__p, __bytes, __align);
42	}
43
44	_LIBCPP_HIDE_FROM_ABI bool is_equal(const memory_resource& __other) const noexcept { return do_is_equal(__other); }
45
46	private:
47	virtual void* do_allocate(size_t, size_t) = 0;
48	virtual void do_deallocate(void*, size_t, size_t) = 0;
49	virtual bool do_is_equal(memory_resource const&) const noexcept = 0;
50	};
51
52	// [mem.res.eq]
53
54	inline _LIBCPP_HIDE_FROM_ABI bool operator==(const memory_resource& __lhs, const memory_resource& __rhs) noexcept {
55	return &__lhs == &__rhs \|\| __lhs.is_equal(__rhs);
56	}
57
58	inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const memory_resource& __lhs, const memory_resource& __rhs) noexcept {
59	return !(__lhs == __rhs);
60	}
61
62	// [mem.res.global]
63
64	[[__gnu__::__returns_nonnull__]] _LIBCPP_FUNC_VIS memory_resource* get_default_resource() noexcept;
65	[[__gnu__::__returns_nonnull__]] _LIBCPP_FUNC_VIS memory_resource* set_default_resource(memory_resource*) noexcept;
66	[[using __gnu__: __returns_nonnull__, __const__]] _LIBCPP_FUNC_VIS memory_resource* new_delete_resource() noexcept;
67	[[using __gnu__: __returns_nonnull__, __const__]] _LIBCPP_FUNC_VIS memory_resource* null_memory_resource() noexcept;
68
69	} // namespace pmr
70
71	_LIBCPP_END_NAMESPACE_STD
72
73	#endif // _LIBCPP_STD_VER > 14
74
75	#endif // _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H

lib/libcxx/include/__memory_resource/monotonic_buffer_resource.h created+120

...	@@ -0,0 +1,120 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
10	#define _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
11
12	#include <__config>
13	#include <__memory/addressof.h>
14	#include <__memory_resource/memory_resource.h>
15	#include <cstddef>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	#if _LIBCPP_STD_VER > 14
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	namespace pmr {
26
27	// [mem.res.monotonic.buffer]
28
29	class _LIBCPP_TYPE_VIS monotonic_buffer_resource : public memory_resource {
30	static const size_t __default_buffer_capacity = 1024;
31	static const size_t __default_buffer_alignment = 16;
32
33	struct __chunk_footer {
34	__chunk_footer* __next_;
35	char* __start_;
36	char* __cur_;
37	size_t __align_;
38	size_t __allocation_size() { return (reinterpret_cast<char>(this) - __start_) + sizeof(this); }
39	void* __try_allocate_from_chunk(size_t, size_t);
40	};
41
42	struct __initial_descriptor {
43	char* __start_;
44	char* __cur_;
45	union {
46	char* __end_;
47	size_t __size_;
48	};
49	void* __try_allocate_from_chunk(size_t, size_t);
50	};
51
52	public:
53	_LIBCPP_HIDE_FROM_ABI monotonic_buffer_resource()
54	: monotonic_buffer_resource(nullptr, __default_buffer_capacity, get_default_resource()) {}
55
56	_LIBCPP_HIDE_FROM_ABI explicit monotonic_buffer_resource(size_t __initial_size)
57	: monotonic_buffer_resource(nullptr, __initial_size, get_default_resource()) {}
58
59	_LIBCPP_HIDE_FROM_ABI monotonic_buffer_resource(void* __buffer, size_t __buffer_size)
60	: monotonic_buffer_resource(__buffer, __buffer_size, get_default_resource()) {}
61
62	_LIBCPP_HIDE_FROM_ABI explicit monotonic_buffer_resource(memory_resource* __upstream)
63	: monotonic_buffer_resource(nullptr, __default_buffer_capacity, __upstream) {}
64
65	_LIBCPP_HIDE_FROM_ABI monotonic_buffer_resource(size_t __initial_size, memory_resource* __upstream)
66	: monotonic_buffer_resource(nullptr, __initial_size, __upstream) {}
67
68	_LIBCPP_HIDE_FROM_ABI monotonic_buffer_resource(void* __buffer, size_t __buffer_size, memory_resource* __upstream)
69	: __res_(__upstream) {
70	__initial_.__start_ = static_cast<char*>(__buffer);
71	if (__buffer != nullptr) {
72	__initial_.__cur_ = static_cast<char*>(__buffer) + __buffer_size;
73	__initial_.__end_ = static_cast<char*>(__buffer) + __buffer_size;
74	} else {
75	__initial_.__cur_ = nullptr;
76	__initial_.__size_ = __buffer_size;
77	}
78	__chunks_ = nullptr;
79	}
80
81	monotonic_buffer_resource(const monotonic_buffer_resource&) = delete;
82
83	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~monotonic_buffer_resource() override { release(); }
84
85	monotonic_buffer_resource& operator=(const monotonic_buffer_resource&) = delete;
86
87	_LIBCPP_HIDE_FROM_ABI void release() {
88	if (__initial_.__start_ != nullptr)
89	__initial_.__cur_ = __initial_.__end_;
90	while (__chunks_ != nullptr) {
91	__chunk_footer* __next = __chunks_->__next_;
92	__res_->deallocate(__chunks_->__start_, __chunks_->__allocation_size(), __chunks_->__align_);
93	__chunks_ = __next;
94	}
95	}
96
97	_LIBCPP_HIDE_FROM_ABI memory_resource* upstream_resource() const { return __res_; }
98
99	protected:
100	void* do_allocate(size_t __bytes, size_t __alignment) override; // key function
101
102	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void do_deallocate(void*, size_t, size_t) override {}
103
104	_LIBCPP_HIDE_FROM_ABI_VIRTUAL bool do_is_equal(const memory_resource& __other) const _NOEXCEPT override {
105	return this == std::addressof(__other);
106	}
107
108	private:
109	__initial_descriptor __initial_;
110	__chunk_footer* __chunks_;
111	memory_resource* __res_;
112	};
113
114	} // namespace pmr
115
116	_LIBCPP_END_NAMESPACE_STD
117
118	#endif // _LIBCPP_STD_VER > 14
119
120	#endif // _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H

lib/libcxx/include/__memory_resource/polymorphic_allocator.h created+224

...	@@ -0,0 +1,224 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
10	#define _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
11
12	#include <__assert>
13	#include <__config>
14	#include <__memory_resource/memory_resource.h>
15	#include <__utility/exception_guard.h>
16	#include <cstddef>
17	#include <limits>
18	#include <new>
19	#include <stdexcept>
20	#include <tuple>
21
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header
24	#endif
25
26	_LIBCPP_PUSH_MACROS
27	#include <__undef_macros>
28
29	#if _LIBCPP_STD_VER > 14
30
31	_LIBCPP_BEGIN_NAMESPACE_STD
32
33	namespace pmr {
34
35	// [mem.poly.allocator.class]
36
37	template <class _ValueType
38	# if _LIBCPP_STD_VER >= 20
39	= byte
40	# endif
41	>
42	class _LIBCPP_TEMPLATE_VIS polymorphic_allocator {
43
44	public:
45	using value_type = _ValueType;
46
47	// [mem.poly.allocator.ctor]
48
49	_LIBCPP_HIDE_FROM_ABI polymorphic_allocator() noexcept : __res_(std::pmr::get_default_resource()) {}
50
51	_LIBCPP_HIDE_FROM_ABI polymorphic_allocator(memory_resource* __r) noexcept : __res_(__r) {}
52
53	polymorphic_allocator(const polymorphic_allocator&) = default;
54
55	template <class _Tp>
56	_LIBCPP_HIDE_FROM_ABI polymorphic_allocator(const polymorphic_allocator<_Tp>& __other) noexcept
57	: __res_(__other.resource()) {}
58
59	polymorphic_allocator& operator=(const polymorphic_allocator&) = delete;
60
61	// [mem.poly.allocator.mem]
62
63	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI _ValueType* allocate(size_t __n) {
64	if (__n > __max_size()) {
65	__throw_bad_array_new_length();
66	}
67	return static_cast<_ValueType>(__res_->allocate(__n sizeof(_ValueType), alignof(_ValueType)));
68	}
69
70	_LIBCPP_HIDE_FROM_ABI void deallocate(_ValueType* __p, size_t __n) {
71	_LIBCPP_ASSERT(__n <= __max_size(), "deallocate called for size which exceeds max_size()");
72	__res_->deallocate(__p, __n * sizeof(_ValueType), alignof(_ValueType));
73	}
74
75	# if _LIBCPP_STD_VER >= 20
76
77	[[nodiscard]] [[using __gnu__: __alloc_size__(2), __alloc_align__(3)]] void*
78	allocate_bytes(size_t __nbytes, size_t __alignment = alignof(max_align_t)) {
79	return __res_->allocate(__nbytes, __alignment);
80	}
81
82	void deallocate_bytes(void* __ptr, size_t __nbytes, size_t __alignment = alignof(max_align_t)) {
83	__res_->deallocate(__ptr, __nbytes, __alignment);
84	}
85
86	template <class _Type>
87	[[nodiscard]] _Type* allocate_object(size_t __n = 1) {
88	if (numeric_limits<size_t>::max() / sizeof(_Type) < __n)
89	std::__throw_bad_array_new_length();
90	return static_cast<_Type>(allocate_bytes(__n sizeof(_Type), alignof(_Type)));
91	}
92
93	template <class _Type>
94	void deallocate_object(_Type* __ptr, size_t __n = 1) {
95	deallocate_bytes(__ptr, __n * sizeof(_Type), alignof(_Type));
96	}
97
98	template <class _Type, class... _CtorArgs>
99	[[nodiscard]] _Type* new_object(_CtorArgs&&... __ctor_args) {
100	_Type* __ptr = allocate_object<_Type>();
101	__exception_guard __guard([&] { deallocate_object(__ptr); });
102	construct(__ptr, std::forward<_CtorArgs>(__ctor_args)...);
103	__guard.__complete();
104	return __ptr;
105	}
106
107	template <class _Type>
108	void delete_object(_Type* __ptr) {
109	destroy(__ptr);
110	deallocate_object(__ptr);
111	}
112
113	# endif // _LIBCPP_STD_VER >= 20
114
115	template <class _Tp, class... _Ts>
116	_LIBCPP_HIDE_FROM_ABI void construct(_Tp* __p, _Ts&&... __args) {
117	std::__user_alloc_construct_impl(
118	typename __uses_alloc_ctor<_Tp, polymorphic_allocator&, _Ts...>::type(),
119	__p,
120	*this,
121	std::forward<_Ts>(__args)...);
122	}
123
124	template <class _T1, class _T2, class... _Args1, class... _Args2>
125	_LIBCPP_HIDE_FROM_ABI void
126	construct(pair<_T1, _T2>* __p, piecewise_construct_t, tuple<_Args1...> __x, tuple<_Args2...> __y) {
127	::new ((void*)__p) pair<_T1, _T2>(
128	piecewise_construct,
129	__transform_tuple(typename __uses_alloc_ctor< _T1, polymorphic_allocator&, _Args1... >::type(),
130	std::move(__x),
131	typename __make_tuple_indices<sizeof...(_Args1)>::type{}),
132	__transform_tuple(typename __uses_alloc_ctor< _T2, polymorphic_allocator&, _Args2... >::type(),
133	std::move(__y),
134	typename __make_tuple_indices<sizeof...(_Args2)>::type{}));
135	}
136
137	template <class _T1, class _T2>
138	_LIBCPP_HIDE_FROM_ABI void construct(pair<_T1, _T2>* __p) {
139	construct(__p, piecewise_construct, tuple<>(), tuple<>());
140	}
141
142	template <class _T1, class _T2, class _Up, class _Vp>
143	_LIBCPP_HIDE_FROM_ABI void construct(pair<_T1, _T2>* __p, _Up&& __u, _Vp&& __v) {
144	construct(__p,
145	piecewise_construct,
146	std::forward_as_tuple(std::forward<_Up>(__u)),
147	std::forward_as_tuple(std::forward<_Vp>(__v)));
148	}
149
150	template <class _T1, class _T2, class _U1, class _U2>
151	_LIBCPP_HIDE_FROM_ABI void construct(pair<_T1, _T2>* __p, const pair<_U1, _U2>& __pr) {
152	construct(__p, piecewise_construct, std::forward_as_tuple(__pr.first), std::forward_as_tuple(__pr.second));
153	}
154
155	template <class _T1, class _T2, class _U1, class _U2>
156	_LIBCPP_HIDE_FROM_ABI void construct(pair<_T1, _T2>* __p, pair<_U1, _U2>&& __pr) {
157	construct(__p,
158	piecewise_construct,
159	std::forward_as_tuple(std::forward<_U1>(__pr.first)),
160	std::forward_as_tuple(std::forward<_U2>(__pr.second)));
161	}
162
163	template <class _Tp>
164	_LIBCPP_HIDE_FROM_ABI void destroy(_Tp* __p) {
165	__p->~_Tp();
166	}
167
168	_LIBCPP_HIDE_FROM_ABI polymorphic_allocator select_on_container_copy_construction() const noexcept {
169	return polymorphic_allocator();
170	}
171
172	_LIBCPP_HIDE_FROM_ABI memory_resource* resource() const noexcept { return __res_; }
173
174	private:
175	template <class... _Args, size_t... _Is>
176	_LIBCPP_HIDE_FROM_ABI tuple<_Args&&...>
177	__transform_tuple(integral_constant<int, 0>, tuple<_Args...>&& __t, __tuple_indices<_Is...>) {
178	return std::forward_as_tuple(std::get<_Is>(std::move(__t))...);
179	}
180
181	template <class... _Args, size_t... _Is>
182	_LIBCPP_HIDE_FROM_ABI tuple<allocator_arg_t const&, polymorphic_allocator&, _Args&&...>
183	__transform_tuple(integral_constant<int, 1>, tuple<_Args...>&& __t, __tuple_indices<_Is...>) {
184	using _Tup = tuple<allocator_arg_t const&, polymorphic_allocator&, _Args&&...>;
185	return _Tup(allocator_arg, *this, std::get<_Is>(std::move(__t))...);
186	}
187
188	template <class... _Args, size_t... _Is>
189	_LIBCPP_HIDE_FROM_ABI tuple<_Args&&..., polymorphic_allocator&>
190	__transform_tuple(integral_constant<int, 2>, tuple<_Args...>&& __t, __tuple_indices<_Is...>) {
191	using _Tup = tuple<_Args&&..., polymorphic_allocator&>;
192	return _Tup(std::get<_Is>(std::move(__t))..., *this);
193	}
194
195	_LIBCPP_HIDE_FROM_ABI size_t __max_size() const noexcept {
196	return numeric_limits<size_t>::max() / sizeof(value_type);
197	}
198
199	memory_resource* __res_;
200	};
201
202	// [mem.poly.allocator.eq]
203
204	template <class _Tp, class _Up>
205	inline _LIBCPP_HIDE_FROM_ABI bool
206	operator==(const polymorphic_allocator<_Tp>& __lhs, const polymorphic_allocator<_Up>& __rhs) noexcept {
207	return __lhs.resource() == __rhs.resource();
208	}
209
210	template <class _Tp, class _Up>
211	inline _LIBCPP_HIDE_FROM_ABI bool
212	operator!=(const polymorphic_allocator<_Tp>& __lhs, const polymorphic_allocator<_Up>& __rhs) noexcept {
213	return !(__lhs == __rhs);
214	}
215
216	} // namespace pmr
217
218	_LIBCPP_END_NAMESPACE_STD
219
220	#endif // _LIBCPP_STD_VER > 14
221
222	_LIBCPP_POP_MACROS
223
224	#endif // _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H

lib/libcxx/include/__memory_resource/pool_options.h created+38

...	@@ -0,0 +1,38 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
10	#define _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
11
12	#include <__config>
13	#include <cstddef>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	#if _LIBCPP_STD_VER > 14
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	namespace pmr {
24
25	// [mem.res.pool.options]
26
27	struct _LIBCPP_TYPE_VIS pool_options {
28	size_t max_blocks_per_chunk = 0;
29	size_t largest_required_pool_block = 0;
30	};
31
32	} // namespace pmr
33
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP_STD_VER > 14
37
38	#endif // _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H

lib/libcxx/include/__memory_resource/synchronized_pool_resource.h created+94

...	@@ -0,0 +1,94 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
10	#define _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
11
12	#include <__config>
13	#include <__memory_resource/memory_resource.h>
14	#include <__memory_resource/pool_options.h>
15	#include <__memory_resource/unsynchronized_pool_resource.h>
16	#include <cstddef>
17	#if !defined(_LIBCPP_HAS_NO_THREADS)
18	# include <mutex>
19	#endif
20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header
23	#endif
24
25	#if _LIBCPP_STD_VER > 14
26
27	_LIBCPP_BEGIN_NAMESPACE_STD
28
29	namespace pmr {
30
31	// [mem.res.pool.overview]
32
33	class _LIBCPP_TYPE_VIS synchronized_pool_resource : public memory_resource {
34	public:
35	_LIBCPP_HIDE_FROM_ABI synchronized_pool_resource(const pool_options& __opts, memory_resource* __upstream)
36	: __unsync_(__opts, __upstream) {}
37
38	_LIBCPP_HIDE_FROM_ABI synchronized_pool_resource()
39	: synchronized_pool_resource(pool_options(), get_default_resource()) {}
40
41	_LIBCPP_HIDE_FROM_ABI explicit synchronized_pool_resource(memory_resource* __upstream)
42	: synchronized_pool_resource(pool_options(), __upstream) {}
43
44	_LIBCPP_HIDE_FROM_ABI explicit synchronized_pool_resource(const pool_options& __opts)
45	: synchronized_pool_resource(__opts, get_default_resource()) {}
46
47	synchronized_pool_resource(const synchronized_pool_resource&) = delete;
48
49	~synchronized_pool_resource() override = default;
50
51	synchronized_pool_resource& operator=(const synchronized_pool_resource&) = delete;
52
53	_LIBCPP_HIDE_FROM_ABI void release() {
54	# if !defined(_LIBCPP_HAS_NO_THREADS)
55	unique_lock<mutex> __lk(__mut_);
56	# endif
57	__unsync_.release();
58	}
59
60	_LIBCPP_HIDE_FROM_ABI memory_resource* upstream_resource() const { return __unsync_.upstream_resource(); }
61
62	_LIBCPP_HIDE_FROM_ABI pool_options options() const { return __unsync_.options(); }
63
64	protected:
65	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void* do_allocate(size_t __bytes, size_t __align) override {
66	# if !defined(_LIBCPP_HAS_NO_THREADS)
67	unique_lock<mutex> __lk(__mut_);
68	# endif
69	return __unsync_.allocate(__bytes, __align);
70	}
71
72	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void do_deallocate(void* __p, size_t __bytes, size_t __align) override {
73	# if !defined(_LIBCPP_HAS_NO_THREADS)
74	unique_lock<mutex> __lk(__mut_);
75	# endif
76	return __unsync_.deallocate(__p, __bytes, __align);
77	}
78
79	bool do_is_equal(const memory_resource& __other) const noexcept override; // key function
80
81	private:
82	# if !defined(_LIBCPP_HAS_NO_THREADS)
83	mutex __mut_;
84	# endif
85	unsynchronized_pool_resource __unsync_;
86	};
87
88	} // namespace pmr
89
90	_LIBCPP_END_NAMESPACE_STD
91
92	#endif // _LIBCPP_STD_VER > 14
93
94	#endif // _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H

lib/libcxx/include/__memory_resource/unsynchronized_pool_resource.h created+106

...	@@ -0,0 +1,106 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
10	#define _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
11
12	#include <__config>
13	#include <__memory_resource/memory_resource.h>
14	#include <__memory_resource/pool_options.h>
15	#include <cstddef>
16	#include <cstdint>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	#if _LIBCPP_STD_VER > 14
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	namespace pmr {
27
28	// [mem.res.pool.overview]
29
30	class _LIBCPP_TYPE_VIS unsynchronized_pool_resource : public memory_resource {
31	class __fixed_pool;
32
33	class __adhoc_pool {
34	struct __chunk_footer;
35	__chunk_footer* __first_;
36
37	public:
38	_LIBCPP_HIDE_FROM_ABI explicit __adhoc_pool() : __first_(nullptr) {}
39
40	void __release_ptr(memory_resource* __upstream);
41	void* __do_allocate(memory_resource* __upstream, size_t __bytes, size_t __align);
42	void __do_deallocate(memory_resource* __upstream, void* __p, size_t __bytes, size_t __align);
43	};
44
45	static const size_t __min_blocks_per_chunk = 16;
46	static const size_t __min_bytes_per_chunk = 1024;
47	static const size_t __max_blocks_per_chunk = (size_t(1) << 20);
48	static const size_t __max_bytes_per_chunk = (size_t(1) << 30);
49
50	static const int __log2_smallest_block_size = 3;
51	static const size_t __smallest_block_size = 8;
52	static const size_t __default_largest_block_size = (size_t(1) << 20);
53	static const size_t __max_largest_block_size = (size_t(1) << 30);
54
55	size_t __pool_block_size(int __i) const;
56	int __log2_pool_block_size(int __i) const;
57	int __pool_index(size_t __bytes, size_t __align) const;
58
59	public:
60	unsynchronized_pool_resource(const pool_options& __opts, memory_resource* __upstream);
61
62	_LIBCPP_HIDE_FROM_ABI unsynchronized_pool_resource()
63	: unsynchronized_pool_resource(pool_options(), get_default_resource()) {}
64
65	_LIBCPP_HIDE_FROM_ABI explicit unsynchronized_pool_resource(memory_resource* __upstream)
66	: unsynchronized_pool_resource(pool_options(), __upstream) {}
67
68	_LIBCPP_HIDE_FROM_ABI explicit unsynchronized_pool_resource(const pool_options& __opts)
69	: unsynchronized_pool_resource(__opts, get_default_resource()) {}
70
71	unsynchronized_pool_resource(const unsynchronized_pool_resource&) = delete;
72
73	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~unsynchronized_pool_resource() override { release(); }
74
75	unsynchronized_pool_resource& operator=(const unsynchronized_pool_resource&) = delete;
76
77	void release();
78
79	_LIBCPP_HIDE_FROM_ABI memory_resource* upstream_resource() const { return __res_; }
80
81	[[__gnu__::__pure__]] pool_options options() const;
82
83	protected:
84	void* do_allocate(size_t __bytes, size_t __align) override; // key function
85
86	void do_deallocate(void* __p, size_t __bytes, size_t __align) override;
87
88	_LIBCPP_HIDE_FROM_ABI_VIRTUAL bool do_is_equal(const memory_resource& __other) const _NOEXCEPT override {
89	return &__other == this;
90	}
91
92	private:
93	memory_resource* __res_;
94	__adhoc_pool __adhoc_pool_;
95	__fixed_pool* __fixed_pools_;
96	int __num_fixed_pools_;
97	uint32_t __options_max_blocks_per_chunk_;
98	};
99
100	} // namespace pmr
101
102	_LIBCPP_END_NAMESPACE_STD
103
104	#endif // _LIBCPP_STD_VER > 14
105
106	#endif // _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H

lib/libcxx/include/__mutex_base+2

...	@@ -103,6 +103,7 @@ private:	...	@@ -103,6 +103,7 @@ private:
103	lock_guard(lock_guard const&) = delete;	103	lock_guard(lock_guard const&) = delete;
104	lock_guard& operator=(lock_guard const&) = delete;	104	lock_guard& operator=(lock_guard const&) = delete;
105	};	105	};
		106	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(lock_guard);
106		107
107	template <class _Mutex>	108	template <class _Mutex>
108	class _LIBCPP_TEMPLATE_VIS unique_lock	109	class _LIBCPP_TEMPLATE_VIS unique_lock
...	@@ -195,6 +196,7 @@ public:	...	@@ -195,6 +196,7 @@ public:
195	_LIBCPP_INLINE_VISIBILITY	196	_LIBCPP_INLINE_VISIBILITY
196	mutex_type* mutex() const _NOEXCEPT {return __m_;}	197	mutex_type* mutex() const _NOEXCEPT {return __m_;}
197	};	198	};
		199	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(unique_lock);
198		200
199	template <class _Mutex>	201	template <class _Mutex>
200	void	202	void

lib/libcxx/include/__node_handle+4-3

...	@@ -60,7 +60,8 @@ public:	...	@@ -60,7 +60,8 @@ public:
60		60
61	#include <__assert>	61	#include <__assert>
62	#include <__config>	62	#include <__config>
63	#include <memory>	63	#include <__memory/allocator_traits.h>
		64	#include <__memory/pointer_traits.h>
64	#include <optional>	65	#include <optional>
65		66
66	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	67	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -90,8 +91,8 @@ class _LIBCPP_TEMPLATE_VIS __basic_node_handle	...	@@ -90,8 +91,8 @@ class _LIBCPP_TEMPLATE_VIS __basic_node_handle
90	_NodeType, __basic_node_handle<_NodeType, _Alloc, _MapOrSetSpecifics>>;	91	_NodeType, __basic_node_handle<_NodeType, _Alloc, _MapOrSetSpecifics>>;
91		92
92	typedef allocator_traits<_Alloc> __alloc_traits;	93	typedef allocator_traits<_Alloc> __alloc_traits;
93	typedef typename __rebind_pointer<typename __alloc_traits::void_pointer,	94	typedef __rebind_pointer_t<typename __alloc_traits::void_pointer,
94	_NodeType>::type	95	_NodeType>
95	__node_pointer_type;	96	__node_pointer_type;
96		97
97	public:	98	public:

lib/libcxx/include/__numeric/accumulate.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _InputIterator, class _Tp>	22	template <class _InputIterator, class _Tp>
23	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	23	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
24	_Tp	24	_Tp
25	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)	25	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
26	{	26	{
...	@@ -34,7 +34,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)	...	@@ -34,7 +34,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
34	}	34	}
35		35
36	template <class _InputIterator, class _Tp, class _BinaryOperation>	36	template <class _InputIterator, class _Tp, class _BinaryOperation>
37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
38	_Tp	38	_Tp
39	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op)	39	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op)
40	{	40	{

lib/libcxx/include/__numeric/adjacent_difference.h+2-2

...	@@ -21,7 +21,7 @@	...	@@ -21,7 +21,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	template <class _InputIterator, class _OutputIterator>	23	template <class _InputIterator, class _OutputIterator>
24	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	24	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
25	_OutputIterator	25	_OutputIterator
26	adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result)	26	adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
27	{	27	{
...	@@ -44,7 +44,7 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterat	...	@@ -44,7 +44,7 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterat
44	}	44	}
45		45
46	template <class _InputIterator, class _OutputIterator, class _BinaryOperation>	46	template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
47	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	47	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
48	_OutputIterator	48	_OutputIterator
49	adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result,	49	adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
50	_BinaryOperation __binary_op)	50	_BinaryOperation __binary_op)

lib/libcxx/include/__numeric/exclusive_scan.h+2-2

...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
23	#if _LIBCPP_STD_VER > 14	23	#if _LIBCPP_STD_VER > 14
24		24
25	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp>	25	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp>
26	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator	26	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
27	exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp __init, _BinaryOp __b) {	27	exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp __init, _BinaryOp __b) {
28	if (__first != __last) {	28	if (__first != __last) {
29	_Tp __tmp(__b(__init, *__first));	29	_Tp __tmp(__b(__init, *__first));
...	@@ -41,7 +41,7 @@ exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __	...	@@ -41,7 +41,7 @@ exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __
41	}	41	}
42		42
43	template <class _InputIterator, class _OutputIterator, class _Tp>	43	template <class _InputIterator, class _OutputIterator, class _Tp>
44	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator	44	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
45	exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp __init) {	45	exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp __init) {
46	return _VSTD::exclusive_scan(__first, __last, __result, __init, _VSTD::plus<>());	46	return _VSTD::exclusive_scan(__first, __last, __result, __init, _VSTD::plus<>());
47	}	47	}

lib/libcxx/include/__numeric/gcd_lcm.h+9-5

 @@ -12,8 +12,12 @@
 #include <__assert>
 #include <__config>
+#include <__type_traits/common_type.h>
+#include <__type_traits/is_integral.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_signed.h>
+#include <__type_traits/make_unsigned.h>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -60,8 +64,8 @@ common_type_t<_Tp,_Up>
 gcd(_Tp __m, _Up __n)
 {
     static_assert((is_integral<_Tp>::value && is_integral<_Up>::value), "Arguments to gcd must be integer types");
-    static_assert((!is_same<typename remove_cv<_Tp>::type, bool>::value), "First argument to gcd cannot be bool" );
+    static_assert((!is_same<__remove_cv_t<_Tp>, bool>::value), "First argument to gcd cannot be bool" );
-    static_assert((!is_same<typename remove_cv<_Up>::type, bool>::value), "Second argument to gcd cannot be bool" );
+    static_assert((!is_same<__remove_cv_t<_Up>, bool>::value), "Second argument to gcd cannot be bool" );
     using _Rp = common_type_t<_Tp,_Up>;
     using _Wp = make_unsigned_t<_Rp>;
     return static_cast<_Rp>(_VSTD::__gcd(
 @@ -75,8 +79,8 @@ common_type_t<_Tp,_Up>
 lcm(_Tp __m, _Up __n)
 {
     static_assert((is_integral<_Tp>::value && is_integral<_Up>::value), "Arguments to lcm must be integer types");
-    static_assert((!is_same<typename remove_cv<_Tp>::type, bool>::value), "First argument to lcm cannot be bool" );
+    static_assert((!is_same<__remove_cv_t<_Tp>, bool>::value), "First argument to lcm cannot be bool" );
-    static_assert((!is_same<typename remove_cv<_Up>::type, bool>::value), "Second argument to lcm cannot be bool" );
+    static_assert((!is_same<__remove_cv_t<_Up>, bool>::value), "Second argument to lcm cannot be bool" );
     if (__m == 0 || __n == 0)
         return 0;

lib/libcxx/include/__numeric/inclusive_scan.h+3-3

lib/libcxx/include/__numeric/inner_product.h+2-2

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <class _InputIterator1, class _InputIterator2, class _Tp>	22	template <class _InputIterator1, class _InputIterator2, class _Tp>
23	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	23	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
24	_Tp	24	_Tp
25	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init)	25	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init)
26	{	26	{
...	@@ -34,7 +34,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2	...	@@ -34,7 +34,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2
34	}	34	}
35		35
36	template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>	36	template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>
37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
38	_Tp	38	_Tp
39	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,	39	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
40	_Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2)	40	_Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2)

lib/libcxx/include/__numeric/iota.h+1-1

...	@@ -19,7 +19,7 @@	...	@@ -19,7 +19,7 @@
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _ForwardIterator, class _Tp>	21	template <class _ForwardIterator, class _Tp>
22	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	22	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
23	void	23	void
24	iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value)	24	iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value)
25	{	25	{

lib/libcxx/include/__numeric/midpoint.h+16-6

 @@ -11,8 +11,18 @@
 #define _LIBCPP___NUMERIC_MIDPOINT_H
 #include <__config>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_floating_point.h>
+#include <__type_traits/is_integral.h>
+#include <__type_traits/is_null_pointer.h>
+#include <__type_traits/is_object.h>
+#include <__type_traits/is_pointer.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_void.h>
+#include <__type_traits/make_unsigned.h>
+#include <__type_traits/remove_pointer.h>
+#include <cstddef>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -55,12 +65,12 @@ midpoint(_TPtr __a, _TPtr __b) noexcept
 template <typename _Tp>
-constexpr int __sign(_Tp __val) {
+_LIBCPP_HIDE_FROM_ABI constexpr int __sign(_Tp __val) {
     return (_Tp(0) < __val) - (__val < _Tp(0));
 }
 template <typename _Fp>
-constexpr _Fp __fp_abs(_Fp __f) { return __f >= 0 ? __f : -__f; }
+_LIBCPP_HIDE_FROM_ABI constexpr _Fp __fp_abs(_Fp __f) { return __f >= 0 ? __f : -__f; }
 template <class _Fp>
 _LIBCPP_INLINE_VISIBILITY constexpr
 @@ -69,10 +79,10 @@ midpoint(_Fp __a, _Fp __b) noexcept
 {
     constexpr _Fp __lo = numeric_limits<_Fp>::min()*2;
     constexpr _Fp __hi = numeric_limits<_Fp>::max()/2;
-    return __fp_abs(__a) <= __hi && __fp_abs(__b) <= __hi ?  // typical case: overflow is impossible
+    return std::__fp_abs(__a) <= __hi && std::__fp_abs(__b) <= __hi ?  // typical case: overflow is impossible
       (__a + __b)/2 :                                        // always correctly rounded
-      __fp_abs(__a) < __lo ? __a + __b/2 :                   // not safe to halve a
+      std::__fp_abs(__a) < __lo ? __a + __b/2 :                   // not safe to halve a
-      __fp_abs(__b) < __lo ? __a/2 + __b :                   // not safe to halve b
+      std::__fp_abs(__b) < __lo ? __a/2 + __b :                   // not safe to halve b
       __a/2 + __b/2;                                         // otherwise correctly rounded
 }

lib/libcxx/include/__numeric/partial_sum.h+2-2

...	@@ -21,7 +21,7 @@	...	@@ -21,7 +21,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	template <class _InputIterator, class _OutputIterator>	23	template <class _InputIterator, class _OutputIterator>
24	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	24	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
25	_OutputIterator	25	_OutputIterator
26	partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result)	26	partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
27	{	27	{
...	@@ -43,7 +43,7 @@ partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __res	...	@@ -43,7 +43,7 @@ partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __res
43	}	43	}
44		44
45	template <class _InputIterator, class _OutputIterator, class _BinaryOperation>	45	template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
46	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	46	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
47	_OutputIterator	47	_OutputIterator
48	partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result,	48	partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
49	_BinaryOperation __binary_op)	49	_BinaryOperation __binary_op)

lib/libcxx/include/__numeric/reduce.h+3-3

lib/libcxx/include/__numeric/transform_exclusive_scan.h+1-1

...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	template <class _InputIterator, class _OutputIterator, class _Tp,	23	template <class _InputIterator, class _OutputIterator, class _Tp,
24	class _BinaryOp, class _UnaryOp>	24	class _BinaryOp, class _UnaryOp>
25	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	25	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
26	_OutputIterator	26	_OutputIterator
27	transform_exclusive_scan(_InputIterator __first, _InputIterator __last,	27	transform_exclusive_scan(_InputIterator __first, _InputIterator __last,
28	_OutputIterator __result, _Tp __init,	28	_OutputIterator __result, _Tp __init,

lib/libcxx/include/__numeric/transform_inclusive_scan.h+2-2

...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22	#if _LIBCPP_STD_VER > 14	22	#if _LIBCPP_STD_VER > 14
23		23
24	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp, class _UnaryOp>	24	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp, class _UnaryOp>
25	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	25	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
26	_OutputIterator	26	_OutputIterator
27	transform_inclusive_scan(_InputIterator __first, _InputIterator __last,	27	transform_inclusive_scan(_InputIterator __first, _InputIterator __last,
28	_OutputIterator __result, _BinaryOp __b, _UnaryOp __u, _Tp __init)	28	_OutputIterator __result, _BinaryOp __b, _UnaryOp __u, _Tp __init)
...	@@ -36,7 +36,7 @@ transform_inclusive_scan(_InputIterator __first, _InputIterator __last,	...	@@ -36,7 +36,7 @@ transform_inclusive_scan(_InputIterator __first, _InputIterator __last,
36	}	36	}
37		37
38	template <class _InputIterator, class _OutputIterator, class _BinaryOp, class _UnaryOp>	38	template <class _InputIterator, class _OutputIterator, class _BinaryOp, class _UnaryOp>
39	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	39	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
40	_OutputIterator	40	_OutputIterator
41	transform_inclusive_scan(_InputIterator __first, _InputIterator __last,	41	transform_inclusive_scan(_InputIterator __first, _InputIterator __last,
42	_OutputIterator __result, _BinaryOp __b, _UnaryOp __u)	42	_OutputIterator __result, _BinaryOp __b, _UnaryOp __u)

lib/libcxx/include/__numeric/transform_reduce.h+3-3

lib/libcxx/include/__random/bernoulli_distribution.h+2-2

...	@@ -110,7 +110,7 @@ bernoulli_distribution::operator()(_URNG& __g, const param_type& __p)	...	@@ -110,7 +110,7 @@ bernoulli_distribution::operator()(_URNG& __g, const param_type& __p)
110	}	110	}
111		111
112	template <class _CharT, class _Traits>	112	template <class _CharT, class _Traits>
113	basic_ostream<_CharT, _Traits>&	113	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
114	operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& __x)	114	operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& __x)
115	{	115	{
116	__save_flags<_CharT, _Traits> __lx(__os);	116	__save_flags<_CharT, _Traits> __lx(__os);
...	@@ -123,7 +123,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& _	...	@@ -123,7 +123,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& _
123	}	123	}
124		124
125	template <class _CharT, class _Traits>	125	template <class _CharT, class _Traits>
126	basic_istream<_CharT, _Traits>&	126	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
127	operator>>(basic_istream<_CharT, _Traits>& __is, bernoulli_distribution& __x)	127	operator>>(basic_istream<_CharT, _Traits>& __is, bernoulli_distribution& __x)
128	{	128	{
129	typedef bernoulli_distribution _Eng;	129	typedef bernoulli_distribution _Eng;

lib/libcxx/include/__random/binomial_distribution.h+5-5

lib/libcxx/include/__random/cauchy_distribution.h+2-2

...	@@ -124,7 +124,7 @@ cauchy_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -124,7 +124,7 @@ cauchy_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
124	}	124	}
125		125
126	template <class _CharT, class _Traits, class _RT>	126	template <class _CharT, class _Traits, class _RT>
127	basic_ostream<_CharT, _Traits>&	127	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
128	operator<<(basic_ostream<_CharT, _Traits>& __os,	128	operator<<(basic_ostream<_CharT, _Traits>& __os,
129	const cauchy_distribution<_RT>& __x)	129	const cauchy_distribution<_RT>& __x)
130	{	130	{
...	@@ -139,7 +139,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -139,7 +139,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
139	}	139	}
140		140
141	template <class _CharT, class _Traits, class _RT>	141	template <class _CharT, class _Traits, class _RT>
142	basic_istream<_CharT, _Traits>&	142	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
143	operator>>(basic_istream<_CharT, _Traits>& __is,	143	operator>>(basic_istream<_CharT, _Traits>& __is,
144	cauchy_distribution<_RT>& __x)	144	cauchy_distribution<_RT>& __x)
145	{	145	{

lib/libcxx/include/__random/chi_squared_distribution.h+2-2

...	@@ -107,7 +107,7 @@ public:	...	@@ -107,7 +107,7 @@ public:
107	};	107	};
108		108
109	template <class _CharT, class _Traits, class _RT>	109	template <class _CharT, class _Traits, class _RT>
110	basic_ostream<_CharT, _Traits>&	110	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
111	operator<<(basic_ostream<_CharT, _Traits>& __os,	111	operator<<(basic_ostream<_CharT, _Traits>& __os,
112	const chi_squared_distribution<_RT>& __x)	112	const chi_squared_distribution<_RT>& __x)
113	{	113	{
...	@@ -120,7 +120,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -120,7 +120,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
120	}	120	}
121		121
122	template <class _CharT, class _Traits, class _RT>	122	template <class _CharT, class _Traits, class _RT>
123	basic_istream<_CharT, _Traits>&	123	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
124	operator>>(basic_istream<_CharT, _Traits>& __is,	124	operator>>(basic_istream<_CharT, _Traits>& __is,
125	chi_squared_distribution<_RT>& __x)	125	chi_squared_distribution<_RT>& __x)
126	{	126	{

lib/libcxx/include/__random/discard_block_engine.h+6-4

lib/libcxx/include/__random/discrete_distribution.h+2-2

...	@@ -221,7 +221,7 @@ discrete_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -221,7 +221,7 @@ discrete_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)
221	}	221	}
222		222
223	template <class _CharT, class _Traits, class _IT>	223	template <class _CharT, class _Traits, class _IT>
224	basic_ostream<_CharT, _Traits>&	224	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
225	operator<<(basic_ostream<_CharT, _Traits>& __os,	225	operator<<(basic_ostream<_CharT, _Traits>& __os,
226	const discrete_distribution<_IT>& __x)	226	const discrete_distribution<_IT>& __x)
227	{	227	{
...	@@ -239,7 +239,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -239,7 +239,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
239	}	239	}
240		240
241	template <class _CharT, class _Traits, class _IT>	241	template <class _CharT, class _Traits, class _IT>
242	basic_istream<_CharT, _Traits>&	242	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
243	operator>>(basic_istream<_CharT, _Traits>& __is,	243	operator>>(basic_istream<_CharT, _Traits>& __is,
244	discrete_distribution<_IT>& __x)	244	discrete_distribution<_IT>& __x)
245	{	245	{

lib/libcxx/include/__random/exponential_distribution.h+2-2

...	@@ -121,7 +121,7 @@ exponential_distribution<_RealType>::operator()(_URNG& __g, const param_type& __	...	@@ -121,7 +121,7 @@ exponential_distribution<_RealType>::operator()(_URNG& __g, const param_type& __
121	}	121	}
122		122
123	template <class _CharT, class _Traits, class _RealType>	123	template <class _CharT, class _Traits, class _RealType>
124	basic_ostream<_CharT, _Traits>&	124	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
125	operator<<(basic_ostream<_CharT, _Traits>& __os,	125	operator<<(basic_ostream<_CharT, _Traits>& __os,
126	const exponential_distribution<_RealType>& __x)	126	const exponential_distribution<_RealType>& __x)
127	{	127	{
...	@@ -133,7 +133,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -133,7 +133,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
133	}	133	}
134		134
135	template <class _CharT, class _Traits, class _RealType>	135	template <class _CharT, class _Traits, class _RealType>
136	basic_istream<_CharT, _Traits>&	136	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
137	operator>>(basic_istream<_CharT, _Traits>& __is,	137	operator>>(basic_istream<_CharT, _Traits>& __is,
138	exponential_distribution<_RealType>& __x)	138	exponential_distribution<_RealType>& __x)
139	{	139	{

lib/libcxx/include/__random/extreme_value_distribution.h+2-2

...	@@ -123,7 +123,7 @@ extreme_value_distribution<_RealType>::operator()(_URNG& __g, const param_type&	...	@@ -123,7 +123,7 @@ extreme_value_distribution<_RealType>::operator()(_URNG& __g, const param_type&
123	}	123	}
124		124
125	template <class _CharT, class _Traits, class _RT>	125	template <class _CharT, class _Traits, class _RT>
126	basic_ostream<_CharT, _Traits>&	126	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
127	operator<<(basic_ostream<_CharT, _Traits>& __os,	127	operator<<(basic_ostream<_CharT, _Traits>& __os,
128	const extreme_value_distribution<_RT>& __x)	128	const extreme_value_distribution<_RT>& __x)
129	{	129	{
...	@@ -138,7 +138,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -138,7 +138,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
138	}	138	}
139		139
140	template <class _CharT, class _Traits, class _RT>	140	template <class _CharT, class _Traits, class _RT>
141	basic_istream<_CharT, _Traits>&	141	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
142	operator>>(basic_istream<_CharT, _Traits>& __is,	142	operator>>(basic_istream<_CharT, _Traits>& __is,
143	extreme_value_distribution<_RT>& __x)	143	extreme_value_distribution<_RT>& __x)
144	{	144	{

lib/libcxx/include/__random/fisher_f_distribution.h+2-2

...	@@ -122,7 +122,7 @@ fisher_f_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -122,7 +122,7 @@ fisher_f_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
122	}	122	}
123		123
124	template <class _CharT, class _Traits, class _RT>	124	template <class _CharT, class _Traits, class _RT>
125	basic_ostream<_CharT, _Traits>&	125	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
126	operator<<(basic_ostream<_CharT, _Traits>& __os,	126	operator<<(basic_ostream<_CharT, _Traits>& __os,
127	const fisher_f_distribution<_RT>& __x)	127	const fisher_f_distribution<_RT>& __x)
128	{	128	{
...	@@ -137,7 +137,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -137,7 +137,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
137	}	137	}
138		138
139	template <class _CharT, class _Traits, class _RT>	139	template <class _CharT, class _Traits, class _RT>
140	basic_istream<_CharT, _Traits>&	140	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
141	operator>>(basic_istream<_CharT, _Traits>& __is,	141	operator>>(basic_istream<_CharT, _Traits>& __is,
142	fisher_f_distribution<_RT>& __x)	142	fisher_f_distribution<_RT>& __x)
143	{	143	{

lib/libcxx/include/__random/gamma_distribution.h+2-2

...	@@ -175,7 +175,7 @@ gamma_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -175,7 +175,7 @@ gamma_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
175	}	175	}
176		176
177	template <class _CharT, class _Traits, class _RT>	177	template <class _CharT, class _Traits, class _RT>
178	basic_ostream<_CharT, _Traits>&	178	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
179	operator<<(basic_ostream<_CharT, _Traits>& __os,	179	operator<<(basic_ostream<_CharT, _Traits>& __os,
180	const gamma_distribution<_RT>& __x)	180	const gamma_distribution<_RT>& __x)
181	{	181	{
...	@@ -190,7 +190,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -190,7 +190,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
190	}	190	}
191		191
192	template <class _CharT, class _Traits, class _RT>	192	template <class _CharT, class _Traits, class _RT>
193	basic_istream<_CharT, _Traits>&	193	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
194	operator>>(basic_istream<_CharT, _Traits>& __is,	194	operator>>(basic_istream<_CharT, _Traits>& __is,
195	gamma_distribution<_RT>& __x)	195	gamma_distribution<_RT>& __x)
196	{	196	{

lib/libcxx/include/__random/generate_canonical.h+1-1

...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
27	// generate_canonical	27	// generate_canonical
28		28
29	template<class _RealType, size_t __bits, class _URNG>	29	template<class _RealType, size_t __bits, class _URNG>
30	_RealType	30	_LIBCPP_HIDE_FROM_ABI _RealType
31	generate_canonical(_URNG& __g)	31	generate_canonical(_URNG& __g)
32	{	32	{
33	const size_t _Dt = numeric_limits<_RealType>::digits;	33	const size_t _Dt = numeric_limits<_RealType>::digits;

lib/libcxx/include/__random/geometric_distribution.h+2-2

...	@@ -108,7 +108,7 @@ public:	...	@@ -108,7 +108,7 @@ public:
108	};	108	};
109		109
110	template <class _CharT, class _Traits, class _IntType>	110	template <class _CharT, class _Traits, class _IntType>
111	basic_ostream<_CharT, _Traits>&	111	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
112	operator<<(basic_ostream<_CharT, _Traits>& __os,	112	operator<<(basic_ostream<_CharT, _Traits>& __os,
113	const geometric_distribution<_IntType>& __x)	113	const geometric_distribution<_IntType>& __x)
114	{	114	{
...	@@ -120,7 +120,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -120,7 +120,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
120	}	120	}
121		121
122	template <class _CharT, class _Traits, class _IntType>	122	template <class _CharT, class _Traits, class _IntType>
123	basic_istream<_CharT, _Traits>&	123	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
124	operator>>(basic_istream<_CharT, _Traits>& __is,	124	operator>>(basic_istream<_CharT, _Traits>& __is,
125	geometric_distribution<_IntType>& __x)	125	geometric_distribution<_IntType>& __x)
126	{	126	{

lib/libcxx/include/__random/independent_bits_engine.h+4-8

lib/libcxx/include/__random/is_seed_sequence.h+1-1

...	@@ -23,7 +23,7 @@ struct __is_seed_sequence	...	@@ -23,7 +23,7 @@ struct __is_seed_sequence
23	{	23	{
24	static _LIBCPP_CONSTEXPR const bool value =	24	static _LIBCPP_CONSTEXPR const bool value =
25	!is_convertible<_Sseq, typename _Engine::result_type>::value &&	25	!is_convertible<_Sseq, typename _Engine::result_type>::value &&
26	!is_same<typename remove_cv<_Sseq>::type, _Engine>::value;	26	!is_same<__remove_cv_t<_Sseq>, _Engine>::value;
27	};	27	};
28		28
29	_LIBCPP_END_NAMESPACE_STD	29	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__random/is_valid.h+1-1

...	@@ -53,7 +53,7 @@ template<> struct __libcpp_random_is_valid_inttype<__uint128_t> : true_type {};	...	@@ -53,7 +53,7 @@ template<> struct __libcpp_random_is_valid_inttype<__uint128_t> : true_type {};
53	template<class, class = void> struct __libcpp_random_is_valid_urng : false_type {};	53	template<class, class = void> struct __libcpp_random_is_valid_urng : false_type {};
54	template<class _Gp> struct __libcpp_random_is_valid_urng<_Gp, __enable_if_t<	54	template<class _Gp> struct __libcpp_random_is_valid_urng<_Gp, __enable_if_t<
55	is_unsigned<typename _Gp::result_type>::value &&	55	is_unsigned<typename _Gp::result_type>::value &&
56	_IsSame<decltype(declval<_Gp&>()()), typename _Gp::result_type>::value	56	_IsSame<decltype(std::declval<_Gp&>()()), typename _Gp::result_type>::value
57	> > : true_type {};	57	> > : true_type {};
58		58
59	_LIBCPP_END_NAMESPACE_STD	59	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__random/linear_congruential_engine.h+2-2

...	@@ -198,7 +198,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -198,7 +198,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
198		198
199	template <class _CharT, class _Traits,	199	template <class _CharT, class _Traits,
200	class _Up, _Up _Ap, _Up _Cp, _Up _Np>	200	class _Up, _Up _Ap, _Up _Cp, _Up _Np>
201	basic_istream<_CharT, _Traits>&	201	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
202	operator>>(basic_istream<_CharT, _Traits>& __is,	202	operator>>(basic_istream<_CharT, _Traits>& __is,
203	linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);	203	linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
204		204
...	@@ -372,7 +372,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -372,7 +372,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
372		372
373	template <class _CharT, class _Traits,	373	template <class _CharT, class _Traits,
374	class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>	374	class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
375	basic_istream<_CharT, _Traits>&	375	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
376	operator>>(basic_istream<_CharT, _Traits>& __is,	376	operator>>(basic_istream<_CharT, _Traits>& __is,
377	linear_congruential_engine<_UIntType, __a, __c, __m>& __x)	377	linear_congruential_engine<_UIntType, __a, __c, __m>& __x)
378	{	378	{

lib/libcxx/include/__random/log2.h+3-6

 @@ -58,15 +58,12 @@ struct __log2
 {
     static const size_t value = __log2_imp<
 #ifndef _LIBCPP_HAS_NO_INT128
-        typename conditional<
+        __conditional_t<sizeof(_UIntType) <= sizeof(unsigned long long), unsigned long long, __uint128_t>,
-                sizeof(_UIntType) <= sizeof(unsigned long long),
-                    unsigned long long,
-                    __uint128_t
-            >::type,
 #else
         unsigned long long,
 #endif // _LIBCPP_HAS_NO_INT128
-        _Xp, sizeof(_UIntType) * __CHAR_BIT__ - 1>::value;
+        _Xp,
+        sizeof(_UIntType) * __CHAR_BIT__ - 1>::value;
 };
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__random/mersenne_twister_engine.h+6-6

lib/libcxx/include/__random/negative_binomial_distribution.h+2-2

...	@@ -144,7 +144,7 @@ negative_binomial_distribution<_IntType>::operator()(_URNG& __urng, const param_	...	@@ -144,7 +144,7 @@ negative_binomial_distribution<_IntType>::operator()(_URNG& __urng, const param_
144	}	144	}
145		145
146	template <class _CharT, class _Traits, class _IntType>	146	template <class _CharT, class _Traits, class _IntType>
147	basic_ostream<_CharT, _Traits>&	147	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
148	operator<<(basic_ostream<_CharT, _Traits>& __os,	148	operator<<(basic_ostream<_CharT, _Traits>& __os,
149	const negative_binomial_distribution<_IntType>& __x)	149	const negative_binomial_distribution<_IntType>& __x)
150	{	150	{
...	@@ -158,7 +158,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -158,7 +158,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
158	}	158	}
159		159
160	template <class _CharT, class _Traits, class _IntType>	160	template <class _CharT, class _Traits, class _IntType>
161	basic_istream<_CharT, _Traits>&	161	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
162	operator>>(basic_istream<_CharT, _Traits>& __is,	162	operator>>(basic_istream<_CharT, _Traits>& __is,
163	negative_binomial_distribution<_IntType>& __x)	163	negative_binomial_distribution<_IntType>& __x)
164	{	164	{

lib/libcxx/include/__random/normal_distribution.h+20-20

...	@@ -58,8 +58,8 @@ public:	...	@@ -58,8 +58,8 @@ public:
58		58
59	private:	59	private:
60	param_type __p_;	60	param_type __p_;
61	result_type _V_;	61	result_type __v_;
62	bool _V_hot_;	62	bool __v_hot_;
63		63
64	public:	64	public:
65	// constructors and reset functions	65	// constructors and reset functions
...	@@ -68,18 +68,18 @@ public:	...	@@ -68,18 +68,18 @@ public:
68	normal_distribution() : normal_distribution(0) {}	68	normal_distribution() : normal_distribution(0) {}
69	_LIBCPP_INLINE_VISIBILITY	69	_LIBCPP_INLINE_VISIBILITY
70	explicit normal_distribution(result_type __mean, result_type __stddev = 1)	70	explicit normal_distribution(result_type __mean, result_type __stddev = 1)
71	: __p_(param_type(__mean, __stddev)), _V_hot_(false) {}	71	: __p_(param_type(__mean, __stddev)), __v_hot_(false) {}
72	#else	72	#else
73	_LIBCPP_INLINE_VISIBILITY	73	_LIBCPP_INLINE_VISIBILITY
74	explicit normal_distribution(result_type __mean = 0,	74	explicit normal_distribution(result_type __mean = 0,
75	result_type __stddev = 1)	75	result_type __stddev = 1)
76	: __p_(param_type(__mean, __stddev)), _V_hot_(false) {}	76	: __p_(param_type(__mean, __stddev)), __v_hot_(false) {}
77	#endif	77	#endif
78	_LIBCPP_INLINE_VISIBILITY	78	_LIBCPP_INLINE_VISIBILITY
79	explicit normal_distribution(const param_type& __p)	79	explicit normal_distribution(const param_type& __p)
80	: __p_(__p), _V_hot_(false) {}	80	: __p_(__p), __v_hot_(false) {}
81	_LIBCPP_INLINE_VISIBILITY	81	_LIBCPP_INLINE_VISIBILITY
82	void reset() {_V_hot_ = false;}	82	void reset() {__v_hot_ = false;}
83		83
84	// generating functions	84	// generating functions
85	template<class _URNG>	85	template<class _URNG>
...	@@ -107,8 +107,8 @@ public:	...	@@ -107,8 +107,8 @@ public:
107	friend _LIBCPP_INLINE_VISIBILITY	107	friend _LIBCPP_INLINE_VISIBILITY
108	bool operator==(const normal_distribution& __x,	108	bool operator==(const normal_distribution& __x,
109	const normal_distribution& __y)	109	const normal_distribution& __y)
110	{return __x.__p_ == __y.__p_ && __x._V_hot_ == __y._V_hot_ &&	110	{return __x.__p_ == __y.__p_ && __x.__v_hot_ == __y.__v_hot_ &&
111	(!__x._V_hot_ \|\| __x._V_ == __y._V_);}	111	(!__x.__v_hot_ \|\| __x.__v_ == __y.__v_);}
112	friend _LIBCPP_INLINE_VISIBILITY	112	friend _LIBCPP_INLINE_VISIBILITY
113	bool operator!=(const normal_distribution& __x,	113	bool operator!=(const normal_distribution& __x,
114	const normal_distribution& __y)	114	const normal_distribution& __y)
...	@@ -134,10 +134,10 @@ normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -134,10 +134,10 @@ normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
134	{	134	{
135	static_assert(__libcpp_random_is_valid_urng<_URNG>::value, "");	135	static_assert(__libcpp_random_is_valid_urng<_URNG>::value, "");
136	result_type _Up;	136	result_type _Up;
137	if (_V_hot_)	137	if (__v_hot_)
138	{	138	{
139	_V_hot_ = false;	139	__v_hot_ = false;
140	_Up = _V_;	140	_Up = __v_;
141	}	141	}
142	else	142	else
143	{	143	{
...	@@ -152,15 +152,15 @@ normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -152,15 +152,15 @@ normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
152	__s = __u * __u + __v * __v;	152	__s = __u * __u + __v * __v;
153	} while (__s > 1 \|\| __s == 0);	153	} while (__s > 1 \|\| __s == 0);
154	result_type _Fp = _VSTD::sqrt(-2 * _VSTD::log(__s) / __s);	154	result_type _Fp = _VSTD::sqrt(-2 * _VSTD::log(__s) / __s);
155	_V_ = __v * _Fp;	155	__v_ = __v * _Fp;
156	_V_hot_ = true;	156	__v_hot_ = true;
157	_Up = __u * _Fp;	157	_Up = __u * _Fp;
158	}	158	}
159	return _Up * __p.stddev() + __p.mean();	159	return _Up * __p.stddev() + __p.mean();
160	}	160	}
161		161
162	template <class _CharT, class _Traits, class _RT>	162	template <class _CharT, class _Traits, class _RT>
163	basic_ostream<_CharT, _Traits>&	163	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
164	operator<<(basic_ostream<_CharT, _Traits>& __os,	164	operator<<(basic_ostream<_CharT, _Traits>& __os,
165	const normal_distribution<_RT>& __x)	165	const normal_distribution<_RT>& __x)
166	{	166	{
...	@@ -170,14 +170,14 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -170,14 +170,14 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
170	_OStream::scientific);	170	_OStream::scientific);
171	_CharT __sp = __os.widen(' ');	171	_CharT __sp = __os.widen(' ');
172	__os.fill(__sp);	172	__os.fill(__sp);
173	__os << __x.mean() << __sp << __x.stddev() << __sp << __x._V_hot_;	173	__os << __x.mean() << __sp << __x.stddev() << __sp << __x.__v_hot_;
174	if (__x._V_hot_)	174	if (__x.__v_hot_)
175	__os << __sp << __x._V_;	175	__os << __sp << __x.__v_;
176	return __os;	176	return __os;
177	}	177	}
178		178
179	template <class _CharT, class _Traits, class _RT>	179	template <class _CharT, class _Traits, class _RT>
180	basic_istream<_CharT, _Traits>&	180	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
181	operator>>(basic_istream<_CharT, _Traits>& __is,	181	operator>>(basic_istream<_CharT, _Traits>& __is,
182	normal_distribution<_RT>& __x)	182	normal_distribution<_RT>& __x)
183	{	183	{
...	@@ -197,8 +197,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is,	...	@@ -197,8 +197,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
197	if (!__is.fail())	197	if (!__is.fail())
198	{	198	{
199	__x.param(param_type(__mean, __stddev));	199	__x.param(param_type(__mean, __stddev));
200	__x._V_hot_ = _V_hot;	200	__x.__v_hot_ = _V_hot;
201	__x._V_ = _Vp;	201	__x.__v_ = _Vp;
202	}	202	}
203	return __is;	203	return __is;
204	}	204	}

lib/libcxx/include/__random/piecewise_constant_distribution.h+2-2

...	@@ -294,7 +294,7 @@ piecewise_constant_distribution<_RealType>::operator()(_URNG& __g, const param_t	...	@@ -294,7 +294,7 @@ piecewise_constant_distribution<_RealType>::operator()(_URNG& __g, const param_t
294	}	294	}
295		295
296	template <class _CharT, class _Traits, class _RT>	296	template <class _CharT, class _Traits, class _RT>
297	basic_ostream<_CharT, _Traits>&	297	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
298	operator<<(basic_ostream<_CharT, _Traits>& __os,	298	operator<<(basic_ostream<_CharT, _Traits>& __os,
299	const piecewise_constant_distribution<_RT>& __x)	299	const piecewise_constant_distribution<_RT>& __x)
300	{	300	{
...	@@ -320,7 +320,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -320,7 +320,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
320	}	320	}
321		321
322	template <class _CharT, class _Traits, class _RT>	322	template <class _CharT, class _Traits, class _RT>
323	basic_istream<_CharT, _Traits>&	323	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
324	operator>>(basic_istream<_CharT, _Traits>& __is,	324	operator>>(basic_istream<_CharT, _Traits>& __is,
325	piecewise_constant_distribution<_RT>& __x)	325	piecewise_constant_distribution<_RT>& __x)
326	{	326	{

lib/libcxx/include/__random/piecewise_linear_distribution.h+2-2

...	@@ -310,7 +310,7 @@ piecewise_linear_distribution<_RealType>::operator()(_URNG& __g, const param_typ	...	@@ -310,7 +310,7 @@ piecewise_linear_distribution<_RealType>::operator()(_URNG& __g, const param_typ
310	}	310	}
311		311
312	template <class _CharT, class _Traits, class _RT>	312	template <class _CharT, class _Traits, class _RT>
313	basic_ostream<_CharT, _Traits>&	313	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
314	operator<<(basic_ostream<_CharT, _Traits>& __os,	314	operator<<(basic_ostream<_CharT, _Traits>& __os,
315	const piecewise_linear_distribution<_RT>& __x)	315	const piecewise_linear_distribution<_RT>& __x)
316	{	316	{
...	@@ -336,7 +336,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -336,7 +336,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
336	}	336	}
337		337
338	template <class _CharT, class _Traits, class _RT>	338	template <class _CharT, class _Traits, class _RT>
339	basic_istream<_CharT, _Traits>&	339	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
340	operator>>(basic_istream<_CharT, _Traits>& __is,	340	operator>>(basic_istream<_CharT, _Traits>& __is,
341	piecewise_linear_distribution<_RT>& __x)	341	piecewise_linear_distribution<_RT>& __x)
342	{	342	{

lib/libcxx/include/__random/poisson_distribution.h+2-2

...	@@ -245,7 +245,7 @@ poisson_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr	...	@@ -245,7 +245,7 @@ poisson_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr
245	}	245	}
246		246
247	template <class _CharT, class _Traits, class _IntType>	247	template <class _CharT, class _Traits, class _IntType>
248	basic_ostream<_CharT, _Traits>&	248	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
249	operator<<(basic_ostream<_CharT, _Traits>& __os,	249	operator<<(basic_ostream<_CharT, _Traits>& __os,
250	const poisson_distribution<_IntType>& __x)	250	const poisson_distribution<_IntType>& __x)
251	{	251	{
...	@@ -257,7 +257,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -257,7 +257,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
257	}	257	}
258		258
259	template <class _CharT, class _Traits, class _IntType>	259	template <class _CharT, class _Traits, class _IntType>
260	basic_istream<_CharT, _Traits>&	260	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
261	operator>>(basic_istream<_CharT, _Traits>& __is,	261	operator>>(basic_istream<_CharT, _Traits>& __is,
262	poisson_distribution<_IntType>& __x)	262	poisson_distribution<_IntType>& __x)
263	{	263	{

lib/libcxx/include/__random/shuffle_order_engine.h+21-21

...	@@ -60,8 +60,8 @@ public:	...	@@ -60,8 +60,8 @@ public:
60		60
61	private:	61	private:
62	_Engine __e_;	62	_Engine __e_;
63	result_type _V_[__k];	63	result_type __v_[__k];
64	result_type _Y_;	64	result_type __y_;
65		65
66	public:	66	public:
67	// engine characteristics	67	// engine characteristics
...	@@ -157,8 +157,8 @@ private:	...	@@ -157,8 +157,8 @@ private:
157	void __init()	157	void __init()
158	{	158	{
159	for (size_t __i = 0; __i < __k; ++__i)	159	for (size_t __i = 0; __i < __k; ++__i)
160	_V_[__i] = __e_();	160	__v_[__i] = __e_();
161	_Y_ = __e_();	161	__y_ = __e_();
162	}	162	}
163		163
164	_LIBCPP_INLINE_VISIBILITY	164	_LIBCPP_INLINE_VISIBILITY
...	@@ -190,11 +190,11 @@ private:	...	@@ -190,11 +190,11 @@ private:
190	>::type	190	>::type
191	__eval(__uratio<_Np, _Dp>)	191	__eval(__uratio<_Np, _Dp>)
192	{	192	{
193	const size_t __j = static_cast<size_t>(__uratio<_Np, _Dp>::num * (_Y_ - _Min)	193	const size_t __j = static_cast<size_t>(__uratio<_Np, _Dp>::num * (__y_ - _Min)
194	/ __uratio<_Np, _Dp>::den);	194	/ __uratio<_Np, _Dp>::den);
195	_Y_ = _V_[__j];	195	__y_ = __v_[__j];
196	_V_[__j] = __e_();	196	__v_[__j] = __e_();
197	return _Y_;	197	return __y_;
198	}	198	}
199		199
200	template <uint64_t __n, uint64_t __d>	200	template <uint64_t __n, uint64_t __d>
...	@@ -204,10 +204,10 @@ private:	...	@@ -204,10 +204,10 @@ private:
204	const double _Fp = __d == 0 ?	204	const double _Fp = __d == 0 ?
205	__n / (2. * 0x8000000000000000ull) :	205	__n / (2. * 0x8000000000000000ull) :
206	__n / (double)__d;	206	__n / (double)__d;
207	const size_t __j = static_cast<size_t>(_Fp * (_Y_ - _Min));	207	const size_t __j = static_cast<size_t>(_Fp * (__y_ - _Min));
208	_Y_ = _V_[__j];	208	__y_ = __v_[__j];
209	_V_[__j] = __e_();	209	__v_[__j] = __e_();
210	return _Y_;	210	return __y_;
211	}	211	}
212	};	212	};
213		213
...	@@ -215,12 +215,12 @@ template<class _Engine, size_t __k>	...	@@ -215,12 +215,12 @@ template<class _Engine, size_t __k>
215	_LIBCPP_CONSTEXPR const size_t shuffle_order_engine<_Engine, __k>::table_size;	215	_LIBCPP_CONSTEXPR const size_t shuffle_order_engine<_Engine, __k>::table_size;
216		216
217	template<class _Eng, size_t _Kp>	217	template<class _Eng, size_t _Kp>
218	bool	218	_LIBCPP_HIDE_FROM_ABI bool
219	operator==(	219	operator==(
220	const shuffle_order_engine<_Eng, _Kp>& __x,	220	const shuffle_order_engine<_Eng, _Kp>& __x,
221	const shuffle_order_engine<_Eng, _Kp>& __y)	221	const shuffle_order_engine<_Eng, _Kp>& __y)
222	{	222	{
223	return __x._Y_ == __y._Y_ && _VSTD::equal(__x._V_, __x._V_ + _Kp, __y._V_) &&	223	return __x.__y_ == __y.__y_ && _VSTD::equal(__x.__v_, __x.__v_ + _Kp, __y.__v_) &&
224	__x.__e_ == __y.__e_;	224	__x.__e_ == __y.__e_;
225	}	225	}
226		226
...	@@ -236,7 +236,7 @@ operator!=(	...	@@ -236,7 +236,7 @@ operator!=(
236		236
237	template <class _CharT, class _Traits,	237	template <class _CharT, class _Traits,
238	class _Eng, size_t _Kp>	238	class _Eng, size_t _Kp>
239	basic_ostream<_CharT, _Traits>&	239	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
240	operator<<(basic_ostream<_CharT, _Traits>& __os,	240	operator<<(basic_ostream<_CharT, _Traits>& __os,
241	const shuffle_order_engine<_Eng, _Kp>& __x)	241	const shuffle_order_engine<_Eng, _Kp>& __x)
242	{	242	{
...	@@ -245,15 +245,15 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -245,15 +245,15 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
245	__os.flags(_Ostream::dec \| _Ostream::left);	245	__os.flags(_Ostream::dec \| _Ostream::left);
246	_CharT __sp = __os.widen(' ');	246	_CharT __sp = __os.widen(' ');
247	__os.fill(__sp);	247	__os.fill(__sp);
248	__os << __x.__e_ << __sp << __x._V_[0];	248	__os << __x.__e_ << __sp << __x.__v_[0];
249	for (size_t __i = 1; __i < _Kp; ++__i)	249	for (size_t __i = 1; __i < _Kp; ++__i)
250	__os << __sp << __x._V_[__i];	250	__os << __sp << __x.__v_[__i];
251	return __os << __sp << __x._Y_;	251	return __os << __sp << __x.__y_;
252	}	252	}
253		253
254	template <class _CharT, class _Traits,	254	template <class _CharT, class _Traits,
255	class _Eng, size_t _Kp>	255	class _Eng, size_t _Kp>
256	basic_istream<_CharT, _Traits>&	256	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
257	operator>>(basic_istream<_CharT, _Traits>& __is,	257	operator>>(basic_istream<_CharT, _Traits>& __is,
258	shuffle_order_engine<_Eng, _Kp>& __x)	258	shuffle_order_engine<_Eng, _Kp>& __x)
259	{	259	{
...	@@ -270,8 +270,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is,	...	@@ -270,8 +270,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
270	{	270	{
271	__x.__e_ = __e;	271	__x.__e_ = __e;
272	for (size_t __i = 0; __i < _Kp; ++__i)	272	for (size_t __i = 0; __i < _Kp; ++__i)
273	__x._V_[__i] = _Vp[__i];	273	__x.__v_[__i] = _Vp[__i];
274	__x._Y_ = _Vp[_Kp];	274	__x.__y_ = _Vp[_Kp];
275	}	275	}
276	return __is;	276	return __is;
277	}	277	}

lib/libcxx/include/__random/student_t_distribution.h+2-2

...	@@ -118,7 +118,7 @@ student_t_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)	...	@@ -118,7 +118,7 @@ student_t_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
118	}	118	}
119		119
120	template <class _CharT, class _Traits, class _RT>	120	template <class _CharT, class _Traits, class _RT>
121	basic_ostream<_CharT, _Traits>&	121	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
122	operator<<(basic_ostream<_CharT, _Traits>& __os,	122	operator<<(basic_ostream<_CharT, _Traits>& __os,
123	const student_t_distribution<_RT>& __x)	123	const student_t_distribution<_RT>& __x)
124	{	124	{
...	@@ -131,7 +131,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -131,7 +131,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
131	}	131	}
132		132
133	template <class _CharT, class _Traits, class _RT>	133	template <class _CharT, class _Traits, class _RT>
134	basic_istream<_CharT, _Traits>&	134	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
135	operator>>(basic_istream<_CharT, _Traits>& __is,	135	operator>>(basic_istream<_CharT, _Traits>& __is,
136	student_t_distribution<_RT>& __x)	136	student_t_distribution<_RT>& __x)
137	{	137	{

lib/libcxx/include/__random/subtract_with_carry_engine.h+6-6

lib/libcxx/include/__random/uniform_int_distribution.h+11-12

...	@@ -9,7 +9,6 @@	...	@@ -9,7 +9,6 @@
9	#ifndef _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H	9	#ifndef _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
10	#define _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H	10	#define _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
11		11
12	#include <__bits>
13	#include <__config>	12	#include <__config>
14	#include <__random/is_valid.h>	13	#include <__random/is_valid.h>
15	#include <__random/log2.h>	14	#include <__random/log2.h>
...	@@ -38,12 +37,8 @@ public:	...	@@ -38,12 +37,8 @@ public:
38		37
39	private:	38	private:
40	typedef typename _Engine::result_type _Engine_result_type;	39	typedef typename _Engine::result_type _Engine_result_type;
41	typedef typename conditional	40	typedef __conditional_t<sizeof(_Engine_result_type) <= sizeof(result_type), result_type, _Engine_result_type>
42	<	41	_Working_result_type;
43	sizeof(_Engine_result_type) <= sizeof(result_type),
44	result_type,
45	_Engine_result_type
46	>::type _Working_result_type;
47		42
48	_Engine& __e_;	43	_Engine& __e_;
49	size_t __w_;	44	size_t __w_;
...	@@ -178,8 +173,10 @@ public:	...	@@ -178,8 +173,10 @@ public:
178	result_type a() const {return __a_;}	173	result_type a() const {return __a_;}
179	result_type b() const {return __b_;}	174	result_type b() const {return __b_;}
180		175
		176	_LIBCPP_HIDE_FROM_ABI
181	friend bool operator==(const param_type& __x, const param_type& __y)	177	friend bool operator==(const param_type& __x, const param_type& __y)
182	{return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}	178	{return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
		179	_LIBCPP_HIDE_FROM_ABI
183	friend bool operator!=(const param_type& __x, const param_type& __y)	180	friend bool operator!=(const param_type& __x, const param_type& __y)
184	{return !(__x == __y);}	181	{return !(__x == __y);}
185	};	182	};
...	@@ -218,9 +215,11 @@ public:	...	@@ -218,9 +215,11 @@ public:
218	result_type min() const {return a();}	215	result_type min() const {return a();}
219	result_type max() const {return b();}	216	result_type max() const {return b();}
220		217
		218	_LIBCPP_HIDE_FROM_ABI
221	friend bool operator==(const uniform_int_distribution& __x,	219	friend bool operator==(const uniform_int_distribution& __x,
222	const uniform_int_distribution& __y)	220	const uniform_int_distribution& __y)
223	{return __x.__p_ == __y.__p_;}	221	{return __x.__p_ == __y.__p_;}
		222	_LIBCPP_HIDE_FROM_ABI
224	friend bool operator!=(const uniform_int_distribution& __x,	223	friend bool operator!=(const uniform_int_distribution& __x,
225	const uniform_int_distribution& __y)	224	const uniform_int_distribution& __y)
226	{return !(__x == __y);}	225	{return !(__x == __y);}
...	@@ -233,8 +232,8 @@ uniform_int_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p	...	@@ -233,8 +232,8 @@ uniform_int_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p
233	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK	232	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
234	{	233	{
235	static_assert(__libcpp_random_is_valid_urng<_URNG>::value, "");	234	static_assert(__libcpp_random_is_valid_urng<_URNG>::value, "");
236	typedef typename conditional<sizeof(result_type) <= sizeof(uint32_t), uint32_t,	235	typedef __conditional_t<sizeof(result_type) <= sizeof(uint32_t), uint32_t, __make_unsigned_t<result_type> >
237	typename make_unsigned<result_type>::type>::type _UIntType;	236	_UIntType;
238	const _UIntType _Rp = _UIntType(__p.b()) - _UIntType(__p.a()) + _UIntType(1);	237	const _UIntType _Rp = _UIntType(__p.b()) - _UIntType(__p.a()) + _UIntType(1);
239	if (_Rp == 1)	238	if (_Rp == 1)
240	return __p.a();	239	return __p.a();
...	@@ -242,7 +241,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK	...	@@ -242,7 +241,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
242	typedef __independent_bits_engine<_URNG, _UIntType> _Eng;	241	typedef __independent_bits_engine<_URNG, _UIntType> _Eng;
243	if (_Rp == 0)	242	if (_Rp == 0)
244	return static_cast<result_type>(_Eng(__g, _Dt)());	243	return static_cast<result_type>(_Eng(__g, _Dt)());
245	size_t __w = _Dt - __countl_zero(_Rp) - 1;	244	size_t __w = _Dt - std::__countl_zero(_Rp) - 1;
246	if ((_Rp & (numeric_limits<_UIntType>::max() >> (_Dt - __w))) != 0)	245	if ((_Rp & (numeric_limits<_UIntType>::max() >> (_Dt - __w))) != 0)
247	++__w;	246	++__w;
248	_Eng __e(__g, __w);	247	_Eng __e(__g, __w);
...	@@ -255,7 +254,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK	...	@@ -255,7 +254,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
255	}	254	}
256		255
257	template <class _CharT, class _Traits, class _IT>	256	template <class _CharT, class _Traits, class _IT>
258	basic_ostream<_CharT, _Traits>&	257	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
259	operator<<(basic_ostream<_CharT, _Traits>& __os,	258	operator<<(basic_ostream<_CharT, _Traits>& __os,
260	const uniform_int_distribution<_IT>& __x)	259	const uniform_int_distribution<_IT>& __x)
261	{	260	{
...	@@ -268,7 +267,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -268,7 +267,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
268	}	267	}
269		268
270	template <class _CharT, class _Traits, class _IT>	269	template <class _CharT, class _Traits, class _IT>
271	basic_istream<_CharT, _Traits>&	270	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
272	operator>>(basic_istream<_CharT, _Traits>& __is,	271	operator>>(basic_istream<_CharT, _Traits>& __is,
273	uniform_int_distribution<_IT>& __x)	272	uniform_int_distribution<_IT>& __x)
274	{	273	{

lib/libcxx/include/__random/uniform_real_distribution.h+2-2

...	@@ -123,7 +123,7 @@ uniform_real_distribution<_RealType>::operator()(_URNG& __g, const param_type& _	...	@@ -123,7 +123,7 @@ uniform_real_distribution<_RealType>::operator()(_URNG& __g, const param_type& _
123	}	123	}
124		124
125	template <class _CharT, class _Traits, class _RT>	125	template <class _CharT, class _Traits, class _RT>
126	basic_ostream<_CharT, _Traits>&	126	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
127	operator<<(basic_ostream<_CharT, _Traits>& __os,	127	operator<<(basic_ostream<_CharT, _Traits>& __os,
128	const uniform_real_distribution<_RT>& __x)	128	const uniform_real_distribution<_RT>& __x)
129	{	129	{
...	@@ -137,7 +137,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -137,7 +137,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
137	}	137	}
138		138
139	template <class _CharT, class _Traits, class _RT>	139	template <class _CharT, class _Traits, class _RT>
140	basic_istream<_CharT, _Traits>&	140	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
141	operator>>(basic_istream<_CharT, _Traits>& __is,	141	operator>>(basic_istream<_CharT, _Traits>& __is,
142	uniform_real_distribution<_RT>& __x)	142	uniform_real_distribution<_RT>& __x)
143	{	143	{

lib/libcxx/include/__random/weibull_distribution.h+2-2

...	@@ -115,7 +115,7 @@ public:	...	@@ -115,7 +115,7 @@ public:
115	};	115	};
116		116
117	template <class _CharT, class _Traits, class _RT>	117	template <class _CharT, class _Traits, class _RT>
118	basic_ostream<_CharT, _Traits>&	118	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
119	operator<<(basic_ostream<_CharT, _Traits>& __os,	119	operator<<(basic_ostream<_CharT, _Traits>& __os,
120	const weibull_distribution<_RT>& __x)	120	const weibull_distribution<_RT>& __x)
121	{	121	{
...	@@ -130,7 +130,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -130,7 +130,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
130	}	130	}
131		131
132	template <class _CharT, class _Traits, class _RT>	132	template <class _CharT, class _Traits, class _RT>
133	basic_istream<_CharT, _Traits>&	133	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
134	operator>>(basic_istream<_CharT, _Traits>& __is,	134	operator>>(basic_istream<_CharT, _Traits>& __is,
135	weibull_distribution<_RT>& __x)	135	weibull_distribution<_RT>& __x)
136	{	136	{

lib/libcxx/include/__ranges/access.h+8-2

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_ACCESS_H
 #define _LIBCPP___RANGES_ACCESS_H
 @@ -14,8 +15,13 @@
 #include <__iterator/concepts.h>
 #include <__iterator/readable_traits.h>
 #include <__ranges/enable_borrowed_range.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/remove_cvref.h>
+#include <__type_traits/remove_reference.h>
 #include <__utility/auto_cast.h>
-#include <type_traits>
+#include <__utility/declval.h>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -99,7 +105,7 @@ inline namespace __cpo {
 namespace ranges {
   template <class _Tp>
-  using iterator_t = decltype(ranges::begin(declval<_Tp&>()));
+  using iterator_t = decltype(ranges::begin(std::declval<_Tp&>()));
 } // namespace ranges
 // [range.access.end]

lib/libcxx/include/__ranges/all.h+4-3

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_ALL_H	10	#ifndef _LIBCPP___RANGES_ALL_H
10	#define _LIBCPP___RANGES_ALL_H	11	#define _LIBCPP___RANGES_ALL_H
11		12
...	@@ -28,7 +29,7 @@	...	@@ -28,7 +29,7 @@
28		29
29	_LIBCPP_BEGIN_NAMESPACE_STD	30	_LIBCPP_BEGIN_NAMESPACE_STD
30		31
31	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	32	#if _LIBCPP_STD_VER > 17
32		33
33	namespace ranges::views {	34	namespace ranges::views {
34		35
...	@@ -72,11 +73,11 @@ inline namespace __cpo {	...	@@ -72,11 +73,11 @@ inline namespace __cpo {
72	} // namespace __cpo	73	} // namespace __cpo
73		74
74	template<ranges::viewable_range _Range>	75	template<ranges::viewable_range _Range>
75	using all_t = decltype(views::all(declval<_Range>()));	76	using all_t = decltype(views::all(std::declval<_Range>()));
76		77
77	} // namespace ranges::views	78	} // namespace ranges::views
78		79
79	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	80	#endif // _LIBCPP_STD_VER > 17
80		81
81	_LIBCPP_END_NAMESPACE_STD	82	_LIBCPP_END_NAMESPACE_STD
82		83

lib/libcxx/include/__ranges/as_rvalue_view.h created+137

...	@@ -0,0 +1,137 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___RANGES_AS_RVALUE_H
10	#define _LIBCPP___RANGES_AS_RVALUE_H
11
12	#include <__concepts/constructible.h>
13	#include <__concepts/same_as.h>
14	#include <__config>
15	#include <__iterator/move_iterator.h>
16	#include <__iterator/move_sentinel.h>
17	#include <__ranges/access.h>
18	#include <__ranges/all.h>
19	#include <__ranges/concepts.h>
20	#include <__ranges/enable_borrowed_range.h>
21	#include <__ranges/range_adaptor.h>
22	#include <__ranges/size.h>
23	#include <__ranges/view_interface.h>
24	#include <__utility/forward.h>
25	#include <__utility/move.h>
26
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header
29	#endif
30
31	#if _LIBCPP_STD_VER >= 23
32
33	_LIBCPP_BEGIN_NAMESPACE_STD
34
35	namespace ranges {
36	template <view _View>
37	requires input_range<_View>
38	class as_rvalue_view : public view_interface<as_rvalue_view<_View>> {
39	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
40
41	public:
42	_LIBCPP_HIDE_FROM_ABI as_rvalue_view()
43	requires default_initializable<_View>
44	= default;
45
46	_LIBCPP_HIDE_FROM_ABI constexpr explicit as_rvalue_view(_View __base) : __base_(std::move(__base)) {}
47
48	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
49	requires copy_constructible<_View>
50	{
51	return __base_;
52	}
53
54	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
55
56	_LIBCPP_HIDE_FROM_ABI constexpr auto begin()
57	requires(!__simple_view<_View>)
58	{
59	return move_iterator(ranges::begin(__base_));
60	}
61
62	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
63	requires range<const _View>
64	{
65	return move_iterator(ranges::begin(__base_));
66	}
67
68	_LIBCPP_HIDE_FROM_ABI constexpr auto end()
69	requires(!__simple_view<_View>)
70	{
71	if constexpr (common_range<_View>) {
72	return move_iterator(ranges::end(__base_));
73	} else {
74	return move_sentinel(ranges::end(__base_));
75	}
76	}
77
78	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const
79	requires range<const _View>
80	{
81	if constexpr (common_range<const _View>) {
82	return move_iterator(ranges::end(__base_));
83	} else {
84	return move_sentinel(ranges::end(__base_));
85	}
86	}
87
88	_LIBCPP_HIDE_FROM_ABI constexpr auto size()
89	requires sized_range<_View>
90	{
91	return ranges::size(__base_);
92	}
93
94	_LIBCPP_HIDE_FROM_ABI constexpr auto size() const
95	requires sized_range<const _View>
96	{
97	return ranges::size(__base_);
98	}
99	};
100
101	template <class _Range>
102	as_rvalue_view(_Range&&) -> as_rvalue_view<views::all_t<_Range>>;
103
104	template <class _View>
105	inline constexpr bool enable_borrowed_range<as_rvalue_view<_View>> = enable_borrowed_range<_View>;
106
107	namespace views {
108	namespace __as_rvalue {
109	struct __fn : __range_adaptor_closure<__fn> {
110	template <class _Range>
111	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range) const
112	noexcept(noexcept(/**/ as_rvalue_view(std::forward<_Range>(__range))))
113	-> decltype(/--/ as_rvalue_view(std::forward<_Range>(__range))) {
114	return /-------------/ as_rvalue_view(std::forward<_Range>(__range));
115	}
116
117	template <class _Range>
118	requires same_as<range_rvalue_reference_t<_Range>, range_reference_t<_Range>>
119	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range) const
120	noexcept(noexcept(/**/ views::all(std::forward<_Range>(__range))))
121	-> decltype(/--/ views::all(std::forward<_Range>(__range))) {
122	return /-------------/ views::all(std::forward<_Range>(__range));
123	}
124	};
125	} // namespace __as_rvalue
126
127	inline namespace __cpo {
128	constexpr auto as_rvalue = __as_rvalue::__fn{};
129	} // namespace __cpo
130	} // namespace views
131	} // namespace ranges
132
133	_LIBCPP_END_NAMESPACE_STD
134
135	#endif // _LIBCPP_STD_VER >= 23
136
137	#endif // _LIBCPP___RANGES_AS_RVALUE_H

lib/libcxx/include/__ranges/common_view.h+5-3

...	@@ -6,9 +6,12 @@	...	@@ -6,9 +6,12 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_COMMON_VIEW_H	10	#ifndef _LIBCPP___RANGES_COMMON_VIEW_H
10	#define _LIBCPP___RANGES_COMMON_VIEW_H	11	#define _LIBCPP___RANGES_COMMON_VIEW_H
11		12
		13	#include <__concepts/constructible.h>
		14	#include <__concepts/copyable.h>
12	#include <__config>	15	#include <__config>
13	#include <__iterator/common_iterator.h>	16	#include <__iterator/common_iterator.h>
14	#include <__iterator/iterator_traits.h>	17	#include <__iterator/iterator_traits.h>
...	@@ -21,7 +24,6 @@	...	@@ -21,7 +24,6 @@
21	#include <__ranges/view_interface.h>	24	#include <__ranges/view_interface.h>
22	#include <__utility/forward.h>	25	#include <__utility/forward.h>
23	#include <__utility/move.h>	26	#include <__utility/move.h>
24	#include <concepts>
25	#include <type_traits>	27	#include <type_traits>
26		28
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -30,7 +32,7 @@	...	@@ -30,7 +32,7 @@
30		32
31	_LIBCPP_BEGIN_NAMESPACE_STD	33	_LIBCPP_BEGIN_NAMESPACE_STD
32		34
33	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	35	#if _LIBCPP_STD_VER > 17
34		36
35	namespace ranges {	37	namespace ranges {
36		38
...	@@ -128,7 +130,7 @@ inline namespace __cpo {	...	@@ -128,7 +130,7 @@ inline namespace __cpo {
128	} // namespace views	130	} // namespace views
129	} // namespace ranges	131	} // namespace ranges
130		132
131	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	133	#endif // _LIBCPP_STD_VER > 17
132		134
133	_LIBCPP_END_NAMESPACE_STD	135	_LIBCPP_END_NAMESPACE_STD
134		136

lib/libcxx/include/__ranges/concepts.h+8-3

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_CONCEPTS_H	10	#ifndef _LIBCPP___RANGES_CONCEPTS_H
10	#define _LIBCPP___RANGES_CONCEPTS_H	11	#define _LIBCPP___RANGES_CONCEPTS_H
11		12
...	@@ -23,8 +24,12 @@	...	@@ -23,8 +24,12 @@
23	#include <__ranges/enable_borrowed_range.h>	24	#include <__ranges/enable_borrowed_range.h>
24	#include <__ranges/enable_view.h>	25	#include <__ranges/enable_view.h>
25	#include <__ranges/size.h>	26	#include <__ranges/size.h>
		27	#include <__type_traits/add_pointer.h>
		28	#include <__type_traits/is_reference.h>
		29	#include <__type_traits/remove_cvref.h>
		30	#include <__type_traits/remove_reference.h>
		31	#include <__utility/declval.h>
26	#include <initializer_list>	32	#include <initializer_list>
27	#include <type_traits>
28		33
29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	34	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
30	# pragma GCC system_header	35	# pragma GCC system_header
...	@@ -54,7 +59,7 @@ namespace ranges {	...	@@ -54,7 +59,7 @@ namespace ranges {
54	// `iterator_t` defined in <__ranges/access.h>	59	// `iterator_t` defined in <__ranges/access.h>
55		60
56	template <range _Rp>	61	template <range _Rp>
57	using sentinel_t = decltype(ranges::end(declval<_Rp&>()));	62	using sentinel_t = decltype(ranges::end(std::declval<_Rp&>()));
58		63
59	template <range _Rp>	64	template <range _Rp>
60	using range_difference_t = iter_difference_t<iterator_t<_Rp>>;	65	using range_difference_t = iter_difference_t<iterator_t<_Rp>>;
...	@@ -73,7 +78,7 @@ namespace ranges {	...	@@ -73,7 +78,7 @@ namespace ranges {
73	concept sized_range = range<_Tp> && requires(_Tp& __t) { ranges::size(__t); };	78	concept sized_range = range<_Tp> && requires(_Tp& __t) { ranges::size(__t); };
74		79
75	template<sized_range _Rp>	80	template<sized_range _Rp>
76	using range_size_t = decltype(ranges::size(declval<_Rp&>()));	81	using range_size_t = decltype(ranges::size(std::declval<_Rp&>()));
77		82
78	// `disable_sized_range` defined in `<__ranges/size.h>`	83	// `disable_sized_range` defined in `<__ranges/size.h>`
79		84

lib/libcxx/include/__ranges/copyable_box.h+5-3

 @@ -10,11 +10,13 @@
 #ifndef _LIBCPP___RANGES_COPYABLE_BOX_H
 #define _LIBCPP___RANGES_COPYABLE_BOX_H
+#include <__concepts/constructible.h>
+#include <__concepts/copyable.h>
+#include <__concepts/movable.h>
 #include <__config>
 #include <__memory/addressof.h>
 #include <__memory/construct_at.h>
 #include <__utility/move.h>
-#include <concepts>
 #include <optional>
 #include <type_traits>
 @@ -24,7 +26,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 // __copyable_box allows turning a type that is copy-constructible (but maybe not copy-assignable) into
 // a type that is both copy-constructible and copy-assignable. It does that by introducing an empty state
 @@ -171,7 +173,7 @@ namespace ranges {
   };
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/counted.h+3-2

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_COUNTED_H	10	#ifndef _LIBCPP___RANGES_COUNTED_H
10	#define _LIBCPP___RANGES_COUNTED_H	11	#define _LIBCPP___RANGES_COUNTED_H
11		12
...	@@ -29,7 +30,7 @@	...	@@ -29,7 +30,7 @@
29		30
30	_LIBCPP_BEGIN_NAMESPACE_STD	31	_LIBCPP_BEGIN_NAMESPACE_STD
31		32
32	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	33	#if _LIBCPP_STD_VER > 17
33		34
34	namespace ranges::views {	35	namespace ranges::views {
35		36
...	@@ -74,7 +75,7 @@ inline namespace __cpo {	...	@@ -74,7 +75,7 @@ inline namespace __cpo {
74		75
75	} // namespace ranges::views	76	} // namespace ranges::views
76		77
77	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
78		79
79	_LIBCPP_END_NAMESPACE_STD	80	_LIBCPP_END_NAMESPACE_STD
80		81

lib/libcxx/include/__ranges/dangling.h+1-1

...	@@ -13,7 +13,7 @@	...	@@ -13,7 +13,7 @@
13	#include <__config>	13	#include <__config>
14	#include <__ranges/access.h>	14	#include <__ranges/access.h>
15	#include <__ranges/concepts.h>	15	#include <__ranges/concepts.h>
16	#include <type_traits>	16	#include <__type_traits/conditional.h>
17		17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	19	# pragma GCC system_header

lib/libcxx/include/__ranges/data.h+7-1

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_DATA_H
 #define _LIBCPP___RANGES_DATA_H
 @@ -15,8 +16,13 @@
 #include <__iterator/iterator_traits.h>
 #include <__memory/pointer_traits.h>
 #include <__ranges/access.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_object.h>
+#include <__type_traits/is_pointer.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/remove_pointer.h>
+#include <__type_traits/remove_reference.h>
 #include <__utility/auto_cast.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__ranges/drop_view.h+5-3

...	@@ -6,11 +6,14 @@	...	@@ -6,11 +6,14 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_DROP_VIEW_H	10	#ifndef _LIBCPP___RANGES_DROP_VIEW_H
10	#define _LIBCPP___RANGES_DROP_VIEW_H	11	#define _LIBCPP___RANGES_DROP_VIEW_H
11		12
12	#include <__algorithm/min.h>	13	#include <__algorithm/min.h>
13	#include <__assert>	14	#include <__assert>
		15	#include <__concepts/constructible.h>
		16	#include <__concepts/convertible_to.h>
14	#include <__config>	17	#include <__config>
15	#include <__functional/bind_back.h>	18	#include <__functional/bind_back.h>
16	#include <__fwd/span.h>	19	#include <__fwd/span.h>
...	@@ -33,7 +36,6 @@	...	@@ -33,7 +36,6 @@
33	#include <__utility/auto_cast.h>	36	#include <__utility/auto_cast.h>
34	#include <__utility/forward.h>	37	#include <__utility/forward.h>
35	#include <__utility/move.h>	38	#include <__utility/move.h>
36	#include <concepts>
37	#include <type_traits>	39	#include <type_traits>
38		40
39	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	41	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -45,7 +47,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -45,7 +47,7 @@ _LIBCPP_PUSH_MACROS
45		47
46	_LIBCPP_BEGIN_NAMESPACE_STD	48	_LIBCPP_BEGIN_NAMESPACE_STD
47		49
48	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	50	#if _LIBCPP_STD_VER > 17
49		51
50	namespace ranges {	52	namespace ranges {
51	template<view _View>	53	template<view _View>
...	@@ -297,7 +299,7 @@ inline namespace __cpo {	...	@@ -297,7 +299,7 @@ inline namespace __cpo {
297		299
298	} // namespace ranges	300	} // namespace ranges
299		301
300	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	302	#endif // _LIBCPP_STD_VER > 17
301		303
302	_LIBCPP_END_NAMESPACE_STD	304	_LIBCPP_END_NAMESPACE_STD
303		305

lib/libcxx/include/__ranges/drop_while_view.h created+129

...	@@ -0,0 +1,129 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_DROP_WHILE_VIEW_H
11	#define _LIBCPP___RANGES_DROP_WHILE_VIEW_H
12
13	#include <__algorithm/ranges_find_if_not.h>
14	#include <__assert>
15	#include <__concepts/constructible.h>
16	#include <__config>
17	#include <__functional/bind_back.h>
18	#include <__functional/reference_wrapper.h>
19	#include <__iterator/concepts.h>
20	#include <__ranges/access.h>
21	#include <__ranges/all.h>
22	#include <__ranges/concepts.h>
23	#include <__ranges/copyable_box.h>
24	#include <__ranges/enable_borrowed_range.h>
25	#include <__ranges/non_propagating_cache.h>
26	#include <__ranges/range_adaptor.h>
27	#include <__ranges/view_interface.h>
28	#include <__type_traits/conditional.h>
29	#include <__type_traits/decay.h>
30	#include <__type_traits/is_nothrow_constructible.h>
31	#include <__type_traits/is_object.h>
32	#include <__utility/forward.h>
33	#include <__utility/in_place.h>
34	#include <__utility/move.h>
35
36	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
37	# pragma GCC system_header
38	#endif
39
40	_LIBCPP_BEGIN_NAMESPACE_STD
41
42	#if _LIBCPP_STD_VER >= 20
43
44	namespace ranges {
45
46	template <view _View, class _Pred>
47	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>
48	class drop_while_view : public view_interface<drop_while_view<_View, _Pred>> {
49	public:
50	_LIBCPP_HIDE_FROM_ABI drop_while_view()
51	requires default_initializable<_View> && default_initializable<_Pred>
52	= default;
53
54	_LIBCPP_HIDE_FROM_ABI constexpr drop_while_view(_View __base, _Pred __pred)
55	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
56
57	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
58	requires copy_constructible<_View>
59	{
60	return __base_;
61	}
62
63	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
64
65	_LIBCPP_HIDE_FROM_ABI constexpr const _Pred& pred() const { return *__pred_; }
66
67	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
68	_LIBCPP_ASSERT(__pred_.__has_value(),
69	"drop_while_view needs to have a non-empty predicate before calling begin() -- did a previous "
70	"assignment to this drop_while_view fail?");
71	if constexpr (_UseCache) {
72	if (!__cached_begin_.__has_value()) {
73	__cached_begin_.__emplace(ranges::find_if_not(__base_, std::cref(*__pred_)));
74	}
75	return *__cached_begin_;
76	} else {
77	return ranges::find_if_not(__base_, std::cref(*__pred_));
78	}
79	}
80
81	_LIBCPP_HIDE_FROM_ABI constexpr auto end() { return ranges::end(__base_); }
82
83	private:
84	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
85	_LIBCPP_NO_UNIQUE_ADDRESS __copyable_box<_Pred> __pred_;
86
87	static constexpr bool _UseCache = forward_range<_View>;
88	using _Cache = _If<_UseCache, __non_propagating_cache<iterator_t<_View>>, __empty_cache>;
89	_LIBCPP_NO_UNIQUE_ADDRESS _Cache __cached_begin_ = _Cache();
90	};
91
92	template <class _View, class _Pred>
93	inline constexpr bool enable_borrowed_range<drop_while_view<_View, _Pred>> = enable_borrowed_range<_View>;
94
95	template <class _Range, class _Pred>
96	drop_while_view(_Range&&, _Pred) -> drop_while_view<views::all_t<_Range>, _Pred>;
97
98	namespace views {
99	namespace __drop_while {
100
101	struct __fn {
102	template <class _Range, class _Pred>
103	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range, _Pred&& __pred) const
104	noexcept(noexcept(/**/ drop_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred))))
105	-> decltype(/--/ drop_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred))) {
106	return /-------------/ drop_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred));
107	}
108
109	template <class _Pred>
110	requires constructible_from<decay_t<_Pred>, _Pred>
111	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
112	noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
113	return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
114	}
115	};
116
117	} // namespace __drop_while
118
119	inline namespace __cpo {
120	inline constexpr auto drop_while = __drop_while::__fn{};
121	} // namespace __cpo
122	} // namespace views
123	} // namespace ranges
124
125	#endif // _LIBCPP_STD_VER >= 20
126
127	_LIBCPP_END_NAMESPACE_STD
128
129	#endif // _LIBCPP___RANGES_DROP_WHILE_VIEW_H

lib/libcxx/include/__ranges/elements_view.h created+423

...	@@ -0,0 +1,423 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_ELEMENTS_VIEW_H
11	#define _LIBCPP___RANGES_ELEMENTS_VIEW_H
12
13	#include <__compare/three_way_comparable.h>
14	#include <__concepts/constructible.h>
15	#include <__concepts/convertible_to.h>
16	#include <__concepts/derived_from.h>
17	#include <__concepts/equality_comparable.h>
18	#include <__config>
19	#include <__fwd/get.h>
20	#include <__iterator/concepts.h>
21	#include <__iterator/iterator_traits.h>
22	#include <__ranges/access.h>
23	#include <__ranges/all.h>
24	#include <__ranges/concepts.h>
25	#include <__ranges/enable_borrowed_range.h>
26	#include <__ranges/range_adaptor.h>
27	#include <__ranges/size.h>
28	#include <__ranges/view_interface.h>
29	#include <__tuple_dir/tuple_element.h>
30	#include <__tuple_dir/tuple_like.h>
31	#include <__tuple_dir/tuple_size.h>
32	#include <__type_traits/is_reference.h>
33	#include <__type_traits/maybe_const.h>
34	#include <__type_traits/remove_cv.h>
35	#include <__type_traits/remove_cvref.h>
36	#include <__type_traits/remove_reference.h>
37	#include <__utility/declval.h>
38	#include <__utility/forward.h>
39	#include <__utility/move.h>
40	#include <cstddef>
41
42	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
43	# pragma GCC system_header
44	#endif
45
46	_LIBCPP_BEGIN_NAMESPACE_STD
47
48	#if _LIBCPP_STD_VER >= 20
49
50	namespace ranges {
51
52	template <class _View, size_t _Np, bool _Const>
53	class __elements_view_iterator;
54
55	template <class _View, size_t _Np, bool _Const>
56	class __elements_view_sentinel;
57
58	template <class _Tp, size_t _Np>
59	concept __has_tuple_element = __tuple_like<_Tp> && _Np < tuple_size<_Tp>::value;
60
61	template <class _Tp, size_t _Np>
62	concept __returnable_element = is_reference_v<_Tp> \|\| move_constructible<tuple_element_t<_Np, _Tp>>;
63
64	template <input_range _View, size_t _Np>
65	requires view<_View> && __has_tuple_element<range_value_t<_View>, _Np> &&
66	__has_tuple_element<remove_reference_t<range_reference_t<_View>>, _Np> &&
67	__returnable_element<range_reference_t<_View>, _Np>
68	class elements_view : public view_interface<elements_view<_View, _Np>> {
69	public:
70	_LIBCPP_HIDE_FROM_ABI elements_view()
71	requires default_initializable<_View>
72	= default;
73
74	_LIBCPP_HIDE_FROM_ABI constexpr explicit elements_view(_View __base) : __base_(std::move(__base)) {}
75
76	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
77	requires copy_constructible<_View>
78	{
79	return __base_;
80	}
81
82	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
83
84	_LIBCPP_HIDE_FROM_ABI constexpr auto begin()
85	requires(!__simple_view<_View>)
86	{
87	return __iterator</_Const=/false>(ranges::begin(__base_));
88	}
89
90	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
91	requires range<const _View>
92	{
93	return __iterator</_Const=/true>(ranges::begin(__base_));
94	}
95
96	_LIBCPP_HIDE_FROM_ABI constexpr auto end()
97	requires(!__simple_view<_View> && !common_range<_View>)
98	{
99	return __sentinel</_Const=/false>{ranges::end(__base_)};
100	}
101
102	_LIBCPP_HIDE_FROM_ABI constexpr auto end()
103	requires(!__simple_view<_View> && common_range<_View>)
104	{
105	return __iterator</_Const=/false>{ranges::end(__base_)};
106	}
107
108	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const
109	requires range<const _View>
110	{
111	return __sentinel</_Const=/true>{ranges::end(__base_)};
112	}
113
114	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const
115	requires common_range<const _View>
116	{
117	return __iterator</_Const=/true>{ranges::end(__base_)};
118	}
119
120	_LIBCPP_HIDE_FROM_ABI constexpr auto size()
121	requires sized_range<_View>
122	{
123	return ranges::size(__base_);
124	}
125
126	_LIBCPP_HIDE_FROM_ABI constexpr auto size() const
127	requires sized_range<const _View>
128	{
129	return ranges::size(__base_);
130	}
131
132	private:
133	template <bool _Const>
134	using __iterator = __elements_view_iterator<_View, _Np, _Const>;
135
136	template <bool _Const>
137	using __sentinel = __elements_view_sentinel<_View, _Np, _Const>;
138
139	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
140	};
141
142	template <class, size_t>
143	struct __elements_view_iterator_category_base {};
144
145	template <forward_range _Base, size_t _Np>
146	struct __elements_view_iterator_category_base<_Base, _Np> {
147	static consteval auto __get_iterator_category() {
148	using _Result = decltype(std::get<_Np>(*std::declval<iterator_t<_Base>>()));
149	using _Cat = typename iterator_traits<iterator_t<_Base>>::iterator_category;
150
151	if constexpr (!is_lvalue_reference_v<_Result>) {
152	return input_iterator_tag{};
153	} else if constexpr (derived_from<_Cat, random_access_iterator_tag>) {
154	return random_access_iterator_tag{};
155	} else {
156	return _Cat{};
157	}
158	}
159
160	using iterator_category = decltype(__get_iterator_category());
161	};
162
163	template <class _View, size_t _Np, bool _Const>
164	class __elements_view_iterator : public __elements_view_iterator_category_base<__maybe_const<_Const, _View>, _Np> {
165	template <class, size_t, bool >
166	friend class __elements_view_iterator;
167
168	template <class, size_t, bool >
169	friend class __elements_view_sentinel;
170
171	using _Base = __maybe_const<_Const, _View>;
172
173	iterator_t<_Base> __current_ = iterator_t<_Base>();
174
175	_LIBCPP_HIDE_FROM_ABI static constexpr decltype(auto) __get_element(const iterator_t<_Base>& __i) {
176	if constexpr (is_reference_v<range_reference_t<_Base>>) {
177	return std::get<_Np>(*__i);
178	} else {
179	using _Element = remove_cv_t<tuple_element_t<_Np, range_reference_t<_Base>>>;
180	return static_cast<_Element>(std::get<_Np>(*__i));
181	}
182	}
183
184	static consteval auto __get_iterator_concept() {
185	if constexpr (random_access_range<_Base>) {
186	return random_access_iterator_tag{};
187	} else if constexpr (bidirectional_range<_Base>) {
188	return bidirectional_iterator_tag{};
189	} else if constexpr (forward_range<_Base>) {
190	return forward_iterator_tag{};
191	} else {
192	return input_iterator_tag{};
193	}
194	}
195
196	public:
197	using iterator_concept = decltype(__get_iterator_concept());
198	using value_type = remove_cvref_t<tuple_element_t<_Np, range_value_t<_Base>>>;
199	using difference_type = range_difference_t<_Base>;
200
201	_LIBCPP_HIDE_FROM_ABI __elements_view_iterator()
202	requires default_initializable<iterator_t<_Base>>
203	= default;
204
205	_LIBCPP_HIDE_FROM_ABI constexpr explicit __elements_view_iterator(iterator_t<_Base> __current)
206	: __current_(std::move(__current)) {}
207
208	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator(__elements_view_iterator<_View, _Np, !_Const> __i)
209	requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>
210	: __current_(std::move(__i.__current_)) {}
211
212	_LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __current_; }
213
214	_LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); }
215
216	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return __get_element(__current_); }
217
218	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator& operator++() {
219	++__current_;
220	return *this;
221	}
222
223	_LIBCPP_HIDE_FROM_ABI constexpr void operator++(int) { ++__current_; }
224
225	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator operator++(int)
226	requires forward_range<_Base>
227	{
228	auto temp = *this;
229	++__current_;
230	return temp;
231	}
232
233	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator& operator--()
234	requires bidirectional_range<_Base>
235	{
236	--__current_;
237	return *this;
238	}
239
240	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator operator--(int)
241	requires bidirectional_range<_Base>
242	{
243	auto temp = *this;
244	--__current_;
245	return temp;
246	}
247
248	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator& operator+=(difference_type __n)
249	requires random_access_range<_Base>
250	{
251	__current_ += __n;
252	return *this;
253	}
254
255	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_iterator& operator-=(difference_type __n)
256	requires random_access_range<_Base>
257	{
258	__current_ -= __n;
259	return *this;
260	}
261
262	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
263	requires random_access_range<_Base>
264	{
265	return __get_element(__current_ + __n);
266	}
267
268	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
269	operator==(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
270	requires equality_comparable<iterator_t<_Base>>
271	{
272	return __x.__current_ == __y.__current_;
273	}
274
275	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
276	operator<(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
277	requires random_access_range<_Base>
278	{
279	return __x.__current_ < __y.__current_;
280	}
281
282	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
283	operator>(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
284	requires random_access_range<_Base>
285	{
286	return __y < __x;
287	}
288
289	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
290	operator<=(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
291	requires random_access_range<_Base>
292	{
293	return !(__y < __x);
294	}
295
296	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
297	operator>=(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
298	requires random_access_range<_Base>
299	{
300	return !(__x < __y);
301	}
302
303	_LIBCPP_HIDE_FROM_ABI friend constexpr auto
304	operator<=>(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
305	requires random_access_range<_Base> && three_way_comparable<iterator_t<_Base>>
306	{
307	return __x.__current_ <=> __y.__current_;
308	}
309
310	_LIBCPP_HIDE_FROM_ABI friend constexpr __elements_view_iterator
311	operator+(const __elements_view_iterator& __x, difference_type __y)
312	requires random_access_range<_Base>
313	{
314	return __elements_view_iterator{__x} += __y;
315	}
316
317	_LIBCPP_HIDE_FROM_ABI friend constexpr __elements_view_iterator
318	operator+(difference_type __x, const __elements_view_iterator& __y)
319	requires random_access_range<_Base>
320	{
321	return __y + __x;
322	}
323
324	_LIBCPP_HIDE_FROM_ABI friend constexpr __elements_view_iterator
325	operator-(const __elements_view_iterator& __x, difference_type __y)
326	requires random_access_range<_Base>
327	{
328	return __elements_view_iterator{__x} -= __y;
329	}
330
331	_LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
332	operator-(const __elements_view_iterator& __x, const __elements_view_iterator& __y)
333	requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
334	{
335	return __x.__current_ - __y.__current_;
336	}
337	};
338
339	template <class _View, size_t _Np, bool _Const>
340	class __elements_view_sentinel {
341	private:
342	using _Base = __maybe_const<_Const, _View>;
343	_LIBCPP_NO_UNIQUE_ADDRESS sentinel_t<_Base> __end_ = sentinel_t<_Base>();
344
345	template <class, size_t, bool >
346	friend class __elements_view_sentinel;
347
348	template <bool _AnyConst>
349	_LIBCPP_HIDE_FROM_ABI static constexpr decltype(auto)
350	__get_current(const __elements_view_iterator<_View, _Np, _AnyConst>& __iter) {
351	return (__iter.__current_);
352	}
353
354	public:
355	_LIBCPP_HIDE_FROM_ABI __elements_view_sentinel() = default;
356
357	_LIBCPP_HIDE_FROM_ABI constexpr explicit __elements_view_sentinel(sentinel_t<_Base> __end)
358	: __end_(std::move(__end)) {}
359
360	_LIBCPP_HIDE_FROM_ABI constexpr __elements_view_sentinel(__elements_view_sentinel<_View, _Np, !_Const> __other)
361	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
362	: __end_(std::move(__other.__end_)) {}
363
364	_LIBCPP_HIDE_FROM_ABI constexpr sentinel_t<_Base> base() const { return __end_; }
365
366	template <bool _OtherConst>
367	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
368	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
369	operator==(const __elements_view_iterator<_View, _Np, _OtherConst>& __x, const __elements_view_sentinel& __y) {
370	return __get_current(__x) == __y.__end_;
371	}
372
373	template <bool _OtherConst>
374	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
375	_LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
376	operator-(const __elements_view_iterator<_View, _Np, _OtherConst>& __x, const __elements_view_sentinel& __y) {
377	return __get_current(__x) - __y.__end_;
378	}
379
380	template <bool _OtherConst>
381	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
382	_LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
383	operator-(const __elements_view_sentinel& __x, const __elements_view_iterator<_View, _Np, _OtherConst>& __y) {
384	return __x.__end_ - __get_current(__y);
385	}
386	};
387
388	template <class _Tp, size_t _Np>
389	inline constexpr bool enable_borrowed_range<elements_view<_Tp, _Np>> = enable_borrowed_range<_Tp>;
390
391	template <class _Tp>
392	using keys_view = elements_view<_Tp, 0>;
393	template <class _Tp>
394	using values_view = elements_view<_Tp, 1>;
395
396	namespace views {
397	namespace __elements {
398
399	template <size_t _Np>
400	struct __fn : __range_adaptor_closure<__fn<_Np>> {
401	template <class _Range>
402	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range) const
403	/**/ noexcept(noexcept(elements_view<all_t<_Range&&>, _Np>(std::forward<_Range>(__range))))
404	/------/ -> decltype(elements_view<all_t<_Range&&>, _Np>(std::forward<_Range>(__range))) {
405	/-------------/ return elements_view<all_t<_Range&&>, _Np>(std::forward<_Range>(__range));
406	}
407	};
408	} // namespace __elements
409
410	inline namespace __cpo {
411	template <size_t _Np>
412	inline constexpr auto elements = __elements::__fn<_Np>{};
413	inline constexpr auto keys = elements<0>;
414	inline constexpr auto values = elements<1>;
415	} // namespace __cpo
416	} // namespace views
417	} // namespace ranges
418
419	#endif // _LIBCPP_STD_VER >= 20
420
421	_LIBCPP_END_NAMESPACE_STD
422
423	#endif // _LIBCPP___RANGES_ELEMENTS_VIEW_H

lib/libcxx/include/__ranges/empty.h+3-3

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_EMPTY_H	10	#ifndef _LIBCPP___RANGES_EMPTY_H
10	#define _LIBCPP___RANGES_EMPTY_H	11	#define _LIBCPP___RANGES_EMPTY_H
11		12
...	@@ -14,7 +15,6 @@	...	@@ -14,7 +15,6 @@
14	#include <__iterator/concepts.h>	15	#include <__iterator/concepts.h>
15	#include <__ranges/access.h>	16	#include <__ranges/access.h>
16	#include <__ranges/size.h>	17	#include <__ranges/size.h>
17	#include <type_traits>
18		18
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header	20	# pragma GCC system_header
...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22		22
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	25	#if _LIBCPP_STD_VER > 17
26		26
27	// [range.prim.empty]	27	// [range.prim.empty]
28		28
...	@@ -75,7 +75,7 @@ inline namespace __cpo {	...	@@ -75,7 +75,7 @@ inline namespace __cpo {
75	} // namespace __cpo	75	} // namespace __cpo
76	} // namespace ranges	76	} // namespace ranges
77		77
78	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	78	#endif // _LIBCPP_STD_VER > 17
79		79
80	_LIBCPP_END_NAMESPACE_STD	80	_LIBCPP_END_NAMESPACE_STD
81		81

lib/libcxx/include/__ranges/empty_view.h+3-2

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_EMPTY_VIEW_H	10	#ifndef _LIBCPP___RANGES_EMPTY_VIEW_H
10	#define _LIBCPP___RANGES_EMPTY_VIEW_H	11	#define _LIBCPP___RANGES_EMPTY_VIEW_H
11		12
...	@@ -20,7 +21,7 @@	...	@@ -20,7 +21,7 @@
20		21
21	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
22		23
23	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	24	#if _LIBCPP_STD_VER > 17
24		25
25	namespace ranges {	26	namespace ranges {
26	template<class _Tp>	27	template<class _Tp>
...	@@ -45,7 +46,7 @@ namespace ranges {	...	@@ -45,7 +46,7 @@ namespace ranges {
45	} // namespace views	46	} // namespace views
46	} // namespace ranges	47	} // namespace ranges
47		48
48	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	49	#endif // _LIBCPP_STD_VER > 17
49		50
50	_LIBCPP_END_NAMESPACE_STD	51	_LIBCPP_END_NAMESPACE_STD
51		52

lib/libcxx/include/__ranges/enable_view.h+5-2

 @@ -10,9 +10,12 @@
 #ifndef _LIBCPP___RANGES_ENABLE_VIEW_H
 #define _LIBCPP___RANGES_ENABLE_VIEW_H
+#include <__concepts/derived_from.h>
+#include <__concepts/same_as.h>
 #include <__config>
-#include <concepts>
+#include <__type_traits/is_class.h>
-#include <type_traits>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/remove_cv.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__ranges/filter_view.h+42-21

 @@ -6,10 +6,15 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_FILTER_VIEW_H
 #define _LIBCPP___RANGES_FILTER_VIEW_H
 #include <__algorithm/ranges_find_if.h>
+#include <__concepts/constructible.h>
+#include <__concepts/copyable.h>
+#include <__concepts/derived_from.h>
+#include <__concepts/equality_comparable.h>
 #include <__config>
 #include <__debug>
 #include <__functional/bind_back.h>
 @@ -30,7 +35,6 @@
 #include <__utility/forward.h>
 #include <__utility/in_place.h>
 #include <__utility/move.h>
-#include <concepts>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -39,9 +43,18 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
+  template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
+    requires view<_View> && is_object_v<_Pred>
+  class __filter_view_iterator;
+  template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
+    requires view<_View> && is_object_v<_Pred>
+  class __filter_view_sentinel;
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
   class filter_view : public view_interface<filter_view<_View, _Pred>> {
 @@ -54,8 +67,11 @@ namespace ranges {
     using _Cache = _If<_UseCache, __non_propagating_cache<iterator_t<_View>>, __empty_cache>;
     _LIBCPP_NO_UNIQUE_ADDRESS _Cache __cached_begin_ = _Cache();
-    class __iterator;
+    using __iterator = __filter_view_iterator<_View, _Pred>;
-    class __sentinel;
+    using __sentinel = __filter_view_sentinel<_View, _Pred>;
+    friend __iterator;
+    friend __sentinel;
   public:
     _LIBCPP_HIDE_FROM_ABI
 @@ -115,10 +131,13 @@ namespace ranges {
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
-  class filter_view<_View, _Pred>::__iterator : public __filter_iterator_category<_View> {
+  class __filter_view_iterator : public __filter_iterator_category<_View> {
+    using __filter_view = filter_view<_View, _Pred>;
   public:
     _LIBCPP_NO_UNIQUE_ADDRESS iterator_t<_View> __current_ = iterator_t<_View>();
-    _LIBCPP_NO_UNIQUE_ADDRESS filter_view* __parent_ = nullptr;
+    _LIBCPP_NO_UNIQUE_ADDRESS __filter_view* __parent_ = nullptr;
     using iterator_concept =
       _If<bidirectional_range<_View>, bidirectional_iterator_tag,
 @@ -130,10 +149,10 @@ namespace ranges {
     using difference_type = range_difference_t<_View>;
     _LIBCPP_HIDE_FROM_ABI
-    __iterator() requires default_initializable<iterator_t<_View>> = default;
+    __filter_view_iterator() requires default_initializable<iterator_t<_View>> = default;
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator(filter_view& __parent, iterator_t<_View> __current)
+    constexpr __filter_view_iterator(__filter_view& __parent, iterator_t<_View> __current)
       : __current_(std::move(__current)), __parent_(std::addressof(__parent))
     { }
 @@ -152,7 +171,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator++() {
+    constexpr __filter_view_iterator& operator++() {
       __current_ = ranges::find_if(std::move(++__current_), ranges::end(__parent_->__base_),
                                    std::ref(*__parent_->__pred_));
       return *this;
 @@ -160,42 +179,42 @@ namespace ranges {
     _LIBCPP_HIDE_FROM_ABI
     constexpr void operator++(int) { ++*this; }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator++(int) requires forward_range<_View> {
+    constexpr __filter_view_iterator operator++(int) requires forward_range<_View> {
       auto __tmp = *this;
       ++*this;
       return __tmp;
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator--() requires bidirectional_range<_View> {
+    constexpr __filter_view_iterator& operator--() requires bidirectional_range<_View> {
       do {
         --__current_;
       } while (!std::invoke(*__parent_->__pred_, *__current_));
       return *this;
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator--(int) requires bidirectional_range<_View> {
+    constexpr __filter_view_iterator operator--(int) requires bidirectional_range<_View> {
       auto tmp = *this;
       --*this;
       return tmp;
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr bool operator==(__iterator const& __x, __iterator const& __y)
+    friend constexpr bool operator==(__filter_view_iterator const& __x, __filter_view_iterator const& __y)
       requires equality_comparable<iterator_t<_View>>
     {
       return __x.__current_ == __y.__current_;
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr range_rvalue_reference_t<_View> iter_move(__iterator const& __it)
+    friend constexpr range_rvalue_reference_t<_View> iter_move(__filter_view_iterator const& __it)
       noexcept(noexcept(ranges::iter_move(__it.__current_)))
     {
       return ranges::iter_move(__it.__current_);
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr void iter_swap(__iterator const& __x, __iterator const& __y)
+    friend constexpr void iter_swap(__filter_view_iterator const& __x, __filter_view_iterator const& __y)
       noexcept(noexcept(ranges::iter_swap(__x.__current_, __y.__current_)))
       requires indirectly_swappable<iterator_t<_View>>
     {
 @@ -205,23 +224,25 @@ namespace ranges {
   template<input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
     requires view<_View> && is_object_v<_Pred>
-  class filter_view<_View, _Pred>::__sentinel {
+  class __filter_view_sentinel {
+    using __filter_view = filter_view<_View, _Pred>;
   public:
     sentinel_t<_View> __end_ = sentinel_t<_View>();
     _LIBCPP_HIDE_FROM_ABI
-    __sentinel() = default;
+    __filter_view_sentinel() = default;
     _LIBCPP_HIDE_FROM_ABI
-    constexpr explicit __sentinel(filter_view& __parent)
+    constexpr explicit __filter_view_sentinel(__filter_view& __parent)
       : __end_(ranges::end(__parent.__base_))
     { }
     _LIBCPP_HIDE_FROM_ABI
     constexpr sentinel_t<_View> base() const { return __end_; }
-    _LIBCPP_HIDE_FROM_ABI
+    _LIBCPP_HIDE_FROM_ABI friend constexpr bool
-    friend constexpr bool operator==(__iterator const& __x, __sentinel const& __y) {
+    operator==(__filter_view_iterator<_View, _Pred> const& __x, __filter_view_sentinel const& __y) {
       return __x.__current_ == __y.__end_;
     }
   };
 @@ -252,7 +273,7 @@ inline namespace __cpo {
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/iota_view.h+231-205

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_IOTA_VIEW_H
 #define _LIBCPP___RANGES_IOTA_VIEW_H
 @@ -39,7 +40,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
   template<class _Int>
 @@ -82,6 +83,14 @@ namespace ranges {
       { __j - __j } -> convertible_to<_IotaDiffT<_Iter>>;
     };
+  template <weakly_incrementable _Start>
+    requires copyable<_Start>
+  struct __iota_view_iterator;
+  template <weakly_incrementable _Start, semiregular _BoundSentinel>
+    requires __weakly_equality_comparable_with<_Start, _BoundSentinel> && copyable<_Start>
+  struct __iota_view_sentinel;
   template<class>
   struct __iota_iterator_category {};
 @@ -93,210 +102,9 @@ namespace ranges {
   template <weakly_incrementable _Start, semiregular _BoundSentinel = unreachable_sentinel_t>
     requires __weakly_equality_comparable_with<_Start, _BoundSentinel> && copyable<_Start>
   class iota_view : public view_interface<iota_view<_Start, _BoundSentinel>> {
-    struct __iterator : public __iota_iterator_category<_Start> {
-      friend class iota_view;
-      using iterator_concept =
-        _If<__advanceable<_Start>,   random_access_iterator_tag,
-        _If<__decrementable<_Start>, bidirectional_iterator_tag,
-        _If<incrementable<_Start>,   forward_iterator_tag,
-        /*Else*/                     input_iterator_tag>>>;
-      using value_type = _Start;
-      using difference_type = _IotaDiffT<_Start>;
-      _Start __value_ = _Start();
-      _LIBCPP_HIDE_FROM_ABI
-      __iterator() requires default_initializable<_Start> = default;
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr explicit __iterator(_Start __value) : __value_(std::move(__value)) {}
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr _Start operator*() const noexcept(is_nothrow_copy_constructible_v<_Start>) {
-        return __value_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator& operator++() {
-        ++__value_;
-        return *this;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr void operator++(int) { ++*this; }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator operator++(int) requires incrementable<_Start> {
-        auto __tmp = *this;
-        ++*this;
-        return __tmp;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator& operator--() requires __decrementable<_Start> {
-        --__value_;
-        return *this;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator  operator--(int) requires __decrementable<_Start> {
-        auto __tmp = *this;
-        --*this;
-        return __tmp;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator& operator+=(difference_type __n)
-        requires __advanceable<_Start>
-      {
-        if constexpr (__integer_like<_Start> && !__signed_integer_like<_Start>) {
-          if (__n >= difference_type(0)) {
-            __value_ += static_cast<_Start>(__n);
-          } else {
-            __value_ -= static_cast<_Start>(-__n);
-          }
-        } else {
-          __value_ += __n;
-        }
-        return *this;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr __iterator& operator-=(difference_type __n)
-        requires __advanceable<_Start>
-      {
-        if constexpr (__integer_like<_Start> && !__signed_integer_like<_Start>) {
-          if (__n >= difference_type(0)) {
-            __value_ -= static_cast<_Start>(__n);
-          } else {
-            __value_ += static_cast<_Start>(-__n);
-          }
-        } else {
-          __value_ -= __n;
-        }
-        return *this;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      constexpr _Start operator[](difference_type __n) const
-        requires __advanceable<_Start>
-      {
-        return _Start(__value_ + __n);
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
-        requires equality_comparable<_Start>
-      {
-        return __x.__value_ == __y.__value_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator<(const __iterator& __x, const __iterator& __y)
-        requires totally_ordered<_Start>
-      {
-        return __x.__value_ < __y.__value_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator>(const __iterator& __x, const __iterator& __y)
-        requires totally_ordered<_Start>
-      {
-        return __y < __x;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y)
-        requires totally_ordered<_Start>
-      {
-        return !(__y < __x);
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y)
-        requires totally_ordered<_Start>
-      {
-        return !(__x < __y);
-      }
-      friend constexpr auto operator<=>(const __iterator& __x, const __iterator& __y)
-        requires totally_ordered<_Start> && three_way_comparable<_Start>
-      {
-        return __x.__value_ <=> __y.__value_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
+    using __iterator = __iota_view_iterator<_Start>;
-      friend constexpr __iterator operator+(__iterator __i, difference_type __n)
+    using __sentinel = __iota_view_sentinel<_Start, _BoundSentinel>;
-        requires __advanceable<_Start>
-      {
-        __i += __n;
-        return __i;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr __iterator operator+(difference_type __n, __iterator __i)
-        requires __advanceable<_Start>
-      {
-        return __i + __n;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr __iterator operator-(__iterator __i, difference_type __n)
-        requires __advanceable<_Start>
-      {
-        __i -= __n;
-        return __i;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)
-        requires __advanceable<_Start>
-      {
-        if constexpr (__integer_like<_Start>) {
-          if constexpr (__signed_integer_like<_Start>) {
-            return difference_type(difference_type(__x.__value_) - difference_type(__y.__value_));
-          }
-          if (__y.__value_ > __x.__value_) {
-            return difference_type(-difference_type(__y.__value_ - __x.__value_));
-          }
-          return difference_type(__x.__value_ - __y.__value_);
-        }
-        return __x.__value_ - __y.__value_;
-      }
-    };
-    struct __sentinel {
-      friend class iota_view;
-    private:
-      _BoundSentinel __bound_sentinel_ = _BoundSentinel();
-    public:
-      _LIBCPP_HIDE_FROM_ABI
-      __sentinel() = default;
-      constexpr explicit __sentinel(_BoundSentinel __bound_sentinel) : __bound_sentinel_(std::move(__bound_sentinel)) {}
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr bool operator==(const __iterator& __x, const __sentinel& __y) {
-        return __x.__value_ == __y.__bound_sentinel_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr iter_difference_t<_Start> operator-(const __iterator& __x, const __sentinel& __y)
-        requires sized_sentinel_for<_BoundSentinel, _Start>
-      {
-        return __x.__value_ - __y.__bound_sentinel_;
-      }
-      _LIBCPP_HIDE_FROM_ABI
-      friend constexpr iter_difference_t<_Start> operator-(const __sentinel& __x, const __iterator& __y)
-        requires sized_sentinel_for<_BoundSentinel, _Start>
-      {
-        return -(__y - __x);
-      }
-    };
     _Start __value_ = _Start();
     _BoundSentinel __bound_sentinel_ = _BoundSentinel();
 @@ -377,6 +185,224 @@ namespace ranges {
   template <class _Start, class _BoundSentinel>
   inline constexpr bool enable_borrowed_range<iota_view<_Start, _BoundSentinel>> = true;
+  template <weakly_incrementable _Start>
+    requires copyable<_Start>
+  struct __iota_view_iterator : public __iota_iterator_category<_Start> {
+    template <weakly_incrementable _StartT, semiregular _BoundSentinelT>
+      requires __weakly_equality_comparable_with<_StartT, _BoundSentinelT> && copyable<_StartT>
+    friend class iota_view;
+    using iterator_concept =
+      _If<__advanceable<_Start>,   random_access_iterator_tag,
+      _If<__decrementable<_Start>, bidirectional_iterator_tag,
+      _If<incrementable<_Start>,   forward_iterator_tag,
+      /*Else*/                     input_iterator_tag>>>;
+    using value_type = _Start;
+    using difference_type = _IotaDiffT<_Start>;
+    _Start __value_ = _Start();
+    _LIBCPP_HIDE_FROM_ABI
+    __iota_view_iterator() requires default_initializable<_Start> = default;
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr explicit __iota_view_iterator(_Start __value) : __value_(std::move(__value)) {}
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr _Start operator*() const noexcept(is_nothrow_copy_constructible_v<_Start>) {
+      return __value_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator& operator++() {
+      ++__value_;
+      return *this;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr void operator++(int) { ++*this; }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator operator++(int) requires incrementable<_Start> {
+      auto __tmp = *this;
+      ++*this;
+      return __tmp;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator& operator--() requires __decrementable<_Start> {
+      --__value_;
+      return *this;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator  operator--(int) requires __decrementable<_Start> {
+      auto __tmp = *this;
+      --*this;
+      return __tmp;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator& operator+=(difference_type __n)
+      requires __advanceable<_Start>
+    {
+      if constexpr (__integer_like<_Start> && !__signed_integer_like<_Start>) {
+        if (__n >= difference_type(0)) {
+          __value_ += static_cast<_Start>(__n);
+        } else {
+          __value_ -= static_cast<_Start>(-__n);
+        }
+      } else {
+        __value_ += __n;
+      }
+      return *this;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr __iota_view_iterator& operator-=(difference_type __n)
+      requires __advanceable<_Start>
+    {
+      if constexpr (__integer_like<_Start> && !__signed_integer_like<_Start>) {
+        if (__n >= difference_type(0)) {
+          __value_ -= static_cast<_Start>(__n);
+        } else {
+          __value_ += static_cast<_Start>(-__n);
+        }
+      } else {
+        __value_ -= __n;
+      }
+      return *this;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    constexpr _Start operator[](difference_type __n) const
+      requires __advanceable<_Start>
+    {
+      return _Start(__value_ + __n);
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator==(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires equality_comparable<_Start>
+    {
+      return __x.__value_ == __y.__value_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator<(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires totally_ordered<_Start>
+    {
+      return __x.__value_ < __y.__value_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator>(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires totally_ordered<_Start>
+    {
+      return __y < __x;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator<=(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires totally_ordered<_Start>
+    {
+      return !(__y < __x);
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator>=(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires totally_ordered<_Start>
+    {
+      return !(__x < __y);
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr auto operator<=>(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires totally_ordered<_Start> && three_way_comparable<_Start>
+    {
+      return __x.__value_ <=> __y.__value_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr __iota_view_iterator operator+(__iota_view_iterator __i, difference_type __n)
+      requires __advanceable<_Start>
+    {
+      __i += __n;
+      return __i;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr __iota_view_iterator operator+(difference_type __n, __iota_view_iterator __i)
+      requires __advanceable<_Start>
+    {
+      return __i + __n;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr __iota_view_iterator operator-(__iota_view_iterator __i, difference_type __n)
+      requires __advanceable<_Start>
+    {
+      __i -= __n;
+      return __i;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr difference_type operator-(const __iota_view_iterator& __x, const __iota_view_iterator& __y)
+      requires __advanceable<_Start>
+    {
+      if constexpr (__integer_like<_Start>) {
+        if constexpr (__signed_integer_like<_Start>) {
+          return difference_type(difference_type(__x.__value_) - difference_type(__y.__value_));
+        }
+        if (__y.__value_ > __x.__value_) {
+          return difference_type(-difference_type(__y.__value_ - __x.__value_));
+        }
+        return difference_type(__x.__value_ - __y.__value_);
+      }
+      return __x.__value_ - __y.__value_;
+    }
+  };
+  template <weakly_incrementable _Start, semiregular _BoundSentinel>
+    requires __weakly_equality_comparable_with<_Start, _BoundSentinel> && copyable<_Start>
+  struct __iota_view_sentinel {
+    template <weakly_incrementable _StartT, semiregular _BoundSentinelT>
+      requires __weakly_equality_comparable_with<_StartT, _BoundSentinelT> && copyable<_StartT>
+    friend class iota_view;
+    using __iterator = __iota_view_iterator<_Start>;
+  private:
+    _BoundSentinel __bound_sentinel_ = _BoundSentinel();
+  public:
+    _LIBCPP_HIDE_FROM_ABI
+    __iota_view_sentinel() = default;
+    constexpr explicit __iota_view_sentinel(_BoundSentinel __bound_sentinel) : __bound_sentinel_(std::move(__bound_sentinel)) {}
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr bool operator==(const __iterator& __x, const __iota_view_sentinel& __y) {
+      return __x.__value_ == __y.__bound_sentinel_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr iter_difference_t<_Start> operator-(const __iterator& __x, const __iota_view_sentinel& __y)
+      requires sized_sentinel_for<_BoundSentinel, _Start>
+    {
+      return __x.__value_ - __y.__bound_sentinel_;
+    }
+    _LIBCPP_HIDE_FROM_ABI
+    friend constexpr iter_difference_t<_Start> operator-(const __iota_view_sentinel& __x, const __iterator& __y)
+      requires sized_sentinel_for<_BoundSentinel, _Start>
+    {
+      return -(__y - __x);
+    }
+  };
  namespace views {
  namespace __iota {
   struct __fn {
 @@ -401,7 +427,7 @@ inline namespace __cpo {
 } // namespace views
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/istream_view.h created+149

...	@@ -0,0 +1,149 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_ISTREAM_VIEW_H
11	#define _LIBCPP___RANGES_ISTREAM_VIEW_H
12
13	#include <__concepts/constructible.h>
14	#include <__concepts/derived_from.h>
15	#include <__concepts/movable.h>
16	#include <__config>
17	#include <__iterator/default_sentinel.h>
18	#include <__iterator/iterator_traits.h>
19	#include <__memory/addressof.h>
20	#include <__ranges/view_interface.h>
21	#include <__type_traits/remove_cvref.h>
22	#include <__utility/forward.h>
23	#include <cstddef>
24	#include <iosfwd>
25
26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
27	# pragma GCC system_header
28	#endif
29
30	#if _LIBCPP_STD_VER >= 20
31
32	_LIBCPP_BEGIN_NAMESPACE_STD
33
34	namespace ranges {
35
36	template <class _Val, class _CharT, class _Traits>
37	concept __stream_extractable = requires(basic_istream<_CharT, _Traits>& __is, _Val& __t) { __is >> __t; };
38
39	template <movable _Val, class _CharT, class _Traits>
40	requires default_initializable<_Val> && __stream_extractable<_Val, _CharT, _Traits>
41	class __basic_istream_view_iterator;
42
43	template <movable _Val, class _CharT, class _Traits = char_traits<_CharT>>
44	requires default_initializable<_Val> && __stream_extractable<_Val, _CharT, _Traits>
45	class basic_istream_view : public view_interface<basic_istream_view<_Val, _CharT, _Traits>> {
46	using __iterator = __basic_istream_view_iterator<_Val, _CharT, _Traits>;
47
48	template <movable _ValueType, class _CharType, class _TraitsType>
49	requires default_initializable<_ValueType> && __stream_extractable<_ValueType, _CharType, _TraitsType>
50	friend class __basic_istream_view_iterator;
51
52	public:
53	_LIBCPP_HIDE_FROM_ABI constexpr explicit basic_istream_view(basic_istream<_CharT, _Traits>& __stream)
54	: __stream_(std::addressof(__stream)) {}
55
56	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
57	*__stream_ >> __value_;
58	return __iterator{*this};
59	}
60
61	_LIBCPP_HIDE_FROM_ABI constexpr default_sentinel_t end() const noexcept { return default_sentinel; }
62
63	private:
64	basic_istream<_CharT, _Traits>* __stream_;
65	_LIBCPP_NO_UNIQUE_ADDRESS _Val __value_ = _Val();
66	};
67
68	template <movable _Val, class _CharT, class _Traits>
69	requires default_initializable<_Val> && __stream_extractable<_Val, _CharT, _Traits>
70	class __basic_istream_view_iterator {
71	public:
72	using iterator_concept = input_iterator_tag;
73	using difference_type = ptrdiff_t;
74	using value_type = _Val;
75
76	_LIBCPP_HIDE_FROM_ABI constexpr explicit __basic_istream_view_iterator(
77	basic_istream_view<_Val, _CharT, _Traits>& __parent) noexcept
78	: __parent_(std::addressof(__parent)) {}
79
80	__basic_istream_view_iterator(const __basic_istream_view_iterator&) = delete;
81	_LIBCPP_HIDE_FROM_ABI __basic_istream_view_iterator(__basic_istream_view_iterator&&) = default;
82
83	__basic_istream_view_iterator& operator=(const __basic_istream_view_iterator&) = delete;
84	_LIBCPP_HIDE_FROM_ABI __basic_istream_view_iterator& operator=(__basic_istream_view_iterator&&) = default;
85
86	_LIBCPP_HIDE_FROM_ABI __basic_istream_view_iterator& operator++() {
87	*__parent_->__stream_ >> __parent_->__value_;
88	return *this;
89	}
90
91	_LIBCPP_HIDE_FROM_ABI void operator++(int) { ++*this; }
92
93	_LIBCPP_HIDE_FROM_ABI _Val& operator*() const { return __parent_->__value_; }
94
95	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const __basic_istream_view_iterator& __x, default_sentinel_t) {
96	return !*__x.__get_parent_stream();
97	}
98
99	private:
100	basic_istream_view<_Val, _CharT, _Traits>* __parent_;
101
102	_LIBCPP_HIDE_FROM_ABI constexpr basic_istream<_CharT, _Traits>* __get_parent_stream() const {
103	return __parent_->__stream_;
104	}
105	};
106
107	template <class _Val>
108	using istream_view = basic_istream_view<_Val, char>;
109
110	# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
111	template <class _Val>
112	using wistream_view = basic_istream_view<_Val, wchar_t>;
113	# endif
114
115	namespace views {
116	namespace __istream {
117
118	// clang-format off
119	template <class _Tp>
120	struct __fn {
121	template <class _Up, class _UnCVRef = remove_cvref_t<_Up>>
122	requires derived_from<_UnCVRef, basic_istream<typename _UnCVRef::char_type,
123	typename _UnCVRef::traits_type>>
124	_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Up&& __u) const
125	noexcept(noexcept(basic_istream_view<_Tp, typename _UnCVRef::char_type,
126	typename _UnCVRef::traits_type>(std::forward<_Up>(__u))))
127	-> decltype( basic_istream_view<_Tp, typename _UnCVRef::char_type,
128	typename _UnCVRef::traits_type>(std::forward<_Up>(__u)))
129	{ return basic_istream_view<_Tp, typename _UnCVRef::char_type,
130	typename _UnCVRef::traits_type>(std::forward<_Up>(__u));
131	}
132	};
133	// clang-format on
134
135	} // namespace __istream
136
137	inline namespace __cpo {
138	template <class _Tp>
139	inline constexpr auto istream = __istream::__fn<_Tp>{};
140	} // namespace __cpo
141	} // namespace views
142
143	} // namespace ranges
144
145	_LIBCPP_END_NAMESPACE_STD
146
147	#endif // _LIBCPP_STD_VER >= 20
148
149	#endif // _LIBCPP___RANGES_ISTREAM_VIEW_H

lib/libcxx/include/__ranges/join_view.h+110-28

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_JOIN_VIEW_H
 #define _LIBCPP___RANGES_JOIN_VIEW_H
 @@ -19,12 +20,16 @@
 #include <__iterator/iter_move.h>
 #include <__iterator/iter_swap.h>
 #include <__iterator/iterator_traits.h>
+#include <__iterator/iterator_with_data.h>
+#include <__iterator/segmented_iterator.h>
 #include <__ranges/access.h>
 #include <__ranges/all.h>
 #include <__ranges/concepts.h>
+#include <__ranges/empty.h>
 #include <__ranges/non_propagating_cache.h>
 #include <__ranges/range_adaptor.h>
 #include <__ranges/view_interface.h>
+#include <__type_traits/maybe_const.h>
 #include <__utility/forward.h>
 #include <optional>
 #include <type_traits>
 @@ -35,7 +40,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
   template<class>
 @@ -61,6 +66,14 @@ namespace ranges {
     >;
   };
+  template <input_range _View, bool _Const>
+    requires view<_View> && input_range<range_reference_t<_View>>
+  struct __join_view_iterator;
+  template <input_range _View, bool _Const>
+    requires view<_View> && input_range<range_reference_t<_View>>
+  struct __join_view_sentinel;
   template<input_range _View>
     requires view<_View> && input_range<range_reference_t<_View>>
   class join_view
 @@ -68,8 +81,22 @@ namespace ranges {
   private:
     using _InnerRange = range_reference_t<_View>;
-    template<bool> struct __iterator;
+    template<bool _Const>
-    template<bool> struct __sentinel;
+    using __iterator = __join_view_iterator<_View, _Const>;
+    template<bool _Const>
+    using __sentinel = __join_view_sentinel<_View, _Const>;
+    template <input_range _View2, bool _Const2>
+      requires view<_View2> && input_range<range_reference_t<_View2>>
+    friend struct __join_view_iterator;
+    template <input_range _View2, bool _Const2>
+      requires view<_View2> && input_range<range_reference_t<_View2>>
+    friend struct __join_view_sentinel;
+    template <class>
+    friend struct std::__segmented_iterator_traits;
     static constexpr bool _UseCache = !is_reference_v<_InnerRange>;
     using _Cache = _If<_UseCache, __non_propagating_cache<remove_cvref_t<_InnerRange>>, __empty_cache>;
 @@ -137,49 +164,57 @@ namespace ranges {
     }
   };
-  template<input_range _View>
+  template<input_range _View, bool _Const>
     requires view<_View> && input_range<range_reference_t<_View>>
-  template<bool _Const> struct join_view<_View>::__sentinel {
+  struct __join_view_sentinel {
-    template<bool> friend struct __sentinel;
+    template<input_range _View2, bool>
+      requires view<_View2> && input_range<range_reference_t<_View2>>
+    friend struct __join_view_sentinel;
   private:
-    using _Parent = __maybe_const<_Const, join_view>;
+    using _Parent = __maybe_const<_Const, join_view<_View>>;
     using _Base = __maybe_const<_Const, _View>;
     sentinel_t<_Base> __end_ = sentinel_t<_Base>();
   public:
     _LIBCPP_HIDE_FROM_ABI
-    __sentinel() = default;
+    __join_view_sentinel() = default;
     _LIBCPP_HIDE_FROM_ABI
-    constexpr explicit __sentinel(_Parent& __parent)
+    constexpr explicit __join_view_sentinel(_Parent& __parent)
       : __end_(ranges::end(__parent.__base_)) {}
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __sentinel(__sentinel<!_Const> __s)
+    constexpr __join_view_sentinel(__join_view_sentinel<_View, !_Const> __s)
       requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
       : __end_(std::move(__s.__end_)) {}
     template<bool _OtherConst>
       requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
+    friend constexpr bool operator==(const __join_view_iterator<_View, _OtherConst>& __x, const __join_view_sentinel& __y) {
       return __x.__outer_ == __y.__end_;
     }
   };
-  template<input_range _View>
+  template<input_range _View, bool _Const>
     requires view<_View> && input_range<range_reference_t<_View>>
-  template<bool _Const> struct join_view<_View>::__iterator
+  struct __join_view_iterator
     : public __join_view_iterator_category<__maybe_const<_Const, _View>> {
-    template<bool> friend struct __iterator;
+    template<input_range _View2, bool>
+      requires view<_View2> && input_range<range_reference_t<_View2>>
+    friend struct __join_view_iterator;
+    template <class>
+    friend struct std::__segmented_iterator_traits;
   private:
-    using _Parent = __maybe_const<_Const, join_view>;
+    using _Parent = __maybe_const<_Const, join_view<_View>>;
     using _Base = __maybe_const<_Const, _View>;
     using _Outer = iterator_t<_Base>;
     using _Inner = iterator_t<range_reference_t<_Base>>;
+    using _InnerRange = range_reference_t<_View>;
     static constexpr bool __ref_is_glvalue = is_reference_v<range_reference_t<_Base>>;
 @@ -208,9 +243,12 @@ namespace ranges {
         __inner_.reset();
     }
+    _LIBCPP_HIDE_FROM_ABI constexpr __join_view_iterator(_Parent* __parent, _Outer __outer, _Inner __inner)
+      : __outer_(std::move(__outer)), __inner_(std::move(__inner)), __parent_(__parent) {}
   public:
     using iterator_concept = _If<
       __ref_is_glvalue && bidirectional_range<_Base> && bidirectional_range<range_reference_t<_Base>> &&
           common_range<range_reference_t<_Base>>,
       bidirectional_iterator_tag,
       _If<
 @@ -226,17 +264,17 @@ namespace ranges {
       range_difference_t<_Base>, range_difference_t<range_reference_t<_Base>>>;
     _LIBCPP_HIDE_FROM_ABI
-    __iterator() requires default_initializable<_Outer> = default;
+    __join_view_iterator() requires default_initializable<_Outer> = default;
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator(_Parent& __parent, _Outer __outer)
+    constexpr __join_view_iterator(_Parent& __parent, _Outer __outer)
       : __outer_(std::move(__outer))
       , __parent_(std::addressof(__parent)) {
       __satisfy();
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator(__iterator<!_Const> __i)
+    constexpr __join_view_iterator(__join_view_iterator<_View, !_Const> __i)
       requires _Const &&
                convertible_to<iterator_t<_View>, _Outer> &&
                convertible_to<iterator_t<_InnerRange>, _Inner>
 @@ -257,7 +295,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator++() {
+    constexpr __join_view_iterator& operator++() {
       auto&& __inner = [&]() -> auto&& {
         if constexpr (__ref_is_glvalue)
           return *__outer_;
 @@ -277,7 +315,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator++(int)
+    constexpr __join_view_iterator operator++(int)
       requires __ref_is_glvalue &&
                forward_range<_Base> &&
                forward_range<range_reference_t<_Base>>
 @@ -288,7 +326,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator& operator--()
+    constexpr __join_view_iterator& operator--()
       requires __ref_is_glvalue &&
                bidirectional_range<_Base> &&
                bidirectional_range<range_reference_t<_Base>> &&
 @@ -307,7 +345,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    constexpr __iterator operator--(int)
+    constexpr __join_view_iterator operator--(int)
       requires __ref_is_glvalue &&
                bidirectional_range<_Base> &&
                bidirectional_range<range_reference_t<_Base>> &&
 @@ -319,7 +357,7 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
+    friend constexpr bool operator==(const __join_view_iterator& __x, const __join_view_iterator& __y)
       requires __ref_is_glvalue &&
                equality_comparable<iterator_t<_Base>> &&
                equality_comparable<iterator_t<range_reference_t<_Base>>>
 @@ -328,14 +366,14 @@ namespace ranges {
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr decltype(auto) iter_move(const __iterator& __i)
+    friend constexpr decltype(auto) iter_move(const __join_view_iterator& __i)
       noexcept(noexcept(ranges::iter_move(*__i.__inner_)))
     {
       return ranges::iter_move(*__i.__inner_);
     }
     _LIBCPP_HIDE_FROM_ABI
-    friend constexpr void iter_swap(const __iterator& __x, const __iterator& __y)
+    friend constexpr void iter_swap(const __join_view_iterator& __x, const __join_view_iterator& __y)
       noexcept(noexcept(ranges::iter_swap(*__x.__inner_, *__y.__inner_)))
       requires indirectly_swappable<_Inner>
     {
 @@ -345,7 +383,7 @@ namespace ranges {
   template<class _Range>
   explicit join_view(_Range&&) -> join_view<views::all_t<_Range>>;
 namespace views {
 namespace __join_view {
 struct __fn : __range_adaptor_closure<__fn> {
 @@ -363,7 +401,51 @@ inline namespace __cpo {
 } // namespace views
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+template <class _View, bool _Const>
+  requires(ranges::common_range<typename ranges::__join_view_iterator<_View, _Const>::_Parent> &&
+           __is_cpp17_random_access_iterator<typename ranges::__join_view_iterator<_View, _Const>::_Outer>::value &&
+           __is_cpp17_random_access_iterator<typename ranges::__join_view_iterator<_View, _Const>::_Inner>::value)
+struct __segmented_iterator_traits<ranges::__join_view_iterator<_View, _Const>> {
+  using _JoinViewIterator = ranges::__join_view_iterator<_View, _Const>;
+  using __segment_iterator =
+      _LIBCPP_NODEBUG __iterator_with_data<typename _JoinViewIterator::_Outer, typename _JoinViewIterator::_Parent*>;
+  using __local_iterator = typename _JoinViewIterator::_Inner;
+  // TODO: Would it make sense to enable the optimization for other iterator types?
+  static constexpr _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_JoinViewIterator __iter) {
+      if (ranges::empty(__iter.__parent_->__base_))
+        return {};
+      if (!__iter.__inner_.has_value())
+        return __segment_iterator(--__iter.__outer_, __iter.__parent_);
+      return __segment_iterator(__iter.__outer_, __iter.__parent_);
+  }
+  static constexpr _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_JoinViewIterator __iter) {
+      if (ranges::empty(__iter.__parent_->__base_))
+        return {};
+      if (!__iter.__inner_.has_value())
+        return ranges::end(*--__iter.__outer_);
+      return *__iter.__inner_;
+  }
+  static constexpr _LIBCPP_HIDE_FROM_ABI __local_iterator __begin(__segment_iterator __iter) {
+      return ranges::begin(*__iter.__get_iter());
+  }
+  static constexpr _LIBCPP_HIDE_FROM_ABI __local_iterator __end(__segment_iterator __iter) {
+      return ranges::end(*__iter.__get_iter());
+  }
+  static constexpr _LIBCPP_HIDE_FROM_ABI _JoinViewIterator
+  __compose(__segment_iterator __seg_iter, __local_iterator __local_iter) {
+      return _JoinViewIterator(
+          std::move(__seg_iter).__get_data(), std::move(__seg_iter).__get_iter(), std::move(__local_iter));
+  }
+};
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/lazy_split_view.h+3-3

...	@@ -10,7 +10,6 @@	...	@@ -10,7 +10,6 @@
10	#ifndef _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H	10	#ifndef _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
11	#define _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H	11	#define _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
12		12
13	#include <__algorithm/in_in_result.h>
14	#include <__algorithm/ranges_find.h>	13	#include <__algorithm/ranges_find.h>
15	#include <__algorithm/ranges_mismatch.h>	14	#include <__algorithm/ranges_mismatch.h>
16	#include <__concepts/constructible.h>	15	#include <__concepts/constructible.h>
...	@@ -35,6 +34,7 @@	...	@@ -35,6 +34,7 @@
35	#include <__ranges/single_view.h>	34	#include <__ranges/single_view.h>
36	#include <__ranges/subrange.h>	35	#include <__ranges/subrange.h>
37	#include <__ranges/view_interface.h>	36	#include <__ranges/view_interface.h>
		37	#include <__type_traits/maybe_const.h>
38	#include <__utility/forward.h>	38	#include <__utility/forward.h>
39	#include <__utility/move.h>	39	#include <__utility/move.h>
40	#include <type_traits>	40	#include <type_traits>
...	@@ -45,7 +45,7 @@	...	@@ -45,7 +45,7 @@
45		45
46	_LIBCPP_BEGIN_NAMESPACE_STD	46	_LIBCPP_BEGIN_NAMESPACE_STD
47		47
48	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	48	#if _LIBCPP_STD_VER > 17
49		49
50	namespace ranges {	50	namespace ranges {
51		51
...	@@ -458,7 +458,7 @@ inline namespace __cpo {	...	@@ -458,7 +458,7 @@ inline namespace __cpo {
458		458
459	} // namespace ranges	459	} // namespace ranges
460		460
461	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	461	#endif // _LIBCPP_STD_VER > 17
462		462
463	_LIBCPP_END_NAMESPACE_STD	463	_LIBCPP_END_NAMESPACE_STD
464		464

lib/libcxx/include/__ranges/non_propagating_cache.h+3-3

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H	10	#ifndef _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
10	#define _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H	11	#define _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
11		12
...	@@ -14,7 +15,6 @@	...	@@ -14,7 +15,6 @@
14	#include <__iterator/iterator_traits.h> // iter_reference_t	15	#include <__iterator/iterator_traits.h> // iter_reference_t
15	#include <__memory/addressof.h>	16	#include <__memory/addressof.h>
16	#include <__utility/forward.h>	17	#include <__utility/forward.h>
17	#include <concepts> // constructible_from
18	#include <optional>	18	#include <optional>
19	#include <type_traits>	19	#include <type_traits>
20		20
...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	27	#if _LIBCPP_STD_VER > 17
28		28
29	namespace ranges {	29	namespace ranges {
30	// __non_propagating_cache is a helper type that allows storing an optional value in it,	30	// __non_propagating_cache is a helper type that allows storing an optional value in it,
...	@@ -107,7 +107,7 @@ namespace ranges {	...	@@ -107,7 +107,7 @@ namespace ranges {
107	struct __empty_cache { };	107	struct __empty_cache { };
108	} // namespace ranges	108	} // namespace ranges
109		109
110	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	110	#endif // _LIBCPP_STD_VER > 17
111		111
112	_LIBCPP_END_NAMESPACE_STD	112	_LIBCPP_END_NAMESPACE_STD
113		113

lib/libcxx/include/__ranges/owning_view.h+4-2

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_OWNING_VIEW_H
 #define _LIBCPP___RANGES_OWNING_VIEW_H
 @@ -28,7 +29,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
   template<range _Rp>
 @@ -68,13 +69,14 @@ public:
     _LIBCPP_HIDE_FROM_ABI constexpr auto data() const requires contiguous_range<const _Rp>
       { return ranges::data(__r_); }
   };
+  _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(owning_view);
   template<class _Tp>
   inline constexpr bool enable_borrowed_range<owning_view<_Tp>> = enable_borrowed_range<_Tp>;
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/range_adaptor.h+7-3

 @@ -10,13 +10,16 @@
 #ifndef _LIBCPP___RANGES_RANGE_ADAPTOR_H
 #define _LIBCPP___RANGES_RANGE_ADAPTOR_H
+#include <__concepts/constructible.h>
+#include <__concepts/derived_from.h>
+#include <__concepts/invocable.h>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__functional/compose.h>
 #include <__functional/invoke.h>
 #include <__ranges/concepts.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <concepts>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -25,7 +28,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 // CRTP base that one can derive from in order to be considered a range adaptor closure
 // by the library. When deriving from this class, a pipe operator will be provided to
 @@ -41,6 +44,7 @@ template <class _Fn>
 struct __range_adaptor_closure_t : _Fn, __range_adaptor_closure<__range_adaptor_closure_t<_Fn>> {
     constexpr explicit __range_adaptor_closure_t(_Fn&& __f) : _Fn(std::move(__f)) { }
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__range_adaptor_closure_t);
 template <class _Tp>
 concept _RangeAdaptorClosure = derived_from<remove_cvref_t<_Tp>, __range_adaptor_closure<remove_cvref_t<_Tp>>>;
 @@ -66,7 +70,7 @@ struct __range_adaptor_closure {
     { return __range_adaptor_closure_t(std::__compose(std::forward<_OtherClosure>(__c2), std::forward<_Closure>(__c1))); }
 };
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/rbegin.h+3-2

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_RBEGIN_H	10	#ifndef _LIBCPP___RANGES_RBEGIN_H
10	#define _LIBCPP___RANGES_RBEGIN_H	11	#define _LIBCPP___RANGES_RBEGIN_H
11		12
...	@@ -25,7 +26,7 @@	...	@@ -25,7 +26,7 @@
25		26
26	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
27		28
28	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
29		30
30	// [ranges.access.rbegin]	31	// [ranges.access.rbegin]
31		32
...	@@ -123,7 +124,7 @@ inline namespace __cpo {	...	@@ -123,7 +124,7 @@ inline namespace __cpo {
123	} // namespace __cpo	124	} // namespace __cpo
124	} // namespace ranges	125	} // namespace ranges
125		126
126	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	127	#endif // _LIBCPP_STD_VER > 17
127		128
128	_LIBCPP_END_NAMESPACE_STD	129	_LIBCPP_END_NAMESPACE_STD
129		130

lib/libcxx/include/__ranges/ref_view.h+6-4

...	@@ -6,9 +6,12 @@	...	@@ -6,9 +6,12 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_REF_VIEW_H	10	#ifndef _LIBCPP___RANGES_REF_VIEW_H
10	#define _LIBCPP___RANGES_REF_VIEW_H	11	#define _LIBCPP___RANGES_REF_VIEW_H
11		12
		13	#include <__concepts/convertible_to.h>
		14	#include <__concepts/different_from.h>
12	#include <__config>	15	#include <__config>
13	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
14	#include <__iterator/incrementable_traits.h>	17	#include <__iterator/incrementable_traits.h>
...	@@ -22,7 +25,6 @@	...	@@ -22,7 +25,6 @@
22	#include <__ranges/size.h>	25	#include <__ranges/size.h>
23	#include <__ranges/view_interface.h>	26	#include <__ranges/view_interface.h>
24	#include <__utility/forward.h>	27	#include <__utility/forward.h>
25	#include <concepts>
26	#include <type_traits>	28	#include <type_traits>
27		29
28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -31,7 +33,7 @@	...	@@ -31,7 +33,7 @@
31		33
32	_LIBCPP_BEGIN_NAMESPACE_STD	34	_LIBCPP_BEGIN_NAMESPACE_STD
33		35
34	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	36	#if _LIBCPP_STD_VER > 17
35		37
36	namespace ranges {	38	namespace ranges {
37	template<range _Range>	39	template<range _Range>
...	@@ -45,7 +47,7 @@ namespace ranges {	...	@@ -45,7 +47,7 @@ namespace ranges {
45	public:	47	public:
46	template<class _Tp>	48	template<class _Tp>
47	requires __different_from<_Tp, ref_view> &&	49	requires __different_from<_Tp, ref_view> &&
48	convertible_to<_Tp, _Range&> && requires { __fun(declval<_Tp>()); }	50	convertible_to<_Tp, _Range&> && requires { __fun(std::declval<_Tp>()); }
49	_LIBCPP_HIDE_FROM_ABI	51	_LIBCPP_HIDE_FROM_ABI
50	constexpr ref_view(_Tp&& __t)	52	constexpr ref_view(_Tp&& __t)
51	: __range_(std::addressof(static_cast<_Range&>(std::forward<_Tp>(__t))))	53	: __range_(std::addressof(static_cast<_Range&>(std::forward<_Tp>(__t))))
...	@@ -79,7 +81,7 @@ public:	...	@@ -79,7 +81,7 @@ public:
79	inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;	81	inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;
80	} // namespace ranges	82	} // namespace ranges
81		83
82	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	84	#endif // _LIBCPP_STD_VER > 17
83		85
84	_LIBCPP_END_NAMESPACE_STD	86	_LIBCPP_END_NAMESPACE_STD
85		87

lib/libcxx/include/__ranges/rend.h+3-2

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_REND_H	10	#ifndef _LIBCPP___RANGES_REND_H
10	#define _LIBCPP___RANGES_REND_H	11	#define _LIBCPP___RANGES_REND_H
11		12
...	@@ -26,7 +27,7 @@	...	@@ -26,7 +27,7 @@
26		27
27	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
28		29
29	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	30	#if _LIBCPP_STD_VER > 17
30		31
31	// [range.access.rend]	32	// [range.access.rend]
32		33
...	@@ -127,7 +128,7 @@ inline namespace __cpo {	...	@@ -127,7 +128,7 @@ inline namespace __cpo {
127	} // namespace __cpo	128	} // namespace __cpo
128	} // namespace ranges	129	} // namespace ranges
129		130
130	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	131	#endif // _LIBCPP_STD_VER > 17
131		132
132	_LIBCPP_END_NAMESPACE_STD	133	_LIBCPP_END_NAMESPACE_STD
133		134

lib/libcxx/include/__ranges/reverse_view.h+3-2

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_REVERSE_VIEW_H	10	#ifndef _LIBCPP___RANGES_REVERSE_VIEW_H
10	#define _LIBCPP___RANGES_REVERSE_VIEW_H	11	#define _LIBCPP___RANGES_REVERSE_VIEW_H
11		12
...	@@ -33,7 +34,7 @@	...	@@ -33,7 +34,7 @@
33		34
34	_LIBCPP_BEGIN_NAMESPACE_STD	35	_LIBCPP_BEGIN_NAMESPACE_STD
35		36
36	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	37	#if _LIBCPP_STD_VER > 17
37		38
38	namespace ranges {	39	namespace ranges {
39	template<view _View>	40	template<view _View>
...	@@ -183,7 +184,7 @@ namespace ranges {	...	@@ -183,7 +184,7 @@ namespace ranges {
183	} // namespace views	184	} // namespace views
184	} // namespace ranges	185	} // namespace ranges
185		186
186	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	187	#endif // _LIBCPP_STD_VER > 17
187		188
188	_LIBCPP_END_NAMESPACE_STD	189	_LIBCPP_END_NAMESPACE_STD
189		190

lib/libcxx/include/__ranges/single_view.h+4-3

...	@@ -6,9 +6,11 @@	...	@@ -6,9 +6,11 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_SINGLE_VIEW_H	10	#ifndef _LIBCPP___RANGES_SINGLE_VIEW_H
10	#define _LIBCPP___RANGES_SINGLE_VIEW_H	11	#define _LIBCPP___RANGES_SINGLE_VIEW_H
11		12
		13	#include <__concepts/constructible.h>
12	#include <__config>	14	#include <__config>
13	#include <__ranges/copyable_box.h>	15	#include <__ranges/copyable_box.h>
14	#include <__ranges/range_adaptor.h>	16	#include <__ranges/range_adaptor.h>
...	@@ -16,7 +18,6 @@	...	@@ -16,7 +18,6 @@
16	#include <__utility/forward.h>	18	#include <__utility/forward.h>
17	#include <__utility/in_place.h>	19	#include <__utility/in_place.h>
18	#include <__utility/move.h>	20	#include <__utility/move.h>
19	#include <concepts>
20	#include <type_traits>	21	#include <type_traits>
21		22
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -25,7 +26,7 @@	...	@@ -25,7 +26,7 @@
25		26
26	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
27		28
28	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	29	#if _LIBCPP_STD_VER > 17
29		30
30	namespace ranges {	31	namespace ranges {
31	template<copy_constructible _Tp>	32	template<copy_constructible _Tp>
...	@@ -94,7 +95,7 @@ inline namespace __cpo {	...	@@ -94,7 +95,7 @@ inline namespace __cpo {
94	} // namespace views	95	} // namespace views
95	} // namespace ranges	96	} // namespace ranges
96		97
97	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	98	#endif // _LIBCPP_STD_VER > 17
98		99
99	_LIBCPP_END_NAMESPACE_STD	100	_LIBCPP_END_NAMESPACE_STD
100		101

lib/libcxx/include/__ranges/size.h+8-3

 @@ -6,18 +6,23 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_SIZE_H
 #define _LIBCPP___RANGES_SIZE_H
+#include <__concepts/arithmetic.h>
 #include <__concepts/class_or_enum.h>
 #include <__config>
 #include <__iterator/concepts.h>
 #include <__iterator/iterator_traits.h>
 #include <__ranges/access.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/make_signed.h>
+#include <__type_traits/make_unsigned.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/auto_cast.h>
-#include <concepts>
+#include <__utility/declval.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -66,7 +71,7 @@ concept __difference =
   __class_or_enum<remove_cvref_t<_Tp>> &&
   requires(_Tp&& __t) {
     { ranges::begin(__t) } -> forward_iterator;
-    { ranges::end(__t) } -> sized_sentinel_for<decltype(ranges::begin(declval<_Tp>()))>;
+    { ranges::end(__t) } -> sized_sentinel_for<decltype(ranges::begin(std::declval<_Tp>()))>;
   };
 struct __fn {

lib/libcxx/include/__ranges/split_view.h created+232

...	@@ -0,0 +1,232 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_SPLIT_VIEW_H
11	#define _LIBCPP___RANGES_SPLIT_VIEW_H
12
13	#include <__algorithm/ranges_search.h>
14	#include <__concepts/constructible.h>
15	#include <__config>
16	#include <__functional/bind_back.h>
17	#include <__functional/ranges_operations.h>
18	#include <__iterator/indirectly_comparable.h>
19	#include <__iterator/iterator_traits.h>
20	#include <__memory/addressof.h>
21	#include <__ranges/access.h>
22	#include <__ranges/all.h>
23	#include <__ranges/concepts.h>
24	#include <__ranges/empty.h>
25	#include <__ranges/non_propagating_cache.h>
26	#include <__ranges/range_adaptor.h>
27	#include <__ranges/single_view.h>
28	#include <__ranges/subrange.h>
29	#include <__ranges/view_interface.h>
30	#include <__type_traits/decay.h>
31	#include <__type_traits/is_nothrow_constructible.h>
32	#include <__utility/forward.h>
33	#include <__utility/move.h>
34
35	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
36	# pragma GCC system_header
37	#endif
38
39	_LIBCPP_BEGIN_NAMESPACE_STD
40
41	#if _LIBCPP_STD_VER >= 20
42
43	namespace ranges {
44
45	template <class _View, class _Pattern>
46	struct __split_view_iterator;
47
48	template <class _View, class _Pattern>
49	struct __split_view_sentinel;
50
51	template <forward_range _View, forward_range _Pattern>
52	requires view<_View> && view<_Pattern> &&
53	indirectly_comparable<iterator_t<_View>, iterator_t<_Pattern>, ranges::equal_to>
54	class split_view : public view_interface<split_view<_View, _Pattern>> {
55	private:
56	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
57	_LIBCPP_NO_UNIQUE_ADDRESS _Pattern __pattern_ = _Pattern();
58	using _Cache = __non_propagating_cache<subrange<iterator_t<_View>>>;
59	_Cache __cached_begin_ = _Cache();
60
61	template <class, class>
62	friend struct __split_view_iterator;
63
64	template <class, class>
65	friend struct __split_view_sentinel;
66
67	using __iterator = __split_view_iterator<_View, _Pattern>;
68	using __sentinel = __split_view_sentinel<_View, _Pattern>;
69
70	_LIBCPP_HIDE_FROM_ABI constexpr subrange<iterator_t<_View>> __find_next(iterator_t<_View> __it) {
71	auto [__begin, __end] = ranges::search(subrange(__it, ranges::end(__base_)), __pattern_);
72	if (__begin != ranges::end(__base_) && ranges::empty(__pattern_)) {
73	++__begin;
74	++__end;
75	}
76	return {__begin, __end};
77	}
78
79	public:
80	_LIBCPP_HIDE_FROM_ABI split_view()
81	requires default_initializable<_View> && default_initializable<_Pattern>
82	= default;
83
84	_LIBCPP_HIDE_FROM_ABI constexpr split_view(_View __base, _Pattern __pattern)
85	: __base_(std::move(__base)), __pattern_(std::move((__pattern))) {}
86
87	template <forward_range _Range>
88	requires constructible_from<_View, views::all_t<_Range>> &&
89	constructible_from<_Pattern, single_view<range_value_t<_Range>>>
90	_LIBCPP_HIDE_FROM_ABI constexpr split_view(_Range&& __range, range_value_t<_Range> __elem)
91	: __base_(views::all(std::forward<_Range>(__range))), __pattern_(views::single(std::move(__elem))) {}
92
93	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
94	requires copy_constructible<_View>
95	{
96	return __base_;
97	}
98
99	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
100
101	_LIBCPP_HIDE_FROM_ABI constexpr __iterator begin() {
102	if (!__cached_begin_.__has_value()) {
103	__cached_begin_.__emplace(__find_next(ranges::begin(__base_)));
104	}
105	return {this, ranges::begin(__base_), __cached_begin_};
106	}
107
108	_LIBCPP_HIDE_FROM_ABI constexpr auto end() {
109	if constexpr (common_range<_View>) {
110	return __iterator{*this, ranges::end(__base_), {}};
111	} else {
112	return __sentinel{*this};
113	}
114	}
115	};
116
117	template <class _Range, class _Pattern>
118	split_view(_Range&&, _Pattern&&) -> split_view<views::all_t<_Range>, views::all_t<_Pattern>>;
119
120	template <forward_range _Range>
121	split_view(_Range&&, range_value_t<_Range>) -> split_view<views::all_t<_Range>, single_view<range_value_t<_Range>>>;
122
123	template <class _View, class _Pattern>
124	struct __split_view_iterator {
125	private:
126	split_view<_View, _Pattern>* __parent_ = nullptr;
127	_LIBCPP_NO_UNIQUE_ADDRESS iterator_t<_View> __cur_ = iterator_t<_View>();
128	_LIBCPP_NO_UNIQUE_ADDRESS subrange<iterator_t<_View>> __next_ = subrange<iterator_t<_View>>();
129	bool __trailing_empty_ = false;
130
131	template <class, class>
132	friend struct __split_view_sentinel;
133
134	public:
135	using iterator_concept = forward_iterator_tag;
136	using iterator_category = input_iterator_tag;
137	using value_type = subrange<iterator_t<_View>>;
138	using difference_type = range_difference_t<_View>;
139
140	_LIBCPP_HIDE_FROM_ABI __split_view_iterator() = default;
141
142	_LIBCPP_HIDE_FROM_ABI constexpr __split_view_iterator(
143	split_view<_View, _Pattern>& __parent, iterator_t<_View> __current, subrange<iterator_t<_View>> __next)
144	: __parent_(std::addressof(__parent)), __cur_(std::move(__current)), __next_(std::move(__next)) {}
145
146	_LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_View> base() const { return __cur_; }
147
148	_LIBCPP_HIDE_FROM_ABI constexpr value_type operator*() const { return {__cur_, __next_.begin()}; }
149
150	_LIBCPP_HIDE_FROM_ABI constexpr __split_view_iterator& operator++() {
151	__cur_ = __next_.begin();
152	if (__cur_ != ranges::end(__parent_->__base_)) {
153	__cur_ = __next_.end();
154	if (__cur_ == ranges::end(__parent_->__base_)) {
155	__trailing_empty_ = true;
156	__next_ = {__cur_, __cur_};
157	} else {
158	__next_ = __parent_->__find_next(__cur_);
159	}
160	} else {
161	__trailing_empty_ = false;
162	}
163	return *this;
164	}
165
166	_LIBCPP_HIDE_FROM_ABI constexpr __split_view_iterator operator++(int) {
167	auto __tmp = *this;
168	++*this;
169	return __tmp;
170	}
171
172	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
173	operator==(const __split_view_iterator& __x, const __split_view_iterator& __y) {
174	return __x.__cur_ == __y.__cur_ && __x.__trailing_empty_ == __y.__trailing_empty_;
175	}
176	};
177
178	template <class _View, class _Pattern>
179	struct __split_view_sentinel {
180	private:
181	_LIBCPP_NO_UNIQUE_ADDRESS sentinel_t<_View> __end_ = sentinel_t<_View>();
182
183	_LIBCPP_HIDE_FROM_ABI static constexpr bool
184	__equals(const __split_view_iterator<_View, _Pattern>& __x, const __split_view_sentinel& __y) {
185	return __x.__cur_ == __y.__end_ && !__x.__trailing_empty_;
186	}
187
188	public:
189	_LIBCPP_HIDE_FROM_ABI __split_view_sentinel() = default;
190
191	_LIBCPP_HIDE_FROM_ABI constexpr explicit __split_view_sentinel(split_view<_View, _Pattern>& __parent)
192	: __end_(ranges::end(__parent.__base_)) {}
193
194	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
195	operator==(const __split_view_iterator<_View, _Pattern>& __x, const __split_view_sentinel& __y) {
196	return __equals(__x, __y);
197	}
198	};
199
200	namespace views {
201	namespace __split_view {
202	struct __fn : __range_adaptor_closure<__fn> {
203	// clang-format off
204	template <class _Range, class _Pattern>
205	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
206	constexpr auto operator()(_Range&& __range, _Pattern&& __pattern) const
207	noexcept(noexcept(split_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern))))
208	-> decltype( split_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern)))
209	{ return split_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern)); }
210	// clang-format on
211
212	template <class _Pattern>
213	requires constructible_from<decay_t<_Pattern>, _Pattern>
214	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const
215	noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {
216	return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
217	}
218	};
219	} // namespace __split_view
220
221	inline namespace __cpo {
222	inline constexpr auto split = __split_view::__fn{};
223	} // namespace __cpo
224	} // namespace views
225
226	} // namespace ranges
227
228	#endif // _LIBCPP_STD_VER >= 20
229
230	_LIBCPP_END_NAMESPACE_STD
231
232	#endif // _LIBCPP___RANGES_SPLIT_VIEW_H

lib/libcxx/include/__ranges/subrange.h+16-17

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_SUBRANGE_H
 #define _LIBCPP___RANGES_SUBRANGE_H
 @@ -16,6 +17,8 @@
 #include <__concepts/derived_from.h>
 #include <__concepts/different_from.h>
 #include <__config>
+#include <__fwd/get.h>
+#include <__fwd/subrange.h>
 #include <__iterator/advance.h>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 @@ -26,9 +29,18 @@
 #include <__ranges/enable_borrowed_range.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
-#include <__tuple>
+#include <__tuple_dir/pair_like.h>
+#include <__tuple_dir/tuple_element.h>
+#include <__tuple_dir/tuple_size.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_pointer.h>
+#include <__type_traits/is_reference.h>
+#include <__type_traits/make_unsigned.h>
+#include <__type_traits/remove_const.h>
+#include <__type_traits/remove_pointer.h>
 #include <__utility/move.h>
-#include <type_traits>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -36,7 +48,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
   template<class _From, class _To>
 @@ -49,17 +61,6 @@ namespace ranges {
     convertible_to<_From, _To> &&
     !__uses_nonqualification_pointer_conversion<decay_t<_From>, decay_t<_To>>;
-  template<class _Tp>
-  concept __pair_like =
-    !is_reference_v<_Tp> && requires(_Tp __t) {
-      typename tuple_size<_Tp>::type; // Ensures `tuple_size<T>` is complete.
-      requires derived_from<tuple_size<_Tp>, integral_constant<size_t, 2>>;
-      typename tuple_element_t<0, remove_const_t<_Tp>>;
-      typename tuple_element_t<1, remove_const_t<_Tp>>;
-      { std::get<0>(__t) } -> convertible_to<const tuple_element_t<0, _Tp>&>;
-      { std::get<1>(__t) } -> convertible_to<const tuple_element_t<1, _Tp>&>;
-    };
   template<class _Pair, class _Iter, class _Sent>
   concept __pair_like_convertible_from =
     !range<_Pair> && __pair_like<_Pair> &&
 @@ -67,8 +68,6 @@ namespace ranges {
     __convertible_to_non_slicing<_Iter, tuple_element_t<0, _Pair>> &&
     convertible_to<_Sent, tuple_element_t<1, _Pair>>;
-  enum class _LIBCPP_ENUM_VIS subrange_kind : bool { unsized, sized };
   template<input_or_output_iterator _Iter, sentinel_for<_Iter> _Sent = _Iter,
            subrange_kind _Kind = sized_sentinel_for<_Sent, _Iter>
              ? subrange_kind::sized
 @@ -285,7 +284,7 @@ struct tuple_element<1, const ranges::subrange<_Ip, _Sp, _Kp>> {
   using type = _Sp;
 };
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/take_view.h+12-6

 @@ -6,11 +6,15 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___RANGES_TAKE_VIEW_H
 #define _LIBCPP___RANGES_TAKE_VIEW_H
 #include <__algorithm/min.h>
 #include <__algorithm/ranges_min.h>
+#include <__assert>
+#include <__concepts/constructible.h>
+#include <__concepts/convertible_to.h>
 #include <__config>
 #include <__functional/bind_back.h>
 #include <__fwd/span.h>
 @@ -30,10 +34,10 @@
 #include <__ranges/size.h>
 #include <__ranges/subrange.h>
 #include <__ranges/view_interface.h>
+#include <__type_traits/maybe_const.h>
 #include <__utility/auto_cast.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <concepts>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -45,7 +49,7 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 17
 namespace ranges {
 @@ -60,9 +64,10 @@ public:
   _LIBCPP_HIDE_FROM_ABI
   take_view() requires default_initializable<_View> = default;
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI constexpr take_view(_View __base, range_difference_t<_View> __count)
-  constexpr take_view(_View __base, range_difference_t<_View> __count)
+      : __base_(std::move(__base)), __count_(__count) {
-    : __base_(std::move(__base)), __count_(__count) {}
+    _LIBCPP_ASSERT(__count >= 0, "count has to be greater than or equal to zero");
+  }
   _LIBCPP_HIDE_FROM_ABI
   constexpr _View base() const& requires copy_constructible<_View> { return __base_; }
 @@ -225,6 +230,7 @@ struct __passthrough_type<basic_string_view<_CharT, _Traits>> {
 };
 template <class _Iter, class _Sent, subrange_kind _Kind>
+  requires requires{typename subrange<_Iter>;}
 struct __passthrough_type<subrange<_Iter, _Sent, _Kind>> {
   using type = subrange<_Iter>;
 };
 @@ -328,7 +334,7 @@ inline namespace __cpo {
 } // namespace ranges
-#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 17
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__ranges/take_while_view.h created+183

...	@@ -0,0 +1,183 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
11	#define _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
12
13	#include <__concepts/constructible.h>
14	#include <__concepts/convertible_to.h>
15	#include <__config>
16	#include <__functional/bind_back.h>
17	#include <__functional/invoke.h>
18	#include <__iterator/concepts.h>
19	#include <__memory/addressof.h>
20	#include <__ranges/access.h>
21	#include <__ranges/all.h>
22	#include <__ranges/concepts.h>
23	#include <__ranges/copyable_box.h>
24	#include <__ranges/range_adaptor.h>
25	#include <__ranges/view_interface.h>
26	#include <__type_traits/decay.h>
27	#include <__type_traits/is_nothrow_constructible.h>
28	#include <__type_traits/is_object.h>
29	#include <__type_traits/maybe_const.h>
30	#include <__utility/forward.h>
31	#include <__utility/in_place.h>
32	#include <__utility/move.h>
33
34	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
35	# pragma GCC system_header
36	#endif
37
38	_LIBCPP_BEGIN_NAMESPACE_STD
39
40	#if _LIBCPP_STD_VER >= 20
41
42	namespace ranges {
43
44	// The spec uses the unnamed requirement inside the `begin` and `end` member functions:
45	// constexpr auto begin() const
46	// requires range<const V> && indirect_unary_predicate<const Pred, iterator_t<const V>>
47	// However, due to a clang-14 and clang-15 bug, the above produces a hard error when `const V` is not a range.
48	// The workaround is to create a named concept and use the concept instead.
49	// As of take_while_view is implemented, the clang-trunk has already fixed the bug.
50	// It is OK to remove the workaround once our CI no longer uses clang-14, clang-15 based compilers,
51	// because we don't actually expect a lot of vendors to ship a new libc++ with an old clang.
52	template <class _View, class _Pred>
53	concept __take_while_const_is_range =
54	range<const _View> && indirect_unary_predicate<const _Pred, iterator_t<const _View>>;
55
56	template <class, class, bool>
57	class __take_while_view_sentinel;
58
59	template <view _View, class _Pred>
60	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>
61	class take_while_view : public view_interface<take_while_view<_View, _Pred>> {
62	template <class, class, bool>
63	friend class __take_while_view_sentinel;
64
65	template <bool _Const>
66	using __sentinel = __take_while_view_sentinel<_View, _Pred, _Const>;
67
68	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
69	_LIBCPP_NO_UNIQUE_ADDRESS __copyable_box<_Pred> __pred_;
70
71	public:
72	_LIBCPP_HIDE_FROM_ABI take_while_view()
73	requires default_initializable<_View> && default_initializable<_Pred>
74	= default;
75
76	_LIBCPP_HIDE_FROM_ABI constexpr take_while_view(_View __base, _Pred __pred)
77	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
78
79	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
80	requires copy_constructible<_View>
81	{
82	return __base_;
83	}
84
85	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
86
87	_LIBCPP_HIDE_FROM_ABI constexpr const _Pred& pred() const { return *__pred_; }
88
89	_LIBCPP_HIDE_FROM_ABI constexpr auto begin()
90	requires(!__simple_view<_View>)
91	{
92	return ranges::begin(__base_);
93	}
94
95	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
96	requires __take_while_const_is_range<_View, _Pred>
97	{
98	return ranges::begin(__base_);
99	}
100
101	_LIBCPP_HIDE_FROM_ABI constexpr auto end()
102	requires(!__simple_view<_View>)
103	{
104	return __sentinel</_Const=/false>(ranges::end(__base_), std::addressof(*__pred_));
105	}
106
107	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const
108	requires __take_while_const_is_range<_View, _Pred>
109	{
110	return __sentinel</_Const=/true>(ranges::end(__base_), std::addressof(*__pred_));
111	}
112	};
113
114	template <class _Range, class _Pred>
115	take_while_view(_Range&&, _Pred) -> take_while_view<views::all_t<_Range>, _Pred>;
116
117	template <class _View, class _Pred, bool _Const>
118	class __take_while_view_sentinel {
119	using _Base = __maybe_const<_Const, _View>;
120
121	sentinel_t<_Base> __end_ = sentinel_t<_Base>();
122	const _Pred* __pred_ = nullptr;
123
124	template <class, class, bool>
125	friend class __take_while_view_sentinel;
126
127	public:
128	_LIBCPP_HIDE_FROM_ABI __take_while_view_sentinel() = default;
129
130	_LIBCPP_HIDE_FROM_ABI constexpr explicit __take_while_view_sentinel(sentinel_t<_Base> __end, const _Pred* __pred)
131	: __end_(std::move(__end)), __pred_(__pred) {}
132
133	_LIBCPP_HIDE_FROM_ABI constexpr __take_while_view_sentinel(__take_while_view_sentinel<_View, _Pred, !_Const> __s)
134	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
135	: __end_(std::move(__s.__end_)), __pred_(__s.__pred_) {}
136
137	_LIBCPP_HIDE_FROM_ABI constexpr sentinel_t<_Base> base() const { return __end_; }
138
139	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
140	operator==(const iterator_t<_Base>& __x, const __take_while_view_sentinel& __y) {
141	return __x == __y.__end_ \|\| !std::invoke(__y.__pred_, __x);
142	}
143
144	template <bool _OtherConst = !_Const>
145	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
146	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
147	operator==(const iterator_t<__maybe_const<_OtherConst, _View>>& __x, const __take_while_view_sentinel& __y) {
148	return __x == __y.__end_ \|\| !std::invoke(__y.__pred_, __x);
149	}
150	};
151
152	namespace views {
153	namespace __take_while {
154
155	struct __fn {
156	template <class _Range, class _Pred>
157	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range, _Pred&& __pred) const
158	noexcept(noexcept(/**/ take_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred))))
159	-> decltype(/--/ take_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred))) {
160	return /-------------/ take_while_view(std::forward<_Range>(__range), std::forward<_Pred>(__pred));
161	}
162
163	template <class _Pred>
164	requires constructible_from<decay_t<_Pred>, _Pred>
165	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
166	noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
167	return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
168	}
169	};
170
171	} // namespace __take_while
172
173	inline namespace __cpo {
174	inline constexpr auto take_while = __take_while::__fn{};
175	} // namespace __cpo
176	} // namespace views
177	} // namespace ranges
178
179	#endif // _LIBCPP_STD_VER >= 20
180
181	_LIBCPP_END_NAMESPACE_STD
182
183	#endif // _LIBCPP___RANGES_TAKE_WHILE_VIEW_H

lib/libcxx/include/__ranges/transform_view.h+80-53

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_TRANSFORM_VIEW_H	10	#ifndef _LIBCPP___RANGES_TRANSFORM_VIEW_H
10	#define _LIBCPP___RANGES_TRANSFORM_VIEW_H	11	#define _LIBCPP___RANGES_TRANSFORM_VIEW_H
11		12
...	@@ -30,6 +31,7 @@	...	@@ -30,6 +31,7 @@
30	#include <__ranges/range_adaptor.h>	31	#include <__ranges/range_adaptor.h>
31	#include <__ranges/size.h>	32	#include <__ranges/size.h>
32	#include <__ranges/view_interface.h>	33	#include <__ranges/view_interface.h>
		34	#include <__type_traits/maybe_const.h>
33	#include <__utility/forward.h>	35	#include <__utility/forward.h>
34	#include <__utility/in_place.h>	36	#include <__utility/in_place.h>
35	#include <__utility/move.h>	37	#include <__utility/move.h>
...	@@ -41,7 +43,7 @@	...	@@ -41,7 +43,7 @@
41		43
42	_LIBCPP_BEGIN_NAMESPACE_STD	44	_LIBCPP_BEGIN_NAMESPACE_STD
43		45
44	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	46	#if _LIBCPP_STD_VER > 17
45		47
46	namespace ranges {	48	namespace ranges {
47		49
...	@@ -55,11 +57,31 @@ concept __transform_view_constraints =	...	@@ -55,11 +57,31 @@ concept __transform_view_constraints =
55	regular_invocable<_Fn&, range_reference_t<_View>> &&	57	regular_invocable<_Fn&, range_reference_t<_View>> &&
56	__can_reference<invoke_result_t<_Fn&, range_reference_t<_View>>>;	58	__can_reference<invoke_result_t<_Fn&, range_reference_t<_View>>>;
57		59
		60	template <input_range _View, copy_constructible _Function, bool _IsConst>
		61	requires __transform_view_constraints<_View, _Function>
		62	class __transform_view_iterator;
		63
		64	template <input_range _View, copy_constructible _Function, bool _IsConst>
		65	requires __transform_view_constraints<_View, _Function>
		66	class __transform_view_sentinel;
		67
58	template<input_range _View, copy_constructible _Fn>	68	template<input_range _View, copy_constructible _Fn>
59	requires __transform_view_constraints<_View, _Fn>	69	requires __transform_view_constraints<_View, _Fn>
60	class transform_view : public view_interface<transform_view<_View, _Fn>> {	70	class transform_view : public view_interface<transform_view<_View, _Fn>> {
61	template<bool> class __iterator;	71
62	template<bool> class __sentinel;	72	template <bool _IsConst>
		73	using __iterator = __transform_view_iterator<_View, _Fn, _IsConst>;
		74
		75	template <bool _IsConst>
		76	using __sentinel = __transform_view_sentinel<_View, _Fn, _IsConst>;
		77
		78	template <input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
		79	requires __transform_view_constraints<_ViewType, _FunctionType>
		80	friend class __transform_view_iterator;
		81
		82	template <input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
		83	requires __transform_view_constraints<_ViewType, _FunctionType>
		84	friend class __transform_view_sentinel;
63		85
64	_LIBCPP_NO_UNIQUE_ADDRESS __copyable_box<_Fn> __func_;	86	_LIBCPP_NO_UNIQUE_ADDRESS __copyable_box<_Fn> __func_;
65	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();	87	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
...	@@ -154,22 +176,23 @@ struct __transform_view_iterator_category_base<_View, _Fn> {	...	@@ -154,22 +176,23 @@ struct __transform_view_iterator_category_base<_View, _Fn> {
154	>;	176	>;
155	};	177	};
156		178
157	template<input_range _View, copy_constructible _Fn>	179	template<input_range _View, copy_constructible _Fn, bool _Const>
158	requires __transform_view_constraints<_View, _Fn>	180	requires __transform_view_constraints<_View, _Fn>
159	template<bool _Const>	181	class __transform_view_iterator
160	class transform_view<_View, _Fn>::__iterator
161	: public __transform_view_iterator_category_base<_View, _Fn> {	182	: public __transform_view_iterator_category_base<_View, _Fn> {
162		183
163	using _Parent = __maybe_const<_Const, transform_view>;	184	using _Parent = __maybe_const<_Const, transform_view<_View, _Fn>>;
164	using _Base = __maybe_const<_Const, _View>;	185	using _Base = __maybe_const<_Const, _View>;
165		186
166	_Parent *__parent_ = nullptr;	187	_Parent *__parent_ = nullptr;
167		188
168	template<bool>	189	template<input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
169	friend class transform_view<_View, _Fn>::__iterator;	190	requires __transform_view_constraints<_ViewType, _FunctionType>
		191	friend class __transform_view_iterator;
170		192
171	template<bool>	193	template<input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
172	friend class transform_view<_View, _Fn>::__sentinel;	194	requires __transform_view_constraints<_ViewType, _FunctionType>
		195	friend class __transform_view_sentinel;
173		196
174	public:	197	public:
175	iterator_t<_Base> __current_ = iterator_t<_Base>();	198	iterator_t<_Base> __current_ = iterator_t<_Base>();
...	@@ -179,17 +202,17 @@ public:	...	@@ -179,17 +202,17 @@ public:
179	using difference_type = range_difference_t<_Base>;	202	using difference_type = range_difference_t<_Base>;
180		203
181	_LIBCPP_HIDE_FROM_ABI	204	_LIBCPP_HIDE_FROM_ABI
182	__iterator() requires default_initializable<iterator_t<_Base>> = default;	205	__transform_view_iterator() requires default_initializable<iterator_t<_Base>> = default;
183		206
184	_LIBCPP_HIDE_FROM_ABI	207	_LIBCPP_HIDE_FROM_ABI
185	constexpr __iterator(_Parent& __parent, iterator_t<_Base> __current)	208	constexpr __transform_view_iterator(_Parent& __parent, iterator_t<_Base> __current)
186	: __parent_(std::addressof(__parent)), __current_(std::move(__current)) {}	209	: __parent_(std::addressof(__parent)), __current_(std::move(__current)) {}
187		210
188	// Note: `__i` should always be `__iterator<false>`, but directly using	211	// Note: `__i` should always be `__transform_view_iterator<false>`, but directly using
189	// `__iterator<false>` is ill-formed when `_Const` is false	212	// `__transform_view_iterator<false>` is ill-formed when `_Const` is false
190	// (see http://wg21.link/class.copy.ctor#5).	213	// (see http://wg21.link/class.copy.ctor#5).
191	_LIBCPP_HIDE_FROM_ABI	214	_LIBCPP_HIDE_FROM_ABI
192	constexpr __iterator(__iterator<!_Const> __i)	215	constexpr __transform_view_iterator(__transform_view_iterator<_View, _Fn, !_Const> __i)
193	requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>	216	requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>
194	: __parent_(__i.__parent_), __current_(std::move(__i.__current_)) {}	217	: __parent_(__i.__parent_), __current_(std::move(__i.__current_)) {}
195		218
...	@@ -211,7 +234,7 @@ public:	...	@@ -211,7 +234,7 @@ public:
211	}	234	}
212		235
213	_LIBCPP_HIDE_FROM_ABI	236	_LIBCPP_HIDE_FROM_ABI
214	constexpr __iterator& operator++() {	237	constexpr __transform_view_iterator& operator++() {
215	++__current_;	238	++__current_;
216	return *this;	239	return *this;
217	}	240	}
...	@@ -220,7 +243,7 @@ public:	...	@@ -220,7 +243,7 @@ public:
220	constexpr void operator++(int) { ++__current_; }	243	constexpr void operator++(int) { ++__current_; }
221		244
222	_LIBCPP_HIDE_FROM_ABI	245	_LIBCPP_HIDE_FROM_ABI
223	constexpr __iterator operator++(int)	246	constexpr __transform_view_iterator operator++(int)
224	requires forward_range<_Base>	247	requires forward_range<_Base>
225	{	248	{
226	auto __tmp = *this;	249	auto __tmp = *this;
...	@@ -229,7 +252,7 @@ public:	...	@@ -229,7 +252,7 @@ public:
229	}	252	}
230		253
231	_LIBCPP_HIDE_FROM_ABI	254	_LIBCPP_HIDE_FROM_ABI
232	constexpr __iterator& operator--()	255	constexpr __transform_view_iterator& operator--()
233	requires bidirectional_range<_Base>	256	requires bidirectional_range<_Base>
234	{	257	{
235	--__current_;	258	--__current_;
...	@@ -237,7 +260,7 @@ public:	...	@@ -237,7 +260,7 @@ public:
237	}	260	}
238		261
239	_LIBCPP_HIDE_FROM_ABI	262	_LIBCPP_HIDE_FROM_ABI
240	constexpr __iterator operator--(int)	263	constexpr __transform_view_iterator operator--(int)
241	requires bidirectional_range<_Base>	264	requires bidirectional_range<_Base>
242	{	265	{
243	auto __tmp = *this;	266	auto __tmp = *this;
...	@@ -246,7 +269,7 @@ public:	...	@@ -246,7 +269,7 @@ public:
246	}	269	}
247		270
248	_LIBCPP_HIDE_FROM_ABI	271	_LIBCPP_HIDE_FROM_ABI
249	constexpr __iterator& operator+=(difference_type __n)	272	constexpr __transform_view_iterator& operator+=(difference_type __n)
250	requires random_access_range<_Base>	273	requires random_access_range<_Base>
251	{	274	{
252	__current_ += __n;	275	__current_ += __n;
...	@@ -254,7 +277,7 @@ public:	...	@@ -254,7 +277,7 @@ public:
254	}	277	}
255		278
256	_LIBCPP_HIDE_FROM_ABI	279	_LIBCPP_HIDE_FROM_ABI
257	constexpr __iterator& operator-=(difference_type __n)	280	constexpr __transform_view_iterator& operator-=(difference_type __n)
258	requires random_access_range<_Base>	281	requires random_access_range<_Base>
259	{	282	{
260	__current_ -= __n;	283	__current_ -= __n;
...	@@ -270,77 +293,77 @@ public:	...	@@ -270,77 +293,77 @@ public:
270	}	293	}
271		294
272	_LIBCPP_HIDE_FROM_ABI	295	_LIBCPP_HIDE_FROM_ABI
273	friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)	296	friend constexpr bool operator==(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
274	requires equality_comparable<iterator_t<_Base>>	297	requires equality_comparable<iterator_t<_Base>>
275	{	298	{
276	return __x.__current_ == __y.__current_;	299	return __x.__current_ == __y.__current_;
277	}	300	}
278		301
279	_LIBCPP_HIDE_FROM_ABI	302	_LIBCPP_HIDE_FROM_ABI
280	friend constexpr bool operator<(const __iterator& __x, const __iterator& __y)	303	friend constexpr bool operator<(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
281	requires random_access_range<_Base>	304	requires random_access_range<_Base>
282	{	305	{
283	return __x.__current_ < __y.__current_;	306	return __x.__current_ < __y.__current_;
284	}	307	}
285		308
286	_LIBCPP_HIDE_FROM_ABI	309	_LIBCPP_HIDE_FROM_ABI
287	friend constexpr bool operator>(const __iterator& __x, const __iterator& __y)	310	friend constexpr bool operator>(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
288	requires random_access_range<_Base>	311	requires random_access_range<_Base>
289	{	312	{
290	return __x.__current_ > __y.__current_;	313	return __x.__current_ > __y.__current_;
291	}	314	}
292		315
293	_LIBCPP_HIDE_FROM_ABI	316	_LIBCPP_HIDE_FROM_ABI
294	friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y)	317	friend constexpr bool operator<=(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
295	requires random_access_range<_Base>	318	requires random_access_range<_Base>
296	{	319	{
297	return __x.__current_ <= __y.__current_;	320	return __x.__current_ <= __y.__current_;
298	}	321	}
299		322
300	_LIBCPP_HIDE_FROM_ABI	323	_LIBCPP_HIDE_FROM_ABI
301	friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y)	324	friend constexpr bool operator>=(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
302	requires random_access_range<_Base>	325	requires random_access_range<_Base>
303	{	326	{
304	return __x.__current_ >= __y.__current_;	327	return __x.__current_ >= __y.__current_;
305	}	328	}
306		329
307	_LIBCPP_HIDE_FROM_ABI	330	_LIBCPP_HIDE_FROM_ABI
308	friend constexpr auto operator<=>(const __iterator& __x, const __iterator& __y)	331	friend constexpr auto operator<=>(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
309	requires random_access_range<_Base> && three_way_comparable<iterator_t<_Base>>	332	requires random_access_range<_Base> && three_way_comparable<iterator_t<_Base>>
310	{	333	{
311	return __x.__current_ <=> __y.__current_;	334	return __x.__current_ <=> __y.__current_;
312	}	335	}
313		336
314	_LIBCPP_HIDE_FROM_ABI	337	_LIBCPP_HIDE_FROM_ABI
315	friend constexpr __iterator operator+(__iterator __i, difference_type __n)	338	friend constexpr __transform_view_iterator operator+(__transform_view_iterator __i, difference_type __n)
316	requires random_access_range<_Base>	339	requires random_access_range<_Base>
317	{	340	{
318	return __iterator{*__i.__parent_, __i.__current_ + __n};	341	return __transform_view_iterator{*__i.__parent_, __i.__current_ + __n};
319	}	342	}
320		343
321	_LIBCPP_HIDE_FROM_ABI	344	_LIBCPP_HIDE_FROM_ABI
322	friend constexpr __iterator operator+(difference_type __n, __iterator __i)	345	friend constexpr __transform_view_iterator operator+(difference_type __n, __transform_view_iterator __i)
323	requires random_access_range<_Base>	346	requires random_access_range<_Base>
324	{	347	{
325	return __iterator{*__i.__parent_, __i.__current_ + __n};	348	return __transform_view_iterator{*__i.__parent_, __i.__current_ + __n};
326	}	349	}
327		350
328	_LIBCPP_HIDE_FROM_ABI	351	_LIBCPP_HIDE_FROM_ABI
329	friend constexpr __iterator operator-(__iterator __i, difference_type __n)	352	friend constexpr __transform_view_iterator operator-(__transform_view_iterator __i, difference_type __n)
330	requires random_access_range<_Base>	353	requires random_access_range<_Base>
331	{	354	{
332	return __iterator{*__i.__parent_, __i.__current_ - __n};	355	return __transform_view_iterator{*__i.__parent_, __i.__current_ - __n};
333	}	356	}
334		357
335	_LIBCPP_HIDE_FROM_ABI	358	_LIBCPP_HIDE_FROM_ABI
336	friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)	359	friend constexpr difference_type operator-(const __transform_view_iterator& __x, const __transform_view_iterator& __y)
337	requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>	360	requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
338	{	361	{
339	return __x.__current_ - __y.__current_;	362	return __x.__current_ - __y.__current_;
340	}	363	}
341		364
342	_LIBCPP_HIDE_FROM_ABI	365	_LIBCPP_HIDE_FROM_ABI
343	friend constexpr decltype(auto) iter_move(const __iterator& __i)	366	friend constexpr decltype(auto) iter_move(const __transform_view_iterator& __i)
344	noexcept(noexcept(*__i))	367	noexcept(noexcept(*__i))
345	{	368	{
346	if constexpr (is_lvalue_reference_v<decltype(*__i)>)	369	if constexpr (is_lvalue_reference_v<decltype(*__i)>)
...	@@ -350,33 +373,37 @@ public:	...	@@ -350,33 +373,37 @@ public:
350	}	373	}
351	};	374	};
352		375
353	template<input_range _View, copy_constructible _Fn>	376	template<input_range _View, copy_constructible _Fn, bool _Const>
354	requires __transform_view_constraints<_View, _Fn>	377	requires __transform_view_constraints<_View, _Fn>
355	template<bool _Const>	378	class __transform_view_sentinel {
356	class transform_view<_View, _Fn>::__sentinel {	379	using _Parent = __maybe_const<_Const, transform_view<_View, _Fn>>;
357	using _Parent = __maybe_const<_Const, transform_view>;
358	using _Base = __maybe_const<_Const, _View>;	380	using _Base = __maybe_const<_Const, _View>;
359		381
		382	template <bool _IsConst>
		383	using __iterator = __transform_view_iterator<_View, _Fn, _IsConst>;
		384
360	sentinel_t<_Base> __end_ = sentinel_t<_Base>();	385	sentinel_t<_Base> __end_ = sentinel_t<_Base>();
361		386
362	template<bool>	387	template<input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
363	friend class transform_view<_View, _Fn>::__iterator;	388	requires __transform_view_constraints<_ViewType, _FunctionType>
		389	friend class __transform_view_iterator;
364		390
365	template<bool>	391	template<input_range _ViewType, copy_constructible _FunctionType, bool _IsConst>
366	friend class transform_view<_View, _Fn>::__sentinel;	392	requires __transform_view_constraints<_ViewType, _FunctionType>
		393	friend class __transform_view_sentinel;
367		394
368	public:	395	public:
369	_LIBCPP_HIDE_FROM_ABI	396	_LIBCPP_HIDE_FROM_ABI
370	__sentinel() = default;	397	__transform_view_sentinel() = default;
371		398
372	_LIBCPP_HIDE_FROM_ABI	399	_LIBCPP_HIDE_FROM_ABI
373	constexpr explicit __sentinel(sentinel_t<_Base> __end) : __end_(__end) {}	400	constexpr explicit __transform_view_sentinel(sentinel_t<_Base> __end) : __end_(__end) {}
374		401
375	// Note: `__i` should always be `__sentinel<false>`, but directly using	402	// Note: `__i` should always be `__transform_view_sentinel<false>`, but directly using
376	// `__sentinel<false>` is ill-formed when `_Const` is false	403	// `__transform_view_sentinel<false>` is ill-formed when `_Const` is false
377	// (see http://wg21.link/class.copy.ctor#5).	404	// (see http://wg21.link/class.copy.ctor#5).
378	_LIBCPP_HIDE_FROM_ABI	405	_LIBCPP_HIDE_FROM_ABI
379	constexpr __sentinel(__sentinel<!_Const> __i)	406	constexpr __transform_view_sentinel(__transform_view_sentinel<_View, _Fn, !_Const> __i)
380	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>	407	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
381	: __end_(std::move(__i.__end_)) {}	408	: __end_(std::move(__i.__end_)) {}
382		409
...	@@ -386,7 +413,7 @@ public:	...	@@ -386,7 +413,7 @@ public:
386	template<bool _OtherConst>	413	template<bool _OtherConst>
387	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>	414	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
388	_LIBCPP_HIDE_FROM_ABI	415	_LIBCPP_HIDE_FROM_ABI
389	friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {	416	friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __transform_view_sentinel& __y) {
390	return __x.__current_ == __y.__end_;	417	return __x.__current_ == __y.__end_;
391	}	418	}
392		419
...	@@ -394,7 +421,7 @@ public:	...	@@ -394,7 +421,7 @@ public:
394	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>	421	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
395	_LIBCPP_HIDE_FROM_ABI	422	_LIBCPP_HIDE_FROM_ABI
396	friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>	423	friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
397	operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {	424	operator-(const __iterator<_OtherConst>& __x, const __transform_view_sentinel& __y) {
398	return __x.__current_ - __y.__end_;	425	return __x.__current_ - __y.__end_;
399	}	426	}
400		427
...	@@ -402,7 +429,7 @@ public:	...	@@ -402,7 +429,7 @@ public:
402	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>	429	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
403	_LIBCPP_HIDE_FROM_ABI	430	_LIBCPP_HIDE_FROM_ABI
404	friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>	431	friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
405	operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) {	432	operator-(const __transform_view_sentinel& __x, const __iterator<_OtherConst>& __y) {
406	return __x.__end_ - __y.__current_;	433	return __x.__end_ - __y.__current_;
407	}	434	}
408	};	435	};
...	@@ -433,7 +460,7 @@ inline namespace __cpo {	...	@@ -433,7 +460,7 @@ inline namespace __cpo {
433		460
434	} // namespace ranges	461	} // namespace ranges
435		462
436	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	463	#endif // _LIBCPP_STD_VER > 17
437		464
438	_LIBCPP_END_NAMESPACE_STD	465	_LIBCPP_END_NAMESPACE_STD
439		466

lib/libcxx/include/__ranges/view_interface.h+8-5

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_VIEW_INTERFACE_H	10	#ifndef _LIBCPP___RANGES_VIEW_INTERFACE_H
10	#define _LIBCPP___RANGES_VIEW_INTERFACE_H	11	#define _LIBCPP___RANGES_VIEW_INTERFACE_H
11		12
...	@@ -20,7 +21,9 @@	...	@@ -20,7 +21,9 @@
20	#include <__ranges/access.h>	21	#include <__ranges/access.h>
21	#include <__ranges/concepts.h>	22	#include <__ranges/concepts.h>
22	#include <__ranges/empty.h>	23	#include <__ranges/empty.h>
23	#include <type_traits>	24	#include <__type_traits/is_class.h>
		25	#include <__type_traits/make_unsigned.h>
		26	#include <__type_traits/remove_cv.h>
24		27
25	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
26	# pragma GCC system_header	29	# pragma GCC system_header
...	@@ -28,7 +31,7 @@	...	@@ -28,7 +31,7 @@
28		31
29	_LIBCPP_BEGIN_NAMESPACE_STD	32	_LIBCPP_BEGIN_NAMESPACE_STD
30		33
31	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	34	#if _LIBCPP_STD_VER > 17
32		35
33	namespace ranges {	36	namespace ranges {
34		37
...	@@ -99,7 +102,7 @@ public:	...	@@ -99,7 +102,7 @@ public:
99	constexpr auto size()	102	constexpr auto size()
100	requires forward_range<_D2> && sized_sentinel_for<sentinel_t<_D2>, iterator_t<_D2>>	103	requires forward_range<_D2> && sized_sentinel_for<sentinel_t<_D2>, iterator_t<_D2>>
101	{	104	{
102	return ranges::end(__derived()) - ranges::begin(__derived());	105	return std::__to_unsigned_like(ranges::end(__derived()) - ranges::begin(__derived()));
103	}	106	}
104		107
105	template<class _D2 = _Derived>	108	template<class _D2 = _Derived>
...	@@ -107,7 +110,7 @@ public:	...	@@ -107,7 +110,7 @@ public:
107	constexpr auto size() const	110	constexpr auto size() const
108	requires forward_range<const _D2> && sized_sentinel_for<sentinel_t<const _D2>, iterator_t<const _D2>>	111	requires forward_range<const _D2> && sized_sentinel_for<sentinel_t<const _D2>, iterator_t<const _D2>>
109	{	112	{
110	return ranges::end(__derived()) - ranges::begin(__derived());	113	return std::__to_unsigned_like(ranges::end(__derived()) - ranges::begin(__derived()));
111	}	114	}
112		115
113	template<class _D2 = _Derived>	116	template<class _D2 = _Derived>
...	@@ -167,7 +170,7 @@ public:	...	@@ -167,7 +170,7 @@ public:
167		170
168	} // namespace ranges	171	} // namespace ranges
169		172
170	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	173	#endif // _LIBCPP_STD_VER > 17
171		174
172	_LIBCPP_END_NAMESPACE_STD	175	_LIBCPP_END_NAMESPACE_STD
173		176

lib/libcxx/include/__ranges/views.h+2-2

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	21	#if _LIBCPP_STD_VER > 17
22		22
23	namespace ranges {	23	namespace ranges {
24		24
...	@@ -28,7 +28,7 @@ namespace views { }	...	@@ -28,7 +28,7 @@ namespace views { }
28		28
29	namespace views = ranges::views;	29	namespace views = ranges::views;
30		30
31	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	31	#endif // _LIBCPP_STD_VER > 17
32		32
33	_LIBCPP_END_NAMESPACE_STD	33	_LIBCPP_END_NAMESPACE_STD
34		34

lib/libcxx/include/__ranges/zip_view.h+6-5

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___RANGES_ZIP_VIEW_H	10	#ifndef _LIBCPP___RANGES_ZIP_VIEW_H
10	#define _LIBCPP___RANGES_ZIP_VIEW_H	11	#define _LIBCPP___RANGES_ZIP_VIEW_H
11		12
...	@@ -44,7 +45,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -44,7 +45,7 @@ _LIBCPP_PUSH_MACROS
44		45
45	_LIBCPP_BEGIN_NAMESPACE_STD	46	_LIBCPP_BEGIN_NAMESPACE_STD
46		47
47	#if _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	48	#if _LIBCPP_STD_VER > 20
48		49
49	namespace ranges {	50	namespace ranges {
50		51
...	@@ -402,15 +403,15 @@ public:	...	@@ -402,15 +403,15 @@ public:
402		403
403	_LIBCPP_HIDE_FROM_ABI	404	_LIBCPP_HIDE_FROM_ABI
404	friend constexpr auto iter_move(const __iterator& __i) noexcept(	405	friend constexpr auto iter_move(const __iterator& __i) noexcept(
405	(noexcept(ranges::iter_move(declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) && ...) &&	406	(noexcept(ranges::iter_move(std::declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) && ...) &&
406	(is_nothrow_move_constructible_v<range_rvalue_reference_t<__maybe_const<_Const, _Views>>> && ...)) {	407	(is_nothrow_move_constructible_v<range_rvalue_reference_t<__maybe_const<_Const, _Views>>> && ...)) {
407	return ranges::__tuple_transform(ranges::iter_move, __i.__current_);	408	return ranges::__tuple_transform(ranges::iter_move, __i.__current_);
408	}	409	}
409		410
410	_LIBCPP_HIDE_FROM_ABI	411	_LIBCPP_HIDE_FROM_ABI
411	friend constexpr void iter_swap(const __iterator& __l, const __iterator& __r) noexcept(	412	friend constexpr void iter_swap(const __iterator& __l, const __iterator& __r) noexcept(
412	(noexcept(ranges::iter_swap(declval<const iterator_t<__maybe_const<_Const, _Views>>&>(),	413	(noexcept(ranges::iter_swap(std::declval<const iterator_t<__maybe_const<_Const, _Views>>&>(),
413	declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) &&	414	std::declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) &&
414	...))	415	...))
415	requires(indirectly_swappable<iterator_t<__maybe_const<_Const, _Views>>> && ...) {	416	requires(indirectly_swappable<iterator_t<__maybe_const<_Const, _Views>>> && ...) {
416	ranges::__tuple_zip_for_each(ranges::iter_swap, __l.__current_, __r.__current_);	417	ranges::__tuple_zip_for_each(ranges::iter_swap, __l.__current_, __r.__current_);
...	@@ -502,7 +503,7 @@ inline namespace __cpo {	...	@@ -502,7 +503,7 @@ inline namespace __cpo {
502	} // namespace views	503	} // namespace views
503	} // namespace ranges	504	} // namespace ranges
504		505
505	#endif // _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	506	#endif // _LIBCPP_STD_VER > 20
506		507
507	_LIBCPP_END_NAMESPACE_STD	508	_LIBCPP_END_NAMESPACE_STD
508		509

lib/libcxx/include/__split_buffer+99-92

 @@ -17,11 +17,14 @@
 #include <__iterator/distance.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/move_iterator.h>
+#include <__memory/allocate_at_least.h>
 #include <__memory/allocator.h>
+#include <__memory/allocator_traits.h>
 #include <__memory/compressed_pair.h>
+#include <__memory/pointer_traits.h>
 #include <__memory/swap_allocator.h>
 #include <__utility/forward.h>
-#include <memory>
+#include <__utility/move.h>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -34,6 +37,10 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
+// __split_buffer allocates a contiguous chunk of memory and stores objects in the range [__begin_, __end_).
+// It has uninitialized memory in the ranges  [__first_, __begin_) and [__end_, __end_cap_.first()). That allows
+// it to grow both in the front and back without having to move the data.
 template <class _Tp, class _Allocator = allocator<_Tp> >
 struct __split_buffer
 {
 @@ -43,7 +50,7 @@ private:
 public:
     typedef _Tp                                             value_type;
     typedef _Allocator                                      allocator_type;
-    typedef typename remove_reference<allocator_type>::type __alloc_rr;
+    typedef __libcpp_remove_reference_t<allocator_type>     __alloc_rr;
     typedef allocator_traits<__alloc_rr>                    __alloc_traits;
     typedef value_type&                                     reference;
     typedef const value_type&                               const_reference;
 @@ -59,110 +66,110 @@ public:
     pointer                                         __end_;
     __compressed_pair<pointer, allocator_type> __end_cap_;
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_ref;
+    typedef __add_lvalue_reference_t<allocator_type> __alloc_ref;
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_const_ref;
+    typedef __add_lvalue_reference_t<allocator_type> __alloc_const_ref;
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY __alloc_rr&           __alloc() _NOEXCEPT         {return __end_cap_.second();}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __alloc_rr&           __alloc() _NOEXCEPT         {return __end_cap_.second();}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const __alloc_rr&     __alloc() const _NOEXCEPT   {return __end_cap_.second();}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const __alloc_rr&     __alloc() const _NOEXCEPT   {return __end_cap_.second();}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY pointer&              __end_cap() _NOEXCEPT       {return __end_cap_.first();}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer&              __end_cap() _NOEXCEPT       {return __end_cap_.first();}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const pointer&        __end_cap() const _NOEXCEPT {return __end_cap_.first();}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const pointer&        __end_cap() const _NOEXCEPT {return __end_cap_.first();}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     __split_buffer()
         _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     explicit __split_buffer(__alloc_rr& __a);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     explicit __split_buffer(const __alloc_rr& __a);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __split_buffer(size_type __cap, size_type __start, __alloc_rr& __a);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer(size_type __cap, size_type __start, __alloc_rr& __a);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 ~__split_buffer();
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~__split_buffer();
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __split_buffer(__split_buffer&& __c)
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer(__split_buffer&& __c)
         _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __split_buffer(__split_buffer&& __c, const __alloc_rr& __a);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer(__split_buffer&& __c, const __alloc_rr& __a);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __split_buffer& operator=(__split_buffer&& __c)
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer& operator=(__split_buffer&& __c)
         _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
                 is_nothrow_move_assignable<allocator_type>::value) ||
                !__alloc_traits::propagate_on_container_move_assignment::value);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY       iterator begin() _NOEXCEPT       {return __begin_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI       iterator begin() _NOEXCEPT       {return __begin_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_iterator begin() const _NOEXCEPT {return __begin_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT {return __begin_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY       iterator end() _NOEXCEPT         {return __end_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI       iterator end() _NOEXCEPT         {return __end_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_iterator end() const _NOEXCEPT   {return __end_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT   {return __end_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     void clear() _NOEXCEPT
         {__destruct_at_end(__begin_);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY size_type size() const {return static_cast<size_type>(__end_ - __begin_);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type size() const {return static_cast<size_type>(__end_ - __begin_);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY bool empty()     const {return __end_ == __begin_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool empty()     const {return __end_ == __begin_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return static_cast<size_type>(__end_cap() - __first_);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type capacity() const {return static_cast<size_type>(__end_cap() - __first_);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY size_type __front_spare() const {return static_cast<size_type>(__begin_ - __first_);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __front_spare() const {return static_cast<size_type>(__begin_ - __first_);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY size_type __back_spare() const {return static_cast<size_type>(__end_cap() - __end_);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __back_spare() const {return static_cast<size_type>(__end_cap() - __end_);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY       reference front()       {return *__begin_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI       reference front()       {return *__begin_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_reference front() const {return *__begin_;}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference front() const {return *__begin_;}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY       reference back()        {return *(__end_ - 1);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI       reference back()        {return *(__end_ - 1);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_reference back() const  {return *(__end_ - 1);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const  {return *(__end_ - 1);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void reserve(size_type __n);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void reserve(size_type __n);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void shrink_to_fit() _NOEXCEPT;
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void shrink_to_fit() _NOEXCEPT;
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void push_front(const_reference __x);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_front(const_reference __x);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_back(const_reference __x);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void push_front(value_type&& __x);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_front(value_type&& __x);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void push_back(value_type&& __x);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_back(value_type&& __x);
     template <class... _Args>
-        _LIBCPP_CONSTEXPR_AFTER_CXX17 void emplace_back(_Args&&... __args);
+        _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void emplace_back(_Args&&... __args);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void pop_front() {__destruct_at_begin(__begin_+1);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void pop_front() {__destruct_at_begin(__begin_+1);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void pop_back() {__destruct_at_end(__end_-1);}
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void pop_back() {__destruct_at_end(__end_-1);}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_at_end(size_type __n);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __construct_at_end(size_type __n);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_at_end(size_type __n, const_reference __x);
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __construct_at_end(size_type __n, const_reference __x);
     template <class _InputIter>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIter>::value>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIter>::value>
         __construct_at_end(_InputIter __first, _InputIter __last);
     template <class _ForwardIterator>
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value>
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value>
         __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void __destruct_at_begin(pointer __new_begin)
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __destruct_at_begin(pointer __new_begin)
         {__destruct_at_begin(__new_begin, is_trivially_destructible<value_type>());}
-        _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+        _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
         void __destruct_at_begin(pointer __new_begin, false_type);
-        _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+        _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
         void __destruct_at_begin(pointer __new_begin, true_type);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     void __destruct_at_end(pointer __new_last) _NOEXCEPT
         {__destruct_at_end(__new_last, false_type());}
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
         void __destruct_at_end(pointer __new_last, false_type) _NOEXCEPT;
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
         void __destruct_at_end(pointer __new_last, true_type) _NOEXCEPT;
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 void swap(__split_buffer& __x)
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void swap(__split_buffer& __x)
         _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
                    __is_nothrow_swappable<__alloc_rr>::value);
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 bool __invariants() const;
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const;
 private:
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     void __move_assign_alloc(__split_buffer& __c, true_type)
         _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
         {
             __alloc() = _VSTD::move(__c.__alloc());
         }
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
     void __move_assign_alloc(__split_buffer&, false_type) _NOEXCEPT
         {}
     struct _ConstructTransaction {
-      _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit _ConstructTransaction(pointer* __p, size_type __n) _NOEXCEPT
+      _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit _ConstructTransaction(pointer* __p, size_type __n) _NOEXCEPT
       : __pos_(*__p), __end_(*__p + __n), __dest_(__p) {
       }
-      _LIBCPP_CONSTEXPR_AFTER_CXX17 ~_ConstructTransaction() {
+      _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~_ConstructTransaction() {
         *__dest_ = __pos_;
       }
       pointer __pos_;
 @@ -173,7 +180,7 @@ private:
 };
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 bool
 __split_buffer<_Tp, _Allocator>::__invariants() const
 {
 @@ -204,7 +211,7 @@ __split_buffer<_Tp, _Allocator>::__invariants() const
 //  Precondition:  size() + __n <= capacity()
 //  Postcondition:  size() == size() + __n
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n)
 {
 @@ -221,7 +228,7 @@ __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n)
 //  Postcondition:  size() == old size() + __n
 //  Postcondition:  [i] == __x for all i in [size() - __n, __n)
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
 {
 @@ -234,7 +241,7 @@ __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n, const_referen
 template <class _Tp, class _Allocator>
 template <class _InputIter>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIter>::value>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIter>::value>
 __split_buffer<_Tp, _Allocator>::__construct_at_end(_InputIter __first, _InputIter __last)
 {
     __alloc_rr& __a = this->__alloc();
 @@ -257,7 +264,7 @@ __split_buffer<_Tp, _Allocator>::__construct_at_end(_InputIter __first, _InputIt
 template <class _Tp, class _Allocator>
 template <class _ForwardIterator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17 __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value>
+_LIBCPP_CONSTEXPR_SINCE_CXX20 __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value>
 __split_buffer<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
 {
     _ConstructTransaction __tx(&this->__end_, _VSTD::distance(__first, __last));
 @@ -268,7 +275,7 @@ __split_buffer<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _F
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 inline
 void
 __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type)
 @@ -278,7 +285,7 @@ __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 inline
 void
 __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, true_type)
 @@ -287,8 +294,8 @@ __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, true_t
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
 void
 __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT
 {
 @@ -297,8 +304,8 @@ __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_typ
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
 void
 __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, true_type) _NOEXCEPT
 {
 @@ -306,7 +313,7 @@ __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, true_type
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __start, __alloc_rr& __a)
     : __end_cap_(nullptr, __a)
 {
 @@ -322,7 +329,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __sta
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 inline
 __split_buffer<_Tp, _Allocator>::__split_buffer()
     _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
 @@ -331,7 +338,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer()
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 inline
 __split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a)
     : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
 @@ -339,7 +346,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 inline
 __split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a)
     : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
 @@ -347,7 +354,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 __split_buffer<_Tp, _Allocator>::~__split_buffer()
 {
     clear();
 @@ -356,7 +363,7 @@ __split_buffer<_Tp, _Allocator>::~__split_buffer()
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c)
     _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
     : __first_(_VSTD::move(__c.__first_)),
 @@ -371,7 +378,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a)
     : __end_cap_(nullptr, __a)
 {
 @@ -398,7 +405,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __al
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 __split_buffer<_Tp, _Allocator>&
 __split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
     _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
 @@ -419,7 +426,7 @@ __split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::swap(__split_buffer& __x)
         _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
 @@ -433,7 +440,7 @@ __split_buffer<_Tp, _Allocator>::swap(__split_buffer& __x)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::reserve(size_type __n)
 {
 @@ -450,7 +457,7 @@ __split_buffer<_Tp, _Allocator>::reserve(size_type __n)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
 {
 @@ -478,7 +485,7 @@ __split_buffer<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
 {
 @@ -493,7 +500,7 @@ __split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
         }
         else
         {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
+            size_type __c = std::max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
             __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
             __t.__construct_at_end(move_iterator<pointer>(__begin_),
                                    move_iterator<pointer>(__end_));
 @@ -508,7 +515,7 @@ __split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
 {
 @@ -523,7 +530,7 @@ __split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
         }
         else
         {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
+            size_type __c = std::max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
             __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
             __t.__construct_at_end(move_iterator<pointer>(__begin_),
                                    move_iterator<pointer>(__end_));
 @@ -539,8 +546,8 @@ __split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
 void
 __split_buffer<_Tp, _Allocator>::push_back(const_reference __x)
 {
 @@ -555,7 +562,7 @@ __split_buffer<_Tp, _Allocator>::push_back(const_reference __x)
         }
         else
         {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
+            size_type __c = std::max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
             __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
             __t.__construct_at_end(move_iterator<pointer>(__begin_),
                                    move_iterator<pointer>(__end_));
 @@ -570,7 +577,7 @@ __split_buffer<_Tp, _Allocator>::push_back(const_reference __x)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::push_back(value_type&& __x)
 {
 @@ -585,7 +592,7 @@ __split_buffer<_Tp, _Allocator>::push_back(value_type&& __x)
         }
         else
         {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
+            size_type __c = std::max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
             __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
             __t.__construct_at_end(move_iterator<pointer>(__begin_),
                                    move_iterator<pointer>(__end_));
 @@ -602,7 +609,7 @@ __split_buffer<_Tp, _Allocator>::push_back(value_type&& __x)
 template <class _Tp, class _Allocator>
 template <class... _Args>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
 void
 __split_buffer<_Tp, _Allocator>::emplace_back(_Args&&... __args)
 {
 @@ -617,7 +624,7 @@ __split_buffer<_Tp, _Allocator>::emplace_back(_Args&&... __args)
         }
         else
         {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
+            size_type __c = std::max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
             __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
             __t.__construct_at_end(move_iterator<pointer>(__begin_),
                                    move_iterator<pointer>(__end_));
 @@ -633,8 +640,8 @@ __split_buffer<_Tp, _Allocator>::emplace_back(_Args&&... __args)
 }
 template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_AFTER_CXX17
+_LIBCPP_CONSTEXPR_SINCE_CXX20
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
 void
 swap(__split_buffer<_Tp, _Allocator>& __x, __split_buffer<_Tp, _Allocator>& __y)
         _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))

lib/libcxx/include/__string/char_traits.h+229-320

...	@@ -14,14 +14,16 @@	...	@@ -14,14 +14,16 @@
14	#include <__algorithm/find_end.h>	14	#include <__algorithm/find_end.h>
15	#include <__algorithm/find_first_of.h>	15	#include <__algorithm/find_first_of.h>
16	#include <__algorithm/min.h>	16	#include <__algorithm/min.h>
		17	#include <__compare/ordering.h>
17	#include <__config>	18	#include <__config>
18	#include <__functional/hash.h>	19	#include <__functional/hash.h>
19	#include <__iterator/iterator_traits.h>	20	#include <__iterator/iterator_traits.h>
		21	#include <__type_traits/is_constant_evaluated.h>
		22	#include <cstddef>
20	#include <cstdint>	23	#include <cstdint>
21	#include <cstdio>	24	#include <cstdio>
22	#include <cstring>	25	#include <cstring>
23	#include <iosfwd>	26	#include <iosfwd>
24	#include <type_traits>
25		27
26	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	28	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
27	# include <cwchar> // for wmemcpy	29	# include <cwchar> // for wmemcpy
...	@@ -37,35 +39,124 @@ _LIBCPP_PUSH_MACROS	...	@@ -37,35 +39,124 @@ _LIBCPP_PUSH_MACROS
37	_LIBCPP_BEGIN_NAMESPACE_STD	39	_LIBCPP_BEGIN_NAMESPACE_STD
38		40
39	template <class _CharT>	41	template <class _CharT>
40	struct _LIBCPP_TEMPLATE_VIS char_traits	42	struct char_traits;
		43	/*
		44	The Standard does not define the base template for char_traits because it is impossible to provide
		45	a correct definition for arbitrary character types. Instead, it requires implementations to provide
		46	specializations for predefined character types like `char`, `wchar_t` and others. We provide this as
		47	exposition-only to document what members a char_traits specialization should provide:
		48	{
		49	using char_type = _CharT;
		50	using int_type = ...;
		51	using off_type = ...;
		52	using pos_type = ...;
		53	using state_type = ...;
		54
		55	static void assign(char_type&, const char_type&);
		56	static bool eq(char_type, char_type);
		57	static bool lt(char_type, char_type);
		58
		59	static int compare(const char_type, const char_type, size_t);
		60	static size_t length(const char_type*);
		61	static const char_type* find(const char_type*, size_t, const char_type&);
		62	static char_type* move(char_type, const char_type, size_t);
		63	static char_type* copy(char_type, const char_type, size_t);
		64	static char_type* assign(char_type*, size_t, char_type);
		65
		66	static int_type not_eof(int_type);
		67	static char_type to_char_type(int_type);
		68	static int_type to_int_type(char_type);
		69	static bool eq_int_type(int_type, int_type);
		70	static int_type eof();
		71	};
		72	*/
		73
		74	//
		75	// Temporary extension to provide a base template for std::char_traits.
		76	// TODO: Remove in LLVM 18.
		77	//
		78	template <class _CharT>
		79	struct _LIBCPP_DEPRECATED_("char_traits<T> for T not equal to char, wchar_t, char8_t, char16_t or char32_t is non-standard and is provided for a temporary period. It will be removed in LLVM 18, so please migrate off of it.")
		80	char_traits
41	{	81	{
42	typedef _CharT char_type;	82	using char_type = _CharT;
43	typedef int int_type;	83	using int_type = int;
44	typedef streamoff off_type;	84	using off_type = streamoff;
45	typedef streampos pos_type;	85	using pos_type = streampos;
46	typedef mbstate_t state_type;	86	using state_type = mbstate_t;
47		87
48	static inline void _LIBCPP_CONSTEXPR_AFTER_CXX14	88	static inline void _LIBCPP_CONSTEXPR_SINCE_CXX17
49	assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}	89	assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}
50	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT	90	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
51	{return __c1 == __c2;}	91	{return __c1 == __c2;}
52	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT	92	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
53	{return __c1 < __c2;}	93	{return __c1 < __c2;}
54		94
55	static _LIBCPP_CONSTEXPR_AFTER_CXX14	95	static _LIBCPP_CONSTEXPR_SINCE_CXX17
56	int compare(const char_type* __s1, const char_type* __s2, size_t __n);	96	int compare(const char_type* __s1, const char_type* __s2, size_t __n) {
57	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	97	for (; __n; --__n, ++__s1, ++__s2)
58	size_t length(const char_type* __s);	98	{
59	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	99	if (lt(__s1, __s2))
60	const char_type* find(const char_type* __s, size_t __n, const char_type& __a);	100	return -1;
61	static _LIBCPP_CONSTEXPR_AFTER_CXX17	101	if (lt(__s2, __s1))
62	char_type* move(char_type* __s1, const char_type* __s2, size_t __n);	102	return 1;
		103	}
		104	return 0;
		105	}
		106	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
		107	size_t length(const char_type* __s) {
		108	size_t __len = 0;
		109	for (; !eq(*__s, char_type(0)); ++__s)
		110	++__len;
		111	return __len;
		112	}
		113	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
		114	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) {
		115	for (; __n; --__n)
		116	{
		117	if (eq(*__s, __a))
		118	return __s;
		119	++__s;
		120	}
		121	return nullptr;
		122	}
		123	static _LIBCPP_CONSTEXPR_SINCE_CXX20
		124	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) {
		125	if (__n == 0) return __s1;
		126	char_type* __r = __s1;
		127	if (__s1 < __s2)
		128	{
		129	for (; __n; --__n, ++__s1, ++__s2)
		130	assign(__s1, __s2);
		131	}
		132	else if (__s2 < __s1)
		133	{
		134	__s1 += __n;
		135	__s2 += __n;
		136	for (; __n; --__n)
		137	assign(--__s1, --__s2);
		138	}
		139	return __r;
		140	}
63	_LIBCPP_INLINE_VISIBILITY	141	_LIBCPP_INLINE_VISIBILITY
64	static _LIBCPP_CONSTEXPR_AFTER_CXX17	142	static _LIBCPP_CONSTEXPR_SINCE_CXX20
65	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n);	143	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) {
		144	if (!__libcpp_is_constant_evaluated()) {
		145	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
		146	}
		147	char_type* __r = __s1;
		148	for (; __n; --__n, ++__s1, ++__s2)
		149	assign(__s1, __s2);
		150	return __r;
		151	}
66	_LIBCPP_INLINE_VISIBILITY	152	_LIBCPP_INLINE_VISIBILITY
67	static _LIBCPP_CONSTEXPR_AFTER_CXX17	153	static _LIBCPP_CONSTEXPR_SINCE_CXX20
68	char_type* assign(char_type* __s, size_t __n, char_type __a);	154	char_type* assign(char_type* __s, size_t __n, char_type __a) {
		155	char_type* __r = __s;
		156	for (; __n; --__n, ++__s)
		157	assign(*__s, __a);
		158	return __r;
		159	}
69		160
70	static inline _LIBCPP_CONSTEXPR int_type not_eof(int_type __c) _NOEXCEPT	161	static inline _LIBCPP_CONSTEXPR int_type not_eof(int_type __c) _NOEXCEPT
71	{return eq_int_type(__c, eof()) ? ~eof() : __c;}	162	{return eq_int_type(__c, eof()) ? ~eof() : __c;}
...	@@ -80,92 +171,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits	...	@@ -80,92 +171,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits
80	};	171	};
81		172
82	template <class _CharT>	173	template <class _CharT>
83	_LIBCPP_CONSTEXPR_AFTER_CXX14 int	174	_LIBCPP_HIDE_FROM_ABI static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
84	char_traits<_CharT>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
85	{
86	for (; __n; --__n, ++__s1, ++__s2)
87	{
88	if (lt(__s1, __s2))
89	return -1;
90	if (lt(__s2, __s1))
91	return 1;
92	}
93	return 0;
94	}
95
96	template <class _CharT>
97	inline
98	_LIBCPP_CONSTEXPR_AFTER_CXX14 size_t
99	char_traits<_CharT>::length(const char_type* __s)
100	{
101	size_t __len = 0;
102	for (; !eq(*__s, char_type(0)); ++__s)
103	++__len;
104	return __len;
105	}
106
107	template <class _CharT>
108	inline
109	_LIBCPP_CONSTEXPR_AFTER_CXX14 const _CharT*
110	char_traits<_CharT>::find(const char_type* __s, size_t __n, const char_type& __a)
111	{
112	for (; __n; --__n)
113	{
114	if (eq(*__s, __a))
115	return __s;
116	++__s;
117	}
118	return nullptr;
119	}
120
121	template <class _CharT>
122	_LIBCPP_CONSTEXPR_AFTER_CXX17 _CharT*
123	char_traits<_CharT>::move(char_type* __s1, const char_type* __s2, size_t __n)
124	{
125	if (__n == 0) return __s1;
126	char_type* __r = __s1;
127	if (__s1 < __s2)
128	{
129	for (; __n; --__n, ++__s1, ++__s2)
130	assign(__s1, __s2);
131	}
132	else if (__s2 < __s1)
133	{
134	__s1 += __n;
135	__s2 += __n;
136	for (; __n; --__n)
137	assign(--__s1, --__s2);
138	}
139	return __r;
140	}
141
142	template <class _CharT>
143	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
144	_CharT*
145	char_traits<_CharT>::copy(char_type* __s1, const char_type* __s2, size_t __n)
146	{
147	if (!__libcpp_is_constant_evaluated()) {
148	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
149	}
150	char_type* __r = __s1;
151	for (; __n; --__n, ++__s1, ++__s2)
152	assign(__s1, __s2);
153	return __r;
154	}
155
156	template <class _CharT>
157	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
158	_CharT*
159	char_traits<_CharT>::assign(char_type* __s, size_t __n, char_type __a)
160	{
161	char_type* __r = __s;
162	for (; __n; --__n, ++__s)
163	assign(*__s, __a);
164	return __r;
165	}
166
167	template <class _CharT>
168	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17
169	_CharT* __char_traits_move(_CharT* __dest, const _CharT* __source, size_t __n) _NOEXCEPT	175	_CharT* __char_traits_move(_CharT* __dest, const _CharT* __source, size_t __n) _NOEXCEPT
170	{	176	{
171	#ifdef _LIBCPP_COMPILER_GCC	177	#ifdef _LIBCPP_COMPILER_GCC
...	@@ -188,45 +194,45 @@ _CharT* __char_traits_move(_CharT* __dest, const _CharT* __source, size_t __n) _	...	@@ -188,45 +194,45 @@ _CharT* __char_traits_move(_CharT* __dest, const _CharT* __source, size_t __n) _
188	template <>	194	template <>
189	struct _LIBCPP_TEMPLATE_VIS char_traits<char>	195	struct _LIBCPP_TEMPLATE_VIS char_traits<char>
190	{	196	{
191	typedef char char_type;	197	using char_type = char;
192	typedef int int_type;	198	using int_type = int;
193	typedef streamoff off_type;	199	using off_type = streamoff;
194	typedef streampos pos_type;	200	using pos_type = streampos;
195	typedef mbstate_t state_type;	201	using state_type = mbstate_t;
		202	#if _LIBCPP_STD_VER > 17
		203	using comparison_category = strong_ordering;
		204	#endif
196		205
197	static inline _LIBCPP_CONSTEXPR_AFTER_CXX14	206	static inline _LIBCPP_CONSTEXPR_SINCE_CXX17
198	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}	207	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}
199	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT	208	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
200	{return __c1 == __c2;}	209	{return __c1 == __c2;}
201	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT	210	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
202	{return (unsigned char)__c1 < (unsigned char)__c2;}	211	{return (unsigned char)__c1 < (unsigned char)__c2;}
203		212
204	static _LIBCPP_CONSTEXPR_AFTER_CXX14	213	static _LIBCPP_CONSTEXPR_SINCE_CXX17 int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
205	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;	214	if (__n == 0)
		215	return 0;
		216	return std::__constexpr_memcmp(__s1, __s2, __n);
		217	}
206		218
207	static inline size_t _LIBCPP_CONSTEXPR_AFTER_CXX14 length(const char_type* __s) _NOEXCEPT {	219	static inline size_t _LIBCPP_CONSTEXPR_SINCE_CXX17 length(const char_type* __s) _NOEXCEPT {
208	// GCC currently does not support __builtin_strlen during constant evaluation.	220	return std::__constexpr_strlen(__s);
209	// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70816	221	}
210	#ifdef _LIBCPP_COMPILER_GCC
211	if (__libcpp_is_constant_evaluated()) {
212	size_t __i = 0;
213	for (; __s[__i] != char_type('\0'); ++__i)
214	;
215	return __i;
216	}
217	#endif
218	return __builtin_strlen(__s);
219	}
220		222
221	static _LIBCPP_CONSTEXPR_AFTER_CXX14	223	static _LIBCPP_CONSTEXPR_SINCE_CXX17
222	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;	224	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT {
		225	if (__n == 0)
		226	return nullptr;
		227	return std::__constexpr_char_memchr(__s, static_cast<int>(__a), __n);
		228	}
223		229
224	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	230	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
225	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	231	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
226	return std::__char_traits_move(__s1, __s2, __n);	232	return std::__char_traits_move(__s1, __s2, __n);
227	}	233	}
228		234
229	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	235	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
230	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	236	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
231	if (!__libcpp_is_constant_evaluated())	237	if (!__libcpp_is_constant_evaluated())
232	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");	238	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
...	@@ -234,7 +240,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>	...	@@ -234,7 +240,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>
234	return __s1;	240	return __s1;
235	}	241	}
236		242
237	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	243	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
238	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {	244	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {
239	std::fill_n(__s, __n, __a);	245	std::fill_n(__s, __n, __a);
240	return __s;	246	return __s;
...	@@ -252,82 +258,51 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>	...	@@ -252,82 +258,51 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>
252	{return int_type(EOF);}	258	{return int_type(EOF);}
253	};	259	};
254		260
255	inline _LIBCPP_CONSTEXPR_AFTER_CXX14
256	int
257	char_traits<char>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
258	{
259	if (__n == 0)
260	return 0;
261	#if __has_feature(cxx_constexpr_string_builtins)
262	return __builtin_memcmp(__s1, __s2, __n);
263	#elif _LIBCPP_STD_VER <= 14
264	return _VSTD::memcmp(__s1, __s2, __n);
265	#else
266	for (; __n; --__n, ++__s1, ++__s2)
267	{
268	if (lt(__s1, __s2))
269	return -1;
270	if (lt(__s2, __s1))
271	return 1;
272	}
273	return 0;
274	#endif
275	}
276
277	inline _LIBCPP_CONSTEXPR_AFTER_CXX14
278	const char*
279	char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT
280	{
281	if (__n == 0)
282	return nullptr;
283	#if __has_feature(cxx_constexpr_string_builtins)
284	return __builtin_char_memchr(__s, to_int_type(__a), __n);
285	#elif _LIBCPP_STD_VER <= 14
286	return (const char_type*) _VSTD::memchr(__s, to_int_type(__a), __n);
287	#else
288	for (; __n; --__n)
289	{
290	if (eq(*__s, __a))
291	return __s;
292	++__s;
293	}
294	return nullptr;
295	#endif
296	}
297
298
299	// char_traits<wchar_t>	261	// char_traits<wchar_t>
300		262
301	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	263	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
302	template <>	264	template <>
303	struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>	265	struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>
304	{	266	{
305	typedef wchar_t char_type;	267	using char_type = wchar_t;
306	typedef wint_t int_type;	268	using int_type = wint_t;
307	typedef streamoff off_type;	269	using off_type = streamoff;
308	typedef streampos pos_type;	270	using pos_type = streampos;
309	typedef mbstate_t state_type;	271	using state_type = mbstate_t;
		272	#if _LIBCPP_STD_VER > 17
		273	using comparison_category = strong_ordering;
		274	#endif
310		275
311	static inline _LIBCPP_CONSTEXPR_AFTER_CXX14	276	static inline _LIBCPP_CONSTEXPR_SINCE_CXX17
312	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}	277	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}
313	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT	278	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
314	{return __c1 == __c2;}	279	{return __c1 == __c2;}
315	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT	280	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
316	{return __c1 < __c2;}	281	{return __c1 < __c2;}
317		282
318	static _LIBCPP_CONSTEXPR_AFTER_CXX14	283	static _LIBCPP_CONSTEXPR_SINCE_CXX17 int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
319	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;	284	if (__n == 0)
320	static _LIBCPP_CONSTEXPR_AFTER_CXX14	285	return 0;
321	size_t length(const char_type* __s) _NOEXCEPT;	286	return std::__constexpr_wmemcmp(__s1, __s2, __n);
322	static _LIBCPP_CONSTEXPR_AFTER_CXX14	287	}
323	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;	288
		289	static _LIBCPP_CONSTEXPR_SINCE_CXX17 size_t length(const char_type* __s) _NOEXCEPT {
		290	return std::__constexpr_wcslen(__s);
		291	}
		292
		293	static _LIBCPP_CONSTEXPR_SINCE_CXX17
		294	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT {
		295	if (__n == 0)
		296	return nullptr;
		297	return std::__constexpr_wmemchr(__s, __a, __n);
		298	}
324		299
325	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	300	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
326	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	301	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
327	return std::__char_traits_move(__s1, __s2, __n);	302	return std::__char_traits_move(__s1, __s2, __n);
328	}	303	}
329		304
330	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	305	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
331	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	306	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
332	if (!__libcpp_is_constant_evaluated())	307	if (!__libcpp_is_constant_evaluated())
333	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");	308	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
...	@@ -335,7 +310,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>	...	@@ -335,7 +310,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>
335	return __s1;	310	return __s1;
336	}	311	}
337		312
338	static inline _LIBCPP_CONSTEXPR_AFTER_CXX17	313	static inline _LIBCPP_CONSTEXPR_SINCE_CXX20
339	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {	314	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {
340	std::fill_n(__s, __n, __a);	315	std::fill_n(__s, __n, __a);
341	return __s;	316	return __s;
...	@@ -352,65 +327,6 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>	...	@@ -352,65 +327,6 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<wchar_t>
352	static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT	327	static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
353	{return int_type(WEOF);}	328	{return int_type(WEOF);}
354	};	329	};
355
356	inline _LIBCPP_CONSTEXPR_AFTER_CXX14
357	int
358	char_traits<wchar_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
359	{
360	if (__n == 0)
361	return 0;
362	#if __has_feature(cxx_constexpr_string_builtins)
363	return __builtin_wmemcmp(__s1, __s2, __n);
364	#elif _LIBCPP_STD_VER <= 14
365	return _VSTD::wmemcmp(__s1, __s2, __n);
366	#else
367	for (; __n; --__n, ++__s1, ++__s2)
368	{
369	if (lt(__s1, __s2))
370	return -1;
371	if (lt(__s2, __s1))
372	return 1;
373	}
374	return 0;
375	#endif
376	}
377
378	inline _LIBCPP_CONSTEXPR_AFTER_CXX14
379	size_t
380	char_traits<wchar_t>::length(const char_type* __s) _NOEXCEPT
381	{
382	#if __has_feature(cxx_constexpr_string_builtins)
383	return __builtin_wcslen(__s);
384	#elif _LIBCPP_STD_VER <= 14
385	return _VSTD::wcslen(__s);
386	#else
387	size_t __len = 0;
388	for (; !eq(*__s, char_type(0)); ++__s)
389	++__len;
390	return __len;
391	#endif
392	}
393
394	inline _LIBCPP_CONSTEXPR_AFTER_CXX14
395	const wchar_t*
396	char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT
397	{
398	if (__n == 0)
399	return nullptr;
400	#if __has_feature(cxx_constexpr_string_builtins)
401	return __builtin_wmemchr(__s, __a, __n);
402	#elif _LIBCPP_STD_VER <= 14
403	return _VSTD::wmemchr(__s, __a, __n);
404	#else
405	for (; __n; --__n)
406	{
407	if (eq(*__s, __a))
408	return __s;
409	++__s;
410	}
411	return nullptr;
412	#endif
413	}
414	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS	330	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
415		331
416	#ifndef _LIBCPP_HAS_NO_CHAR8_T	332	#ifndef _LIBCPP_HAS_NO_CHAR8_T
...	@@ -418,11 +334,14 @@ char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __	...	@@ -418,11 +334,14 @@ char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __
418	template <>	334	template <>
419	struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>	335	struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
420	{	336	{
421	typedef char8_t char_type;	337	using char_type = char8_t;
422	typedef unsigned int int_type;	338	using int_type = unsigned int;
423	typedef streamoff off_type;	339	using off_type = streamoff;
424	typedef u8streampos pos_type;	340	using pos_type = u8streampos;
425	typedef mbstate_t state_type;	341	using state_type = mbstate_t;
		342	#if _LIBCPP_STD_VER > 17
		343	using comparison_category = strong_ordering;
		344	#endif
426		345
427	static inline constexpr void assign(char_type& __c1, const char_type& __c2) noexcept	346	static inline constexpr void assign(char_type& __c1, const char_type& __c2) noexcept
428	{__c1 = __c2;}	347	{__c1 = __c2;}
...	@@ -431,8 +350,10 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>	...	@@ -431,8 +350,10 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
431	static inline constexpr bool lt(char_type __c1, char_type __c2) noexcept	350	static inline constexpr bool lt(char_type __c1, char_type __c2) noexcept
432	{return __c1 < __c2;}	351	{return __c1 < __c2;}
433		352
434	static constexpr	353	static _LIBCPP_HIDE_FROM_ABI constexpr int
435	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;	354	compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
		355	return std::__constexpr_memcmp(__s1, __s2, __n);
		356	}
436		357
437	static constexpr	358	static constexpr
438	size_t length(const char_type* __s) _NOEXCEPT;	359	size_t length(const char_type* __s) _NOEXCEPT;
...	@@ -440,12 +361,12 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>	...	@@ -440,12 +361,12 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
440	_LIBCPP_INLINE_VISIBILITY static constexpr	361	_LIBCPP_INLINE_VISIBILITY static constexpr
441	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;	362	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;
442		363
443	static _LIBCPP_CONSTEXPR_AFTER_CXX17	364	static _LIBCPP_CONSTEXPR_SINCE_CXX20
444	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	365	char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
445	return std::__char_traits_move(__s1, __s2, __n);	366	return std::__char_traits_move(__s1, __s2, __n);
446	}	367	}
447		368
448	static _LIBCPP_CONSTEXPR_AFTER_CXX17	369	static _LIBCPP_CONSTEXPR_SINCE_CXX20
449	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	370	char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
450	if (!__libcpp_is_constant_evaluated())	371	if (!__libcpp_is_constant_evaluated())
451	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");	372	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
...	@@ -453,7 +374,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>	...	@@ -453,7 +374,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
453	return __s1;	374	return __s1;
454	}	375	}
455		376
456	static _LIBCPP_CONSTEXPR_AFTER_CXX17	377	static _LIBCPP_CONSTEXPR_SINCE_CXX20
457	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {	378	char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {
458	std::fill_n(__s, __n, __a);	379	std::fill_n(__s, __n, __a);
459	return __s;	380	return __s;
...	@@ -482,24 +403,6 @@ char_traits<char8_t>::length(const char_type* __s) _NOEXCEPT	...	@@ -482,24 +403,6 @@ char_traits<char8_t>::length(const char_type* __s) _NOEXCEPT
482	return __len;	403	return __len;
483	}	404	}
484		405
485	inline constexpr
486	int
487	char_traits<char8_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
488	{
489	#if __has_feature(cxx_constexpr_string_builtins)
490	return __builtin_memcmp(__s1, __s2, __n);
491	#else
492	for (; __n; --__n, ++__s1, ++__s2)
493	{
494	if (lt(__s1, __s2))
495	return -1;
496	if (lt(__s2, __s1))
497	return 1;
498	}
499	return 0;
500	#endif
501	}
502
503	// TODO use '__builtin_char_memchr' if it ever supports char8_t ??	406	// TODO use '__builtin_char_memchr' if it ever supports char8_t ??
504	inline constexpr	407	inline constexpr
505	const char8_t*	408	const char8_t*
...	@@ -519,32 +422,35 @@ char_traits<char8_t>::find(const char_type* __s, size_t __n, const char_type& __	...	@@ -519,32 +422,35 @@ char_traits<char8_t>::find(const char_type* __s, size_t __n, const char_type& __
519	template <>	422	template <>
520	struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>	423	struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>
521	{	424	{
522	typedef char16_t char_type;	425	using char_type = char16_t;
523	typedef uint_least16_t int_type;	426	using int_type = uint_least16_t;
524	typedef streamoff off_type;	427	using off_type = streamoff;
525	typedef u16streampos pos_type;	428	using pos_type = u16streampos;
526	typedef mbstate_t state_type;	429	using state_type = mbstate_t;
		430	#if _LIBCPP_STD_VER > 17
		431	using comparison_category = strong_ordering;
		432	#endif
527		433
528	static inline _LIBCPP_CONSTEXPR_AFTER_CXX14	434	static inline _LIBCPP_CONSTEXPR_SINCE_CXX17
529	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}	435	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}
530	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT	436	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
531	{return __c1 == __c2;}	437	{return __c1 == __c2;}
532	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT	438	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
533	{return __c1 < __c2;}	439	{return __c1 < __c2;}
534		440
535	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	441	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
536	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;	442	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;
537	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	443	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
538	size_t length(const char_type* __s) _NOEXCEPT;	444	size_t length(const char_type* __s) _NOEXCEPT;
539	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	445	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
540	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;	446	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;
541		447
542	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	448	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
543	static char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	449	static char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
544	return std::__char_traits_move(__s1, __s2, __n);	450	return std::__char_traits_move(__s1, __s2, __n);
545	}	451	}
546		452
547	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	453	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
548	static char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	454	static char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
549	if (!__libcpp_is_constant_evaluated())	455	if (!__libcpp_is_constant_evaluated())
550	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");	456	_LIBCPP_ASSERT(__s2 < __s1 \|\| __s2 >= __s1+__n, "char_traits::copy overlapped range");
...	@@ -552,7 +458,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>	...	@@ -552,7 +458,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>
552	return __s1;	458	return __s1;
553	}	459	}
554		460
555	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	461	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
556	static char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {	462	static char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {
557	std::fill_n(__s, __n, __a);	463	std::fill_n(__s, __n, __a);
558	return __s;	464	return __s;
...	@@ -570,7 +476,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>	...	@@ -570,7 +476,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char16_t>
570	{return int_type(0xFFFF);}	476	{return int_type(0xFFFF);}
571	};	477	};
572		478
573	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	479	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
574	int	480	int
575	char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT	481	char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
576	{	482	{
...	@@ -584,7 +490,7 @@ char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, siz	...	@@ -584,7 +490,7 @@ char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, siz
584	return 0;	490	return 0;
585	}	491	}
586		492
587	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	493	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
588	size_t	494	size_t
589	char_traits<char16_t>::length(const char_type* __s) _NOEXCEPT	495	char_traits<char16_t>::length(const char_type* __s) _NOEXCEPT
590	{	496	{
...	@@ -594,7 +500,7 @@ char_traits<char16_t>::length(const char_type* __s) _NOEXCEPT	...	@@ -594,7 +500,7 @@ char_traits<char16_t>::length(const char_type* __s) _NOEXCEPT
594	return __len;	500	return __len;
595	}	501	}
596		502
597	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	503	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
598	const char16_t*	504	const char16_t*
599	char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT	505	char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT
600	{	506	{
...	@@ -610,38 +516,41 @@ char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& _	...	@@ -610,38 +516,41 @@ char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& _
610	template <>	516	template <>
611	struct _LIBCPP_TEMPLATE_VIS char_traits<char32_t>	517	struct _LIBCPP_TEMPLATE_VIS char_traits<char32_t>
612	{	518	{
613	typedef char32_t char_type;	519	using char_type = char32_t;
614	typedef uint_least32_t int_type;	520	using int_type = uint_least32_t;
615	typedef streamoff off_type;	521	using off_type = streamoff;
616	typedef u32streampos pos_type;	522	using pos_type = u32streampos;
617	typedef mbstate_t state_type;	523	using state_type = mbstate_t;
		524	#if _LIBCPP_STD_VER > 17
		525	using comparison_category = strong_ordering;
		526	#endif
618		527
619	static inline _LIBCPP_CONSTEXPR_AFTER_CXX14	528	static inline _LIBCPP_CONSTEXPR_SINCE_CXX17
620	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}	529	void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT {__c1 = __c2;}
621	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT	530	static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
622	{return __c1 == __c2;}	531	{return __c1 == __c2;}
623	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT	532	static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
624	{return __c1 < __c2;}	533	{return __c1 < __c2;}
625		534
626	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	535	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
627	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;	536	int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;
628	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	537	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
629	size_t length(const char_type* __s) _NOEXCEPT;	538	size_t length(const char_type* __s) _NOEXCEPT;
630	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_AFTER_CXX14	539	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR_SINCE_CXX17
631	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;	540	const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;
632		541
633	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	542	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
634	static char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	543	static char_type* move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
635	return std::__char_traits_move(__s1, __s2, __n);	544	return std::__char_traits_move(__s1, __s2, __n);
636	}	545	}
637		546
638	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	547	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
639	static char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {	548	static char_type* copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT {
640	std::copy_n(__s2, __n, __s1);	549	std::copy_n(__s2, __n, __s1);
641	return __s1;	550	return __s1;
642	}	551	}
643		552
644	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	553	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
645	static char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {	554	static char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT {
646	std::fill_n(__s, __n, __a);	555	std::fill_n(__s, __n, __a);
647	return __s;	556	return __s;
...	@@ -659,7 +568,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char32_t>	...	@@ -659,7 +568,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char32_t>
659	{return int_type(0xFFFFFFFF);}	568	{return int_type(0xFFFFFFFF);}
660	};	569	};
661		570
662	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	571	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
663	int	572	int
664	char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT	573	char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
665	{	574	{
...	@@ -673,7 +582,7 @@ char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, siz	...	@@ -673,7 +582,7 @@ char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, siz
673	return 0;	582	return 0;
674	}	583	}
675		584
676	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	585	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
677	size_t	586	size_t
678	char_traits<char32_t>::length(const char_type* __s) _NOEXCEPT	587	char_traits<char32_t>::length(const char_type* __s) _NOEXCEPT
679	{	588	{
...	@@ -683,7 +592,7 @@ char_traits<char32_t>::length(const char_type* __s) _NOEXCEPT	...	@@ -683,7 +592,7 @@ char_traits<char32_t>::length(const char_type* __s) _NOEXCEPT
683	return __len;	592	return __len;
684	}	593	}
685		594
686	inline _LIBCPP_CONSTEXPR_AFTER_CXX14	595	inline _LIBCPP_CONSTEXPR_SINCE_CXX17
687	const char32_t*	596	const char32_t*
688	char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT	597	char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT
689	{	598	{
...	@@ -700,7 +609,7 @@ char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& _	...	@@ -700,7 +609,7 @@ char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& _
700		609
701	// __str_find	610	// __str_find
702	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	611	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
703	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	612	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
704	__str_find(const _CharT *__p, _SizeT __sz,	613	__str_find(const _CharT *__p, _SizeT __sz,
705	_CharT __c, _SizeT __pos) _NOEXCEPT	614	_CharT __c, _SizeT __pos) _NOEXCEPT
706	{	615	{
...	@@ -713,7 +622,7 @@ __str_find(const _CharT *__p, _SizeT __sz,	...	@@ -713,7 +622,7 @@ __str_find(const _CharT *__p, _SizeT __sz,
713	}	622	}
714		623
715	template <class _CharT, class _Traits>	624	template <class _CharT, class _Traits>
716	inline _LIBCPP_CONSTEXPR_AFTER_CXX11 const _CharT *	625	_LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR_SINCE_CXX14 const _CharT *
717	__search_substring(const _CharT __first1, const _CharT __last1,	626	__search_substring(const _CharT __first1, const _CharT __last1,
718	const _CharT __first2, const _CharT __last2) _NOEXCEPT {	627	const _CharT __first2, const _CharT __last2) _NOEXCEPT {
719	// Take advantage of knowing source and pattern lengths.	628	// Take advantage of knowing source and pattern lengths.
...	@@ -752,7 +661,7 @@ __search_substring(const _CharT __first1, const _CharT __last1,	...	@@ -752,7 +661,7 @@ __search_substring(const _CharT __first1, const _CharT __last1,
752	}	661	}
753		662
754	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	663	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
755	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	664	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
756	__str_find(const _CharT *__p, _SizeT __sz,	665	__str_find(const _CharT *__p, _SizeT __sz,
757	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	666	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
758	{	667	{
...	@@ -762,7 +671,7 @@ __str_find(const _CharT *__p, _SizeT __sz,	...	@@ -762,7 +671,7 @@ __str_find(const _CharT *__p, _SizeT __sz,
762	if (__n == 0) // There is nothing to search, just return __pos.	671	if (__n == 0) // There is nothing to search, just return __pos.
763	return __pos;	672	return __pos;
764		673
765	const _CharT *__r = __search_substring<_CharT, _Traits>(	674	const _CharT *__r = std::__search_substring<_CharT, _Traits>(
766	__p + __pos, __p + __sz, __s, __s + __n);	675	__p + __pos, __p + __sz, __s, __s + __n);
767		676
768	if (__r == __p + __sz)	677	if (__r == __p + __sz)
...	@@ -774,7 +683,7 @@ __str_find(const _CharT *__p, _SizeT __sz,	...	@@ -774,7 +683,7 @@ __str_find(const _CharT *__p, _SizeT __sz,
774	// __str_rfind	683	// __str_rfind
775		684
776	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	685	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
777	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	686	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
778	__str_rfind(const _CharT *__p, _SizeT __sz,	687	__str_rfind(const _CharT *__p, _SizeT __sz,
779	_CharT __c, _SizeT __pos) _NOEXCEPT	688	_CharT __c, _SizeT __pos) _NOEXCEPT
780	{	689	{
...	@@ -793,7 +702,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,	...	@@ -793,7 +702,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,
793	}	702	}
794		703
795	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	704	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
796	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	705	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
797	__str_rfind(const _CharT *__p, _SizeT __sz,	706	__str_rfind(const _CharT *__p, _SizeT __sz,
798	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	707	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
799	{	708	{
...	@@ -810,7 +719,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,	...	@@ -810,7 +719,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,
810		719
811	// __str_find_first_of	720	// __str_find_first_of
812	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	721	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
813	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	722	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
814	__str_find_first_of(const _CharT *__p, _SizeT __sz,	723	__str_find_first_of(const _CharT *__p, _SizeT __sz,
815	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	724	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
816	{	725	{
...	@@ -826,7 +735,7 @@ __str_find_first_of(const _CharT *__p, _SizeT __sz,	...	@@ -826,7 +735,7 @@ __str_find_first_of(const _CharT *__p, _SizeT __sz,
826		735
827	// __str_find_last_of	736	// __str_find_last_of
828	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	737	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
829	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	738	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
830	__str_find_last_of(const _CharT *__p, _SizeT __sz,	739	__str_find_last_of(const _CharT *__p, _SizeT __sz,
831	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	740	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
832	{	741	{
...	@@ -849,7 +758,7 @@ __str_find_last_of(const _CharT *__p, _SizeT __sz,	...	@@ -849,7 +758,7 @@ __str_find_last_of(const _CharT *__p, _SizeT __sz,
849		758
850	// __str_find_first_not_of	759	// __str_find_first_not_of
851	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	760	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
852	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	761	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
853	__str_find_first_not_of(const _CharT *__p, _SizeT __sz,	762	__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
854	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	763	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
855	{	764	{
...	@@ -865,7 +774,7 @@ __str_find_first_not_of(const _CharT *__p, _SizeT __sz,	...	@@ -865,7 +774,7 @@ __str_find_first_not_of(const _CharT *__p, _SizeT __sz,
865		774
866		775
867	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	776	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
868	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	777	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
869	__str_find_first_not_of(const _CharT *__p, _SizeT __sz,	778	__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
870	_CharT __c, _SizeT __pos) _NOEXCEPT	779	_CharT __c, _SizeT __pos) _NOEXCEPT
871	{	780	{
...	@@ -882,7 +791,7 @@ __str_find_first_not_of(const _CharT *__p, _SizeT __sz,	...	@@ -882,7 +791,7 @@ __str_find_first_not_of(const _CharT *__p, _SizeT __sz,
882		791
883	// __str_find_last_not_of	792	// __str_find_last_not_of
884	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	793	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
885	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	794	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
886	__str_find_last_not_of(const _CharT *__p, _SizeT __sz,	795	__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
887	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT	796	const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
888	{	797	{
...	@@ -898,7 +807,7 @@ __str_find_last_not_of(const _CharT *__p, _SizeT __sz,	...	@@ -898,7 +807,7 @@ __str_find_last_not_of(const _CharT *__p, _SizeT __sz,
898		807
899		808
900	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>	809	template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
901	inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY	810	inline _SizeT _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
902	__str_find_last_not_of(const _CharT *__p, _SizeT __sz,	811	__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
903	_CharT __c, _SizeT __pos) _NOEXCEPT	812	_CharT __c, _SizeT __pos) _NOEXCEPT
904	{	813	{

lib/libcxx/include/__support/android/locale_bionic.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H	10	#ifndef _LIBCPP___SUPPORT_ANDROID_LOCALE_BIONIC_H
11	#define _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H	11	#define _LIBCPP___SUPPORT_ANDROID_LOCALE_BIONIC_H
12		12
13	#if defined(__BIONIC__)	13	#if defined(__BIONIC__)
14		14
...	@@ -72,4 +72,4 @@ strtol_l(const char* __nptr, char** __endptr, int __base, locale_t) {	...	@@ -72,4 +72,4 @@ strtol_l(const char* __nptr, char** __endptr, int __base, locale_t) {
72	#endif // defined(__ANDROID__)	72	#endif // defined(__ANDROID__)
73		73
74	#endif // defined(__BIONIC__)	74	#endif // defined(__BIONIC__)
75	#endif // _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H	75	#endif // _LIBCPP___SUPPORT_ANDROID_LOCALE_BIONIC_H

lib/libcxx/include/__support/fuchsia/xlocale.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H	10	#ifndef _LIBCPP___SUPPORT_FUCHSIA_XLOCALE_H
11	#define _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H	11	#define _LIBCPP___SUPPORT_FUCHSIA_XLOCALE_H
12		12
13	#if defined(__Fuchsia__)	13	#if defined(__Fuchsia__)
14		14
...	@@ -19,4 +19,4 @@	...	@@ -19,4 +19,4 @@
19		19
20	#endif // defined(__Fuchsia__)	20	#endif // defined(__Fuchsia__)
21		21
22	#endif // _LIBCPP_SUPPORT_FUCHSIA_XLOCALE_H	22	#endif // _LIBCPP___SUPPORT_FUCHSIA_XLOCALE_H

lib/libcxx/include/__support/ibm/gettod_zos.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_IBM_GETTOD_ZOS_H	10	#ifndef _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H
11	#define _LIBCPP_SUPPORT_IBM_GETTOD_ZOS_H	11	#define _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H
12		12
13	#include <time.h>	13	#include <time.h>
14		14
...	@@ -51,4 +51,4 @@ gettimeofdayMonotonic(struct timespec64* Output) {	...	@@ -51,4 +51,4 @@ gettimeofdayMonotonic(struct timespec64* Output) {
51	return 0;	51	return 0;
52	}	52	}
53		53
54	#endif // _LIBCPP_SUPPORT_IBM_GETTOD_ZOS_H	54	#endif // _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H

lib/libcxx/include/__support/ibm/locale_mgmt_zos.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_IBM_LOCALE_MGMT_ZOS_H	10	#ifndef _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
11	#define _LIBCPP_SUPPORT_IBM_LOCALE_MGMT_ZOS_H	11	#define _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
12		12
13	#if defined(__MVS__)	13	#if defined(__MVS__)
14	#include <locale.h>	14	#include <locale.h>
...	@@ -50,4 +50,4 @@ locale_t uselocale(locale_t newloc);	...	@@ -50,4 +50,4 @@ locale_t uselocale(locale_t newloc);
50	}	50	}
51	#endif	51	#endif
52	#endif // defined(__MVS__)	52	#endif // defined(__MVS__)
53	#endif // _LIBCPP_SUPPORT_IBM_LOCALE_MGMT_ZOS_H	53	#endif // _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H

lib/libcxx/include/__support/ibm/nanosleep.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_IBM_NANOSLEEP_H	10	#ifndef _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
11	#define _LIBCPP_SUPPORT_IBM_NANOSLEEP_H	11	#define _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
12		12
13	#include <unistd.h>	13	#include <unistd.h>
14		14
...	@@ -52,4 +52,4 @@ inline int nanosleep(const struct timespec* __req, struct timespec* __rem) {	...	@@ -52,4 +52,4 @@ inline int nanosleep(const struct timespec* __req, struct timespec* __rem) {
52	return 0;	52	return 0;
53	}	53	}
54		54
55	#endif // _LIBCPP_SUPPORT_IBM_NANOSLEEP_H	55	#endif // _LIBCPP___SUPPORT_IBM_NANOSLEEP_H

lib/libcxx/include/__support/ibm/xlocale.h+3-3

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_IBM_XLOCALE_H	10	#ifndef _LIBCPP___SUPPORT_IBM_XLOCALE_H
11	#define _LIBCPP_SUPPORT_IBM_XLOCALE_H	11	#define _LIBCPP___SUPPORT_IBM_XLOCALE_H
12		12
13	#if defined(__MVS__)	13	#if defined(__MVS__)
14	#include <__support/ibm/locale_mgmt_zos.h>	14	#include <__support/ibm/locale_mgmt_zos.h>
...	@@ -126,4 +126,4 @@ vasprintf(char *strp, const char fmt, va_list ap) {	...	@@ -126,4 +126,4 @@ vasprintf(char *strp, const char fmt, va_list ap) {
126	#ifdef __cplusplus	126	#ifdef __cplusplus
127	}	127	}
128	#endif	128	#endif
129	#endif // _LIBCPP_SUPPORT_IBM_XLOCALE_H	129	#endif // _LIBCPP___SUPPORT_IBM_XLOCALE_H

lib/libcxx/include/__support/musl/xlocale.h+4-4

...	@@ -14,8 +14,8 @@	...	@@ -14,8 +14,8 @@
14	// in Musl.	14	// in Musl.
15	//===----------------------------------------------------------------------===//	15	//===----------------------------------------------------------------------===//
16		16
17	#ifndef _LIBCPP_SUPPORT_MUSL_XLOCALE_H	17	#ifndef _LIBCPP___SUPPORT_MUSL_XLOCALE_H
18	#define _LIBCPP_SUPPORT_MUSL_XLOCALE_H	18	#define _LIBCPP___SUPPORT_MUSL_XLOCALE_H
19		19
20	#include <cstdlib>	20	#include <cstdlib>
21	#include <cwchar>	21	#include <cwchar>
...	@@ -39,7 +39,7 @@ wcstoll_l(const wchar_t __nptr, wchar_t *__endptr, int __base, locale_t) {	...	@@ -39,7 +39,7 @@ wcstoll_l(const wchar_t __nptr, wchar_t *__endptr, int __base, locale_t) {
39	return ::wcstoll(__nptr, __endptr, __base);	39	return ::wcstoll(__nptr, __endptr, __base);
40	}	40	}
41		41
42	inline _LIBCPP_HIDE_FROM_ABI long long	42	inline _LIBCPP_HIDE_FROM_ABI unsigned long long
43	wcstoull_l(const wchar_t __nptr, wchar_t *__endptr, int __base, locale_t) {	43	wcstoull_l(const wchar_t __nptr, wchar_t *__endptr, int __base, locale_t) {
44	return ::wcstoull(__nptr, __endptr, __base);	44	return ::wcstoull(__nptr, __endptr, __base);
45	}	45	}
...	@@ -53,4 +53,4 @@ wcstold_l(const wchar_t __nptr, wchar_t *__endptr, locale_t) {	...	@@ -53,4 +53,4 @@ wcstold_l(const wchar_t __nptr, wchar_t *__endptr, locale_t) {
53	}	53	}
54	#endif	54	#endif
55		55
56	#endif // _LIBCPP_SUPPORT_MUSL_XLOCALE_H	56	#endif // _LIBCPP___SUPPORT_MUSL_XLOCALE_H

lib/libcxx/include/__support/newlib/xlocale.h+2-6

 @@ -6,15 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SUPPORT_NEWLIB_XLOCALE_H
+#ifndef _LIBCPP___SUPPORT_NEWLIB_XLOCALE_H
-#define _LIBCPP_SUPPORT_NEWLIB_XLOCALE_H
+#define _LIBCPP___SUPPORT_NEWLIB_XLOCALE_H
 #if defined(_NEWLIB_VERSION)
-#include <cstdlib>
-#include <clocale>
-#include <cwctype>
-#include <ctype.h>
 #if !defined(__NEWLIB__) || __NEWLIB__ < 2 || \
     __NEWLIB__ == 2 && __NEWLIB_MINOR__ < 5
 #include <__support/xlocale/__nop_locale_mgmt.h>

lib/libcxx/include/__support/openbsd/xlocale.h+2-2

...	@@ -7,8 +7,8 @@	...	@@ -7,8 +7,8 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_OPENBSD_XLOCALE_H	10	#ifndef _LIBCPP___SUPPORT_OPENBSD_XLOCALE_H
11	#define _LIBCPP_SUPPORT_OPENBSD_XLOCALE_H	11	#define _LIBCPP___SUPPORT_OPENBSD_XLOCALE_H
12		12
13	#include <__support/xlocale/__strtonum_fallback.h>	13	#include <__support/xlocale/__strtonum_fallback.h>
14	#include <clocale>	14	#include <clocale>

lib/libcxx/include/__support/solaris/xlocale.h+1-1

...	@@ -43,7 +43,7 @@ strtol_l(const char __nptr, char *__endptr, int __base, locale_t __loc) {	...	@@ -43,7 +43,7 @@ strtol_l(const char __nptr, char *__endptr, int __base, locale_t __loc) {
43	}	43	}
44		44
45	inline _LIBCPP_HIDE_FROM_ABI unsigned long long	45	inline _LIBCPP_HIDE_FROM_ABI unsigned long long
46	strtoull_l(const char __nptr, char *__endptr, int __base, locale_t __loc)	46	strtoull_l(const char __nptr, char *__endptr, int __base, locale_t __loc)
47	return ::strtoull(__nptr, __endptr, __base);	47	return ::strtoull(__nptr, __endptr, __base);
48	}	48	}
49		49

lib/libcxx/include/__support/win32/limits_msvc_win32.h deleted-71

...	@@ -1,71 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_SUPPORT_WIN32_LIMITS_MSVC_WIN32_H
11	#define _LIBCPP_SUPPORT_WIN32_LIMITS_MSVC_WIN32_H
12
13	#if !defined(_LIBCPP_MSVCRT)
14	#error "This header complements the Microsoft C Runtime library, and should not be included otherwise."
15	#endif
16	#if defined(__clang__)
17	#error "This header should only be included when using Microsoft's C1XX frontend"
18	#endif
19
20	#include <float.h> // limit constants
21	#include <limits.h> // CHAR_BIT
22	#include <math.h> // HUGE_VAL
23	#include <ymath.h> // internal MSVC header providing the needed functionality
24
25	#define __CHAR_BIT__ CHAR_BIT
26
27	#define __FLT_MANT_DIG__ FLT_MANT_DIG
28	#define __FLT_DIG__ FLT_DIG
29	#define __FLT_RADIX__ FLT_RADIX
30	#define __FLT_MIN_EXP__ FLT_MIN_EXP
31	#define __FLT_MIN_10_EXP__ FLT_MIN_10_EXP
32	#define __FLT_MAX_EXP__ FLT_MAX_EXP
33	#define __FLT_MAX_10_EXP__ FLT_MAX_10_EXP
34	#define __FLT_MIN__ FLT_MIN
35	#define __FLT_MAX__ FLT_MAX
36	#define __FLT_EPSILON__ FLT_EPSILON
37	// predefined by MinGW GCC
38	#define __FLT_DENORM_MIN__ 1.40129846432481707092e-45F
39
40	#define __DBL_MANT_DIG__ DBL_MANT_DIG
41	#define __DBL_DIG__ DBL_DIG
42	#define __DBL_RADIX__ DBL_RADIX
43	#define __DBL_MIN_EXP__ DBL_MIN_EXP
44	#define __DBL_MIN_10_EXP__ DBL_MIN_10_EXP
45	#define __DBL_MAX_EXP__ DBL_MAX_EXP
46	#define __DBL_MAX_10_EXP__ DBL_MAX_10_EXP
47	#define __DBL_MIN__ DBL_MIN
48	#define __DBL_MAX__ DBL_MAX
49	#define __DBL_EPSILON__ DBL_EPSILON
50	// predefined by MinGW GCC
51	#define __DBL_DENORM_MIN__ double(4.94065645841246544177e-324L)
52
53	#define __LDBL_MANT_DIG__ LDBL_MANT_DIG
54	#define __LDBL_DIG__ LDBL_DIG
55	#define __LDBL_RADIX__ LDBL_RADIX
56	#define __LDBL_MIN_EXP__ LDBL_MIN_EXP
57	#define __LDBL_MIN_10_EXP__ LDBL_MIN_10_EXP
58	#define __LDBL_MAX_EXP__ LDBL_MAX_EXP
59	#define __LDBL_MAX_10_EXP__ LDBL_MAX_10_EXP
60	#define __LDBL_MIN__ LDBL_MIN
61	#define __LDBL_MAX__ LDBL_MAX
62	#define __LDBL_EPSILON__ LDBL_EPSILON
63	// predefined by MinGW GCC
64	#define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L
65
66	// __builtin replacements/workarounds
67	#define __builtin_huge_vall() _LInf._Long_double
68	#define __builtin_nanl(__dummmy) _LNan._Long_double
69	#define __builtin_nansl(__dummy) _LSnan._Long_double
70
71	#endif // _LIBCPP_SUPPORT_WIN32_LIMITS_MSVC_WIN32_H

lib/libcxx/include/__support/win32/locale_win32.h+62-61

...	@@ -7,13 +7,14 @@	...	@@ -7,13 +7,14 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_WIN32_LOCALE_WIN32_H	10	#ifndef _LIBCPP___SUPPORT_WIN32_LOCALE_WIN32_H
11	#define _LIBCPP_SUPPORT_WIN32_LOCALE_WIN32_H	11	#define _LIBCPP___SUPPORT_WIN32_LOCALE_WIN32_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <cstddef>	14	#include <cstddef>
15	#include <locale.h> // _locale_t	15	#include <locale.h> // _locale_t
16	#include <stdio.h>	16	#include <stdio.h>
		17	#include <string>
17		18
18	#define _X_ALL LC_ALL	19	#define _X_ALL LC_ALL
19	#define _X_COLLATE LC_COLLATE	20	#define _X_COLLATE LC_COLLATE
...	@@ -50,92 +51,92 @@	...	@@ -50,92 +51,92 @@
50	class __lconv_storage {	51	class __lconv_storage {
51	public:	52	public:
52	__lconv_storage(const lconv *__lc_input) {	53	__lconv_storage(const lconv *__lc_input) {
53	__lc = *__lc_input;	54	__lc_ = *__lc_input;
54		55
55	__decimal_point = __lc_input->decimal_point;	56	__decimal_point_ = __lc_input->decimal_point;
56	__thousands_sep = __lc_input->thousands_sep;	57	__thousands_sep_ = __lc_input->thousands_sep;
57	__grouping = __lc_input->grouping;	58	__grouping_ = __lc_input->grouping;
58	__int_curr_symbol = __lc_input->int_curr_symbol;	59	__int_curr_symbol_ = __lc_input->int_curr_symbol;
59	__currency_symbol = __lc_input->currency_symbol;	60	__currency_symbol_ = __lc_input->currency_symbol;
60	__mon_decimal_point = __lc_input->mon_decimal_point;	61	__mon_decimal_point_ = __lc_input->mon_decimal_point;
61	__mon_thousands_sep = __lc_input->mon_thousands_sep;	62	__mon_thousands_sep_ = __lc_input->mon_thousands_sep;
62	__mon_grouping = __lc_input->mon_grouping;	63	__mon_grouping_ = __lc_input->mon_grouping;
63	__positive_sign = __lc_input->positive_sign;	64	__positive_sign_ = __lc_input->positive_sign;
64	__negative_sign = __lc_input->negative_sign;	65	__negative_sign_ = __lc_input->negative_sign;
65		66
66	__lc.decimal_point = const_cast<char *>(__decimal_point.c_str());	67	__lc_.decimal_point = const_cast<char *>(__decimal_point_.c_str());
67	__lc.thousands_sep = const_cast<char *>(__thousands_sep.c_str());	68	__lc_.thousands_sep = const_cast<char *>(__thousands_sep_.c_str());
68	__lc.grouping = const_cast<char *>(__grouping.c_str());	69	__lc_.grouping = const_cast<char *>(__grouping_.c_str());
69	__lc.int_curr_symbol = const_cast<char *>(__int_curr_symbol.c_str());	70	__lc_.int_curr_symbol = const_cast<char *>(__int_curr_symbol_.c_str());
70	__lc.currency_symbol = const_cast<char *>(__currency_symbol.c_str());	71	__lc_.currency_symbol = const_cast<char *>(__currency_symbol_.c_str());
71	__lc.mon_decimal_point = const_cast<char *>(__mon_decimal_point.c_str());	72	__lc_.mon_decimal_point = const_cast<char *>(__mon_decimal_point_.c_str());
72	__lc.mon_thousands_sep = const_cast<char *>(__mon_thousands_sep.c_str());	73	__lc_.mon_thousands_sep = const_cast<char *>(__mon_thousands_sep_.c_str());
73	__lc.mon_grouping = const_cast<char *>(__mon_grouping.c_str());	74	__lc_.mon_grouping = const_cast<char *>(__mon_grouping_.c_str());
74	__lc.positive_sign = const_cast<char *>(__positive_sign.c_str());	75	__lc_.positive_sign = const_cast<char *>(__positive_sign_.c_str());
75	__lc.negative_sign = const_cast<char *>(__negative_sign.c_str());	76	__lc_.negative_sign = const_cast<char *>(__negative_sign_.c_str());
76	}	77	}
77		78
78	lconv *__get() {	79	lconv *__get() {
79	return &__lc;	80	return &__lc_;
80	}	81	}
81	private:	82	private:
82	lconv __lc;	83	lconv __lc_;
83	std::string __decimal_point;	84	std::string __decimal_point_;
84	std::string __thousands_sep;	85	std::string __thousands_sep_;
85	std::string __grouping;	86	std::string __grouping_;
86	std::string __int_curr_symbol;	87	std::string __int_curr_symbol_;
87	std::string __currency_symbol;	88	std::string __currency_symbol_;
88	std::string __mon_decimal_point;	89	std::string __mon_decimal_point_;
89	std::string __mon_thousands_sep;	90	std::string __mon_thousands_sep_;
90	std::string __mon_grouping;	91	std::string __mon_grouping_;
91	std::string __positive_sign;	92	std::string __positive_sign_;
92	std::string __negative_sign;	93	std::string __negative_sign_;
93	};	94	};
94		95
95	class locale_t {	96	class locale_t {
96	public:	97	public:
97	locale_t()	98	locale_t()
98	: __locale(nullptr), __locale_str(nullptr), __lc(nullptr) {}	99	: __locale_(nullptr), __locale_str_(nullptr), __lc_(nullptr) {}
99	locale_t(std::nullptr_t)	100	locale_t(std::nullptr_t)
100	: __locale(nullptr), __locale_str(nullptr), __lc(nullptr) {}	101	: __locale_(nullptr), __locale_str_(nullptr), __lc_(nullptr) {}
101	locale_t(_locale_t __xlocale, const char* __xlocale_str)	102	locale_t(_locale_t __xlocale, const char* __xlocale_str)
102	: __locale(__xlocale), __locale_str(__xlocale_str), __lc(nullptr) {}	103	: __locale_(__xlocale), __locale_str_(__xlocale_str), __lc_(nullptr) {}
103	locale_t(const locale_t &__l)	104	locale_t(const locale_t &__l)
104	: __locale(__l.__locale), __locale_str(__l.__locale_str), __lc(nullptr) {}	105	: __locale_(__l.__locale_), __locale_str_(__l.__locale_str_), __lc_(nullptr) {}
105		106
106	~locale_t() {	107	~locale_t() {
107	delete __lc;	108	delete __lc_;
108	}	109	}
109		110
110	locale_t &operator =(const locale_t &__l) {	111	locale_t &operator =(const locale_t &__l) {
111	__locale = __l.__locale;	112	__locale_ = __l.__locale_;
112	__locale_str = __l.__locale_str;	113	__locale_str_ = __l.__locale_str_;
113	// __lc not copied	114	// __lc_ not copied
114	return *this;	115	return *this;
115	}	116	}
116		117
117	friend bool operator==(const locale_t& __left, const locale_t& __right) {	118	friend bool operator==(const locale_t& __left, const locale_t& __right) {
118	return __left.__locale == __right.__locale;	119	return __left.__locale_ == __right.__locale_;
119	}	120	}
120		121
121	friend bool operator==(const locale_t& __left, int __right) {	122	friend bool operator==(const locale_t& __left, int __right) {
122	return __left.__locale == nullptr && __right == 0;	123	return __left.__locale_ == nullptr && __right == 0;
123	}	124	}
124		125
125	friend bool operator==(const locale_t& __left, long long __right) {	126	friend bool operator==(const locale_t& __left, long long __right) {
126	return __left.__locale == nullptr && __right == 0;	127	return __left.__locale_ == nullptr && __right == 0;
127	}	128	}
128		129
129	friend bool operator==(const locale_t& __left, std::nullptr_t) {	130	friend bool operator==(const locale_t& __left, std::nullptr_t) {
130	return __left.__locale == nullptr;	131	return __left.__locale_ == nullptr;
131	}	132	}
132		133
133	friend bool operator==(int __left, const locale_t& __right) {	134	friend bool operator==(int __left, const locale_t& __right) {
134	return __left == 0 && nullptr == __right.__locale;	135	return __left == 0 && nullptr == __right.__locale_;
135	}	136	}
136		137
137	friend bool operator==(std::nullptr_t, const locale_t& __right) {	138	friend bool operator==(std::nullptr_t, const locale_t& __right) {
138	return nullptr == __right.__locale;	139	return nullptr == __right.__locale_;
139	}	140	}
140		141
141	friend bool operator!=(const locale_t& __left, const locale_t& __right) {	142	friend bool operator!=(const locale_t& __left, const locale_t& __right) {
...	@@ -163,24 +164,24 @@ public:	...	@@ -163,24 +164,24 @@ public:
163	}	164	}
164		165
165	operator bool() const {	166	operator bool() const {
166	return __locale != nullptr;	167	return __locale_ != nullptr;
167	}	168	}
168		169
169	const char* __get_locale() const { return __locale_str; }	170	const char* __get_locale() const { return __locale_str_; }
170		171
171	operator _locale_t() const {	172	operator _locale_t() const {
172	return __locale;	173	return __locale_;
173	}	174	}
174		175
175	lconv __store_lconv(const lconv __input_lc) {	176	lconv __store_lconv(const lconv __input_lc) {
176	delete __lc;	177	delete __lc_;
177	__lc = new __lconv_storage(__input_lc);	178	__lc_ = new __lconv_storage(__input_lc);
178	return __lc->__get();	179	return __lc_->__get();
179	}	180	}
180	private:	181	private:
181	_locale_t __locale;	182	_locale_t __locale_;
182	const char* __locale_str;	183	const char* __locale_str_;
183	__lconv_storage *__lc = nullptr;	184	__lconv_storage *__lc_ = nullptr;
184	};	185	};
185		186
186	// Locale management functions	187	// Locale management functions
...	@@ -278,4 +279,4 @@ inline int iswblank_l( wint_t __c, locale_t /loc/ )	...	@@ -278,4 +279,4 @@ inline int iswblank_l( wint_t __c, locale_t /loc/ )
278	return ( __c == L' ' \|\| __c == L'\t' );	279	return ( __c == L' ' \|\| __c == L'\t' );
279	}	280	}
280		281
281	#endif // _LIBCPP_SUPPORT_WIN32_LOCALE_WIN32_H	282	#endif // _LIBCPP___SUPPORT_WIN32_LOCALE_WIN32_H

lib/libcxx/include/__support/xlocale/__nop_locale_mgmt.h+5-3

...	@@ -7,8 +7,10 @@	...	@@ -7,8 +7,10 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#ifndef _LIBCPP_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H	10	#ifndef _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
11	#define _LIBCPP_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H	11	#define _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
		12
		13	#include <__config>
12		14
13	#ifdef __cplusplus	15	#ifdef __cplusplus
14	extern "C" {	16	extern "C" {
...	@@ -53,4 +55,4 @@ uselocale(locale_t) {	...	@@ -53,4 +55,4 @@ uselocale(locale_t) {
53	} // extern "C"	55	} // extern "C"
54	#endif	56	#endif
55		57
56	#endif // _LIBCPP_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H	58	#endif // _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H

lib/libcxx/include/__support/xlocale/__posix_l_fallback.h+23-11

 @@ -12,8 +12,16 @@
 // Android's bionic and Newlib).
 //===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#ifndef _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
-#define _LIBCPP_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#define _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#include <__config>
+#include <ctype.h>
+#include <time.h>
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#  include <wctype.h>
+#endif
 #ifdef __cplusplus
 extern "C" {
 @@ -67,6 +75,15 @@ inline _LIBCPP_HIDE_FROM_ABI int isxdigit_l(int __c, locale_t) {
   return ::isxdigit(__c);
 }
+inline _LIBCPP_HIDE_FROM_ABI int toupper_l(int __c, locale_t) {
+  return ::toupper(__c);
+}
+inline _LIBCPP_HIDE_FROM_ABI int tolower_l(int __c, locale_t) {
+  return ::tolower(__c);
+}
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 inline _LIBCPP_HIDE_FROM_ABI int iswalnum_l(wint_t __c, locale_t) {
   return ::iswalnum(__c);
 }
 @@ -115,14 +132,6 @@ inline _LIBCPP_HIDE_FROM_ABI int iswxdigit_l(wint_t __c, locale_t) {
   return ::iswxdigit(__c);
 }
-inline _LIBCPP_HIDE_FROM_ABI int toupper_l(int __c, locale_t) {
-  return ::toupper(__c);
-}
-inline _LIBCPP_HIDE_FROM_ABI int tolower_l(int __c, locale_t) {
-  return ::tolower(__c);
-}
 inline _LIBCPP_HIDE_FROM_ABI wint_t towupper_l(wint_t __c, locale_t) {
   return ::towupper(__c);
 }
 @@ -130,6 +139,7 @@ inline _LIBCPP_HIDE_FROM_ABI wint_t towupper_l(wint_t __c, locale_t) {
 inline _LIBCPP_HIDE_FROM_ABI wint_t towlower_l(wint_t __c, locale_t) {
   return ::towlower(__c);
 }
+#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 inline _LIBCPP_HIDE_FROM_ABI int
 strcoll_l(const char *__s1, const char *__s2, locale_t) {
 @@ -147,6 +157,7 @@ strftime_l(char *__s, size_t __max, const char *__format, const struct tm *__tm,
   return ::strftime(__s, __max, __format, __tm);
 }
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 inline _LIBCPP_HIDE_FROM_ABI int
 wcscoll_l(const wchar_t *__ws1, const wchar_t *__ws2, locale_t) {
   return ::wcscoll(__ws1, __ws2);
 @@ -156,9 +167,10 @@ inline _LIBCPP_HIDE_FROM_ABI size_t
 wcsxfrm_l(wchar_t *__dest, const wchar_t *__src, size_t __n, locale_t) {
   return ::wcsxfrm(__dest, __src, __n);
 }
+#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 #ifdef __cplusplus
 }
 #endif
-#endif // _LIBCPP_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#endif // _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H

lib/libcxx/include/__support/xlocale/__strtonum_fallback.h+12-3

 @@ -12,8 +12,15 @@
 // convert strings to some numeric type.
 //===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#ifndef _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
-#define _LIBCPP_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#define _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#include <__config>
+#include <stdlib.h>
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#  include <wchar.h>
+#endif
 #ifdef __cplusplus
 extern "C" {
 @@ -44,6 +51,7 @@ strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t) {
   return ::strtoull(__nptr, __endptr, __base);
 }
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 inline _LIBCPP_HIDE_FROM_ABI long long
 wcstoll_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
   return ::wcstoll(__nptr, __endptr, __base);
 @@ -58,9 +66,10 @@ inline _LIBCPP_HIDE_FROM_ABI long double
 wcstold_l(const wchar_t *__nptr, wchar_t **__endptr, locale_t) {
   return ::wcstold(__nptr, __endptr);
 }
+#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 #ifdef __cplusplus
 }
 #endif
-#endif // _LIBCPP_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#endif // _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H

lib/libcxx/include/__thread/poll_with_backoff.h+1-3

 @@ -6,16 +6,14 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
 #define _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
 #include <__availability>
 #include <__chrono/duration.h>
 #include <__chrono/high_resolution_clock.h>
-#include <__chrono/steady_clock.h>
-#include <__chrono/time_point.h>
 #include <__config>
-#include <__filesystem/file_time_type.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__thread/timed_backoff_policy.h+1

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H	10	#ifndef _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
10	#define _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H	11	#define _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
11		12

lib/libcxx/include/__threading_support+54-25

...	@@ -13,7 +13,9 @@	...	@@ -13,7 +13,9 @@
13	#include <__availability>	13	#include <__availability>
14	#include <__chrono/convert_to_timespec.h>	14	#include <__chrono/convert_to_timespec.h>
15	#include <__chrono/duration.h>	15	#include <__chrono/duration.h>
		16	#include <__compare/ordering.h>
16	#include <__config>	17	#include <__config>
		18	#include <__fwd/hash.h>
17	#include <__thread/poll_with_backoff.h>	19	#include <__thread/poll_with_backoff.h>
18	#include <errno.h>	20	#include <errno.h>
19	#include <iosfwd>	21	#include <iosfwd>
...	@@ -609,40 +611,28 @@ class _LIBCPP_TEMPLATE_VIS __thread_id	...	@@ -609,40 +611,28 @@ class _LIBCPP_TEMPLATE_VIS __thread_id
609	// on other platforms. We assume 0 works everywhere for now.	611	// on other platforms. We assume 0 works everywhere for now.
610	__libcpp_thread_id __id_;	612	__libcpp_thread_id __id_;
611		613
612	public:	614	static _LIBCPP_HIDE_FROM_ABI
613	_LIBCPP_INLINE_VISIBILITY	615	bool __lt_impl(__thread_id __x, __thread_id __y) _NOEXCEPT
614	__thread_id() _NOEXCEPT : __id_(0) {}
615
616	friend _LIBCPP_INLINE_VISIBILITY
617	bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT
618	{ // don't pass id==0 to underlying routines
619	if (__x.__id_ == 0) return __y.__id_ == 0;
620	if (__y.__id_ == 0) return false;
621	return __libcpp_thread_id_equal(__x.__id_, __y.__id_);
622	}
623	friend _LIBCPP_INLINE_VISIBILITY
624	bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT
625	{return !(__x == __y);}
626	friend _LIBCPP_INLINE_VISIBILITY
627	bool operator< (__thread_id __x, __thread_id __y) _NOEXCEPT
628	{ // id==0 is always less than any other thread_id	616	{ // id==0 is always less than any other thread_id
629	if (__x.__id_ == 0) return __y.__id_ != 0;	617	if (__x.__id_ == 0) return __y.__id_ != 0;
630	if (__y.__id_ == 0) return false;	618	if (__y.__id_ == 0) return false;
631	return __libcpp_thread_id_less(__x.__id_, __y.__id_);	619	return __libcpp_thread_id_less(__x.__id_, __y.__id_);
632	}	620	}
633	friend _LIBCPP_INLINE_VISIBILITY	621
634	bool operator<=(__thread_id __x, __thread_id __y) _NOEXCEPT	622	public:
635	{return !(__y < __x);}	623	_LIBCPP_INLINE_VISIBILITY
636	friend _LIBCPP_INLINE_VISIBILITY	624	__thread_id() _NOEXCEPT : __id_(0) {}
637	bool operator> (__thread_id __x, __thread_id __y) _NOEXCEPT
638	{return __y < __x ;}
639	friend _LIBCPP_INLINE_VISIBILITY
640	bool operator>=(__thread_id __x, __thread_id __y) _NOEXCEPT
641	{return !(__x < __y);}
642		625
643	_LIBCPP_INLINE_VISIBILITY	626	_LIBCPP_INLINE_VISIBILITY
644	void __reset() { __id_ = 0; }	627	void __reset() { __id_ = 0; }
645		628
		629	friend _LIBCPP_HIDE_FROM_ABI bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT;
		630	#if _LIBCPP_STD_VER <= 17
		631	friend _LIBCPP_HIDE_FROM_ABI bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT;
		632	#else // _LIBCPP_STD_VER <= 17
		633	friend _LIBCPP_HIDE_FROM_ABI strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept;
		634	#endif // _LIBCPP_STD_VER <= 17
		635
646	template<class _CharT, class _Traits>	636	template<class _CharT, class _Traits>
647	friend	637	friend
648	_LIBCPP_INLINE_VISIBILITY	638	_LIBCPP_INLINE_VISIBILITY
...	@@ -658,6 +648,45 @@ private:	...	@@ -658,6 +648,45 @@ private:
658	friend struct _LIBCPP_TEMPLATE_VIS hash<__thread_id>;	648	friend struct _LIBCPP_TEMPLATE_VIS hash<__thread_id>;
659	};	649	};
660		650
		651	inline _LIBCPP_HIDE_FROM_ABI
		652	bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT {
		653	// Don't pass id==0 to underlying routines
		654	if (__x.__id_ == 0)
		655	return __y.__id_ == 0;
		656	if (__y.__id_ == 0)
		657	return false;
		658	return __libcpp_thread_id_equal(__x.__id_, __y.__id_);
		659	}
		660
		661	#if _LIBCPP_STD_VER <= 17
		662
		663	inline _LIBCPP_HIDE_FROM_ABI
		664	bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT {
		665	return !(__x == __y);
		666	}
		667
		668	inline _LIBCPP_HIDE_FROM_ABI
		669	bool operator<(__thread_id __x, __thread_id __y) _NOEXCEPT {
		670	return __thread_id::__lt_impl(__x.__id_, __y.__id_);
		671	}
		672
		673	inline _LIBCPP_HIDE_FROM_ABI bool operator<=(__thread_id __x, __thread_id __y) _NOEXCEPT { return !(__y < __x); }
		674	inline _LIBCPP_HIDE_FROM_ABI bool operator>(__thread_id __x, __thread_id __y) _NOEXCEPT { return __y < __x; }
		675	inline _LIBCPP_HIDE_FROM_ABI bool operator>=(__thread_id __x, __thread_id __y) _NOEXCEPT { return !(__x < __y); }
		676
		677	#else // _LIBCPP_STD_VER <= 17
		678
		679	inline _LIBCPP_HIDE_FROM_ABI
		680	strong_ordering operator<=>(__thread_id __x, __thread_id __y) noexcept {
		681	if (__x == __y)
		682	return strong_ordering::equal;
		683	if (__thread_id::__lt_impl(__x, __y))
		684	return strong_ordering::less;
		685	return strong_ordering::greater;
		686	}
		687
		688	#endif // _LIBCPP_STD_VER <= 17
		689
661	namespace this_thread	690	namespace this_thread
662	{	691	{
663		692

lib/libcxx/include/__tree+43-30

 @@ -14,14 +14,32 @@
 #include <__assert>
 #include <__config>
 #include <__debug>
+#include <__functional/invoke.h>
 #include <__iterator/distance.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/next.h>
+#include <__memory/allocator_traits.h>
+#include <__memory/compressed_pair.h>
+#include <__memory/pointer_traits.h>
 #include <__memory/swap_allocator.h>
+#include <__memory/unique_ptr.h>
+#include <__type_traits/can_extract_key.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_const.h>
+#include <__type_traits/is_nothrow_copy_constructible.h>
+#include <__type_traits/is_nothrow_default_constructible.h>
+#include <__type_traits/is_nothrow_move_assignable.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/is_pointer.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_swappable.h>
+#include <__type_traits/remove_const_ref.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/forward.h>
+#include <__utility/move.h>
+#include <__utility/pair.h>
 #include <__utility/swap.h>
 #include <limits>
-#include <memory>
 #include <stdexcept>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -126,7 +144,7 @@ __tree_sub_invariant(_NodePtr __x)
 //    __root == nullptr is a proper tree.  Returns true is __root is a proper
 //    red black tree, else returns false.
 template <class _NodePtr>
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 __tree_invariant(_NodePtr __root)
 {
     if (__root == nullptr)
 @@ -169,7 +187,7 @@ __tree_max(_NodePtr __x) _NOEXCEPT
 // Returns:  pointer to the next in-order node after __x.
 template <class _NodePtr>
-_NodePtr
+_LIBCPP_HIDE_FROM_ABI _NodePtr
 __tree_next(_NodePtr __x) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__x != nullptr, "node shouldn't be null");
 @@ -211,7 +229,7 @@ __tree_prev_iter(_EndNodePtr __x) _NOEXCEPT
 // Returns:  pointer to a node which has no children
 template <class _NodePtr>
-_NodePtr
+_LIBCPP_HIDE_FROM_ABI _NodePtr
 __tree_leaf(_NodePtr __x) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__x != nullptr, "node shouldn't be null");
 @@ -235,7 +253,7 @@ __tree_leaf(_NodePtr __x) _NOEXCEPT
 // Effects:  Makes __x->__right_ the subtree root with __x as its left child
 //           while preserving in-order order.
 template <class _NodePtr>
-void
+_LIBCPP_HIDE_FROM_ABI void
 __tree_left_rotate(_NodePtr __x) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__x != nullptr, "node shouldn't be null");
 @@ -256,7 +274,7 @@ __tree_left_rotate(_NodePtr __x) _NOEXCEPT
 // Effects:  Makes __x->__left_ the subtree root with __x as its right child
 //           while preserving in-order order.
 template <class _NodePtr>
-void
+_LIBCPP_HIDE_FROM_ABI void
 __tree_right_rotate(_NodePtr __x) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__x != nullptr, "node shouldn't be null");
 @@ -282,7 +300,7 @@ __tree_right_rotate(_NodePtr __x) _NOEXCEPT
 // Postcondition: __tree_invariant(end_node->__left_) == true.  end_node->__left_
 //                may be different than the value passed in as __root.
 template <class _NodePtr>
-void
+_LIBCPP_HIDE_FROM_ABI void
 __tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__root != nullptr, "Root of the tree shouldn't be null");
 @@ -352,7 +370,7 @@ __tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT
 //                nor any of its children refer to __z.  end_node->__left_
 //                may be different than the value passed in as __root.
 template <class _NodePtr>
-void
+_LIBCPP_HIDE_FROM_ABI void
 __tree_remove(_NodePtr __root, _NodePtr __z) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__root != nullptr, "Root node should not be null");
 @@ -554,7 +572,7 @@ template <class ..._Args>
 struct __is_tree_value_type : false_type {};
 template <class _One>
-struct __is_tree_value_type<_One> : __is_tree_value_type_imp<__uncvref_t<_One> > {};
+struct __is_tree_value_type<_One> : __is_tree_value_type_imp<__remove_cvref_t<_One> > {};
 template <class _Tp>
 struct __tree_key_value_types {
 @@ -632,19 +650,17 @@ struct __tree_node_base_types {
   typedef _VoidPtr                                               __void_pointer;
   typedef __tree_node_base<__void_pointer>                      __node_base_type;
-  typedef typename __rebind_pointer<_VoidPtr, __node_base_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, __node_base_type>
                                                              __node_base_pointer;
   typedef __tree_end_node<__node_base_pointer>                  __end_node_type;
-  typedef typename __rebind_pointer<_VoidPtr, __end_node_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, __end_node_type>
                                                              __end_node_pointer;
 #if defined(_LIBCPP_ABI_TREE_REMOVE_NODE_POINTER_UB)
   typedef __end_node_pointer __parent_pointer;
 #else
-  typedef typename conditional<
+  typedef __conditional_t< is_pointer<__end_node_pointer>::value, __end_node_pointer, __node_base_pointer>
-      is_pointer<__end_node_pointer>::value,
+      __parent_pointer;
-        __end_node_pointer,
-        __node_base_pointer>::type __parent_pointer;
 #endif
 private:
 @@ -659,9 +675,9 @@ struct __tree_map_pointer_types {};
 template <class _Tp, class _AllocPtr, class _KVTypes>
 struct __tree_map_pointer_types<_Tp, _AllocPtr, _KVTypes, true> {
   typedef typename _KVTypes::__map_value_type   _Mv;
-  typedef typename __rebind_pointer<_AllocPtr, _Mv>::type
+  typedef __rebind_pointer_t<_AllocPtr, _Mv>
                                                        __map_value_type_pointer;
-  typedef typename __rebind_pointer<_AllocPtr, const _Mv>::type
+  typedef __rebind_pointer_t<_AllocPtr, const _Mv>
                                                  __const_map_value_type_pointer;
 };
 @@ -683,28 +699,26 @@ public:
   typedef _NodePtr                                              __node_pointer;
   typedef _Tp                                                 __node_value_type;
-  typedef typename __rebind_pointer<_VoidPtr, __node_value_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, __node_value_type>
                                                       __node_value_type_pointer;
-  typedef typename __rebind_pointer<_VoidPtr, const __node_value_type>::type
+  typedef __rebind_pointer_t<_VoidPtr, const __node_value_type>
                                                 __const_node_value_type_pointer;
 #if defined(_LIBCPP_ABI_TREE_REMOVE_NODE_POINTER_UB)
   typedef typename __base::__end_node_pointer __iter_pointer;
 #else
-  typedef typename conditional<
+  typedef __conditional_t< is_pointer<__node_pointer>::value, typename __base::__end_node_pointer, __node_pointer>
-      is_pointer<__node_pointer>::value,
+      __iter_pointer;
-        typename __base::__end_node_pointer,
-        __node_pointer>::type __iter_pointer;
 #endif
 private:
     static_assert(!is_const<__node_type>::value,
                 "_NodePtr should never be a pointer to const");
-    static_assert((is_same<typename __rebind_pointer<_VoidPtr, __node_type>::type,
+    static_assert((is_same<__rebind_pointer_t<_VoidPtr, __node_type>,
                           _NodePtr>::value), "_VoidPtr does not rebind to _NodePtr.");
 };
 template <class _ValueTp, class _VoidPtr>
 struct __make_tree_node_types {
-  typedef typename __rebind_pointer<_VoidPtr, __tree_node<_ValueTp, _VoidPtr> >::type
+  typedef __rebind_pointer_t<_VoidPtr, __tree_node<_ValueTp, _VoidPtr> >
                                                                         _NodePtr;
   typedef __tree_node_types<_NodePtr> type;
 };
 @@ -1019,7 +1033,7 @@ public:
     typedef typename _NodeTypes::__parent_pointer      __parent_pointer;
     typedef typename _NodeTypes::__iter_pointer        __iter_pointer;
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node>::type __node_allocator;
+    typedef __rebind_alloc<__alloc_traits, __node> __node_allocator;
     typedef allocator_traits<__node_allocator>         __node_traits;
 private:
 @@ -1028,8 +1042,7 @@ private:
     // the pointer using 'pointer_traits'.
     static_assert((is_same<__node_pointer, typename __node_traits::pointer>::value),
                   "Allocator does not rebind pointers in a sane manner.");
-    typedef typename __rebind_alloc_helper<__node_traits, __node_base>::type
+    typedef __rebind_alloc<__node_traits, __node_base> __node_base_allocator;
-        __node_base_allocator;
     typedef allocator_traits<__node_base_allocator> __node_base_traits;
     static_assert((is_same<__node_base_pointer, typename __node_base_traits::pointer>::value),
                  "Allocator does not rebind pointers in a sane manner.");
 @@ -1271,14 +1284,14 @@ public:
     }
     template <class _Vp,
-              class = __enable_if_t<!is_same<typename __unconstref<_Vp>::type, __container_value_type>::value> >
+              class = __enable_if_t<!is_same<__remove_const_ref_t<_Vp>, __container_value_type>::value> >
     _LIBCPP_INLINE_VISIBILITY
     pair<iterator, bool> __insert_unique(_Vp&& __v) {
         return __emplace_unique(_VSTD::forward<_Vp>(__v));
     }
     template <class _Vp,
-              class = __enable_if_t<!is_same<typename __unconstref<_Vp>::type, __container_value_type>::value> >
+              class = __enable_if_t<!is_same<__remove_const_ref_t<_Vp>, __container_value_type>::value> >
     _LIBCPP_INLINE_VISIBILITY
     iterator __insert_unique(const_iterator __p, _Vp&& __v) {
         return __emplace_hint_unique(__p, _VSTD::forward<_Vp>(__v));

lib/libcxx/include/__tuple deleted-550

...	@@ -1,550 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___TUPLE
11	#define _LIBCPP___TUPLE
12
13	#include <__config>
14	#include <cstddef>
15	#include <type_traits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size;
25
26	#if !defined(_LIBCPP_CXX03_LANG)
27	template <class _Tp, class...>
28	using __enable_if_tuple_size_imp = _Tp;
29
30	template <class _Tp>
31	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
32	const _Tp,
33	__enable_if_t<!is_volatile<_Tp>::value>,
34	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
35	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
36
37	template <class _Tp>
38	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
39	volatile _Tp,
40	__enable_if_t<!is_const<_Tp>::value>,
41	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
42	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
43
44	template <class _Tp>
45	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
46	const volatile _Tp,
47	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
48	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
49
50	#else
51	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<const _Tp> : public tuple_size<_Tp> {};
52	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<volatile _Tp> : public tuple_size<_Tp> {};
53	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<const volatile _Tp> : public tuple_size<_Tp> {};
54	#endif
55
56	template <size_t _Ip, class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_element;
57
58	template <size_t _Ip, class _Tp>
59	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const _Tp>
60	{
61	typedef _LIBCPP_NODEBUG typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
62	};
63
64	template <size_t _Ip, class _Tp>
65	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, volatile _Tp>
66	{
67	typedef _LIBCPP_NODEBUG typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
68	};
69
70	template <size_t _Ip, class _Tp>
71	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp>
72	{
73	typedef _LIBCPP_NODEBUG typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
74	};
75
76	template <class _Tp> struct __tuple_like : false_type {};
77
78	template <class _Tp> struct __tuple_like<const _Tp> : public __tuple_like<_Tp> {};
79	template <class _Tp> struct __tuple_like<volatile _Tp> : public __tuple_like<_Tp> {};
80	template <class _Tp> struct __tuple_like<const volatile _Tp> : public __tuple_like<_Tp> {};
81
82	// tuple specializations
83
84	#ifndef _LIBCPP_CXX03_LANG
85
86	template <size_t...> struct __tuple_indices {};
87
88	template <class _IdxType, _IdxType... _Values>
89	struct __integer_sequence {
90	template <template <class _OIdxType, _OIdxType...> class _ToIndexSeq, class _ToIndexType>
91	using __convert = _ToIndexSeq<_ToIndexType, _Values...>;
92
93	template <size_t _Sp>
94	using __to_tuple_indices = __tuple_indices<(_Values + _Sp)...>;
95	};
96
97	#if !__has_builtin(__make_integer_seq) \|\| defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
98	namespace __detail {
99
100	template<typename _Tp, size_t ..._Extra> struct __repeat;
101	template<typename _Tp, _Tp ..._Np, size_t ..._Extra> struct __repeat<__integer_sequence<_Tp, _Np...>, _Extra...> {
102	typedef _LIBCPP_NODEBUG __integer_sequence<_Tp,
103	_Np...,
104	sizeof...(_Np) + _Np...,
105	2 * sizeof...(_Np) + _Np...,
106	3 * sizeof...(_Np) + _Np...,
107	4 * sizeof...(_Np) + _Np...,
108	5 * sizeof...(_Np) + _Np...,
109	6 * sizeof...(_Np) + _Np...,
110	7 * sizeof...(_Np) + _Np...,
111	_Extra...> type;
112	};
113
114	template<size_t _Np> struct __parity;
115	template<size_t _Np> struct __make : __parity<_Np % 8>::template __pmake<_Np> {};
116
117	template<> struct __make<0> { typedef __integer_sequence<size_t> type; };
118	template<> struct __make<1> { typedef __integer_sequence<size_t, 0> type; };
119	template<> struct __make<2> { typedef __integer_sequence<size_t, 0, 1> type; };
120	template<> struct __make<3> { typedef __integer_sequence<size_t, 0, 1, 2> type; };
121	template<> struct __make<4> { typedef __integer_sequence<size_t, 0, 1, 2, 3> type; };
122	template<> struct __make<5> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4> type; };
123	template<> struct __make<6> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4, 5> type; };
124	template<> struct __make<7> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4, 5, 6> type; };
125
126	template<> struct __parity<0> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type> {}; };
127	template<> struct __parity<1> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 1> {}; };
128	template<> struct __parity<2> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 2, _Np - 1> {}; };
129	template<> struct __parity<3> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 3, _Np - 2, _Np - 1> {}; };
130	template<> struct __parity<4> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
131	template<> struct __parity<5> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
132	template<> struct __parity<6> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
133	template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 7, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
134
135	} // namespace detail
136
137	#endif // !__has_builtin(__make_integer_seq) \|\| defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
138
139	#if __has_builtin(__make_integer_seq)
140	template <size_t _Ep, size_t _Sp>
141	using __make_indices_imp =
142	typename __make_integer_seq<__integer_sequence, size_t, _Ep - _Sp>::template
143	__to_tuple_indices<_Sp>;
144	#else
145	template <size_t _Ep, size_t _Sp>
146	using __make_indices_imp =
147	typename __detail::__make<_Ep - _Sp>::type::template __to_tuple_indices<_Sp>;
148
149	#endif
150
151	template <size_t _Ep, size_t _Sp = 0>
152	struct __make_tuple_indices
153	{
154	static_assert(_Sp <= _Ep, "__make_tuple_indices input error");
155	typedef __make_indices_imp<_Ep, _Sp> type;
156	};
157
158
159	template <class ..._Tp> class _LIBCPP_TEMPLATE_VIS tuple;
160
161	template <class... _Tp> struct __tuple_like<tuple<_Tp...> > : true_type {};
162
163	template <class ..._Tp>
164	struct _LIBCPP_TEMPLATE_VIS tuple_size<tuple<_Tp...> >
165	: public integral_constant<size_t, sizeof...(_Tp)>
166	{
167	};
168
169	template <size_t _Ip, class ..._Tp>
170	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
171	typename tuple_element<_Ip, tuple<_Tp...> >::type&
172	get(tuple<_Tp...>&) _NOEXCEPT;
173
174	template <size_t _Ip, class ..._Tp>
175	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
176	const typename tuple_element<_Ip, tuple<_Tp...> >::type&
177	get(const tuple<_Tp...>&) _NOEXCEPT;
178
179	template <size_t _Ip, class ..._Tp>
180	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
181	typename tuple_element<_Ip, tuple<_Tp...> >::type&&
182	get(tuple<_Tp...>&&) _NOEXCEPT;
183
184	template <size_t _Ip, class ..._Tp>
185	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
186	const typename tuple_element<_Ip, tuple<_Tp...> >::type&&
187	get(const tuple<_Tp...>&&) _NOEXCEPT;
188
189	#endif // !defined(_LIBCPP_CXX03_LANG)
190
191	// pair specializations
192
193	template <class _T1, class _T2> struct __tuple_like<pair<_T1, _T2> > : true_type {};
194
195	template <size_t _Ip, class _T1, class _T2>
196	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
197	typename tuple_element<_Ip, pair<_T1, _T2> >::type&
198	get(pair<_T1, _T2>&) _NOEXCEPT;
199
200	template <size_t _Ip, class _T1, class _T2>
201	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
202	const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
203	get(const pair<_T1, _T2>&) _NOEXCEPT;
204
205	#ifndef _LIBCPP_CXX03_LANG
206	template <size_t _Ip, class _T1, class _T2>
207	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
208	typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
209	get(pair<_T1, _T2>&&) _NOEXCEPT;
210
211	template <size_t _Ip, class _T1, class _T2>
212	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
213	const typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
214	get(const pair<_T1, _T2>&&) _NOEXCEPT;
215	#endif
216
217	// array specializations
218
219	template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
220
221	template <class _Tp, size_t _Size> struct __tuple_like<array<_Tp, _Size> > : true_type {};
222
223	template <size_t _Ip, class _Tp, size_t _Size>
224	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
225	_Tp&
226	get(array<_Tp, _Size>&) _NOEXCEPT;
227
228	template <size_t _Ip, class _Tp, size_t _Size>
229	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
230	const _Tp&
231	get(const array<_Tp, _Size>&) _NOEXCEPT;
232
233	#ifndef _LIBCPP_CXX03_LANG
234	template <size_t _Ip, class _Tp, size_t _Size>
235	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
236	_Tp&&
237	get(array<_Tp, _Size>&&) _NOEXCEPT;
238
239	template <size_t _Ip, class _Tp, size_t _Size>
240	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
241	const _Tp&&
242	get(const array<_Tp, _Size>&&) _NOEXCEPT;
243	#endif
244
245	#ifndef _LIBCPP_CXX03_LANG
246
247	// __tuple_types
248
249	template <class ..._Tp> struct __tuple_types {};
250
251	#if !__has_builtin(__type_pack_element)
252
253	namespace __indexer_detail {
254
255	template <size_t _Idx, class _Tp>
256	struct __indexed { using type _LIBCPP_NODEBUG = _Tp; };
257
258	template <class _Types, class _Indexes> struct __indexer;
259
260	template <class ..._Types, size_t ..._Idx>
261	struct __indexer<__tuple_types<_Types...>, __tuple_indices<_Idx...>>
262	: __indexed<_Idx, _Types>...
263	{};
264
265	template <size_t _Idx, class _Tp>
266	__indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&);
267
268	} // namespace __indexer_detail
269
270	template <size_t _Idx, class ..._Types>
271	using __type_pack_element _LIBCPP_NODEBUG = typename decltype(
272	__indexer_detail::__at_index<_Idx>(
273	__indexer_detail::__indexer<
274	__tuple_types<_Types...>,
275	typename __make_tuple_indices<sizeof...(_Types)>::type
276	>{})
277	)::type;
278	#endif
279
280	template <size_t _Ip, class ..._Types>
281	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> >
282	{
283	static_assert(_Ip < sizeof...(_Types), "tuple_element index out of range");
284	typedef _LIBCPP_NODEBUG __type_pack_element<_Ip, _Types...> type;
285	};
286
287
288	template <class ..._Tp>
289	struct _LIBCPP_TEMPLATE_VIS tuple_size<__tuple_types<_Tp...> >
290	: public integral_constant<size_t, sizeof...(_Tp)>
291	{
292	};
293
294	template <class... _Tp> struct __tuple_like<__tuple_types<_Tp...> > : true_type {};
295
296	template <bool _ApplyLV, bool _ApplyConst, bool _ApplyVolatile>
297	struct __apply_cv_mf;
298	template <>
299	struct __apply_cv_mf<false, false, false> {
300	template <class _Tp> using __apply = _Tp;
301	};
302	template <>
303	struct __apply_cv_mf<false, true, false> {
304	template <class _Tp> using __apply _LIBCPP_NODEBUG = const _Tp;
305	};
306	template <>
307	struct __apply_cv_mf<false, false, true> {
308	template <class _Tp> using __apply _LIBCPP_NODEBUG = volatile _Tp;
309	};
310	template <>
311	struct __apply_cv_mf<false, true, true> {
312	template <class _Tp> using __apply _LIBCPP_NODEBUG = const volatile _Tp;
313	};
314	template <>
315	struct __apply_cv_mf<true, false, false> {
316	template <class _Tp> using __apply _LIBCPP_NODEBUG = _Tp&;
317	};
318	template <>
319	struct __apply_cv_mf<true, true, false> {
320	template <class _Tp> using __apply _LIBCPP_NODEBUG = const _Tp&;
321	};
322	template <>
323	struct __apply_cv_mf<true, false, true> {
324	template <class _Tp> using __apply _LIBCPP_NODEBUG = volatile _Tp&;
325	};
326	template <>
327	struct __apply_cv_mf<true, true, true> {
328	template <class _Tp> using __apply _LIBCPP_NODEBUG = const volatile _Tp&;
329	};
330	template <class _Tp, class _RawTp = typename remove_reference<_Tp>::type>
331	using __apply_cv_t _LIBCPP_NODEBUG = __apply_cv_mf<
332	is_lvalue_reference<_Tp>::value,
333	is_const<_RawTp>::value,
334	is_volatile<_RawTp>::value>;
335
336	// __make_tuple_types
337
338	// __make_tuple_types<_Tuple<_Types...>, _Ep, _Sp>::type is a
339	// __tuple_types<_Types...> using only those _Types in the range [_Sp, _Ep).
340	// _Sp defaults to 0 and _Ep defaults to tuple_size<_Tuple>. If _Tuple is a
341	// lvalue_reference type, then __tuple_types<_Types&...> is the result.
342
343	template <class _TupleTypes, class _TupleIndices>
344	struct __make_tuple_types_flat;
345
346	template <template <class...> class _Tuple, class ..._Types, size_t ..._Idx>
347	struct __make_tuple_types_flat<_Tuple<_Types...>, __tuple_indices<_Idx...>> {
348	// Specialization for pair, tuple, and __tuple_types
349	template <class _Tp, class _ApplyFn = __apply_cv_t<_Tp>>
350	using __apply_quals _LIBCPP_NODEBUG = __tuple_types<
351	typename _ApplyFn::template __apply<__type_pack_element<_Idx, _Types...>>...
352	>;
353	};
354
355	template <class _Vt, size_t _Np, size_t ..._Idx>
356	struct __make_tuple_types_flat<array<_Vt, _Np>, __tuple_indices<_Idx...>> {
357	template <size_t>
358	using __value_type = _Vt;
359	template <class _Tp, class _ApplyFn = __apply_cv_t<_Tp>>
360	using __apply_quals = __tuple_types<
361	typename _ApplyFn::template __apply<__value_type<_Idx>>...
362	>;
363	};
364
365	template <class _Tp, size_t _Ep = tuple_size<typename remove_reference<_Tp>::type>::value,
366	size_t _Sp = 0,
367	bool _SameSize = (_Ep == tuple_size<typename remove_reference<_Tp>::type>::value)>
368	struct __make_tuple_types
369	{
370	static_assert(_Sp <= _Ep, "__make_tuple_types input error");
371	using _RawTp = typename remove_cv<typename remove_reference<_Tp>::type>::type;
372	using _Maker = __make_tuple_types_flat<_RawTp, typename __make_tuple_indices<_Ep, _Sp>::type>;
373	using type = typename _Maker::template __apply_quals<_Tp>;
374	};
375
376	template <class ..._Types, size_t _Ep>
377	struct __make_tuple_types<tuple<_Types...>, _Ep, 0, true> {
378	typedef _LIBCPP_NODEBUG __tuple_types<_Types...> type;
379	};
380
381	template <class ..._Types, size_t _Ep>
382	struct __make_tuple_types<__tuple_types<_Types...>, _Ep, 0, true> {
383	typedef _LIBCPP_NODEBUG __tuple_types<_Types...> type;
384	};
385
386	template <bool ..._Preds>
387	struct __all_dummy;
388
389	template <bool ..._Pred>
390	struct __all : _IsSame<__all_dummy<_Pred...>, __all_dummy<((void)_Pred, true)...>> {};
391
392	struct __tuple_sfinae_base {
393	template <template <class, class...> class _Trait,
394	class ..._LArgs, class ..._RArgs>
395	static auto __do_test(__tuple_types<_LArgs...>, __tuple_types<_RArgs...>)
396	-> __all<__enable_if_t<_Trait<_LArgs, _RArgs>::value, bool>{true}...>;
397	template <template <class...> class>
398	static auto __do_test(...) -> false_type;
399
400	template <class _FromArgs, class _ToArgs>
401	using __constructible = decltype(__do_test<is_constructible>(_ToArgs{}, _FromArgs{}));
402	template <class _FromArgs, class _ToArgs>
403	using __convertible = decltype(__do_test<is_convertible>(_FromArgs{}, _ToArgs{}));
404	template <class _FromArgs, class _ToArgs>
405	using __assignable = decltype(__do_test<is_assignable>(_ToArgs{}, _FromArgs{}));
406	};
407
408	// __tuple_convertible
409
410	template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
411	bool = __tuple_like<_Up>::value>
412	struct __tuple_convertible
413	: public false_type {};
414
415	template <class _Tp, class _Up>
416	struct __tuple_convertible<_Tp, _Up, true, true>
417	: public __tuple_sfinae_base::__convertible<
418	typename __make_tuple_types<_Tp>::type
419	, typename __make_tuple_types<_Up>::type
420	>
421	{};
422
423	// __tuple_constructible
424
425	template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
426	bool = __tuple_like<_Up>::value>
427	struct __tuple_constructible
428	: public false_type {};
429
430	template <class _Tp, class _Up>
431	struct __tuple_constructible<_Tp, _Up, true, true>
432	: public __tuple_sfinae_base::__constructible<
433	typename __make_tuple_types<_Tp>::type
434	, typename __make_tuple_types<_Up>::type
435	>
436	{};
437
438	// __tuple_assignable
439
440	template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
441	bool = __tuple_like<_Up>::value>
442	struct __tuple_assignable
443	: public false_type {};
444
445	template <class _Tp, class _Up>
446	struct __tuple_assignable<_Tp, _Up, true, true>
447	: public __tuple_sfinae_base::__assignable<
448	typename __make_tuple_types<_Tp>::type
449	, typename __make_tuple_types<_Up&>::type
450	>
451	{};
452
453
454	template <size_t _Ip, class ..._Tp>
455	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, tuple<_Tp...> >
456	{
457	typedef _LIBCPP_NODEBUG typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
458	};
459
460	#if _LIBCPP_STD_VER > 11
461	template <size_t _Ip, class ..._Tp>
462	using tuple_element_t _LIBCPP_NODEBUG = typename tuple_element <_Ip, _Tp...>::type;
463	#endif
464
465	template <bool _IsTuple, class _SizeTrait, size_t _Expected>
466	struct __tuple_like_with_size_imp : false_type {};
467
468	template <class _SizeTrait, size_t _Expected>
469	struct __tuple_like_with_size_imp<true, _SizeTrait, _Expected>
470	: integral_constant<bool, _SizeTrait::value == _Expected> {};
471
472	template <class _Tuple, size_t _ExpectedSize, class _RawTuple = __uncvref_t<_Tuple> >
473	using __tuple_like_with_size _LIBCPP_NODEBUG = __tuple_like_with_size_imp<
474	__tuple_like<_RawTuple>::value,
475	tuple_size<_RawTuple>, _ExpectedSize
476	>;
477
478	struct _LIBCPP_TYPE_VIS __check_tuple_constructor_fail {
479
480	static constexpr bool __enable_explicit_default() { return false; }
481	static constexpr bool __enable_implicit_default() { return false; }
482	template <class ...>
483	static constexpr bool __enable_explicit() { return false; }
484	template <class ...>
485	static constexpr bool __enable_implicit() { return false; }
486	template <class ...>
487	static constexpr bool __enable_assign() { return false; }
488	};
489	#endif // !defined(_LIBCPP_CXX03_LANG)
490
491	#if _LIBCPP_STD_VER > 14
492
493	template <bool _CanCopy, bool _CanMove>
494	struct __sfinae_ctor_base {};
495	template <>
496	struct __sfinae_ctor_base<false, false> {
497	__sfinae_ctor_base() = default;
498	__sfinae_ctor_base(__sfinae_ctor_base const&) = delete;
499	__sfinae_ctor_base(__sfinae_ctor_base &&) = delete;
500	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
501	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
502	};
503	template <>
504	struct __sfinae_ctor_base<true, false> {
505	__sfinae_ctor_base() = default;
506	__sfinae_ctor_base(__sfinae_ctor_base const&) = default;
507	__sfinae_ctor_base(__sfinae_ctor_base &&) = delete;
508	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
509	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
510	};
511	template <>
512	struct __sfinae_ctor_base<false, true> {
513	__sfinae_ctor_base() = default;
514	__sfinae_ctor_base(__sfinae_ctor_base const&) = delete;
515	__sfinae_ctor_base(__sfinae_ctor_base &&) = default;
516	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
517	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
518	};
519
520	template <bool _CanCopy, bool _CanMove>
521	struct __sfinae_assign_base {};
522	template <>
523	struct __sfinae_assign_base<false, false> {
524	__sfinae_assign_base() = default;
525	__sfinae_assign_base(__sfinae_assign_base const&) = default;
526	__sfinae_assign_base(__sfinae_assign_base &&) = default;
527	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = delete;
528	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = delete;
529	};
530	template <>
531	struct __sfinae_assign_base<true, false> {
532	__sfinae_assign_base() = default;
533	__sfinae_assign_base(__sfinae_assign_base const&) = default;
534	__sfinae_assign_base(__sfinae_assign_base &&) = default;
535	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = default;
536	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = delete;
537	};
538	template <>
539	struct __sfinae_assign_base<false, true> {
540	__sfinae_assign_base() = default;
541	__sfinae_assign_base(__sfinae_assign_base const&) = default;
542	__sfinae_assign_base(__sfinae_assign_base &&) = default;
543	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = delete;
544	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = default;
545	};
546	#endif // _LIBCPP_STD_VER > 14
547
548	_LIBCPP_END_NAMESPACE_STD
549
550	#endif // _LIBCPP___TUPLE

lib/libcxx/include/__tuple_dir/apply_cv.h created+70

...	@@ -0,0 +1,70 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_APPLY_CV_H
10	#define _LIBCPP___TUPLE_APPLY_CV_H
11
12	#include <__config>
13	#include <__type_traits/is_const.h>
14	#include <__type_traits/is_reference.h>
15	#include <__type_traits/is_volatile.h>
16	#include <__type_traits/remove_reference.h>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	#ifndef _LIBCPP_CXX03_LANG
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	template <bool _ApplyLV, bool _ApplyConst, bool _ApplyVolatile>
27	struct __apply_cv_mf;
28	template <>
29	struct __apply_cv_mf<false, false, false> {
30	template <class _Tp> using __apply = _Tp;
31	};
32	template <>
33	struct __apply_cv_mf<false, true, false> {
34	template <class _Tp> using __apply _LIBCPP_NODEBUG = const _Tp;
35	};
36	template <>
37	struct __apply_cv_mf<false, false, true> {
38	template <class _Tp> using __apply _LIBCPP_NODEBUG = volatile _Tp;
39	};
40	template <>
41	struct __apply_cv_mf<false, true, true> {
42	template <class _Tp> using __apply _LIBCPP_NODEBUG = const volatile _Tp;
43	};
44	template <>
45	struct __apply_cv_mf<true, false, false> {
46	template <class _Tp> using __apply _LIBCPP_NODEBUG = _Tp&;
47	};
48	template <>
49	struct __apply_cv_mf<true, true, false> {
50	template <class _Tp> using __apply _LIBCPP_NODEBUG = const _Tp&;
51	};
52	template <>
53	struct __apply_cv_mf<true, false, true> {
54	template <class _Tp> using __apply _LIBCPP_NODEBUG = volatile _Tp&;
55	};
56	template <>
57	struct __apply_cv_mf<true, true, true> {
58	template <class _Tp> using __apply _LIBCPP_NODEBUG = const volatile _Tp&;
59	};
60	template <class _Tp, class _RawTp = __libcpp_remove_reference_t<_Tp> >
61	using __apply_cv_t _LIBCPP_NODEBUG = __apply_cv_mf<
62	is_lvalue_reference<_Tp>::value,
63	is_const<_RawTp>::value,
64	is_volatile<_RawTp>::value>;
65
66	_LIBCPP_END_NAMESPACE_STD
67
68	#endif // _LIBCPP_CXX03_LANG
69
70	#endif // _LIBCPP___TUPLE_APPLY_CV_H

lib/libcxx/include/__tuple_dir/make_tuple_types.h created+84

...	@@ -0,0 +1,84 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
10	#define _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
11
12	#include <__config>
13	#include <__fwd/array.h>
14	#include <__fwd/tuple.h>
15	#include <__tuple_dir/apply_cv.h>
16	#include <__tuple_dir/tuple_element.h>
17	#include <__tuple_dir/tuple_indices.h>
18	#include <__tuple_dir/tuple_size.h>
19	#include <__tuple_dir/tuple_types.h>
20	#include <__type_traits/remove_cv.h>
21	#include <__type_traits/remove_reference.h>
22	#include <cstddef>
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	#ifndef _LIBCPP_CXX03_LANG
29
30	_LIBCPP_BEGIN_NAMESPACE_STD
31
32	// __make_tuple_types<_Tuple<_Types...>, _Ep, _Sp>::type is a
33	// __tuple_types<_Types...> using only those _Types in the range [_Sp, _Ep).
34	// _Sp defaults to 0 and _Ep defaults to tuple_size<_Tuple>. If _Tuple is a
35	// lvalue_reference type, then __tuple_types<_Types&...> is the result.
36
37	template <class _TupleTypes, class _TupleIndices>
38	struct __make_tuple_types_flat;
39
40	template <template <class...> class _Tuple, class ..._Types, size_t ..._Idx>
41	struct __make_tuple_types_flat<_Tuple<_Types...>, __tuple_indices<_Idx...>> {
42	// Specialization for pair, tuple, and __tuple_types
43	template <class _Tp, class _ApplyFn = __apply_cv_t<_Tp>>
44	using __apply_quals _LIBCPP_NODEBUG = __tuple_types<
45	typename _ApplyFn::template __apply<__type_pack_element<_Idx, _Types...>>...
46	>;
47	};
48
49	template <class _Vt, size_t _Np, size_t ..._Idx>
50	struct __make_tuple_types_flat<array<_Vt, _Np>, __tuple_indices<_Idx...>> {
51	template <size_t>
52	using __value_type = _Vt;
53	template <class _Tp, class _ApplyFn = __apply_cv_t<_Tp>>
54	using __apply_quals = __tuple_types<
55	typename _ApplyFn::template __apply<__value_type<_Idx>>...
56	>;
57	};
58
59	template <class _Tp, size_t _Ep = tuple_size<__libcpp_remove_reference_t<_Tp> >::value,
60	size_t _Sp = 0,
61	bool _SameSize = (_Ep == tuple_size<__libcpp_remove_reference_t<_Tp> >::value)>
62	struct __make_tuple_types
63	{
64	static_assert(_Sp <= _Ep, "__make_tuple_types input error");
65	using _RawTp = __remove_cv_t<__libcpp_remove_reference_t<_Tp> >;
66	using _Maker = __make_tuple_types_flat<_RawTp, typename __make_tuple_indices<_Ep, _Sp>::type>;
67	using type = typename _Maker::template __apply_quals<_Tp>;
68	};
69
70	template <class ..._Types, size_t _Ep>
71	struct __make_tuple_types<tuple<_Types...>, _Ep, 0, true> {
72	typedef _LIBCPP_NODEBUG __tuple_types<_Types...> type;
73	};
74
75	template <class ..._Types, size_t _Ep>
76	struct __make_tuple_types<__tuple_types<_Types...>, _Ep, 0, true> {
77	typedef _LIBCPP_NODEBUG __tuple_types<_Types...> type;
78	};
79
80	_LIBCPP_END_NAMESPACE_STD
81
82	#endif // _LIBCPP_CXX03_LANG
83
84	#endif // _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H

lib/libcxx/include/__tuple_dir/pair_like.h created+32

...	@@ -0,0 +1,32 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_PAIR_LIKE_H
10	#define _LIBCPP___TUPLE_PAIR_LIKE_H
11
12	#include <__config>
13	#include <__tuple_dir/tuple_like.h>
14	#include <__tuple_dir/tuple_size.h>
15	#include <__type_traits/remove_cvref.h>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	#if _LIBCPP_STD_VER >= 20
24
25	template <class _Tp>
26	concept __pair_like = __tuple_like<_Tp> && tuple_size<remove_cvref_t<_Tp>>::value == 2;
27
28	#endif // _LIBCPP_STD_VER >= 20
29
30	_LIBCPP_END_NAMESPACE_STD
31
32	#endif // _LIBCPP___TUPLE_PAIR_LIKE_H

lib/libcxx/include/__tuple_dir/sfinae_helpers.h created+196

...	@@ -0,0 +1,196 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_SFINAE_HELPERS_H
10	#define _LIBCPP___TUPLE_SFINAE_HELPERS_H
11
12	#include <__config>
13	#include <__fwd/tuple.h>
14	#include <__tuple_dir/make_tuple_types.h>
15	#include <__tuple_dir/tuple_element.h>
16	#include <__tuple_dir/tuple_like_ext.h>
17	#include <__tuple_dir/tuple_size.h>
18	#include <__tuple_dir/tuple_types.h>
19	#include <__type_traits/enable_if.h>
20	#include <__type_traits/integral_constant.h>
21	#include <__type_traits/is_assignable.h>
22	#include <__type_traits/is_constructible.h>
23	#include <__type_traits/is_convertible.h>
24	#include <__type_traits/is_same.h>
25	#include <__type_traits/remove_cvref.h>
26	#include <__type_traits/remove_reference.h>
27	#include <cstddef>
28
29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
30	# pragma GCC system_header
31	#endif
32
33	_LIBCPP_BEGIN_NAMESPACE_STD
34
35	#ifndef _LIBCPP_CXX03_LANG
36
37	template <bool ..._Preds>
38	struct __all_dummy;
39
40	template <bool ..._Pred>
41	struct __all : _IsSame<__all_dummy<_Pred...>, __all_dummy<((void)_Pred, true)...>> {};
42
43	struct __tuple_sfinae_base {
44	template <template <class, class...> class _Trait,
45	class ..._LArgs, class ..._RArgs>
46	static auto __do_test(__tuple_types<_LArgs...>, __tuple_types<_RArgs...>)
47	-> __all<__enable_if_t<_Trait<_LArgs, _RArgs>::value, bool>{true}...>;
48	template <template <class...> class>
49	static auto __do_test(...) -> false_type;
50
51	template <class _FromArgs, class _ToArgs>
52	using __constructible = decltype(__do_test<is_constructible>(_ToArgs{}, _FromArgs{}));
53	template <class _FromArgs, class _ToArgs>
54	using __convertible = decltype(__do_test<is_convertible>(_FromArgs{}, _ToArgs{}));
55	template <class _FromArgs, class _ToArgs>
56	using __assignable = decltype(__do_test<is_assignable>(_ToArgs{}, _FromArgs{}));
57	};
58
59	// __tuple_convertible
60
61	template <class _Tp, class _Up, bool = __tuple_like_ext<__libcpp_remove_reference_t<_Tp> >::value,
62	bool = __tuple_like_ext<_Up>::value>
63	struct __tuple_convertible
64	: public false_type {};
65
66	template <class _Tp, class _Up>
67	struct __tuple_convertible<_Tp, _Up, true, true>
68	: public __tuple_sfinae_base::__convertible<
69	typename __make_tuple_types<_Tp>::type
70	, typename __make_tuple_types<_Up>::type
71	>
72	{};
73
74	// __tuple_constructible
75
76	template <class _Tp, class _Up, bool = __tuple_like_ext<__libcpp_remove_reference_t<_Tp> >::value,
77	bool = __tuple_like_ext<_Up>::value>
78	struct __tuple_constructible
79	: public false_type {};
80
81	template <class _Tp, class _Up>
82	struct __tuple_constructible<_Tp, _Up, true, true>
83	: public __tuple_sfinae_base::__constructible<
84	typename __make_tuple_types<_Tp>::type
85	, typename __make_tuple_types<_Up>::type
86	>
87	{};
88
89	// __tuple_assignable
90
91	template <class _Tp, class _Up, bool = __tuple_like_ext<__libcpp_remove_reference_t<_Tp> >::value,
92	bool = __tuple_like_ext<_Up>::value>
93	struct __tuple_assignable
94	: public false_type {};
95
96	template <class _Tp, class _Up>
97	struct __tuple_assignable<_Tp, _Up, true, true>
98	: public __tuple_sfinae_base::__assignable<
99	typename __make_tuple_types<_Tp>::type
100	, typename __make_tuple_types<_Up&>::type
101	>
102	{};
103
104
105	template <size_t _Ip, class ..._Tp>
106	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, tuple<_Tp...> >
107	{
108	typedef _LIBCPP_NODEBUG typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
109	};
110
111	template <bool _IsTuple, class _SizeTrait, size_t _Expected>
112	struct __tuple_like_with_size_imp : false_type {};
113
114	template <class _SizeTrait, size_t _Expected>
115	struct __tuple_like_with_size_imp<true, _SizeTrait, _Expected>
116	: integral_constant<bool, _SizeTrait::value == _Expected> {};
117
118	template <class _Tuple, size_t _ExpectedSize, class _RawTuple = __libcpp_remove_reference_t<_Tuple> >
119	using __tuple_like_with_size _LIBCPP_NODEBUG = __tuple_like_with_size_imp<
120	__tuple_like_ext<_RawTuple>::value,
121	tuple_size<_RawTuple>, _ExpectedSize
122	>;
123
124	struct _LIBCPP_TYPE_VIS __check_tuple_constructor_fail {
125
126	static constexpr bool __enable_explicit_default() { return false; }
127	static constexpr bool __enable_implicit_default() { return false; }
128	template <class ...>
129	static constexpr bool __enable_explicit() { return false; }
130	template <class ...>
131	static constexpr bool __enable_implicit() { return false; }
132	template <class ...>
133	static constexpr bool __enable_assign() { return false; }
134	};
135	#endif // !defined(_LIBCPP_CXX03_LANG)
136
137	#if _LIBCPP_STD_VER > 14
138
139	template <bool _CanCopy, bool _CanMove>
140	struct __sfinae_ctor_base {};
141	template <>
142	struct __sfinae_ctor_base<false, false> {
143	__sfinae_ctor_base() = default;
144	__sfinae_ctor_base(__sfinae_ctor_base const&) = delete;
145	__sfinae_ctor_base(__sfinae_ctor_base &&) = delete;
146	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
147	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
148	};
149	template <>
150	struct __sfinae_ctor_base<true, false> {
151	__sfinae_ctor_base() = default;
152	__sfinae_ctor_base(__sfinae_ctor_base const&) = default;
153	__sfinae_ctor_base(__sfinae_ctor_base &&) = delete;
154	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
155	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
156	};
157	template <>
158	struct __sfinae_ctor_base<false, true> {
159	__sfinae_ctor_base() = default;
160	__sfinae_ctor_base(__sfinae_ctor_base const&) = delete;
161	__sfinae_ctor_base(__sfinae_ctor_base &&) = default;
162	__sfinae_ctor_base& operator=(__sfinae_ctor_base const&) = default;
163	__sfinae_ctor_base& operator=(__sfinae_ctor_base&&) = default;
164	};
165
166	template <bool _CanCopy, bool _CanMove>
167	struct __sfinae_assign_base {};
168	template <>
169	struct __sfinae_assign_base<false, false> {
170	__sfinae_assign_base() = default;
171	__sfinae_assign_base(__sfinae_assign_base const&) = default;
172	__sfinae_assign_base(__sfinae_assign_base &&) = default;
173	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = delete;
174	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = delete;
175	};
176	template <>
177	struct __sfinae_assign_base<true, false> {
178	__sfinae_assign_base() = default;
179	__sfinae_assign_base(__sfinae_assign_base const&) = default;
180	__sfinae_assign_base(__sfinae_assign_base &&) = default;
181	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = default;
182	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = delete;
183	};
184	template <>
185	struct __sfinae_assign_base<false, true> {
186	__sfinae_assign_base() = default;
187	__sfinae_assign_base(__sfinae_assign_base const&) = default;
188	__sfinae_assign_base(__sfinae_assign_base &&) = default;
189	__sfinae_assign_base& operator=(__sfinae_assign_base const&) = delete;
190	__sfinae_assign_base& operator=(__sfinae_assign_base&&) = default;
191	};
192	#endif // _LIBCPP_STD_VER > 14
193
194	_LIBCPP_END_NAMESPACE_STD
195
196	#endif // _LIBCPP___TUPLE_SFINAE_HELPERS_H

lib/libcxx/include/__tuple_dir/tuple_element.h created+93

...	@@ -0,0 +1,93 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_ELEMENT_H
10	#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
11
12	#include <__config>
13	#include <__tuple_dir/tuple_indices.h>
14	#include <__tuple_dir/tuple_types.h>
15	#include <__type_traits/add_const.h>
16	#include <__type_traits/add_cv.h>
17	#include <__type_traits/add_volatile.h>
18	#include <cstddef>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	template <size_t _Ip, class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_element;
27
28	template <size_t _Ip, class _Tp>
29	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const _Tp>
30	{
31	typedef _LIBCPP_NODEBUG typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
32	};
33
34	template <size_t _Ip, class _Tp>
35	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, volatile _Tp>
36	{
37	typedef _LIBCPP_NODEBUG typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
38	};
39
40	template <size_t _Ip, class _Tp>
41	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp>
42	{
43	typedef _LIBCPP_NODEBUG typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
44	};
45
46	#ifndef _LIBCPP_CXX03_LANG
47
48	#if !__has_builtin(__type_pack_element)
49
50	namespace __indexer_detail {
51
52	template <size_t _Idx, class _Tp>
53	struct __indexed { using type _LIBCPP_NODEBUG = _Tp; };
54
55	template <class _Types, class _Indexes> struct __indexer;
56
57	template <class ..._Types, size_t ..._Idx>
58	struct __indexer<__tuple_types<_Types...>, __tuple_indices<_Idx...>>
59	: __indexed<_Idx, _Types>...
60	{};
61
62	template <size_t _Idx, class _Tp>
63	__indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&);
64
65	} // namespace __indexer_detail
66
67	template <size_t _Idx, class ..._Types>
68	using __type_pack_element _LIBCPP_NODEBUG = typename decltype(
69	__indexer_detail::__at_index<_Idx>(
70	__indexer_detail::__indexer<
71	__tuple_types<_Types...>,
72	typename __make_tuple_indices<sizeof...(_Types)>::type
73	>{})
74	)::type;
75	#endif
76
77	template <size_t _Ip, class ..._Types>
78	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> >
79	{
80	static_assert(_Ip < sizeof...(_Types), "tuple_element index out of range");
81	typedef _LIBCPP_NODEBUG __type_pack_element<_Ip, _Types...> type;
82	};
83
84	#if _LIBCPP_STD_VER > 11
85	template <size_t _Ip, class ..._Tp>
86	using tuple_element_t _LIBCPP_NODEBUG = typename tuple_element <_Ip, _Tp...>::type;
87	#endif
88
89	#endif // _LIBCPP_CXX03_LANG
90
91	_LIBCPP_END_NAMESPACE_STD
92
93	#endif // _LIBCPP___TUPLE_TUPLE_ELEMENT_H

lib/libcxx/include/__tuple_dir/tuple_indices.h created+37

...	@@ -0,0 +1,37 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
10	#define _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
11
12	#include <__config>
13	#include <__utility/integer_sequence.h>
14	#include <cstddef>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	#ifndef _LIBCPP_CXX03_LANG
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template <size_t...> struct __tuple_indices {};
25
26	template <size_t _Ep, size_t _Sp = 0>
27	struct __make_tuple_indices
28	{
29	static_assert(_Sp <= _Ep, "__make_tuple_indices input error");
30	typedef __make_indices_imp<_Ep, _Sp> type;
31	};
32
33	_LIBCPP_END_NAMESPACE_STD
34
35	#endif // _LIBCPP_CXX03_LANG
36
37	#endif // _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H

lib/libcxx/include/__tuple_dir/tuple_like.h created+51

...	@@ -0,0 +1,51 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_H
10	#define _LIBCPP___TUPLE_TUPLE_LIKE_H
11
12	#include <__config>
13	#include <__fwd/array.h>
14	#include <__fwd/pair.h>
15	#include <__fwd/subrange.h>
16	#include <__fwd/tuple.h>
17	#include <__type_traits/integral_constant.h>
18	#include <__type_traits/remove_cvref.h>
19	#include <cstddef>
20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header
23	#endif
24
25	_LIBCPP_BEGIN_NAMESPACE_STD
26
27	#if _LIBCPP_STD_VER >= 20
28
29	template <class _Tp>
30	struct __tuple_like_impl : false_type {};
31
32	template <class... _Tp>
33	struct __tuple_like_impl<tuple<_Tp...> > : true_type {};
34
35	template <class _T1, class _T2>
36	struct __tuple_like_impl<pair<_T1, _T2> > : true_type {};
37
38	template <class _Tp, size_t _Size>
39	struct __tuple_like_impl<array<_Tp, _Size> > : true_type {};
40
41	template <class _Ip, class _Sp, ranges::subrange_kind _Kp>
42	struct __tuple_like_impl<ranges::subrange<_Ip, _Sp, _Kp> > : true_type {};
43
44	template <class _Tp>
45	concept __tuple_like = __tuple_like_impl<remove_cvref_t<_Tp>>::value;
46
47	#endif // _LIBCPP_STD_VER >= 20
48
49	_LIBCPP_END_NAMESPACE_STD
50
51	#endif // _LIBCPP___TUPLE_TUPLE_LIKE_H

lib/libcxx/include/__tuple_dir/tuple_like_ext.h created+44

...	@@ -0,0 +1,44 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
10	#define _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
11
12	#include <__config>
13	#include <__fwd/array.h>
14	#include <__fwd/pair.h>
15	#include <__fwd/tuple.h>
16	#include <__tuple_dir/tuple_types.h>
17	#include <__type_traits/integral_constant.h>
18	#include <cstddef>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	template <class _Tp> struct __tuple_like_ext : false_type {};
27
28	template <class _Tp> struct __tuple_like_ext<const _Tp> : public __tuple_like_ext<_Tp> {};
29	template <class _Tp> struct __tuple_like_ext<volatile _Tp> : public __tuple_like_ext<_Tp> {};
30	template <class _Tp> struct __tuple_like_ext<const volatile _Tp> : public __tuple_like_ext<_Tp> {};
31
32	#ifndef _LIBCPP_CXX03_LANG
33	template <class... _Tp> struct __tuple_like_ext<tuple<_Tp...> > : true_type {};
34	#endif
35
36	template <class _T1, class _T2> struct __tuple_like_ext<pair<_T1, _T2> > : true_type {};
37
38	template <class _Tp, size_t _Size> struct __tuple_like_ext<array<_Tp, _Size> > : true_type {};
39
40	template <class... _Tp> struct __tuple_like_ext<__tuple_types<_Tp...> > : true_type {};
41
42	_LIBCPP_END_NAMESPACE_STD
43
44	#endif // _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H

lib/libcxx/include/__tuple_dir/tuple_size.h created+75

...	@@ -0,0 +1,75 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_SIZE_H
10	#define _LIBCPP___TUPLE_TUPLE_SIZE_H
11
12	#include <__config>
13	#include <__fwd/tuple.h>
14	#include <__tuple_dir/tuple_types.h>
15	#include <__type_traits/is_const.h>
16	#include <__type_traits/is_volatile.h>
17	#include <cstddef>
18
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header
21	#endif
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size;
26
27	#if !defined(_LIBCPP_CXX03_LANG)
28	template <class _Tp, class...>
29	using __enable_if_tuple_size_imp = _Tp;
30
31	template <class _Tp>
32	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
33	const _Tp,
34	__enable_if_t<!is_volatile<_Tp>::value>,
35	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
36	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
37
38	template <class _Tp>
39	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
40	volatile _Tp,
41	__enable_if_t<!is_const<_Tp>::value>,
42	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
43	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
44
45	template <class _Tp>
46	struct _LIBCPP_TEMPLATE_VIS tuple_size<__enable_if_tuple_size_imp<
47	const volatile _Tp,
48	integral_constant<size_t, sizeof(tuple_size<_Tp>)>>>
49	: public integral_constant<size_t, tuple_size<_Tp>::value> {};
50
51	#else
52	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<const _Tp> : public tuple_size<_Tp> {};
53	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<volatile _Tp> : public tuple_size<_Tp> {};
54	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<const volatile _Tp> : public tuple_size<_Tp> {};
55	#endif
56
57	#ifndef _LIBCPP_CXX03_LANG
58
59	template <class ..._Tp>
60	struct _LIBCPP_TEMPLATE_VIS tuple_size<tuple<_Tp...> >
61	: public integral_constant<size_t, sizeof...(_Tp)>
62	{
63	};
64
65	template <class ..._Tp>
66	struct _LIBCPP_TEMPLATE_VIS tuple_size<__tuple_types<_Tp...> >
67	: public integral_constant<size_t, sizeof...(_Tp)>
68	{
69	};
70
71	#endif // _LIBCPP_CXX03_LANG
72
73	_LIBCPP_END_NAMESPACE_STD
74
75	#endif // _LIBCPP___TUPLE_TUPLE_SIZE_H

lib/libcxx/include/__tuple_dir/tuple_types.h created+24

...	@@ -0,0 +1,24 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_TYPES_H
10	#define _LIBCPP___TUPLE_TUPLE_TYPES_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class ..._Tp> struct __tuple_types {};
21
22	_LIBCPP_END_NAMESPACE_STD
23
24	#endif // _LIBCPP___TUPLE_TUPLE_TYPES_H

lib/libcxx/include/__type_traits/add_lvalue_reference.h+25-5

...	@@ -18,14 +18,34 @@	...	@@ -18,14 +18,34 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_lvalue_reference_impl { typedef _LIBCPP_NODEBUG _Tp type; };	21	#if __has_builtin(__add_lvalue_reference)
22	template <class _Tp > struct __add_lvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG _Tp& type; };
23		22
24	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_lvalue_reference	23	template <class _Tp>
25	{typedef _LIBCPP_NODEBUG typename __add_lvalue_reference_impl<_Tp>::type type;};	24	using __add_lvalue_reference_t = __add_lvalue_reference(_Tp);
		25
		26	#else
		27
		28	template <class _Tp, bool = __libcpp_is_referenceable<_Tp>::value>
		29	struct __add_lvalue_reference_impl {
		30	typedef _LIBCPP_NODEBUG _Tp type;
		31	};
		32	template <class _Tp >
		33	struct __add_lvalue_reference_impl<_Tp, true> {
		34	typedef _LIBCPP_NODEBUG _Tp& type;
		35	};
		36
		37	template <class _Tp>
		38	using __add_lvalue_reference_t = typename __add_lvalue_reference_impl<_Tp>::type;
		39
		40	#endif // __has_builtin(__add_lvalue_reference)
		41
		42	template <class _Tp>
		43	struct add_lvalue_reference {
		44	using type _LIBCPP_NODEBUG = __add_lvalue_reference_t<_Tp>;
		45	};
26		46
27	#if _LIBCPP_STD_VER > 11	47	#if _LIBCPP_STD_VER > 11
28	template <class _Tp> using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;	48	template <class _Tp> using add_lvalue_reference_t = __add_lvalue_reference_t<_Tp>;
29	#endif	49	#endif
30		50
31	_LIBCPP_END_NAMESPACE_STD	51	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/add_pointer.h+21-7

 @@ -12,6 +12,7 @@
 #include <__config>
 #include <__type_traits/is_referenceable.h>
 #include <__type_traits/is_same.h>
+#include <__type_traits/is_void.h>
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_reference.h>
 @@ -21,19 +22,32 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+#if __has_builtin(__add_pointer)
+template <class _Tp>
+using __add_pointer_t = __add_pointer(_Tp);
+#else
 template <class _Tp,
-        bool = __is_referenceable<_Tp>::value ||
+          bool = __libcpp_is_referenceable<_Tp>::value || is_void<_Tp>::value>
-                _IsSame<typename remove_cv<_Tp>::type, void>::value>
+struct __add_pointer_impl {
-struct __add_pointer_impl
+  typedef _LIBCPP_NODEBUG __libcpp_remove_reference_t<_Tp>* type;
-    {typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type* type;};
+};
 template <class _Tp> struct __add_pointer_impl<_Tp, false>
     {typedef _LIBCPP_NODEBUG _Tp type;};
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_pointer
+template <class _Tp>
-    {typedef _LIBCPP_NODEBUG typename __add_pointer_impl<_Tp>::type type;};
+using __add_pointer_t = typename __add_pointer_impl<_Tp>::type;
+#endif // __has_builtin(__add_pointer)
+template <class _Tp>
+struct add_pointer {
+  using type _LIBCPP_NODEBUG = __add_pointer_t<_Tp>;
+};
 #if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_pointer_t = typename add_pointer<_Tp>::type;
+template <class _Tp> using add_pointer_t = __add_pointer_t<_Tp>;
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/add_rvalue_reference.h+26-5

...	@@ -18,14 +18,35 @@	...	@@ -18,14 +18,35 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_rvalue_reference_impl { typedef _LIBCPP_NODEBUG _Tp type; };	21	#if __has_builtin(__add_rvalue_reference)
22	template <class _Tp > struct __add_rvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG _Tp&& type; };
23		22
24	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_rvalue_reference	23	template <class _Tp>
25	{typedef _LIBCPP_NODEBUG typename __add_rvalue_reference_impl<_Tp>::type type;};	24	using __add_rvalue_reference_t = __add_rvalue_reference(_Tp);
		25
		26	#else
		27
		28	template <class _Tp, bool = __libcpp_is_referenceable<_Tp>::value>
		29	struct __add_rvalue_reference_impl {
		30	typedef _LIBCPP_NODEBUG _Tp type;
		31	};
		32	template <class _Tp >
		33	struct __add_rvalue_reference_impl<_Tp, true> {
		34	typedef _LIBCPP_NODEBUG _Tp&& type;
		35	};
		36
		37	template <class _Tp>
		38	using __add_rvalue_reference_t = typename __add_rvalue_reference_impl<_Tp>::type;
		39
		40	#endif // __has_builtin(__add_rvalue_reference)
		41
		42	template <class _Tp>
		43	struct add_rvalue_reference {
		44	using type = __add_rvalue_reference_t<_Tp>;
		45	};
26		46
27	#if _LIBCPP_STD_VER > 11	47	#if _LIBCPP_STD_VER > 11
28	template <class _Tp> using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;	48	template <class _Tp>
		49	using add_rvalue_reference_t = __add_rvalue_reference_t<_Tp>;
29	#endif	50	#endif
30		51
31	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/aligned_storage.h+9-13

 @@ -54,21 +54,13 @@ template <class _TL, size_t _Align> struct __find_pod;
 template <class _Hp, size_t _Align>
 struct __find_pod<__type_list<_Hp, __nat>, _Align>
 {
-    typedef typename conditional<
+    typedef __conditional_t<_Align == _Hp::value, typename _Hp::type, __fallback_overaligned<_Align> > type;
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             __fallback_overaligned<_Align>
-                         >::type type;
 };
 template <class _Hp, class _Tp, size_t _Align>
 struct __find_pod<__type_list<_Hp, _Tp>, _Align>
 {
-    typedef typename conditional<
+    typedef __conditional_t<_Align == _Hp::value, typename _Hp::type, typename __find_pod<_Tp, _Align>::type> type;
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             typename __find_pod<_Tp, _Align>::type
-                         >::type type;
 };
 template <class _TL, size_t _Len> struct __find_max_align;
 @@ -91,7 +83,7 @@ struct __find_max_align<__type_list<_Hp, _Tp>, _Len>
     : public integral_constant<size_t, __select_align<_Len, _Hp::value, __find_max_align<_Tp, _Len>::value>::value> {};
 template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-struct _LIBCPP_TEMPLATE_VIS aligned_storage
+struct _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_TEMPLATE_VIS aligned_storage
 {
     typedef typename __find_pod<__all_types, _Align>::type _Aligner;
     union type
 @@ -102,13 +94,17 @@ struct _LIBCPP_TEMPLATE_VIS aligned_storage
 };
 #if _LIBCPP_STD_VER > 11
+  _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-    using aligned_storage_t = typename aligned_storage<_Len, _Align>::type;
+    using aligned_storage_t _LIBCPP_DEPRECATED_IN_CXX23 = typename aligned_storage<_Len, _Align>::type;
+  _LIBCPP_SUPPRESS_DEPRECATED_POP
 #endif
 #define _CREATE_ALIGNED_STORAGE_SPECIALIZATION(n) \
 template <size_t _Len>\
-struct _LIBCPP_TEMPLATE_VIS aligned_storage<_Len, n>\
+struct _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_TEMPLATE_VIS aligned_storage<_Len, n>\
 {\
     struct _ALIGNAS(n) type\
     {\

lib/libcxx/include/__type_traits/aligned_union.h+3-2

...	@@ -37,7 +37,7 @@ struct __static_max<_I0, _I1, _In...>	...	@@ -37,7 +37,7 @@ struct __static_max<_I0, _I1, _In...>
37	};	37	};
38		38
39	template <size_t _Len, class _Type0, class ..._Types>	39	template <size_t _Len, class _Type0, class ..._Types>
40	struct aligned_union	40	struct _LIBCPP_DEPRECATED_IN_CXX23 aligned_union
41	{	41	{
42	static const size_t alignment_value = __static_max<_LIBCPP_PREFERRED_ALIGNOF(_Type0),	42	static const size_t alignment_value = __static_max<_LIBCPP_PREFERRED_ALIGNOF(_Type0),
43	_LIBCPP_PREFERRED_ALIGNOF(_Types)...>::value;	43	_LIBCPP_PREFERRED_ALIGNOF(_Types)...>::value;
...	@@ -47,7 +47,8 @@ struct aligned_union	...	@@ -47,7 +47,8 @@ struct aligned_union
47	};	47	};
48		48
49	#if _LIBCPP_STD_VER > 11	49	#if _LIBCPP_STD_VER > 11
50	template <size_t _Len, class ..._Types> using aligned_union_t = typename aligned_union<_Len, _Types...>::type;	50	template <size_t _Len, class... _Types>
		51	using aligned_union_t _LIBCPP_DEPRECATED_IN_CXX23 = typename aligned_union<_Len, _Types...>::type;
51	#endif	52	#endif
52		53
53	_LIBCPP_END_NAMESPACE_STD	54	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/alignment_of.h+1-1

...	@@ -24,7 +24,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS alignment_of	...	@@ -24,7 +24,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS alignment_of
24		24
25	#if _LIBCPP_STD_VER > 14	25	#if _LIBCPP_STD_VER > 14
26	template <class _Tp>	26	template <class _Tp>
27	inline constexpr size_t alignment_of_v = alignment_of<_Tp>::value;	27	inline constexpr size_t alignment_of_v = _LIBCPP_ALIGNOF(_Tp);
28	#endif	28	#endif
29		29
30	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/apply_cv.h+2-3

...	@@ -10,7 +10,6 @@	...	@@ -10,7 +10,6 @@
10	#define _LIBCPP___TYPE_TRAITS_APPLY_CV_H	10	#define _LIBCPP___TYPE_TRAITS_APPLY_CV_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/is_const.h>	13	#include <__type_traits/is_const.h>
15	#include <__type_traits/is_volatile.h>	14	#include <__type_traits/is_volatile.h>
16	#include <__type_traits/remove_reference.h>	15	#include <__type_traits/remove_reference.h>
...	@@ -22,8 +21,8 @@	...	@@ -22,8 +21,8 @@
22		21
23	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
24		23
25	template <class _Tp, class _Up, bool = is_const<typename remove_reference<_Tp>::type>::value,	24	template <class _Tp, class _Up, bool = is_const<__libcpp_remove_reference_t<_Tp> >::value,
26	bool = is_volatile<typename remove_reference<_Tp>::type>::value>	25	bool = is_volatile<__libcpp_remove_reference_t<_Tp> >::value>
27	struct __apply_cv	26	struct __apply_cv
28	{	27	{
29	typedef _LIBCPP_NODEBUG _Up type;	28	typedef _LIBCPP_NODEBUG _Up type;

lib/libcxx/include/__type_traits/can_extract_key.h created+56

...	@@ -0,0 +1,56 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
10	#define _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
11
12	#include <__config>
13	#include <__fwd/pair.h>
14	#include <__type_traits/conditional.h>
15	#include <__type_traits/integral_constant.h>
16	#include <__type_traits/is_same.h>
17	#include <__type_traits/remove_const.h>
18	#include <__type_traits/remove_const_ref.h>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	// These traits are used in __tree and __hash_table
27	struct __extract_key_fail_tag {};
28	struct __extract_key_self_tag {};
29	struct __extract_key_first_tag {};
30
31	template <class _ValTy, class _Key, class _RawValTy = __remove_const_ref_t<_ValTy> >
32	struct __can_extract_key
33	: __conditional_t<_IsSame<_RawValTy, _Key>::value, __extract_key_self_tag, __extract_key_fail_tag> {};
34
35	template <class _Pair, class _Key, class _First, class _Second>
36	struct __can_extract_key<_Pair, _Key, pair<_First, _Second> >
37	: __conditional_t<_IsSame<__remove_const_t<_First>, _Key>::value, __extract_key_first_tag, __extract_key_fail_tag> {
38	};
39
40	// __can_extract_map_key uses true_type/false_type instead of the tags.
41	// It returns true if _Key != _ContainerValueTy (the container is a map not a set)
42	// and _ValTy == _Key.
43	template <class _ValTy, class _Key, class _ContainerValueTy,
44	class _RawValTy = __remove_const_ref_t<_ValTy> >
45	struct __can_extract_map_key
46	: integral_constant<bool, _IsSame<_RawValTy, _Key>::value> {};
47
48	// This specialization returns __extract_key_fail_tag for non-map containers
49	// because _Key == _ContainerValueTy
50	template <class _ValTy, class _Key, class _RawValTy>
51	struct __can_extract_map_key<_ValTy, _Key, _Key, _RawValTy>
52	: false_type {};
53
54	_LIBCPP_END_NAMESPACE_STD
55
56	#endif // _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H

lib/libcxx/include/__type_traits/common_reference.h+1-1

...	@@ -31,7 +31,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -31,7 +31,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
31	// Let COND_RES(X, Y) be:	31	// Let COND_RES(X, Y) be:
32	template <class _Xp, class _Yp>	32	template <class _Xp, class _Yp>
33	using __cond_res =	33	using __cond_res =
34	decltype(false ? declval<_Xp(&)()>()() : declval<_Yp(&)()>()());	34	decltype(false ? std::declval<_Xp(&)()>()() : std::declval<_Yp(&)()>()());
35		35
36	// Let `XREF(A)` denote a unary alias template `T` such that `T<U>` denotes the same type as `U`	36	// Let `XREF(A)` denote a unary alias template `T` such that `T<U>` denotes the same type as `U`
37	// with the addition of `A`'s cv and reference qualifiers, for a non-reference cv-unqualified type	37	// with the addition of `A`'s cv and reference qualifiers, for a non-reference cv-unqualified type

lib/libcxx/include/__type_traits/common_type.h+5-9

...	@@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
26	#if _LIBCPP_STD_VER > 17	26	#if _LIBCPP_STD_VER > 17
27	// Let COND_RES(X, Y) be:	27	// Let COND_RES(X, Y) be:
28	template <class _Tp, class _Up>	28	template <class _Tp, class _Up>
29	using __cond_type = decltype(false ? declval<_Tp>() : declval<_Up>());	29	using __cond_type = decltype(false ? std::declval<_Tp>() : std::declval<_Up>());
30		30
31	template <class _Tp, class _Up, class = void>	31	template <class _Tp, class _Up, class = void>
32	struct __common_type3 {};	32	struct __common_type3 {};
...	@@ -47,13 +47,10 @@ struct __common_type2_imp {};	...	@@ -47,13 +47,10 @@ struct __common_type2_imp {};
47		47
48	// sub-bullet 3 - "if decay_t<decltype(false ? declval<D1>() : declval<D2>())> ..."	48	// sub-bullet 3 - "if decay_t<decltype(false ? declval<D1>() : declval<D2>())> ..."
49	template <class _Tp, class _Up>	49	template <class _Tp, class _Up>
50	struct __common_type2_imp<_Tp, _Up,	50	struct __common_type2_imp<_Tp, _Up, __void_t<decltype(true ? std::declval<_Tp>() : std::declval<_Up>())> >
51	typename __void_t<decltype(
52	true ? declval<_Tp>() : declval<_Up>()
53	)>::type>
54	{	51	{
55	typedef _LIBCPP_NODEBUG typename decay<decltype(	52	typedef _LIBCPP_NODEBUG typename decay<decltype(
56	true ? declval<_Tp>() : declval<_Up>()	53	true ? std::declval<_Tp>() : std::declval<_Up>()
57	)>::type type;	54	)>::type type;
58	};	55	};
59		56
...	@@ -82,8 +79,7 @@ struct common_type {	...	@@ -82,8 +79,7 @@ struct common_type {
82		79
83	template <class _Tp, class _Up>	80	template <class _Tp, class _Up>
84	struct __common_type_impl<	81	struct __common_type_impl<
85	__common_types<_Tp, _Up>,	82	__common_types<_Tp, _Up>, __void_t<typename common_type<_Tp, _Up>::type> >
86	typename __void_t<typename common_type<_Tp, _Up>::type>::type>
87	{	83	{
88	typedef typename common_type<_Tp, _Up>::type type;	84	typedef typename common_type<_Tp, _Up>::type type;
89	};	85	};
...	@@ -91,7 +87,7 @@ struct __common_type_impl<	...	@@ -91,7 +87,7 @@ struct __common_type_impl<
91	template <class _Tp, class _Up, class _Vp _LIBCPP_OPTIONAL_PACK(class... _Rest)>	87	template <class _Tp, class _Up, class _Vp _LIBCPP_OPTIONAL_PACK(class... _Rest)>
92	struct __common_type_impl<	88	struct __common_type_impl<
93	__common_types<_Tp, _Up, _Vp _LIBCPP_OPTIONAL_PACK(_Rest...)>,	89	__common_types<_Tp, _Up, _Vp _LIBCPP_OPTIONAL_PACK(_Rest...)>,
94	typename __void_t<typename common_type<_Tp, _Up>::type>::type>	90	__void_t<typename common_type<_Tp, _Up>::type> >
95	: __common_type_impl<__common_types<typename common_type<_Tp, _Up>::type,	91	: __common_type_impl<__common_types<typename common_type<_Tp, _Up>::type,
96	_Vp _LIBCPP_OPTIONAL_PACK(_Rest...)> > {	92	_Vp _LIBCPP_OPTIONAL_PACK(_Rest...)> > {
97	};	93	};

lib/libcxx/include/__type_traits/conditional.h+9-4

 @@ -36,17 +36,22 @@ template <bool _Cond, class _IfRes, class _ElseRes>
 using _If _LIBCPP_NODEBUG = typename _IfImpl<_Cond>::template _Select<_IfRes, _ElseRes>;
 template <bool _Bp, class _If, class _Then>
-    struct _LIBCPP_TEMPLATE_VIS conditional {typedef _If type;};
+struct _LIBCPP_TEMPLATE_VIS conditional {
+  using type _LIBCPP_NODEBUG = _If;
+};
 template <class _If, class _Then>
-    struct _LIBCPP_TEMPLATE_VIS conditional<false, _If, _Then> {typedef _Then type;};
+struct _LIBCPP_TEMPLATE_VIS conditional<false, _If, _Then> {
+  using type _LIBCPP_NODEBUG = _Then;
+};
 #if _LIBCPP_STD_VER > 11
 template <bool _Bp, class _IfRes, class _ElseRes>
-using conditional_t = typename conditional<_Bp, _IfRes, _ElseRes>::type;
+using conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _IfRes, _ElseRes>::type;
 #endif
 // Helper so we can use "conditional_t" in all language versions.
-template <bool _Bp, class _If, class _Then> using __conditional_t = typename conditional<_Bp, _If, _Then>::type;
+template <bool _Bp, class _If, class _Then>
+using __conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _If, _Then>::type;
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/conjunction.h+22-21

 @@ -20,26 +20,6 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER > 14
-template <class _Arg, class... _Args>
-struct __conjunction_impl {
-  using type = conditional_t<!bool(_Arg::value), _Arg, typename __conjunction_impl<_Args...>::type>;
-};
-template <class _Arg>
-struct __conjunction_impl<_Arg> {
-  using type = _Arg;
-};
-template <class... _Args>
-struct conjunction : __conjunction_impl<true_type, _Args...>::type {};
-template<class... _Args>
-inline constexpr bool conjunction_v = conjunction<_Args...>::value;
-#endif // _LIBCPP_STD_VER > 14
 template <class...>
 using __expand_to_true = true_type;
 @@ -49,8 +29,29 @@ __expand_to_true<__enable_if_t<_Pred::value>...> __and_helper(int);
 template <class...>
 false_type __and_helper(...);
+// _And always performs lazy evaluation of its arguments.
+//
+// However, `_And<_Pred...>` itself will evaluate its result immediately (without having to
+// be instantiated) since it is an alias, unlike `conjunction<_Pred...>`, which is a struct.
+// If you want to defer the evaluation of `_And<_Pred...>` itself, use `_Lazy<_And, _Pred...>`.
 template <class... _Pred>
-using _And _LIBCPP_NODEBUG = decltype(__and_helper<_Pred...>(0));
+using _And _LIBCPP_NODEBUG = decltype(std::__and_helper<_Pred...>(0));
+#if _LIBCPP_STD_VER > 14
+template <class...>
+struct conjunction : true_type {};
+template <class _Arg>
+struct conjunction<_Arg> : _Arg {};
+template <class _Arg, class... _Args>
+struct conjunction<_Arg, _Args...> : conditional_t<!bool(_Arg::value), _Arg, conjunction<_Args...>> {};
+template <class... _Args>
+inline constexpr bool conjunction_v = conjunction<_Args...>::value;
+#endif // _LIBCPP_STD_VER > 14
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/copy_cvref.h+2-2

...	@@ -29,13 +29,13 @@ struct __copy_cvref	...	@@ -29,13 +29,13 @@ struct __copy_cvref
29	template <class _From, class _To>	29	template <class _From, class _To>
30	struct __copy_cvref<_From&, _To>	30	struct __copy_cvref<_From&, _To>
31	{	31	{
32	using type = typename add_lvalue_reference<__copy_cv_t<_From, _To> >::type;	32	using type = __add_lvalue_reference_t<__copy_cv_t<_From, _To> >;
33	};	33	};
34		34
35	template <class _From, class _To>	35	template <class _From, class _To>
36	struct __copy_cvref<_From&&, _To>	36	struct __copy_cvref<_From&&, _To>
37	{	37	{
38	using type = typename add_rvalue_reference<__copy_cv_t<_From, _To> >::type;	38	using type = __add_rvalue_reference_t<__copy_cv_t<_From, _To> >;
39	};	39	};
40		40
41	template <class _From, class _To>	41	template <class _From, class _To>

lib/libcxx/include/__type_traits/decay.h+12-6

 @@ -12,7 +12,6 @@
 #include <__config>
 #include <__type_traits/add_pointer.h>
 #include <__type_traits/conditional.h>
-#include <__type_traits/integral_constant.h>
 #include <__type_traits/is_array.h>
 #include <__type_traits/is_function.h>
 #include <__type_traits/is_referenceable.h>
 @@ -26,9 +25,15 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+#if __has_builtin(__decay)
+template <class _Tp>
+struct decay {
+  using type _LIBCPP_NODEBUG = __decay(_Tp);
+};
+#else
 template <class _Up, bool>
 struct __decay {
-    typedef _LIBCPP_NODEBUG typename remove_cv<_Up>::type type;
+    typedef _LIBCPP_NODEBUG __remove_cv_t<_Up> type;
 };
 template <class _Up>
 @@ -37,12 +42,12 @@ public:
     typedef _LIBCPP_NODEBUG typename conditional
                      <
                          is_array<_Up>::value,
-                         typename remove_extent<_Up>::type*,
+                         __add_pointer_t<__remove_extent_t<_Up> >,
                          typename conditional
                          <
                               is_function<_Up>::value,
                               typename add_pointer<_Up>::type,
-                              typename remove_cv<_Up>::type
+                              __remove_cv_t<_Up>
                          >::type
                      >::type type;
 };
 @@ -51,10 +56,11 @@ template <class _Tp>
 struct _LIBCPP_TEMPLATE_VIS decay
 {
 private:
-    typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type _Up;
+    typedef _LIBCPP_NODEBUG __libcpp_remove_reference_t<_Tp> _Up;
 public:
-    typedef _LIBCPP_NODEBUG typename __decay<_Up, __is_referenceable<_Up>::value>::type type;
+  typedef _LIBCPP_NODEBUG typename __decay<_Up, __libcpp_is_referenceable<_Up>::value>::type type;
 };
+#endif // __has_builtin(__decay)
 #if _LIBCPP_STD_VER > 11
 template <class _Tp> using decay_t = typename decay<_Tp>::type;

lib/libcxx/include/__type_traits/dependent_type.h created+25

...	@@ -0,0 +1,25 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
10	#define _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class _Tp, bool>
21	struct _LIBCPP_TEMPLATE_VIS __dependent_type : public _Tp {};
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H

lib/libcxx/include/__type_traits/disjunction.h+6-1

 @@ -10,7 +10,6 @@
 #define _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
 #include <__config>
-#include <__type_traits/conditional.h>
 #include <__type_traits/integral_constant.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -35,6 +34,12 @@ struct _OrImpl<false> {
   using _Result = _Res;
 };
+// _Or always performs lazy evaluation of its arguments.
+//
+// However, `_Or<_Pred...>` itself will evaluate its result immediately (without having to
+// be instantiated) since it is an alias, unlike `disjunction<_Pred...>`, which is a struct.
+// If you want to defer the evaluation of `_Or<_Pred...>` itself, use `_Lazy<_Or, _Pred...>`
+// or `disjunction<_Pred...>` directly.
 template <class... _Args>
 using _Or _LIBCPP_NODEBUG = typename _OrImpl<sizeof...(_Args) != 0>::template _Result<false_type, _Args...>;

lib/libcxx/include/__type_traits/has_virtual_destructor.h+1-10

 @@ -18,21 +18,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if __has_builtin(__has_virtual_destructor)
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS has_virtual_destructor
     : public integral_constant<bool, __has_virtual_destructor(_Tp)> {};
-#else
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS has_virtual_destructor
-    : public false_type {};
-#endif
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool has_virtual_destructor_v = has_virtual_destructor<_Tp>::value;
+inline constexpr bool has_virtual_destructor_v = __has_virtual_destructor(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_allocator.h created+36

...	@@ -0,0 +1,36 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_IS_ALLOCATOR_H
10	#define _LIBCPP___TYPE_IS_ALLOCATOR_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/void_t.h>
15	#include <__utility/declval.h>
16	#include <cstddef>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template<typename _Alloc, typename = void, typename = void>
25	struct __is_allocator : false_type {};
26
27	template<typename _Alloc>
28	struct __is_allocator<_Alloc,
29	__void_t<typename _Alloc::value_type>,
30	__void_t<decltype(std::declval<_Alloc&>().allocate(size_t(0)))>
31	>
32	: true_type {};
33
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP___TYPE_IS_ALLOCATOR_H

lib/libcxx/include/__type_traits/is_always_bitcastable.h created+82

...	@@ -0,0 +1,82 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/is_integral.h>
15	#include <__type_traits/is_object.h>
16	#include <__type_traits/is_same.h>
17	#include <__type_traits/is_trivially_copyable.h>
18	#include <__type_traits/remove_cv.h>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	// Checks whether an object of type `From` can always be bit-cast to an object of type `To` and represent a valid value
27	// of type `To`. In other words, `From` and `To` have the same value representation and the set of values of `From` is
28	// a subset of the set of values of `To`.
29	//
30	// Note that types that cannot be assigned to each other using built-in assignment (e.g. arrays) might still be
31	// considered bit-castable.
32	template <class _From, class _To>
33	struct __is_always_bitcastable {
34	using _UnqualFrom = __remove_cv_t<_From>;
35	using _UnqualTo = __remove_cv_t<_To>;
36
37	static const bool value =
38	// First, the simple case -- `From` and `To` are the same object type.
39	(is_same<_UnqualFrom, _UnqualTo>::value && is_trivially_copyable<_UnqualFrom>::value) \|\|
40
41	// Beyond the simple case, we say that one type is "always bit-castable" to another if:
42	// - (1) `From` and `To` have the same value representation, and in addition every possible value of `From` has
43	// a corresponding value in the `To` type (in other words, the set of values of `To` is a superset of the set of
44	// values of `From`);
45	// - (2) When the corresponding values are not the same value (as, for example, between an unsigned and a signed
46	// integer, where a large positive value of the unsigned integer corresponds to a negative value in the signed
47	// integer type), the value of `To` that results from a bitwise copy of `From` is the same what would be produced
48	// by the built-in assignment (if it were defined for the two types, to which there are minor exceptions, e.g.
49	// built-in arrays).
50	//
51	// In practice, that means:
52	// - all integral types (except `bool`, see below) -- that is, character types and `int` types, both signed and
53	// unsigned...
54	// - as well as arrays of such types...
55	// - ...that have the same size.
56	//
57	// Other trivially-copyable types can't be validly bit-cast outside of their own type:
58	// - floating-point types normally have different sizes and thus aren't bit-castable between each other (fails #1);
59	// - integral types and floating-point types use different representations, so for example bit-casting an integral
60	// `1` to `float` results in a very small less-than-one value, unlike built-in assignment that produces `1.0`
61	// (fails #2);
62	// - booleans normally use only a single bit of their object representation; bit-casting an integer to a boolean
63	// will result in a boolean object with an incorrect representation, which is undefined behavior (fails #2).
64	// Bit-casting from a boolean into an integer, however, is valid;
65	// - enumeration types may have different ranges of possible values (fails #1);
66	// - for pointers, it is not guaranteed that pointers to different types use the same set of values to represent
67	// addresses, and the conversion results are explicitly unspecified for types with different alignments
68	// (fails #1);
69	// - for structs and unions it is impossible to determine whether the set of values of one of them is a subset of
70	// the other (fails #1);
71	// - there is no need to consider `nullptr_t` for practical purposes.
72	(
73	sizeof(_From) == sizeof(_To) &&
74	is_integral<_From>::value &&
75	is_integral<_To>::value &&
76	!is_same<_UnqualTo, bool>::value
77	);
78	};
79
80	_LIBCPP_END_NAMESPACE_STD
81
82	#endif // _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H

lib/libcxx/include/__type_traits/is_assignable.h-35

...	@@ -18,10 +18,6 @@	...	@@ -18,10 +18,6 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	template<typename, typename _Tp> struct __select_2nd { typedef _LIBCPP_NODEBUG _Tp type; };
22
23	#if __has_builtin(__is_assignable)
24
25	template<class _Tp, class _Up>	21	template<class _Tp, class _Up>
26	struct _LIBCPP_TEMPLATE_VIS is_assignable : _BoolConstant<__is_assignable(_Tp, _Up)> { };	22	struct _LIBCPP_TEMPLATE_VIS is_assignable : _BoolConstant<__is_assignable(_Tp, _Up)> { };
27		23
...	@@ -30,37 +26,6 @@ template <class _Tp, class _Arg>	...	@@ -30,37 +26,6 @@ template <class _Tp, class _Arg>
30	inline constexpr bool is_assignable_v = __is_assignable(_Tp, _Arg);	26	inline constexpr bool is_assignable_v = __is_assignable(_Tp, _Arg);
31	#endif	27	#endif
32		28
33	#else // __has_builtin(__is_assignable)
34
35	template <class _Tp, class _Arg>
36	typename __select_2nd<decltype((declval<_Tp>() = declval<_Arg>())), true_type>::type
37	__is_assignable_test(int);
38
39	template <class, class>
40	false_type __is_assignable_test(...);
41
42
43	template <class _Tp, class _Arg, bool = is_void<_Tp>::value \|\| is_void<_Arg>::value>
44	struct __is_assignable_imp
45	: public decltype((_VSTD::__is_assignable_test<_Tp, _Arg>(0))) {};
46
47	template <class _Tp, class _Arg>
48	struct __is_assignable_imp<_Tp, _Arg, true>
49	: public false_type
50	{
51	};
52
53	template <class _Tp, class _Arg>
54	struct is_assignable
55	: public __is_assignable_imp<_Tp, _Arg> {};
56
57	#if _LIBCPP_STD_VER > 14
58	template <class _Tp, class _Arg>
59	inline constexpr bool is_assignable_v = is_assignable<_Tp, _Arg>::value;
60	#endif
61
62	#endif // __has_builtin(__is_assignable)
63
64	_LIBCPP_END_NAMESPACE_STD	29	_LIBCPP_END_NAMESPACE_STD
65		30
66	#endif // _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H	31	#endif // _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H

lib/libcxx/include/__type_traits/is_callable.h+1-1

...	@@ -25,7 +25,7 @@ template<class...>	...	@@ -25,7 +25,7 @@ template<class...>
25	false_type __is_callable_helper(...);	25	false_type __is_callable_helper(...);
26		26
27	template<class _Func, class... _Args>	27	template<class _Func, class... _Args>
28	struct __is_callable : decltype(__is_callable_helper<_Func, _Args...>(0)) {};	28	struct __is_callable : decltype(std::__is_callable_helper<_Func, _Args...>(0)) {};
29		29
30	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD
31		31

lib/libcxx/include/__type_traits/is_char_like_type.h created+28

...	@@ -0,0 +1,28 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
11
12	#include <__config>
13	#include <__type_traits/conjunction.h>
14	#include <__type_traits/is_standard_layout.h>
15	#include <__type_traits/is_trivial.h>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <class _CharT>
24	using _IsCharLikeType = _And<is_standard_layout<_CharT>, is_trivial<_CharT> >;
25
26	_LIBCPP_END_NAMESPACE_STD
27
28	#endif // _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H

lib/libcxx/include/__type_traits/is_class.h-2

...	@@ -11,8 +11,6 @@	...	@@ -11,8 +11,6 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/is_union.h>
15	#include <__type_traits/remove_cv.h>
16		14
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__type_traits/is_constant_evaluated.h+1-1

...	@@ -24,7 +24,7 @@ inline constexpr bool is_constant_evaluated() noexcept {	...	@@ -24,7 +24,7 @@ inline constexpr bool is_constant_evaluated() noexcept {
24	}	24	}
25	#endif	25	#endif
26		26
27	inline _LIBCPP_CONSTEXPR	27	_LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR
28	bool __libcpp_is_constant_evaluated() _NOEXCEPT { return __builtin_is_constant_evaluated(); }	28	bool __libcpp_is_constant_evaluated() _NOEXCEPT { return __builtin_is_constant_evaluated(); }
29		29
30	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_constructible.h+1-1

...	@@ -25,7 +25,7 @@ struct _LIBCPP_TEMPLATE_VIS is_constructible	...	@@ -25,7 +25,7 @@ struct _LIBCPP_TEMPLATE_VIS is_constructible
25		25
26	#if _LIBCPP_STD_VER > 14	26	#if _LIBCPP_STD_VER > 14
27	template <class _Tp, class ..._Args>	27	template <class _Tp, class ..._Args>
28	inline constexpr bool is_constructible_v = is_constructible<_Tp, _Args...>::value;	28	inline constexpr bool is_constructible_v = __is_constructible(_Tp, _Args...);
29	#endif	29	#endif
30		30
31	_LIBCPP_END_NAMESPACE_STD	31	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_convertible.h+2-2

...	@@ -40,7 +40,7 @@ struct __is_convertible_test : public false_type {};	...	@@ -40,7 +40,7 @@ struct __is_convertible_test : public false_type {};
40		40
41	template <class _From, class _To>	41	template <class _From, class _To>
42	struct __is_convertible_test<_From, _To,	42	struct __is_convertible_test<_From, _To,
43	decltype(__is_convertible_imp::__test_convert<_To>(declval<_From>()))> : public true_type	43	decltype(__is_convertible_imp::__test_convert<_To>(std::declval<_From>()))> : public true_type
44	{};	44	{};
45		45
46	template <class _Tp, bool _IsArray = is_array<_Tp>::value,	46	template <class _Tp, bool _IsArray = is_array<_Tp>::value,
...	@@ -53,7 +53,7 @@ template <class _Tp> struct __is_array_function_or_void<_Tp, false, false, true>	...	@@ -53,7 +53,7 @@ template <class _Tp> struct __is_array_function_or_void<_Tp, false, false, true>
53	}	53	}
54		54
55	template <class _Tp,	55	template <class _Tp,
56	unsigned = __is_convertible_imp::__is_array_function_or_void<typename remove_reference<_Tp>::type>::value>	56	unsigned = __is_convertible_imp::__is_array_function_or_void<__libcpp_remove_reference_t<_Tp> >::value>
57	struct __is_convertible_check	57	struct __is_convertible_check
58	{	58	{
59	static const size_t __v = 0;	59	static const size_t __v = 0;

lib/libcxx/include/__type_traits/is_copy_assignable.h+6-4

 @@ -13,7 +13,6 @@
 #include <__type_traits/add_const.h>
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,9 +20,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_copy_assignable
+template <class _Tp>
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_copy_assignable
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
+    : public integral_constant<
+          bool,
+          __is_assignable(__add_lvalue_reference_t<_Tp>,
+                          __add_lvalue_reference_t<typename add_const<_Tp>::type>)> {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_copy_constructible.h+3-3

...	@@ -13,7 +13,6 @@	...	@@ -13,7 +13,6 @@
13	#include <__type_traits/add_const.h>	13	#include <__type_traits/add_const.h>
14	#include <__type_traits/add_lvalue_reference.h>	14	#include <__type_traits/add_lvalue_reference.h>
15	#include <__type_traits/integral_constant.h>	15	#include <__type_traits/integral_constant.h>
16	#include <__type_traits/is_constructible.h>
17		16
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	18	# pragma GCC system_header
...	@@ -23,8 +22,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -23,8 +22,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
23		22
24	template <class _Tp>	23	template <class _Tp>
25	struct _LIBCPP_TEMPLATE_VIS is_copy_constructible	24	struct _LIBCPP_TEMPLATE_VIS is_copy_constructible
26	: public is_constructible<_Tp,	25	: public integral_constant<
27	typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};	26	bool,
		27	__is_constructible(_Tp, __add_lvalue_reference_t<typename add_const<_Tp>::type>)> {};
28		28
29	#if _LIBCPP_STD_VER > 14	29	#if _LIBCPP_STD_VER > 14
30	template <class _Tp>	30	template <class _Tp>

lib/libcxx/include/__type_traits/is_default_constructible.h+2-3

 @@ -11,7 +11,6 @@
 #include <__config>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_constructible.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,12 +20,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 struct _LIBCPP_TEMPLATE_VIS is_default_constructible
-    : public is_constructible<_Tp>
+    : public integral_constant<bool, __is_constructible(_Tp)>
     {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool is_default_constructible_v = is_default_constructible<_Tp>::value;
+inline constexpr bool is_default_constructible_v = __is_constructible(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_destructible.h+2-2

...	@@ -48,7 +48,7 @@ template <typename _Tp>	...	@@ -48,7 +48,7 @@ template <typename _Tp>
48	struct __is_destructor_wellformed {	48	struct __is_destructor_wellformed {
49	template <typename _Tp1>	49	template <typename _Tp1>
50	static true_type __test (	50	static true_type __test (
51	typename __is_destructible_apply<decltype(declval<_Tp1&>().~_Tp1())>::type	51	typename __is_destructible_apply<decltype(std::declval<_Tp1&>().~_Tp1())>::type
52	);	52	);
53		53
54	template <typename _Tp1>	54	template <typename _Tp1>
...	@@ -63,7 +63,7 @@ struct __destructible_imp;	...	@@ -63,7 +63,7 @@ struct __destructible_imp;
63	template <class _Tp>	63	template <class _Tp>
64	struct __destructible_imp<_Tp, false>	64	struct __destructible_imp<_Tp, false>
65	: public integral_constant<bool,	65	: public integral_constant<bool,
66	__is_destructor_wellformed<typename remove_all_extents<_Tp>::type>::value> {};	66	__is_destructor_wellformed<__remove_all_extents_t<_Tp> >::value> {};
67		67
68	template <class _Tp>	68	template <class _Tp>
69	struct __destructible_imp<_Tp, true>	69	struct __destructible_imp<_Tp, true>

lib/libcxx/include/__type_traits/is_enum.h-1

...	@@ -11,7 +11,6 @@	...	@@ -11,7 +11,6 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/remove_cv.h>
15		14
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__type_traits/is_floating_point.h+1-1

...	@@ -25,7 +25,7 @@ template <> struct __libcpp_is_floating_point<double> : public tru	...	@@ -25,7 +25,7 @@ template <> struct __libcpp_is_floating_point<double> : public tru
25	template <> struct __libcpp_is_floating_point<long double> : public true_type {};	25	template <> struct __libcpp_is_floating_point<long double> : public true_type {};
26		26
27	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_floating_point	27	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_floating_point
28	: public __libcpp_is_floating_point<typename remove_cv<_Tp>::type> {};	28	: public __libcpp_is_floating_point<__remove_cv_t<_Tp> > {};
29		29
30	#if _LIBCPP_STD_VER > 14	30	#if _LIBCPP_STD_VER > 14
31	template <class _Tp>	31	template <class _Tp>

lib/libcxx/include/__type_traits/is_implicitly_default_constructible.h created+48

...	@@ -0,0 +1,48 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/is_default_constructible.h>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	#ifndef _LIBCPP_CXX03_LANG
23	// First of all, we can't implement this check in C++03 mode because the {}
24	// default initialization syntax isn't valid.
25	// Second, we implement the trait in a funny manner with two defaulted template
26	// arguments to workaround Clang's PR43454.
27	template <class _Tp>
28	void __test_implicit_default_constructible(_Tp);
29
30	template <class _Tp, class = void, class = typename is_default_constructible<_Tp>::type>
31	struct __is_implicitly_default_constructible
32	: false_type
33	{ };
34
35	template <class _Tp>
36	struct __is_implicitly_default_constructible<_Tp, decltype(std::__test_implicit_default_constructible<_Tp const&>({})), true_type>
37	: true_type
38	{ };
39
40	template <class _Tp>
41	struct __is_implicitly_default_constructible<_Tp, decltype(std::__test_implicit_default_constructible<_Tp const&>({})), false_type>
42	: false_type
43	{ };
44	#endif // !C++03
45
46	_LIBCPP_END_NAMESPACE_STD
47
48	#endif // _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H

lib/libcxx/include/__type_traits/is_integral.h+1-1

...	@@ -58,7 +58,7 @@ inline constexpr bool is_integral_v = __is_integral(_Tp);	...	@@ -58,7 +58,7 @@ inline constexpr bool is_integral_v = __is_integral(_Tp);
58	#else	58	#else
59		59
60	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_integral	60	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_integral
61	: public _BoolConstant<__libcpp_is_integral<typename remove_cv<_Tp>::type>::value> {};	61	: public _BoolConstant<__libcpp_is_integral<__remove_cv_t<_Tp> >::value> {};
62		62
63	#if _LIBCPP_STD_VER > 14	63	#if _LIBCPP_STD_VER > 14
64	template <class _Tp>	64	template <class _Tp>

lib/libcxx/include/__type_traits/is_literal_type.h+1-1

...	@@ -25,7 +25,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 is_	...	@@ -25,7 +25,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 is_
25		25
26	#if _LIBCPP_STD_VER > 14	26	#if _LIBCPP_STD_VER > 14
27	template <class _Tp>	27	template <class _Tp>
28	_LIBCPP_DEPRECATED_IN_CXX17 inline constexpr bool is_literal_type_v = is_literal_type<_Tp>::value;	28	_LIBCPP_DEPRECATED_IN_CXX17 inline constexpr bool is_literal_type_v = __is_literal_type(_Tp);
29	#endif // _LIBCPP_STD_VER > 14	29	#endif // _LIBCPP_STD_VER > 14
30	#endif // _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)	30	#endif // _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
31		31

lib/libcxx/include/__type_traits/is_member_function_pointer.h+1-1

...	@@ -50,7 +50,7 @@ inline constexpr bool is_member_function_pointer_v = __is_member_function_pointe	...	@@ -50,7 +50,7 @@ inline constexpr bool is_member_function_pointer_v = __is_member_function_pointe
50	#else // __has_builtin(__is_member_function_pointer)	50	#else // __has_builtin(__is_member_function_pointer)
51		51
52	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer	52	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer
53	: public _BoolConstant< __libcpp_is_member_pointer<typename remove_cv<_Tp>::type>::__is_func > {};	53	: public _BoolConstant< __libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_func > {};
54		54
55	#if _LIBCPP_STD_VER > 14	55	#if _LIBCPP_STD_VER > 14
56	template <class _Tp>	56	template <class _Tp>

lib/libcxx/include/__type_traits/is_member_object_pointer.h+1-1

...	@@ -32,7 +32,7 @@ inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_T	...	@@ -32,7 +32,7 @@ inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_T
32	#else // __has_builtin(__is_member_object_pointer)	32	#else // __has_builtin(__is_member_object_pointer)
33		33
34	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer	34	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer
35	: public _BoolConstant< __libcpp_is_member_pointer<typename remove_cv<_Tp>::type>::__is_obj > {};	35	: public _BoolConstant< __libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_obj > {};
36		36
37	#if _LIBCPP_STD_VER > 14	37	#if _LIBCPP_STD_VER > 14
38	template <class _Tp>	38	template <class _Tp>

lib/libcxx/include/__type_traits/is_member_pointer.h+2-1

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
		14	#include <__type_traits/is_member_function_pointer.h>
14		15
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -31,7 +32,7 @@ inline constexpr bool is_member_pointer_v = __is_member_pointer(_Tp);	...	@@ -31,7 +32,7 @@ inline constexpr bool is_member_pointer_v = __is_member_pointer(_Tp);
31	#else // __has_builtin(__is_member_pointer)	32	#else // __has_builtin(__is_member_pointer)
32		33
33	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_pointer	34	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_member_pointer
34	: public _BoolConstant< __libcpp_is_member_pointer<typename remove_cv<_Tp>::type>::__is_member > {};	35	: public _BoolConstant< __libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_member > {};
35		36
36	#if _LIBCPP_STD_VER > 14	37	#if _LIBCPP_STD_VER > 14
37	template <class _Tp>	38	template <class _Tp>

lib/libcxx/include/__type_traits/is_move_assignable.h+5-5

 @@ -10,11 +10,9 @@
 #define _LIBCPP___TYPE_TRAITS_IS_MOVE_ASSIGNABLE_H
 #include <__config>
-#include <__type_traits/add_const.h>
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/add_rvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -22,9 +20,11 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_move_assignable
+template <class _Tp>
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_move_assignable
-                           typename add_rvalue_reference<_Tp>::type> {};
+    : public integral_constant<
+          bool,
+          __is_assignable(__add_lvalue_reference_t<_Tp>, __add_rvalue_reference_t<_Tp>)> {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_move_constructible.h+1-2

...	@@ -12,7 +12,6 @@	...	@@ -12,7 +12,6 @@
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/add_rvalue_reference.h>	13	#include <__type_traits/add_rvalue_reference.h>
14	#include <__type_traits/integral_constant.h>	14	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_constructible.h>
16		15
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -22,7 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +21,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		21
23	template <class _Tp>	22	template <class _Tp>
24	struct _LIBCPP_TEMPLATE_VIS is_move_constructible	23	struct _LIBCPP_TEMPLATE_VIS is_move_constructible
25	: public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	24	: public integral_constant<bool, __is_constructible(_Tp, __add_rvalue_reference_t<_Tp>)>
26	{};	25	{};
27		26
28	#if _LIBCPP_STD_VER > 14	27	#if _LIBCPP_STD_VER > 14

lib/libcxx/include/__type_traits/is_nothrow_assignable.h+1-28

...	@@ -10,7 +10,6 @@	...	@@ -10,7 +10,6 @@
10	#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H	10	#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/add_const.h>
14	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
15		14
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -19,39 +18,13 @@	...	@@ -19,39 +18,13 @@
19		18
20	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
21		20
22	#if __has_builtin(__is_nothrow_assignable)
23
24	template <class _Tp, class _Arg>	21	template <class _Tp, class _Arg>
25	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable	22	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable
26	: public integral_constant<bool, __is_nothrow_assignable(_Tp, _Arg)> {};	23	: public integral_constant<bool, __is_nothrow_assignable(_Tp, _Arg)> {};
27		24
28	#else
29
30	template <bool, class _Tp, class _Arg> struct __libcpp_is_nothrow_assignable;
31
32	template <class _Tp, class _Arg>
33	struct __libcpp_is_nothrow_assignable<false, _Tp, _Arg>
34	: public false_type
35	{
36	};
37
38	template <class _Tp, class _Arg>
39	struct __libcpp_is_nothrow_assignable<true, _Tp, _Arg>
40	: public integral_constant<bool, noexcept(declval<_Tp>() = declval<_Arg>()) >
41	{
42	};
43
44	template <class _Tp, class _Arg>
45	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable
46	: public __libcpp_is_nothrow_assignable<is_assignable<_Tp, _Arg>::value, _Tp, _Arg>
47	{
48	};
49
50	#endif // __has_builtin(__is_nothrow_assignable)
51
52	#if _LIBCPP_STD_VER > 14	25	#if _LIBCPP_STD_VER > 14
53	template <class _Tp, class _Arg>	26	template <class _Tp, class _Arg>
54	inline constexpr bool is_nothrow_assignable_v = is_nothrow_assignable<_Tp, _Arg>::value;	27	inline constexpr bool is_nothrow_assignable_v = __is_nothrow_assignable(_Tp, _Arg);
55	#endif	28	#endif
56		29
57	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_nothrow_constructible.h+7-4

 @@ -11,7 +11,10 @@
 #include <__config>
 #include <__type_traits/integral_constant.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/is_reference.h>
 #include <__utility/declval.h>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,17 +24,17 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if __has_builtin(__is_nothrow_constructible)
-template <class _Tp, class... _Args>
+template <
+    class _Tp, class... _Args>
 struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible
     : public integral_constant<bool, __is_nothrow_constructible(_Tp, _Args...)> {};
 #else
 template <bool, bool, class _Tp, class... _Args> struct __libcpp_is_nothrow_constructible;
 template <class _Tp, class... _Args>
 struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/false, _Tp, _Args...>
-    : public integral_constant<bool, noexcept(_Tp(declval<_Args>()...))>
+    : public integral_constant<bool, noexcept(_Tp(std::declval<_Args>()...))>
 {
 };
 @@ -40,7 +43,7 @@ void __implicit_conversion_to(_Tp) noexcept { }
 template <class _Tp, class _Arg>
 struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/true, _Tp, _Arg>
-    : public integral_constant<bool, noexcept(_VSTD::__implicit_conversion_to<_Tp>(declval<_Arg>()))>
+    : public integral_constant<bool, noexcept(_VSTD::__implicit_conversion_to<_Tp>(std::declval<_Arg>()))>
 {
 };

lib/libcxx/include/__type_traits/is_nothrow_convertible.h+1-1

...	@@ -30,7 +30,7 @@ template <typename _Tp>	...	@@ -30,7 +30,7 @@ template <typename _Tp>
30	static void __test_noexcept(_Tp) noexcept;	30	static void __test_noexcept(_Tp) noexcept;
31		31
32	template<typename _Fm, typename _To>	32	template<typename _Fm, typename _To>
33	static bool_constant<noexcept(_VSTD::__test_noexcept<_To>(declval<_Fm>()))>	33	static bool_constant<noexcept(_VSTD::__test_noexcept<_To>(std::declval<_Fm>()))>
34	__is_nothrow_convertible_test();	34	__is_nothrow_convertible_test();
35		35
36	template <typename _Fm, typename _To>	36	template <typename _Fm, typename _To>

lib/libcxx/include/__type_traits/is_nothrow_copy_assignable.h+7-4

 @@ -13,7 +13,6 @@
 #include <__type_traits/add_const.h>
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_nothrow_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,9 +20,13 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_assignable
+template <class _Tp>
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_assignable
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
+    : public integral_constant<
+          bool,
+          __is_nothrow_assignable(
+              __add_lvalue_reference_t<_Tp>,
+              __add_lvalue_reference_t<typename add_const<_Tp>::type>)> {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_nothrow_copy_constructible.h+14-1

...	@@ -21,9 +21,22 @@	...	@@ -21,9 +21,22 @@
21		21
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
23		23
		24	// TODO: remove this implementation once https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106611 is fixed
		25	#ifdef _LIBCPP_COMPILER_GCC
		26
24	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_constructible	27	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_constructible
25	: public is_nothrow_constructible<_Tp,	28	: public is_nothrow_constructible<_Tp,
26	typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};	29	__add_lvalue_reference_t<typename add_const<_Tp>::type> > {};
		30
		31	#else // _LIBCPP_COMPILER_GCC
		32
		33	template <class _Tp>
		34	struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_constructible
		35	: public integral_constant<
		36	bool,
		37	__is_nothrow_constructible(_Tp, typename add_lvalue_reference<typename add_const<_Tp>::type>::type)> {};
		38
		39	#endif // _LIBCPP_COMPILER_GCC
27		40
28	#if _LIBCPP_STD_VER > 14	41	#if _LIBCPP_STD_VER > 14
29	template <class _Tp>	42	template <class _Tp>

lib/libcxx/include/__type_traits/is_nothrow_default_constructible.h+2-3

 @@ -11,7 +11,6 @@
 #include <__config>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_nothrow_constructible.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -20,12 +19,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_default_constructible
-    : public is_nothrow_constructible<_Tp>
+    : public integral_constant<bool, __is_nothrow_constructible(_Tp)>
     {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool is_nothrow_default_constructible_v = is_nothrow_default_constructible<_Tp>::value;
+inline constexpr bool is_nothrow_default_constructible_v = __is_nothrow_constructible(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_nothrow_destructible.h+2-3

...	@@ -10,7 +10,6 @@	...	@@ -10,7 +10,6 @@
10	#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H	10	#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/add_const.h>
14	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_destructible.h>	14	#include <__type_traits/is_destructible.h>
16	#include <__type_traits/is_reference.h>	15	#include <__type_traits/is_reference.h>
...	@@ -37,7 +36,7 @@ struct __libcpp_is_nothrow_destructible<false, _Tp>	...	@@ -37,7 +36,7 @@ struct __libcpp_is_nothrow_destructible<false, _Tp>
37		36
38	template <class _Tp>	37	template <class _Tp>
39	struct __libcpp_is_nothrow_destructible<true, _Tp>	38	struct __libcpp_is_nothrow_destructible<true, _Tp>
40	: public integral_constant<bool, noexcept(declval<_Tp>().~_Tp()) >	39	: public integral_constant<bool, noexcept(std::declval<_Tp>().~_Tp()) >
41	{	40	{
42	};	41	};
43		42
...	@@ -72,7 +71,7 @@ template <class _Tp> struct __libcpp_nothrow_destructor	...	@@ -72,7 +71,7 @@ template <class _Tp> struct __libcpp_nothrow_destructor
72	is_reference<_Tp>::value> {};	71	is_reference<_Tp>::value> {};
73		72
74	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible	73	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible
75	: public __libcpp_nothrow_destructor<typename remove_all_extents<_Tp>::type> {};	74	: public __libcpp_nothrow_destructor<__remove_all_extents_t<_Tp> > {};
76		75
77	template <class _Tp>	76	template <class _Tp>
78	struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp[]>	77	struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp[]>

lib/libcxx/include/__type_traits/is_nothrow_move_assignable.h+6-5

 @@ -13,7 +13,6 @@
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/add_rvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_nothrow_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,10 +20,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_assignable
+template <class _Tp>
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_assignable
-                                     typename add_rvalue_reference<_Tp>::type>
+    : public integral_constant<
-    {};
+          bool,
+          __is_nothrow_assignable(__add_lvalue_reference_t<_Tp>, __add_rvalue_reference_t<_Tp>)> {
+};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_nothrow_move_constructible.h+12-1

...	@@ -20,10 +20,21 @@	...	@@ -20,10 +20,21 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
		23	// TODO: remove this implementation once https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106611 is fixed
		24	#ifndef _LIBCPP_COMPILER_GCC
		25
		26	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible
		27	: public integral_constant<bool, __is_nothrow_constructible(_Tp, __add_rvalue_reference_t<_Tp>)>
		28	{};
		29
		30	#else // _LIBCPP_COMPILER_GCC
		31
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible	32	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible
24	: public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	33	: public is_nothrow_constructible<_Tp, __add_rvalue_reference_t<_Tp> >
25	{};	34	{};
26		35
		36	#endif // _LIBCPP_COMPILER_GCC
		37
27	#if _LIBCPP_STD_VER > 14	38	#if _LIBCPP_STD_VER > 14
28	template <class _Tp>	39	template <class _Tp>
29	inline constexpr bool is_nothrow_move_constructible_v = is_nothrow_move_constructible<_Tp>::value;	40	inline constexpr bool is_nothrow_move_constructible_v = is_nothrow_move_constructible<_Tp>::value;

lib/libcxx/include/__type_traits/is_null_pointer.h+2-2

...	@@ -24,11 +24,11 @@ template <class _Tp> struct __is_nullptr_t_impl : public false_type {};	...	@@ -24,11 +24,11 @@ template <class _Tp> struct __is_nullptr_t_impl : public false_type {};
24	template <> struct __is_nullptr_t_impl<nullptr_t> : public true_type {};	24	template <> struct __is_nullptr_t_impl<nullptr_t> : public true_type {};
25		25
26	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS __is_nullptr_t	26	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS __is_nullptr_t
27	: public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};	27	: public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {};
28		28
29	#if _LIBCPP_STD_VER > 11	29	#if _LIBCPP_STD_VER > 11
30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_null_pointer	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_null_pointer
31	: public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};	31	: public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {};
32		32
33	#if _LIBCPP_STD_VER > 14	33	#if _LIBCPP_STD_VER > 14
34	template <class _Tp>	34	template <class _Tp>

lib/libcxx/include/__type_traits/is_pod.h+1-13

...	@@ -18,24 +18,12 @@	...	@@ -18,24 +18,12 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
21	#if __has_builtin(__is_pod)
22
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pod	21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pod
24	: public integral_constant<bool, __is_pod(_Tp)> {};	22	: public integral_constant<bool, __is_pod(_Tp)> {};
25		23
26	#else
27
28	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pod
29	: public integral_constant<bool, is_trivially_default_constructible<_Tp>::value &&
30	is_trivially_copy_constructible<_Tp>::value &&
31	is_trivially_copy_assignable<_Tp>::value &&
32	is_trivially_destructible<_Tp>::value> {};
33
34	#endif // __has_builtin(__is_pod)
35
36	#if _LIBCPP_STD_VER > 14	24	#if _LIBCPP_STD_VER > 14
37	template <class _Tp>	25	template <class _Tp>
38	inline constexpr bool is_pod_v = is_pod<_Tp>::value;	26	inline constexpr bool is_pod_v = __is_pod(_Tp);
39	#endif	27	#endif
40		28
41	_LIBCPP_END_NAMESPACE_STD	29	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_pointer.h+1-1

...	@@ -43,7 +43,7 @@ template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __unsafe_unretai	...	@@ -43,7 +43,7 @@ template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __unsafe_unretai
43	#endif	43	#endif
44		44
45	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pointer	45	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pointer
46	: public __libcpp_is_pointer<typename __libcpp_remove_objc_qualifiers<typename remove_cv<_Tp>::type>::type> {};	46	: public __libcpp_is_pointer<typename __libcpp_remove_objc_qualifiers<__remove_cv_t<_Tp> >::type> {};
47		47
48	#if _LIBCPP_STD_VER > 14	48	#if _LIBCPP_STD_VER > 14
49	template <class _Tp>	49	template <class _Tp>

lib/libcxx/include/__type_traits/is_reference_wrapper.h+1-1

...	@@ -24,7 +24,7 @@ template <class _Tp> class _LIBCPP_TEMPLATE_VIS reference_wrapper;	...	@@ -24,7 +24,7 @@ template <class _Tp> class _LIBCPP_TEMPLATE_VIS reference_wrapper;
24	template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};	24	template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};
25	template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};	25	template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};
26	template <class _Tp> struct __is_reference_wrapper	26	template <class _Tp> struct __is_reference_wrapper
27	: public __is_reference_wrapper_impl<typename remove_cv<_Tp>::type> {};	27	: public __is_reference_wrapper_impl<__remove_cv_t<_Tp> > {};
28		28
29	_LIBCPP_END_NAMESPACE_STD	29	_LIBCPP_END_NAMESPACE_STD
30		30

lib/libcxx/include/__type_traits/is_referenceable.h+13-5

 @@ -19,14 +19,22 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-struct __is_referenceable_impl {
+#if __has_builtin(__is_referenceable)
-    template <class _Tp> static _Tp& __test(int);
+template <class _Tp>
-    template <class _Tp> static false_type __test(...);
+struct __libcpp_is_referenceable : integral_constant<bool, __is_referenceable(_Tp)> {};
+#else
+struct __libcpp_is_referenceable_impl {
+  template <class _Tp>
+  static _Tp& __test(int);
+  template <class _Tp>
+  static false_type __test(...);
 };
 template <class _Tp>
-struct __is_referenceable : integral_constant<bool,
+struct __libcpp_is_referenceable
-    _IsNotSame<decltype(__is_referenceable_impl::__test<_Tp>(0)), false_type>::value> {};
+    : integral_constant<bool, _IsNotSame<decltype(__libcpp_is_referenceable_impl::__test<_Tp>(0)), false_type>::value> {
+};
+#endif // __has_builtin(__is_referenceable)
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_scalar.h+1

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14	#include <__type_traits/is_arithmetic.h>	14	#include <__type_traits/is_arithmetic.h>
15	#include <__type_traits/is_enum.h>	15	#include <__type_traits/is_enum.h>
16	#include <__type_traits/is_member_pointer.h>	16	#include <__type_traits/is_member_pointer.h>
		17	#include <__type_traits/is_null_pointer.h>
17	#include <__type_traits/is_pointer.h>	18	#include <__type_traits/is_pointer.h>
18		19
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

lib/libcxx/include/__type_traits/is_signed.h+2

...	@@ -11,6 +11,8 @@	...	@@ -11,6 +11,8 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
		14	#include <__type_traits/is_arithmetic.h>
		15	#include <__type_traits/is_integral.h>
14		16
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	18	# pragma GCC system_header

lib/libcxx/include/__type_traits/is_specialization.h created+45

...	@@ -0,0 +1,45 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
11	#define _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
12
13	// This contains parts of P2098R1 but is based on MSVC STL's implementation.
14	//
15	// The paper has been rejected
16	// We will not pursue P2098R0 (std::is_specialization_of) at this time; we'd
17	// like to see a solution to this problem, but it requires language evolution
18	// too.
19	//
20	// Since it is expected a real solution will be provided in the future only the
21	// minimal part is implemented.
22	//
23	// Note a cvref qualified _Tp is never considered a specialization.
24
25	#include <__config>
26
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header
29	#endif
30
31	_LIBCPP_BEGIN_NAMESPACE_STD
32
33	#if _LIBCPP_STD_VER > 14
34
35	template <class _Tp, template <class...> class _Template>
36	inline constexpr bool __is_specialization_v = false; // true if and only if _Tp is a specialization of _Template
37
38	template <template <class...> class _Template, class... _Args>
39	inline constexpr bool __is_specialization_v<_Template<_Args...>, _Template> = true;
40
41	#endif // _LIBCPP_STD_VER > 14
42
43	_LIBCPP_END_NAMESPACE_STD
44
45	#endif // _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION

lib/libcxx/include/__type_traits/is_standard_layout.h+1-5

 @@ -19,16 +19,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_standard_layout
-#if __has_builtin(__is_standard_layout)
     : public integral_constant<bool, __is_standard_layout(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
-#endif
     {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool is_standard_layout_v = is_standard_layout<_Tp>::value;
+inline constexpr bool is_standard_layout_v = __is_standard_layout(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_swappable.h created+165

...	@@ -0,0 +1,165 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
11
12	#include <__config>
13	#include <__type_traits/add_lvalue_reference.h>
14	#include <__type_traits/conditional.h>
15	#include <__type_traits/enable_if.h>
16	#include <__type_traits/is_move_assignable.h>
17	#include <__type_traits/is_move_constructible.h>
18	#include <__type_traits/is_nothrow_move_assignable.h>
19	#include <__type_traits/is_nothrow_move_constructible.h>
20	#include <__type_traits/is_referenceable.h>
21	#include <__type_traits/is_same.h>
22	#include <__type_traits/is_void.h>
23	#include <__type_traits/nat.h>
24	#include <__utility/declval.h>
25	#include <cstddef>
26
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header
29	#endif
30
31	_LIBCPP_BEGIN_NAMESPACE_STD
32
33	template <class _Tp> struct __is_swappable;
34	template <class _Tp> struct __is_nothrow_swappable;
35
36
37	#ifndef _LIBCPP_CXX03_LANG
38	template <class _Tp>
39	using __swap_result_t = typename enable_if<is_move_constructible<_Tp>::value && is_move_assignable<_Tp>::value>::type;
40	#else
41	template <class>
42	using __swap_result_t = void;
43	#endif
44
45	template <class _Tp>
46	inline _LIBCPP_INLINE_VISIBILITY
47	_LIBCPP_CONSTEXPR_SINCE_CXX20 __swap_result_t<_Tp>
48	swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
49	is_nothrow_move_assignable<_Tp>::value);
50
51	template<class _Tp, size_t _Np>
52	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
53	typename enable_if<
54	__is_swappable<_Tp>::value
55	>::type
56	swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value);
57
58	namespace __detail
59	{
60	// ALL generic swap overloads MUST already have a declaration available at this point.
61
62	template <class _Tp, class _Up = _Tp,
63	bool _NotVoid = !is_void<_Tp>::value && !is_void<_Up>::value>
64	struct __swappable_with
65	{
66	template <class _LHS, class _RHS>
67	static decltype(swap(std::declval<_LHS>(), std::declval<_RHS>()))
68	__test_swap(int);
69	template <class, class>
70	static __nat __test_swap(long);
71
72	// Extra parens are needed for the C++03 definition of decltype.
73	typedef decltype((__test_swap<_Tp, _Up>(0))) __swap1;
74	typedef decltype((__test_swap<_Up, _Tp>(0))) __swap2;
75
76	static const bool value = _IsNotSame<__swap1, __nat>::value
77	&& _IsNotSame<__swap2, __nat>::value;
78	};
79
80	template <class _Tp, class _Up>
81	struct __swappable_with<_Tp, _Up, false> : false_type {};
82
83	template <class _Tp, class _Up = _Tp, bool _Swappable = __swappable_with<_Tp, _Up>::value>
84	struct __nothrow_swappable_with {
85	static const bool value =
86	#ifndef _LIBCPP_HAS_NO_NOEXCEPT
87	noexcept(swap(std::declval<_Tp>(), std::declval<_Up>()))
88	&& noexcept(swap(std::declval<_Up>(), std::declval<_Tp>()));
89	#else
90	false;
91	#endif
92	};
93
94	template <class _Tp, class _Up>
95	struct __nothrow_swappable_with<_Tp, _Up, false> : false_type {};
96
97	} // namespace __detail
98
99	template <class _Tp>
100	struct __is_swappable
101	: public integral_constant<bool, __detail::__swappable_with<_Tp&>::value>
102	{
103	};
104
105	template <class _Tp>
106	struct __is_nothrow_swappable
107	: public integral_constant<bool, __detail::__nothrow_swappable_with<_Tp&>::value>
108	{
109	};
110
111	#if _LIBCPP_STD_VER > 14
112
113	template <class _Tp, class _Up>
114	struct _LIBCPP_TEMPLATE_VIS is_swappable_with
115	: public integral_constant<bool, __detail::__swappable_with<_Tp, _Up>::value>
116	{
117	};
118
119	template <class _Tp>
120	struct _LIBCPP_TEMPLATE_VIS is_swappable
121	: public __conditional_t<
122	__libcpp_is_referenceable<_Tp>::value,
123	is_swappable_with<
124	__add_lvalue_reference_t<_Tp>,
125	__add_lvalue_reference_t<_Tp> >,
126	false_type
127	>
128	{
129	};
130
131	template <class _Tp, class _Up>
132	struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable_with
133	: public integral_constant<bool, __detail::__nothrow_swappable_with<_Tp, _Up>::value>
134	{
135	};
136
137	template <class _Tp>
138	struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable
139	: public __conditional_t<
140	__libcpp_is_referenceable<_Tp>::value,
141	is_nothrow_swappable_with<
142	__add_lvalue_reference_t<_Tp>,
143	__add_lvalue_reference_t<_Tp> >,
144	false_type
145	>
146	{
147	};
148
149	template <class _Tp, class _Up>
150	inline constexpr bool is_swappable_with_v = is_swappable_with<_Tp, _Up>::value;
151
152	template <class _Tp>
153	inline constexpr bool is_swappable_v = is_swappable<_Tp>::value;
154
155	template <class _Tp, class _Up>
156	inline constexpr bool is_nothrow_swappable_with_v = is_nothrow_swappable_with<_Tp, _Up>::value;
157
158	template <class _Tp>
159	inline constexpr bool is_nothrow_swappable_v = is_nothrow_swappable<_Tp>::value;
160
161	#endif // _LIBCPP_STD_VER > 14
162
163	_LIBCPP_END_NAMESPACE_STD
164
165	#endif // _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H

lib/libcxx/include/__type_traits/is_trivial.h+1-6

 @@ -19,17 +19,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivial
-#if __has_builtin(__is_trivial)
     : public integral_constant<bool, __is_trivial(_Tp)>
-#else
-    : integral_constant<bool, is_trivially_copyable<_Tp>::value &&
-                                 is_trivially_default_constructible<_Tp>::value>
-#endif
     {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool is_trivial_v = is_trivial<_Tp>::value;
+inline constexpr bool is_trivial_v = __is_trivial(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_trivially_assignable.h+1-1

...	@@ -25,7 +25,7 @@ struct is_trivially_assignable	...	@@ -25,7 +25,7 @@ struct is_trivially_assignable
25		25
26	#if _LIBCPP_STD_VER > 14	26	#if _LIBCPP_STD_VER > 14
27	template <class _Tp, class _Arg>	27	template <class _Tp, class _Arg>
28	inline constexpr bool is_trivially_assignable_v = is_trivially_assignable<_Tp, _Arg>::value;	28	inline constexpr bool is_trivially_assignable_v = __is_trivially_assignable(_Tp, _Arg);
29	#endif	29	#endif
30		30
31	_LIBCPP_END_NAMESPACE_STD	31	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_trivially_constructible.h+1-1

...	@@ -26,7 +26,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible	...	@@ -26,7 +26,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible
26		26
27	#if _LIBCPP_STD_VER > 14	27	#if _LIBCPP_STD_VER > 14
28	template <class _Tp, class... _Args>	28	template <class _Tp, class... _Args>
29	inline constexpr bool is_trivially_constructible_v = is_trivially_constructible<_Tp, _Args...>::value;	29	inline constexpr bool is_trivially_constructible_v = __is_trivially_constructible(_Tp, _Args...);
30	#endif	30	#endif
31		31
32	_LIBCPP_END_NAMESPACE_STD	32	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_trivially_copy_assignable.h+7-4

 @@ -13,7 +13,6 @@
 #include <__type_traits/add_const.h>
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_trivially_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,9 +20,13 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_copy_assignable
+template <class _Tp>
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_trivially_copy_assignable
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
+    : public integral_constant<
+          bool,
+          __is_trivially_assignable(
+              __add_lvalue_reference_t<_Tp>,
+              __add_lvalue_reference_t<typename add_const<_Tp>::type>)> {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_trivially_copy_constructible.h+1-2

...	@@ -12,7 +12,6 @@	...	@@ -12,7 +12,6 @@
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/add_lvalue_reference.h>	13	#include <__type_traits/add_lvalue_reference.h>
14	#include <__type_traits/integral_constant.h>	14	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_trivially_constructible.h>
16		15
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -21,7 +20,7 @@	...	@@ -21,7 +20,7 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
22		21
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_copy_constructible	22	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_copy_constructible
24	: public is_trivially_constructible<_Tp, typename add_lvalue_reference<const _Tp>::type>	23	: public integral_constant<bool, __is_trivially_constructible(_Tp, __add_lvalue_reference_t<const _Tp>)>
25	{};	24	{};
26		25
27	#if _LIBCPP_STD_VER > 14	26	#if _LIBCPP_STD_VER > 14

lib/libcxx/include/__type_traits/is_trivially_copyable.h+1-1

...	@@ -24,7 +24,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_copyable	...	@@ -24,7 +24,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_copyable
24		24
25	#if _LIBCPP_STD_VER > 14	25	#if _LIBCPP_STD_VER > 14
26	template <class _Tp>	26	template <class _Tp>
27	inline constexpr bool is_trivially_copyable_v = is_trivially_copyable<_Tp>::value;	27	inline constexpr bool is_trivially_copyable_v = __is_trivially_copyable(_Tp);
28	#endif	28	#endif
29		29
30	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_trivially_default_constructible.h+2-3

 @@ -11,7 +11,6 @@
 #include <__config>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_trivially_constructible.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -20,12 +19,12 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_default_constructible
-    : public is_trivially_constructible<_Tp>
+    : public integral_constant<bool, __is_trivially_constructible(_Tp)>
     {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
-inline constexpr bool is_trivially_default_constructible_v = is_trivially_default_constructible<_Tp>::value;
+inline constexpr bool is_trivially_default_constructible_v = __is_trivially_constructible(_Tp);
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_trivially_destructible.h+2-9

 @@ -11,6 +11,7 @@
 #include <__config>
 #include <__type_traits/integral_constant.h>
+#include <__type_traits/is_destructible.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -30,15 +31,7 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible
 #else
-template <class _Tp> struct __libcpp_trivial_destructor
+#error is_trivially_destructible is not implemented
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_reference<_Tp>::value> {};
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible
-    : public __libcpp_trivial_destructor<typename remove_all_extents<_Tp>::type> {};
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible<_Tp[]>
-    : public false_type {};
 #endif // __has_builtin(__is_trivially_destructible)

lib/libcxx/include/__type_traits/is_trivially_move_assignable.h+5-5

 @@ -13,7 +13,6 @@
 #include <__type_traits/add_lvalue_reference.h>
 #include <__type_traits/add_rvalue_reference.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_trivially_assignable.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -21,10 +20,11 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_assignable
+template <class _Tp>
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
+struct _LIBCPP_TEMPLATE_VIS is_trivially_move_assignable
-                                     typename add_rvalue_reference<_Tp>::type>
+    : public integral_constant<
-    {};
+          bool,
+          __is_trivially_assignable(__add_lvalue_reference_t<_Tp>, __add_rvalue_reference_t<_Tp>)> {};
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>

lib/libcxx/include/__type_traits/is_trivially_move_constructible.h+3-4

...	@@ -12,7 +12,6 @@	...	@@ -12,7 +12,6 @@
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/add_rvalue_reference.h>	13	#include <__type_traits/add_rvalue_reference.h>
14	#include <__type_traits/integral_constant.h>	14	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_trivially_constructible.h>
16		15
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -20,9 +19,9 @@	...	@@ -20,9 +19,9 @@
20		19
21	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
22		21
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_constructible	22	template <class _Tp>
24	: public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	23	struct _LIBCPP_TEMPLATE_VIS is_trivially_move_constructible
25	{};	24	: public integral_constant<bool, __is_trivially_constructible(_Tp, __add_rvalue_reference_t<_Tp>)> {};
26		25
27	#if _LIBCPP_STD_VER > 14	26	#if _LIBCPP_STD_VER > 14
28	template <class _Tp>	27	template <class _Tp>

lib/libcxx/include/__type_traits/is_union.h-1

...	@@ -11,7 +11,6 @@	...	@@ -11,7 +11,6 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
14	#include <__type_traits/remove_cv.h>
15		14
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	16	# pragma GCC system_header

lib/libcxx/include/__type_traits/is_unsigned.h+1-2

...	@@ -20,8 +20,7 @@	...	@@ -20,8 +20,7 @@
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	// Before AppleClang 14, __is_unsigned returned true for enums with signed underlying type.	23	#if __has_builtin(__is_unsigned)
24	#if __has_builtin(__is_unsigned) && !(defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 1400)
25		24
26	template<class _Tp>	25	template<class _Tp>
27	struct _LIBCPP_TEMPLATE_VIS is_unsigned : _BoolConstant<__is_unsigned(_Tp)> { };	26	struct _LIBCPP_TEMPLATE_VIS is_unsigned : _BoolConstant<__is_unsigned(_Tp)> { };

lib/libcxx/include/__type_traits/is_valid_expansion.h+1-1

...	@@ -24,7 +24,7 @@ template <template <class...> class, class ...>	...	@@ -24,7 +24,7 @@ template <template <class...> class, class ...>
24	false_type __sfinae_test_impl(...);	24	false_type __sfinae_test_impl(...);
25		25
26	template <template <class ...> class _Templ, class ..._Args>	26	template <template <class ...> class _Templ, class ..._Args>
27	using _IsValidExpansion _LIBCPP_NODEBUG = decltype(__sfinae_test_impl<_Templ, _Args...>(0));	27	using _IsValidExpansion _LIBCPP_NODEBUG = decltype(std::__sfinae_test_impl<_Templ, _Args...>(0));
28		28
29	_LIBCPP_END_NAMESPACE_STD	29	_LIBCPP_END_NAMESPACE_STD
30		30

lib/libcxx/include/__type_traits/is_void.h+3-1

...	@@ -11,6 +11,8 @@	...	@@ -11,6 +11,8 @@
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/integral_constant.h>	13	#include <__type_traits/integral_constant.h>
		14	#include <__type_traits/is_same.h>
		15	#include <__type_traits/remove_cv.h>
14		16
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	18	# pragma GCC system_header
...	@@ -31,7 +33,7 @@ inline constexpr bool is_void_v = __is_void(_Tp);	...	@@ -31,7 +33,7 @@ inline constexpr bool is_void_v = __is_void(_Tp);
31	#else	33	#else
32		34
33	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_void	35	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_void
34	: public is_same<typename remove_cv<_Tp>::type, void> {};	36	: public is_same<__remove_cv_t<_Tp>, void> {};
35		37
36	#if _LIBCPP_STD_VER > 14	38	#if _LIBCPP_STD_VER > 14
37	template <class _Tp>	39	template <class _Tp>

lib/libcxx/include/__type_traits/make_const_lvalue_ref.h created+26

...	@@ -0,0 +1,26 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
10	#define _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
11
12	#include <__config>
13	#include <__type_traits/remove_reference.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template<class _Tp>
22	using __make_const_lvalue_ref = const __libcpp_remove_reference_t<_Tp>&;
23
24	_LIBCPP_END_NAMESPACE_STD
25
26	#endif // _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H

lib/libcxx/include/__type_traits/make_signed.h+20-10

...	@@ -23,19 +23,25 @@	...	@@ -23,19 +23,25 @@
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
25		25
		26	#if __has_builtin(__make_signed)
		27
		28	template <class _Tp>
		29	using __make_signed_t = __make_signed(_Tp);
		30
		31	#else
26	typedef	32	typedef
27	__type_list<signed char,	33	__type_list<signed char,
28	__type_list<signed short,	34	__type_list<signed short,
29	__type_list<signed int,	35	__type_list<signed int,
30	__type_list<signed long,	36	__type_list<signed long,
31	__type_list<signed long long,	37	__type_list<signed long long,
32	#ifndef _LIBCPP_HAS_NO_INT128	38	# ifndef _LIBCPP_HAS_NO_INT128
33	__type_list<__int128_t,	39	__type_list<__int128_t,
34	#endif	40	# endif
35	__nat	41	__nat
36	#ifndef _LIBCPP_HAS_NO_INT128	42	# ifndef _LIBCPP_HAS_NO_INT128
37	>	43	>
38	#endif	44	# endif
39	> > > > > __signed_types;	45	> > > > > __signed_types;
40		46
41	template <class _Tp, bool = is_integral<_Tp>::value \|\| is_enum<_Tp>::value>	47	template <class _Tp, bool = is_integral<_Tp>::value \|\| is_enum<_Tp>::value>
...	@@ -56,19 +62,23 @@ template <> struct __make_signed< signed long, true> {typedef long ty	...	@@ -56,19 +62,23 @@ template <> struct __make_signed< signed long, true> {typedef long ty
56	template <> struct __make_signed<unsigned long, true> {typedef long type;};	62	template <> struct __make_signed<unsigned long, true> {typedef long type;};
57	template <> struct __make_signed< signed long long, true> {typedef long long type;};	63	template <> struct __make_signed< signed long long, true> {typedef long long type;};
58	template <> struct __make_signed<unsigned long long, true> {typedef long long type;};	64	template <> struct __make_signed<unsigned long long, true> {typedef long long type;};
59	#ifndef _LIBCPP_HAS_NO_INT128	65	# ifndef _LIBCPP_HAS_NO_INT128
60	template <> struct __make_signed<__int128_t, true> {typedef __int128_t type;};	66	template <> struct __make_signed<__int128_t, true> {typedef __int128_t type;};
61	template <> struct __make_signed<__uint128_t, true> {typedef __int128_t type;};	67	template <> struct __make_signed<__uint128_t, true> {typedef __int128_t type;};
62	#endif	68	# endif
63		69
64	template <class _Tp>	70	template <class _Tp>
65	struct _LIBCPP_TEMPLATE_VIS make_signed	71	using __make_signed_t = typename __apply_cv<_Tp, typename __make_signed<__remove_cv_t<_Tp> >::type>::type;
66	{	72
67	typedef typename __apply_cv<_Tp, typename __make_signed<typename remove_cv<_Tp>::type>::type>::type type;	73	#endif // __has_builtin(__make_signed)
		74
		75	template <class _Tp>
		76	struct make_signed {
		77	using type _LIBCPP_NODEBUG = __make_signed_t<_Tp>;
68	};	78	};
69		79
70	#if _LIBCPP_STD_VER > 11	80	#if _LIBCPP_STD_VER > 11
71	template <class _Tp> using make_signed_t = typename make_signed<_Tp>::type;	81	template <class _Tp> using make_signed_t = __make_signed_t<_Tp>;
72	#endif	82	#endif
73		83
74	_LIBCPP_END_NAMESPACE_STD	84	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/make_unsigned.h+23-13

...	@@ -25,19 +25,25 @@	...	@@ -25,19 +25,25 @@
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
27		27
		28	#if __has_builtin(__make_unsigned)
		29
		30	template <class _Tp>
		31	using __make_unsigned_t = __make_unsigned(_Tp);
		32
		33	#else
28	typedef	34	typedef
29	__type_list<unsigned char,	35	__type_list<unsigned char,
30	__type_list<unsigned short,	36	__type_list<unsigned short,
31	__type_list<unsigned int,	37	__type_list<unsigned int,
32	__type_list<unsigned long,	38	__type_list<unsigned long,
33	__type_list<unsigned long long,	39	__type_list<unsigned long long,
34	#ifndef _LIBCPP_HAS_NO_INT128	40	# ifndef _LIBCPP_HAS_NO_INT128
35	__type_list<__uint128_t,	41	__type_list<__uint128_t,
36	#endif	42	# endif
37	__nat	43	__nat
38	#ifndef _LIBCPP_HAS_NO_INT128	44	# ifndef _LIBCPP_HAS_NO_INT128
39	>	45	>
40	#endif	46	# endif
41	> > > > > __unsigned_types;	47	> > > > > __unsigned_types;
42		48
43	template <class _Tp, bool = is_integral<_Tp>::value \|\| is_enum<_Tp>::value>	49	template <class _Tp, bool = is_integral<_Tp>::value \|\| is_enum<_Tp>::value>
...	@@ -58,31 +64,35 @@ template <> struct __make_unsigned< signed long, true> {typedef unsigned l	...	@@ -58,31 +64,35 @@ template <> struct __make_unsigned< signed long, true> {typedef unsigned l
58	template <> struct __make_unsigned<unsigned long, true> {typedef unsigned long type;};	64	template <> struct __make_unsigned<unsigned long, true> {typedef unsigned long type;};
59	template <> struct __make_unsigned< signed long long, true> {typedef unsigned long long type;};	65	template <> struct __make_unsigned< signed long long, true> {typedef unsigned long long type;};
60	template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};	66	template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};
61	#ifndef _LIBCPP_HAS_NO_INT128	67	# ifndef _LIBCPP_HAS_NO_INT128
62	template <> struct __make_unsigned<__int128_t, true> {typedef __uint128_t type;};	68	template <> struct __make_unsigned<__int128_t, true> {typedef __uint128_t type;};
63	template <> struct __make_unsigned<__uint128_t, true> {typedef __uint128_t type;};	69	template <> struct __make_unsigned<__uint128_t, true> {typedef __uint128_t type;};
64	#endif	70	# endif
65		71
66	template <class _Tp>	72	template <class _Tp>
67	struct _LIBCPP_TEMPLATE_VIS make_unsigned	73	using __make_unsigned_t = typename __apply_cv<_Tp, typename __make_unsigned<__remove_cv_t<_Tp> >::type>::type;
68	{	74
69	typedef typename __apply_cv<_Tp, typename __make_unsigned<typename remove_cv<_Tp>::type>::type>::type type;	75	#endif // __has_builtin(__make_unsigned)
		76
		77	template <class _Tp>
		78	struct make_unsigned {
		79	using type _LIBCPP_NODEBUG = __make_unsigned_t<_Tp>;
70	};	80	};
71		81
72	#if _LIBCPP_STD_VER > 11	82	#if _LIBCPP_STD_VER > 11
73	template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;	83	template <class _Tp> using make_unsigned_t = __make_unsigned_t<_Tp>;
74	#endif	84	#endif
75		85
76	#ifndef _LIBCPP_CXX03_LANG	86	#ifndef _LIBCPP_CXX03_LANG
77	template <class _Tp>	87	template <class _Tp>
78	_LIBCPP_HIDE_FROM_ABI constexpr	88	_LIBCPP_HIDE_FROM_ABI constexpr
79	typename make_unsigned<_Tp>::type __to_unsigned_like(_Tp __x) noexcept {	89	__make_unsigned_t<_Tp> __to_unsigned_like(_Tp __x) noexcept {
80	return static_cast<typename make_unsigned<_Tp>::type>(__x);	90	return static_cast<__make_unsigned_t<_Tp> >(__x);
81	}	91	}
82	#endif	92	#endif
83		93
84	template <class _Tp, class _Up>	94	template <class _Tp, class _Up>
85	using __copy_unsigned_t = __conditional_t<is_unsigned<_Tp>::value, typename make_unsigned<_Up>::type, _Up>;	95	using __copy_unsigned_t = __conditional_t<is_unsigned<_Tp>::value, __make_unsigned_t<_Up>, _Up>;
86		96
87	_LIBCPP_END_NAMESPACE_STD	97	_LIBCPP_END_NAMESPACE_STD
88		98

lib/libcxx/include/__type_traits/maybe_const.h created+26

...	@@ -0,0 +1,26 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
10	#define _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
11
12	#include <__config>
13	#include <__type_traits/conditional.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template<bool _Const, class _Tp>
22	using __maybe_const = __conditional_t<_Const, const _Tp, _Tp>;
23
24	_LIBCPP_END_NAMESPACE_STD
25
26	#endif // _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H

lib/libcxx/include/__type_traits/negation.h+1-1

...	@@ -25,7 +25,7 @@ struct _Not : _BoolConstant<!_Pred::value> {};	...	@@ -25,7 +25,7 @@ struct _Not : _BoolConstant<!_Pred::value> {};
25	template <class _Tp>	25	template <class _Tp>
26	struct negation : _Not<_Tp> {};	26	struct negation : _Not<_Tp> {};
27	template<class _Tp>	27	template<class _Tp>
28	inline constexpr bool negation_v = negation<_Tp>::value;	28	inline constexpr bool negation_v = !_Tp::value;
29	#endif // _LIBCPP_STD_VER > 14	29	#endif // _LIBCPP_STD_VER > 14
30		30
31	_LIBCPP_END_NAMESPACE_STD	31	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/noexcept_move_assign_container.h created+35

...	@@ -0,0 +1,35 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
10	#define _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
11
12	#include <__config>
13	#include <__memory/allocator_traits.h>
14	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_nothrow_move_assignable.h>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <typename _Alloc, typename _Traits=allocator_traits<_Alloc> >
24	struct __noexcept_move_assign_container : public integral_constant<bool,
25	_Traits::propagate_on_container_move_assignment::value
26	#if _LIBCPP_STD_VER > 14
27	\|\| _Traits::is_always_equal::value
28	#else
29	&& is_nothrow_move_assignable<_Alloc>::value
30	#endif
31	> {};
32
33	_LIBCPP_END_NAMESPACE_STD
34
35	#endif // _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H

lib/libcxx/include/__type_traits/promote.h+5-1

 @@ -33,10 +33,14 @@ struct __numeric_type
    static double __test(unsigned long);
    static double __test(long long);
    static double __test(unsigned long long);
+#ifndef _LIBCPP_HAS_NO_INT128
+   static double __test(__int128_t);
+   static double __test(__uint128_t);
+#endif
    static double __test(double);
    static long double __test(long double);
-   typedef decltype(__test(declval<_Tp>())) type;
+   typedef decltype(__test(std::declval<_Tp>())) type;
    static const bool value = _IsNotSame<type, void>::value;
 };

lib/libcxx/include/__type_traits/rank.h+10

 @@ -19,6 +19,14 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+// TODO: Enable using the builtin __array_rank when https://llvm.org/PR57133 is resolved
+#if __has_builtin(__array_rank) && 0
+template <class _Tp>
+struct rank : integral_constant<size_t, __array_rank(_Tp)> {};
+#else
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS rank
     : public integral_constant<size_t, 0> {};
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS rank<_Tp[]>
 @@ -26,6 +34,8 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS rank<_Tp[]>
 template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS rank<_Tp[_Np]>
     : public integral_constant<size_t, rank<_Tp>::value + 1> {};
+#endif // __has_builtin(__array_rank)
 #if _LIBCPP_STD_VER > 14
 template <class _Tp>
 inline constexpr size_t rank_v = rank<_Tp>::value;

lib/libcxx/include/__type_traits/remove_all_extents.h+14-1

...	@@ -18,6 +18,15 @@	...	@@ -18,6 +18,15 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
		21	#if __has_builtin(__remove_all_extents)
		22	template <class _Tp>
		23	struct remove_all_extents {
		24	using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp);
		25	};
		26
		27	template <class _Tp>
		28	using __remove_all_extents_t = __remove_all_extents(_Tp);
		29	#else
21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents
22	{typedef _Tp type;};	31	{typedef _Tp type;};
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[]>	32	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[]>
...	@@ -25,8 +34,12 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[]>	...	@@ -25,8 +34,12 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[]>
25	template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[_Np]>	34	template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[_Np]>
26	{typedef typename remove_all_extents<_Tp>::type type;};	35	{typedef typename remove_all_extents<_Tp>::type type;};
27		36
		37	template <class _Tp>
		38	using __remove_all_extents_t = typename remove_all_extents<_Tp>::type;
		39	#endif // __has_builtin(__remove_all_extents)
		40
28	#if _LIBCPP_STD_VER > 11	41	#if _LIBCPP_STD_VER > 11
29	template <class _Tp> using remove_all_extents_t = typename remove_all_extents<_Tp>::type;	42	template <class _Tp> using remove_all_extents_t = __remove_all_extents_t<_Tp>;
30	#endif	43	#endif
31		44
32	_LIBCPP_END_NAMESPACE_STD	45	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_const.h+15-1

...	@@ -17,10 +17,24 @@	...	@@ -17,10 +17,24 @@
17		17
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
		20	#if __has_builtin(__remove_const)
		21	template <class _Tp>
		22	struct remove_const {
		23	using type _LIBCPP_NODEBUG = __remove_const(_Tp);
		24	};
		25
		26	template <class _Tp>
		27	using __remove_const_t = __remove_const(_Tp);
		28	#else
20	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_const {typedef _Tp type;};	29	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_const {typedef _Tp type;};
21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_const<const _Tp> {typedef _Tp type;};	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_const<const _Tp> {typedef _Tp type;};
		31
		32	template <class _Tp>
		33	using __remove_const_t = typename remove_const<_Tp>::type;
		34	#endif // __has_builtin(__remove_const)
		35
22	#if _LIBCPP_STD_VER > 11	36	#if _LIBCPP_STD_VER > 11
23	template <class _Tp> using remove_const_t = typename remove_const<_Tp>::type;	37	template <class _Tp> using remove_const_t = __remove_const_t<_Tp>;
24	#endif	38	#endif
25		39
26	_LIBCPP_END_NAMESPACE_STD	40	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_const_ref.h created+27

...	@@ -0,0 +1,27 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
10	#define _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
11
12	#include <__config>
13	#include <__type_traits/remove_const.h>
14	#include <__type_traits/remove_reference.h>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	template <class _Tp>
23	using __remove_const_ref_t = __remove_const_t<__libcpp_remove_reference_t<_Tp> >;
24
25	_LIBCPP_END_NAMESPACE_STD
26
27	#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H

lib/libcxx/include/__type_traits/remove_cv.h+16-2

...	@@ -19,10 +19,24 @@	...	@@ -19,10 +19,24 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
		22	#if __has_builtin(__remove_cv)
		23	template <class _Tp>
		24	struct remove_cv {
		25	using type _LIBCPP_NODEBUG = __remove_cv(_Tp);
		26	};
		27
		28	template <class _Tp>
		29	using __remove_cv_t = __remove_cv(_Tp);
		30	#else
22	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_cv	31	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_cv
23	{typedef typename remove_volatile<typename remove_const<_Tp>::type>::type type;};	32	{typedef __remove_volatile_t<__remove_const_t<_Tp> > type;};
		33
		34	template <class _Tp>
		35	using __remove_cv_t = __remove_volatile_t<__remove_const_t<_Tp> >;
		36	#endif // __has_builtin(__remove_cv)
		37
24	#if _LIBCPP_STD_VER > 11	38	#if _LIBCPP_STD_VER > 11
25	template <class _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;	39	template <class _Tp> using remove_cv_t = __remove_cv_t<_Tp>;
26	#endif	40	#endif
27		41
28	_LIBCPP_END_NAMESPACE_STD	42	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_cvref.h+9-5

 @@ -20,20 +20,24 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+#if __has_builtin(__remove_cvref)
 template <class _Tp>
-using __uncvref_t _LIBCPP_NODEBUG = typename remove_cv<typename remove_reference<_Tp>::type>::type;
+using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp);
+#else
+template <class _Tp>
+using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cv_t<__libcpp_remove_reference_t<_Tp> >;
+#endif // __has_builtin(__remove_cvref)
 template <class _Tp, class _Up>
-struct __is_same_uncvref : _IsSame<__uncvref_t<_Tp>, __uncvref_t<_Up> > {};
+struct __is_same_uncvref : _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> > {};
 #if _LIBCPP_STD_VER > 17
-// remove_cvref - same as __uncvref
 template <class _Tp>
 struct remove_cvref {
-    using type _LIBCPP_NODEBUG = __uncvref_t<_Tp>;
+    using type _LIBCPP_NODEBUG = __remove_cvref_t<_Tp>;
 };
-template <class _Tp> using remove_cvref_t = typename remove_cvref<_Tp>::type;
+template <class _Tp> using remove_cvref_t = __remove_cvref_t<_Tp>;
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_extent.h+14-1

...	@@ -18,6 +18,15 @@	...	@@ -18,6 +18,15 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
		21	#if __has_builtin(__remove_extent)
		22	template <class _Tp>
		23	struct remove_extent {
		24	using type _LIBCPP_NODEBUG = __remove_extent(_Tp);
		25	};
		26
		27	template <class _Tp>
		28	using __remove_extent_t = __remove_extent(_Tp);
		29	#else
21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent
22	{typedef _Tp type;};	31	{typedef _Tp type;};
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[]>	32	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[]>
...	@@ -25,8 +34,12 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[]>	...	@@ -25,8 +34,12 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[]>
25	template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[_Np]>	34	template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[_Np]>
26	{typedef _Tp type;};	35	{typedef _Tp type;};
27		36
		37	template <class _Tp>
		38	using __remove_extent_t = typename remove_extent<_Tp>::type;
		39	#endif // __has_builtin(__remove_extent)
		40
28	#if _LIBCPP_STD_VER > 11	41	#if _LIBCPP_STD_VER > 11
29	template <class _Tp> using remove_extent_t = typename remove_extent<_Tp>::type;	42	template <class _Tp> using remove_extent_t = __remove_extent_t<_Tp>;
30	#endif	43	#endif
31		44
32	_LIBCPP_END_NAMESPACE_STD	45	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_pointer.h+14-1

 @@ -17,14 +17,27 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+#if __has_builtin(__remove_pointer)
+template <class _Tp>
+struct remove_pointer {
+  using type _LIBCPP_NODEBUG = __remove_pointer(_Tp);
+};
+template <class _Tp>
+using __remove_pointer_t = __remove_pointer(_Tp);
+#else
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer                      {typedef _LIBCPP_NODEBUG _Tp type;};
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp*>                {typedef _LIBCPP_NODEBUG _Tp type;};
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const>          {typedef _LIBCPP_NODEBUG _Tp type;};
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* volatile>       {typedef _LIBCPP_NODEBUG _Tp type;};
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const volatile> {typedef _LIBCPP_NODEBUG _Tp type;};
+template <class _Tp>
+using __remove_pointer_t = typename remove_pointer<_Tp>::type;
+#endif // __has_builtin(__remove_pointer)
 #if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type;
+template <class _Tp> using remove_pointer_t = __remove_pointer_t<_Tp>;
 #endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_reference.h+14-1

...	@@ -18,12 +18,25 @@	...	@@ -18,12 +18,25 @@
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
20		20
		21	#if __has_builtin(__remove_reference_t)
		22	template <class _Tp>
		23	struct remove_reference {
		24	using type _LIBCPP_NODEBUG = __remove_reference_t(_Tp);
		25	};
		26
		27	template <class _Tp>
		28	using __libcpp_remove_reference_t = __remove_reference_t(_Tp);
		29	#else
21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;};	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;};
22	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;};	31	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;};
23	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;};	32	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;};
24		33
		34	template <class _Tp>
		35	using __libcpp_remove_reference_t = typename remove_reference<_Tp>::type;
		36	#endif // __has_builtin(__remove_reference_t)
		37
25	#if _LIBCPP_STD_VER > 11	38	#if _LIBCPP_STD_VER > 11
26	template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::type;	39	template <class _Tp> using remove_reference_t = __libcpp_remove_reference_t<_Tp>;
27	#endif	40	#endif
28		41
29	_LIBCPP_END_NAMESPACE_STD	42	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/remove_volatile.h+15-1

...	@@ -17,10 +17,24 @@	...	@@ -17,10 +17,24 @@
17		17
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
		20	#if __has_builtin(__remove_volatile)
		21	template <class _Tp>
		22	struct remove_volatile {
		23	using type _LIBCPP_NODEBUG = __remove_volatile(_Tp);
		24	};
		25
		26	template <class _Tp>
		27	using __remove_volatile_t = __remove_volatile(_Tp);
		28	#else
20	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_volatile {typedef _Tp type;};	29	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_volatile {typedef _Tp type;};
21	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_volatile<volatile _Tp> {typedef _Tp type;};	30	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_volatile<volatile _Tp> {typedef _Tp type;};
		31
		32	template <class _Tp>
		33	using __remove_volatile_t = typename remove_volatile<_Tp>::type;
		34	#endif // __has_builtin(__remove_volatile)
		35
22	#if _LIBCPP_STD_VER > 11	36	#if _LIBCPP_STD_VER > 11
23	template <class _Tp> using remove_volatile_t = typename remove_volatile<_Tp>::type;	37	template <class _Tp> using remove_volatile_t = __remove_volatile_t<_Tp>;
24	#endif	38	#endif
25		39
26	_LIBCPP_END_NAMESPACE_STD	40	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/result_of.h created+39

...	@@ -0,0 +1,39 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_RESULT_OF_H
10	#define _LIBCPP___TYPE_TRAITS_RESULT_OF_H
11
12	#include <__config>
13	#include <__functional/invoke.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	// result_of
22
23	#if _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
24	template <class _Callable> class _LIBCPP_DEPRECATED_IN_CXX17 result_of;
25
26	template <class _Fp, class ..._Args>
27	class _LIBCPP_TEMPLATE_VIS result_of<_Fp(_Args...)>
28	: public __invoke_of<_Fp, _Args...>
29	{
30	};
31
32	#if _LIBCPP_STD_VER > 11
33	template <class _Tp> using result_of_t _LIBCPP_DEPRECATED_IN_CXX17 = typename result_of<_Tp>::type;
34	#endif // _LIBCPP_STD_VER > 11
35	#endif // _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
36
37	_LIBCPP_END_NAMESPACE_STD
38
39	#endif // _LIBCPP___TYPE_TRAITS_RESULT_OF_H

lib/libcxx/include/__type_traits/strip_signature.h created+79

...	@@ -0,0 +1,79 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
10	#define _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	#if _LIBCPP_STD_VER >= 17
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	template<class _Fp>
23	struct __strip_signature;
24
25	# if defined(__cpp_static_call_operator) && __cpp_static_call_operator >= 202207L
26
27	template <class _Rp, class... _Args>
28	struct __strip_signature<_Rp(*)(_Args...)> {
29	using type = _Rp(_Args...);
30	};
31
32	template <class _Rp, class... _Args>
33	struct __strip_signature<_Rp(*)(_Args...) noexcept> {
34	using type = _Rp(_Args...);
35	};
36
37	# endif // defined(__cpp_static_call_operator) && __cpp_static_call_operator >= 202207L
38
39	template<class _Rp, class _Gp, class ..._Ap>
40	struct __strip_signature<_Rp (_Gp::*) (_Ap...)> { using type = _Rp(_Ap...); };
41	template<class _Rp, class _Gp, class ..._Ap>
42	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const> { using type = _Rp(_Ap...); };
43	template<class _Rp, class _Gp, class ..._Ap>
44	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile> { using type = _Rp(_Ap...); };
45	template<class _Rp, class _Gp, class ..._Ap>
46	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile> { using type = _Rp(_Ap...); };
47
48	template<class _Rp, class _Gp, class ..._Ap>
49	struct __strip_signature<_Rp (_Gp::*) (_Ap...) &> { using type = _Rp(_Ap...); };
50	template<class _Rp, class _Gp, class ..._Ap>
51	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const &> { using type = _Rp(_Ap...); };
52	template<class _Rp, class _Gp, class ..._Ap>
53	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile &> { using type = _Rp(_Ap...); };
54	template<class _Rp, class _Gp, class ..._Ap>
55	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile &> { using type = _Rp(_Ap...); };
56
57	template<class _Rp, class _Gp, class ..._Ap>
58	struct __strip_signature<_Rp (_Gp::*) (_Ap...) noexcept> { using type = _Rp(_Ap...); };
59	template<class _Rp, class _Gp, class ..._Ap>
60	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const noexcept> { using type = _Rp(_Ap...); };
61	template<class _Rp, class _Gp, class ..._Ap>
62	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile noexcept> { using type = _Rp(_Ap...); };
63	template<class _Rp, class _Gp, class ..._Ap>
64	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile noexcept> { using type = _Rp(_Ap...); };
65
66	template<class _Rp, class _Gp, class ..._Ap>
67	struct __strip_signature<_Rp (_Gp::*) (_Ap...) & noexcept> { using type = _Rp(_Ap...); };
68	template<class _Rp, class _Gp, class ..._Ap>
69	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const & noexcept> { using type = _Rp(_Ap...); };
70	template<class _Rp, class _Gp, class ..._Ap>
71	struct __strip_signature<_Rp (_Gp::*) (_Ap...) volatile & noexcept> { using type = _Rp(_Ap...); };
72	template<class _Rp, class _Gp, class ..._Ap>
73	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile & noexcept> { using type = _Rp(_Ap...); };
74
75	_LIBCPP_END_NAMESPACE_STD
76
77	#endif // _LIBCPP_STD_VER >= 17
78
79	#endif // _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H

lib/libcxx/include/__type_traits/void_t.h+2-2

...	@@ -21,8 +21,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -21,8 +21,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
21	template <class...> using void_t = void;	21	template <class...> using void_t = void;
22	#endif	22	#endif
23		23
24	template <class>	24	template <class...>
25	struct __void_t { typedef void type; };	25	using __void_t = void;
26		26
27	_LIBCPP_END_NAMESPACE_STD	27	_LIBCPP_END_NAMESPACE_STD
28		28

lib/libcxx/include/__utility/as_const.h+2-2

...	@@ -10,9 +10,9 @@	...	@@ -10,9 +10,9 @@
10	#define _LIBCPP___UTILITY_AS_CONST_H	10	#define _LIBCPP___UTILITY_AS_CONST_H
11		11
12	#include <__config>	12	#include <__config>
		13	#include <__type_traits/add_const.h>
13	#include <__utility/forward.h>	14	#include <__utility/forward.h>
14	#include <__utility/move.h>	15	#include <__utility/move.h>
15	#include <type_traits>
16		16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	18	# pragma GCC system_header
...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	#if _LIBCPP_STD_VER > 14	23	#if _LIBCPP_STD_VER > 14
24	template <class _Tp>	24	template <class _Tp>
25	_LIBCPP_NODISCARD_EXT constexpr add_const_t<_Tp>& as_const(_Tp& __t) noexcept { return __t; }	25	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr add_const_t<_Tp>& as_const(_Tp& __t) noexcept { return __t; }
26		26
27	template <class _Tp>	27	template <class _Tp>
28	void as_const(const _Tp&&) = delete;	28	void as_const(const _Tp&&) = delete;

lib/libcxx/include/__utility/auto_cast.h+1-1

...	@@ -11,7 +11,7 @@	...	@@ -11,7 +11,7 @@
11	#define _LIBCPP___UTILITY_AUTO_CAST_H	11	#define _LIBCPP___UTILITY_AUTO_CAST_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <type_traits>	14	#include <__type_traits/decay.h>
15		15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__utility/cmp.h+5-1

 @@ -10,10 +10,14 @@
 #define _LIBCPP___UTILITY_CMP_H
 #include <__config>
+#include <__type_traits/disjunction.h>
+#include <__type_traits/is_integral.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_signed.h>
+#include <__type_traits/make_unsigned.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <limits>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__utility/convert_to_integral.h created+72

...	@@ -0,0 +1,72 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H
10	#define _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H
11
12	#include <__config>
13	#include <__type_traits/enable_if.h>
14	#include <__type_traits/is_enum.h>
15	#include <__type_traits/is_floating_point.h>
16	#include <__type_traits/underlying_type.h>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
25	int __convert_to_integral(int __val) { return __val; }
26
27	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
28	unsigned __convert_to_integral(unsigned __val) { return __val; }
29
30	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
31	long __convert_to_integral(long __val) { return __val; }
32
33	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
34	unsigned long __convert_to_integral(unsigned long __val) { return __val; }
35
36	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
37	long long __convert_to_integral(long long __val) { return __val; }
38
39	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
40	unsigned long long __convert_to_integral(unsigned long long __val) {return __val; }
41
42	template<typename _Fp>
43	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
44	typename enable_if<is_floating_point<_Fp>::value, long long>::type
45	__convert_to_integral(_Fp __val) { return __val; }
46
47	#ifndef _LIBCPP_HAS_NO_INT128
48	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
49	__int128_t __convert_to_integral(__int128_t __val) { return __val; }
50
51	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
52	__uint128_t __convert_to_integral(__uint128_t __val) { return __val; }
53	#endif
54
55	template <class _Tp, bool = is_enum<_Tp>::value>
56	struct __sfinae_underlying_type
57	{
58	typedef typename underlying_type<_Tp>::type type;
59	typedef decltype(((type)1) + 0) __promoted_type;
60	};
61
62	template <class _Tp>
63	struct __sfinae_underlying_type<_Tp, false> {};
64
65	template <class _Tp>
66	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
67	typename __sfinae_underlying_type<_Tp>::__promoted_type
68	__convert_to_integral(_Tp __val) { return __val; }
69
70	_LIBCPP_END_NAMESPACE_STD
71
72	#endif // _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H

lib/libcxx/include/__utility/declval.h+1-1

...	@@ -27,7 +27,7 @@ _Tp __declval(long);	...	@@ -27,7 +27,7 @@ _Tp __declval(long);
27	_LIBCPP_SUPPRESS_DEPRECATED_POP	27	_LIBCPP_SUPPRESS_DEPRECATED_POP
28		28
29	template <class _Tp>	29	template <class _Tp>
30	decltype(__declval<_Tp>(0)) declval() _NOEXCEPT;	30	decltype(std::__declval<_Tp>(0)) declval() _NOEXCEPT;
31		31
32	_LIBCPP_END_NAMESPACE_STD	32	_LIBCPP_END_NAMESPACE_STD
33		33

lib/libcxx/include/__utility/exception_guard.h created+128

...	@@ -0,0 +1,128 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___UTILITY_TRANSACTION_H
10	#define _LIBCPP___UTILITY_TRANSACTION_H
11
12	#include <__assert>
13	#include <__config>
14	#include <__type_traits/is_nothrow_move_constructible.h>
15	#include <__utility/exchange.h>
16	#include <__utility/move.h>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	// __exception_guard is a helper class for writing code with the strong exception guarantee.
25	//
26	// When writing code that can throw an exception, one can store rollback instructions in an
27	// exception guard so that if an exception is thrown at any point during the lifetime of the
28	// exception guard, it will be rolled back automatically. When the exception guard is done, one
29	// must mark it as being complete so it isn't rolled back when the exception guard is destroyed.
30	//
31	// Exception guards are not default constructible, they can't be copied or assigned to, but
32	// they can be moved around for convenience.
33	//
34	// __exception_guard is a no-op in -fno-exceptions mode to produce better code-gen. This means
35	// that we don't provide the strong exception guarantees. However, Clang doesn't generate cleanup
36	// code with exceptions disabled, so even if we wanted to provide the strong exception guarantees
37	// we couldn't. This is also only relevant for constructs with a stack of
38	// -fexceptions > -fno-exceptions > -fexceptions code, since the exception can't be caught where
39	// exceptions are disabled. While -fexceptions > -fno-exceptions is quite common
40	// (e.g. libc++.dylib > -fno-exceptions), having another layer with exceptions enabled seems a lot
41	// less common, especially one that tries to catch an exception through -fno-exceptions code.
42	//
43	// __exception_guard can help greatly simplify code that would normally be cluttered by
44	// `#if _LIBCPP_NO_EXCEPTIONS`. For example:
45	//
46	// template <class Iterator, class Size, class OutputIterator>
47	// Iterator uninitialized_copy_n(Iterator iter, Size n, OutputIterator out) {
48	// typedef typename iterator_traits<Iterator>::value_type value_type;
49	// __exception_guard guard([start=out, &out] {
50	// std::destroy(start, out);
51	// });
52	//
53	// for (; n > 0; ++iter, ++out, --n) {
54	// ::new ((void)std::addressof(out)) value_type(*iter);
55	// }
56	// guard.__complete();
57	// return out;
58	// }
59	//
60
61	#ifndef _LIBCPP_NO_EXCEPTIONS
62	template <class _Rollback>
63	struct __exception_guard {
64	__exception_guard() = delete;
65
66	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __exception_guard(_Rollback __rollback)
67	: __rollback_(std::move(__rollback)), __completed_(false) {}
68
69	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __exception_guard(__exception_guard&& __other)
70	_NOEXCEPT_(is_nothrow_move_constructible<_Rollback>::value)
71	: __rollback_(std::move(__other.__rollback_)), __completed_(__other.__completed_) {
72	__other.__completed_ = true;
73	}
74
75	__exception_guard(__exception_guard const&) = delete;
76	__exception_guard& operator=(__exception_guard const&) = delete;
77	__exception_guard& operator=(__exception_guard&&) = delete;
78
79	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __complete() _NOEXCEPT { __completed_ = true; }
80
81	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 ~__exception_guard() {
82	if (!__completed_)
83	__rollback_();
84	}
85
86	private:
87	_Rollback __rollback_;
88	bool __completed_;
89	};
90	#else // _LIBCPP_NO_EXCEPTIONS
91	template <class _Rollback>
92	struct __exception_guard {
93	__exception_guard() = delete;
94	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG explicit __exception_guard(_Rollback) {}
95
96	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG __exception_guard(__exception_guard&& __other)
97	_NOEXCEPT_(is_nothrow_move_constructible<_Rollback>::value)
98	: __completed_(__other.__completed_) {
99	__other.__completed_ = true;
100	}
101
102	__exception_guard(__exception_guard const&) = delete;
103	__exception_guard& operator=(__exception_guard const&) = delete;
104	__exception_guard& operator=(__exception_guard&&) = delete;
105
106	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG void __complete() _NOEXCEPT {
107	__completed_ = true;
108	}
109
110	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG ~__exception_guard() {
111	_LIBCPP_ASSERT(__completed_, "__exception_guard not completed with exceptions disabled");
112	}
113
114	private:
115	bool __completed_ = false;
116	};
117	#endif // _LIBCPP_NO_EXCEPTIONS
118
119	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__exception_guard);
120
121	template <class _Rollback>
122	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __exception_guard<_Rollback> __make_exception_guard(_Rollback __rollback) {
123	return __exception_guard<_Rollback>(std::move(__rollback));
124	}
125
126	_LIBCPP_END_NAMESPACE_STD
127
128	#endif // _LIBCPP___UTILITY_TRANSACTION_H

lib/libcxx/include/__utility/exchange.h+3-2

 @@ -10,9 +10,10 @@
 #define _LIBCPP___UTILITY_EXCHANGE_H
 #include <__config>
+#include <__type_traits/is_nothrow_assignable.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -22,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 11
 template<class _T1, class _T2 = _T1>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _T1 exchange(_T1& __obj, _T2&& __new_value)
     noexcept(is_nothrow_move_constructible<_T1>::value && is_nothrow_assignable<_T1&, _T2>::value)
 {

lib/libcxx/include/__utility/forward.h+4-4

...	@@ -21,14 +21,14 @@	...	@@ -21,14 +21,14 @@
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	template <class _Tp>	23	template <class _Tp>
24	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR _Tp&&	24	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp&&
25	forward(typename remove_reference<_Tp>::type& __t) _NOEXCEPT {	25	forward(_LIBCPP_LIFETIMEBOUND __libcpp_remove_reference_t<_Tp>& __t) _NOEXCEPT {
26	return static_cast<_Tp&&>(__t);	26	return static_cast<_Tp&&>(__t);
27	}	27	}
28		28
29	template <class _Tp>	29	template <class _Tp>
30	_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR _Tp&&	30	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp&&
31	forward(typename remove_reference<_Tp>::type&& __t) _NOEXCEPT {	31	forward(_LIBCPP_LIFETIMEBOUND __libcpp_remove_reference_t<_Tp>&& __t) _NOEXCEPT {
32	static_assert(!is_lvalue_reference<_Tp>::value, "cannot forward an rvalue as an lvalue");	32	static_assert(!is_lvalue_reference<_Tp>::value, "cannot forward an rvalue as an lvalue");
33	return static_cast<_Tp&&>(__t);	33	return static_cast<_Tp&&>(__t);
34	}	34	}

lib/libcxx/include/__utility/forward_like.h created+46

...	@@ -0,0 +1,46 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___UTILITY_FORWARD_LIKE_H
11	#define _LIBCPP___UTILITY_FORWARD_LIKE_H
12
13	#include <__config>
14	#include <__type_traits/conditional.h>
15	#include <__type_traits/is_const.h>
16	#include <__type_traits/is_reference.h>
17	#include <__type_traits/remove_reference.h>
18
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header
21	#endif
22
23	_LIBCPP_BEGIN_NAMESPACE_STD
24
25	#if _LIBCPP_STD_VER > 20
26
27	template <class _Ap, class _Bp>
28	using _CopyConst = _If<is_const_v<_Ap>, const _Bp, _Bp>;
29
30	template <class _Ap, class _Bp>
31	using _OverrideRef = _If<is_rvalue_reference_v<_Ap>, remove_reference_t<_Bp>&&, _Bp&>;
32
33	template <class _Ap, class _Bp>
34	using _ForwardLike = _OverrideRef<_Ap&&, _CopyConst<remove_reference_t<_Ap>, remove_reference_t<_Bp>>>;
35
36	template <class _Tp, class _Up>
37	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto forward_like(_LIBCPP_LIFETIMEBOUND _Up&& __ux) noexcept
38	-> _ForwardLike<_Tp, _Up> {
39	return static_cast<_ForwardLike<_Tp, _Up>>(__ux);
40	}
41
42	#endif // _LIBCPP_STD_VER > 20
43
44	_LIBCPP_END_NAMESPACE_STD
45
46	#endif // _LIBCPP___UTILITY_FORWARD_LIKE_H

lib/libcxx/include/__utility/in_place.h+4-3

 @@ -10,7 +10,8 @@
 #define _LIBCPP___UTILITY_IN_PLACE_H
 #include <__config>
-#include <type_traits>
+#include <__type_traits/remove_cvref.h>
+#include <cstddef>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -43,13 +44,13 @@ template <class _Tp> struct __is_inplace_type_imp : false_type {};
 template <class _Tp> struct __is_inplace_type_imp<in_place_type_t<_Tp>> : true_type {};
 template <class _Tp>
-using __is_inplace_type = __is_inplace_type_imp<__uncvref_t<_Tp>>;
+using __is_inplace_type = __is_inplace_type_imp<__remove_cvref_t<_Tp>>;
 template <class _Tp> struct __is_inplace_index_imp : false_type {};
 template <size_t _Idx> struct __is_inplace_index_imp<in_place_index_t<_Idx>> : true_type {};
 template <class _Tp>
-using __is_inplace_index = __is_inplace_index_imp<__uncvref_t<_Tp>>;
+using __is_inplace_index = __is_inplace_index_imp<__remove_cvref_t<_Tp>>;
 #endif // _LIBCPP_STD_VER > 14

lib/libcxx/include/__utility/integer_sequence.h+76-1

...	@@ -10,7 +10,8 @@	...	@@ -10,7 +10,8 @@
10	#define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H	10	#define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <type_traits>	13	#include <__type_traits/is_integral.h>
		14	#include <cstddef>
14		15
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	17	# pragma GCC system_header
...	@@ -18,6 +19,72 @@	...	@@ -18,6 +19,72 @@
18		19
19	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
20		21
		22	template <size_t...> struct __tuple_indices;
		23
		24	template <class _IdxType, _IdxType... _Values>
		25	struct __integer_sequence {
		26	template <template <class _OIdxType, _OIdxType...> class _ToIndexSeq, class _ToIndexType>
		27	using __convert = _ToIndexSeq<_ToIndexType, _Values...>;
		28
		29	template <size_t _Sp>
		30	using __to_tuple_indices = __tuple_indices<(_Values + _Sp)...>;
		31	};
		32
		33	#if !__has_builtin(__make_integer_seq) \|\| defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
		34
		35	namespace __detail {
		36
		37	template<typename _Tp, size_t ..._Extra> struct __repeat;
		38	template<typename _Tp, _Tp ..._Np, size_t ..._Extra> struct __repeat<__integer_sequence<_Tp, _Np...>, _Extra...> {
		39	typedef _LIBCPP_NODEBUG __integer_sequence<_Tp,
		40	_Np...,
		41	sizeof...(_Np) + _Np...,
		42	2 * sizeof...(_Np) + _Np...,
		43	3 * sizeof...(_Np) + _Np...,
		44	4 * sizeof...(_Np) + _Np...,
		45	5 * sizeof...(_Np) + _Np...,
		46	6 * sizeof...(_Np) + _Np...,
		47	7 * sizeof...(_Np) + _Np...,
		48	_Extra...> type;
		49	};
		50
		51	template<size_t _Np> struct __parity;
		52	template<size_t _Np> struct __make : __parity<_Np % 8>::template __pmake<_Np> {};
		53
		54	template<> struct __make<0> { typedef __integer_sequence<size_t> type; };
		55	template<> struct __make<1> { typedef __integer_sequence<size_t, 0> type; };
		56	template<> struct __make<2> { typedef __integer_sequence<size_t, 0, 1> type; };
		57	template<> struct __make<3> { typedef __integer_sequence<size_t, 0, 1, 2> type; };
		58	template<> struct __make<4> { typedef __integer_sequence<size_t, 0, 1, 2, 3> type; };
		59	template<> struct __make<5> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4> type; };
		60	template<> struct __make<6> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4, 5> type; };
		61	template<> struct __make<7> { typedef __integer_sequence<size_t, 0, 1, 2, 3, 4, 5, 6> type; };
		62
		63	template<> struct __parity<0> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type> {}; };
		64	template<> struct __parity<1> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 1> {}; };
		65	template<> struct __parity<2> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 2, _Np - 1> {}; };
		66	template<> struct __parity<3> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 3, _Np - 2, _Np - 1> {}; };
		67	template<> struct __parity<4> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
		68	template<> struct __parity<5> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
		69	template<> struct __parity<6> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
		70	template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 7, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
		71
		72	} // namespace detail
		73
		74	#endif
		75
		76	#if __has_builtin(__make_integer_seq)
		77	template <size_t _Ep, size_t _Sp>
		78	using __make_indices_imp =
		79	typename __make_integer_seq<__integer_sequence, size_t, _Ep - _Sp>::template
		80	__to_tuple_indices<_Sp>;
		81	#else
		82	template <size_t _Ep, size_t _Sp>
		83	using __make_indices_imp =
		84	typename __detail::__make<_Ep - _Sp>::type::template __to_tuple_indices<_Sp>;
		85
		86	#endif
		87
21	#if _LIBCPP_STD_VER > 11	88	#if _LIBCPP_STD_VER > 11
22		89
23	template<class _Tp, _Tp... _Ip>	90	template<class _Tp, _Tp... _Ip>
...	@@ -71,6 +138,14 @@ template<size_t _Np>	...	@@ -71,6 +138,14 @@ template<size_t _Np>
71	template<class... _Tp>	138	template<class... _Tp>
72	using index_sequence_for = make_index_sequence<sizeof...(_Tp)>;	139	using index_sequence_for = make_index_sequence<sizeof...(_Tp)>;
73		140
		141	# if _LIBCPP_STD_VER > 17
		142	// Executes __func for every element in an index_sequence.
		143	template <size_t... _Index, class _Function>
		144	_LIBCPP_HIDE_FROM_ABI constexpr void __for_each_index_sequence(index_sequence<_Index...>, _Function __func) {
		145	(__func.template operator()<_Index>(), ...);
		146	}
		147	# endif // _LIBCPP_STD_VER > 17
		148
74	#endif // _LIBCPP_STD_VER > 11	149	#endif // _LIBCPP_STD_VER > 11
75		150
76	_LIBCPP_END_NAMESPACE_STD	151	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__utility/move.h+11-9

 @@ -11,7 +11,10 @@
 #define _LIBCPP___UTILITY_MOVE_H
 #include <__config>
-#include <type_traits>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_copy_constructible.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/remove_reference.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -20,21 +23,20 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR typename remove_reference<_Tp>::type&&
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __libcpp_remove_reference_t<_Tp>&&
-move(_Tp&& __t) _NOEXCEPT {
+move(_LIBCPP_LIFETIMEBOUND _Tp&& __t) _NOEXCEPT {
-  typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type _Up;
+  typedef _LIBCPP_NODEBUG __libcpp_remove_reference_t<_Tp> _Up;
   return static_cast<_Up&&>(__t);
 }
 template <class _Tp>
 using __move_if_noexcept_result_t =
-    typename conditional<!is_nothrow_move_constructible<_Tp>::value && is_copy_constructible<_Tp>::value, const _Tp&,
+    __conditional_t<!is_nothrow_move_constructible<_Tp>::value && is_copy_constructible<_Tp>::value, const _Tp&, _Tp&&>;
-                         _Tp&&>::type;
 template <class _Tp>
-_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 __move_if_noexcept_result_t<_Tp>
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __move_if_noexcept_result_t<_Tp>
-move_if_noexcept(_Tp& __x) _NOEXCEPT {
+move_if_noexcept(_LIBCPP_LIFETIMEBOUND _Tp& __x) _NOEXCEPT {
-  return _VSTD::move(__x);
+  return std::move(__x);
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__utility/pair.h+173-77

 @@ -13,12 +13,35 @@
 #include <__compare/synth_three_way.h>
 #include <__config>
 #include <__functional/unwrap_ref.h>
-#include <__tuple>
+#include <__fwd/get.h>
+#include <__fwd/tuple.h>
+#include <__tuple_dir/sfinae_helpers.h>
+#include <__tuple_dir/tuple_element.h>
+#include <__tuple_dir/tuple_indices.h>
+#include <__tuple_dir/tuple_size.h>
+#include <__type_traits/common_reference.h>
+#include <__type_traits/common_type.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/is_convertible.h>
+#include <__type_traits/is_copy_assignable.h>
+#include <__type_traits/is_default_constructible.h>
+#include <__type_traits/is_implicitly_default_constructible.h>
+#include <__type_traits/is_move_assignable.h>
+#include <__type_traits/is_nothrow_assignable.h>
+#include <__type_traits/is_nothrow_constructible.h>
+#include <__type_traits/is_nothrow_copy_assignable.h>
+#include <__type_traits/is_nothrow_copy_constructible.h>
+#include <__type_traits/is_nothrow_default_constructible.h>
+#include <__type_traits/is_nothrow_move_assignable.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_swappable.h>
+#include <__type_traits/nat.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/piecewise_construct.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -31,7 +54,7 @@ template <class, class>
 struct __non_trivially_copyable_base {
   _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
   __non_trivially_copyable_base() _NOEXCEPT {}
-  _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
   __non_trivially_copyable_base(__non_trivially_copyable_base const&) _NOEXCEPT {}
 };
 #endif
 @@ -48,12 +71,8 @@ struct _LIBCPP_TEMPLATE_VIS pair
     _T1 first;
     _T2 second;
-#if !defined(_LIBCPP_CXX03_LANG)
     pair(pair const&) = default;
     pair(pair&&) = default;
-#else
-  // Use the implicitly declared copy constructor in C++03
-#endif
 #ifdef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
 @@ -88,20 +107,26 @@ struct _LIBCPP_TEMPLATE_VIS pair
       }
       template <class _U1, class _U2>
-      static constexpr bool __enable_explicit() {
+      static constexpr bool __is_pair_constructible() {
           return is_constructible<first_type, _U1>::value
-              && is_constructible<second_type, _U2>::value
+              && is_constructible<second_type, _U2>::value;
-              && (!is_convertible<_U1, first_type>::value
-                  || !is_convertible<_U2, second_type>::value);
       }
       template <class _U1, class _U2>
-      static constexpr bool __enable_implicit() {
+      static constexpr bool __is_implicit() {
-          return is_constructible<first_type, _U1>::value
+          return is_convertible<_U1, first_type>::value
-              && is_constructible<second_type, _U2>::value
-              && is_convertible<_U1, first_type>::value
               && is_convertible<_U2, second_type>::value;
       }
+      template <class _U1, class _U2>
+      static constexpr bool __enable_explicit() {
+          return __is_pair_constructible<_U1, _U2>() && !__is_implicit<_U1, _U2>();
+      }
+      template <class _U1, class _U2>
+      static constexpr bool __enable_implicit() {
+          return __is_pair_constructible<_U1, _U2>() && __is_implicit<_U1, _U2>();
+      }
     };
     template <bool _MaybeEnable>
 @@ -127,12 +152,12 @@ struct _LIBCPP_TEMPLATE_VIS pair
     };
     template <class _Tuple>
-    using _CheckTLC _LIBCPP_NODEBUG = typename conditional<
+    using _CheckTLC _LIBCPP_NODEBUG = __conditional_t<
         __tuple_like_with_size<_Tuple, 2>::value
             && !is_same<typename decay<_Tuple>::type, pair>::value,
         _CheckTupleLikeConstructor,
         __check_tuple_constructor_fail
-    >::type;
+    >;
     template<bool _Dummy = true, typename enable_if<
             _CheckArgsDep<_Dummy>::__enable_explicit_default()
 @@ -153,7 +178,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template <bool _Dummy = true, typename enable_if<
              _CheckArgsDep<_Dummy>::template __enable_explicit<_T1 const&, _T2 const&>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     explicit pair(_T1 const& __t1, _T2 const& __t2)
         _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value &&
                    is_nothrow_copy_constructible<second_type>::value)
 @@ -162,7 +187,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template<bool _Dummy = true, typename enable_if<
             _CheckArgsDep<_Dummy>::template __enable_implicit<_T1 const&, _T2 const&>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     pair(_T1 const& __t1, _T2 const& __t2)
         _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value &&
                    is_nothrow_copy_constructible<second_type>::value)
 @@ -176,7 +201,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
 #endif
         typename enable_if<_CheckArgs::template __enable_explicit<_U1, _U2>()>::type* = nullptr
     >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     explicit pair(_U1&& __u1, _U2&& __u2)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1>::value &&
                     is_nothrow_constructible<second_type, _U2>::value))
 @@ -190,16 +215,27 @@ struct _LIBCPP_TEMPLATE_VIS pair
 #endif
         typename enable_if<_CheckArgs::template __enable_implicit<_U1, _U2>()>::type* = nullptr
     >
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     pair(_U1&& __u1, _U2&& __u2)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1>::value &&
                     is_nothrow_constructible<second_type, _U2>::value))
         : first(_VSTD::forward<_U1>(__u1)), second(_VSTD::forward<_U2>(__u2)) {}
+#if _LIBCPP_STD_VER > 20
+    template<class _U1, class _U2, __enable_if_t<
+            _CheckArgs::template __is_pair_constructible<_U1&, _U2&>()
+    >* = nullptr>
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    explicit(!_CheckArgs::template __is_implicit<_U1&, _U2&>()) pair(pair<_U1, _U2>& __p)
+        noexcept((is_nothrow_constructible<first_type, _U1&>::value &&
+                  is_nothrow_constructible<second_type, _U2&>::value))
+        : first(__p.first), second(__p.second) {}
+#endif
     template<class _U1, class _U2, typename enable_if<
             _CheckArgs::template __enable_explicit<_U1 const&, _U2 const&>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     explicit pair(pair<_U1, _U2> const& __p)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1 const&>::value &&
                     is_nothrow_constructible<second_type, _U2 const&>::value))
 @@ -208,7 +244,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template<class _U1, class _U2, typename enable_if<
             _CheckArgs::template __enable_implicit<_U1 const&, _U2 const&>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     pair(pair<_U1, _U2> const& __p)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1 const&>::value &&
                     is_nothrow_constructible<second_type, _U2 const&>::value))
 @@ -217,7 +253,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template<class _U1, class _U2, typename enable_if<
             _CheckArgs::template __enable_explicit<_U1, _U2>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     explicit pair(pair<_U1, _U2>&&__p)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1&&>::value &&
                     is_nothrow_constructible<second_type, _U2&&>::value))
 @@ -226,16 +262,28 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template<class _U1, class _U2, typename enable_if<
             _CheckArgs::template __enable_implicit<_U1, _U2>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     pair(pair<_U1, _U2>&& __p)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _U1&&>::value &&
                     is_nothrow_constructible<second_type, _U2&&>::value))
         : first(_VSTD::forward<_U1>(__p.first)), second(_VSTD::forward<_U2>(__p.second)) {}
+#if _LIBCPP_STD_VER > 20
+    template<class _U1, class _U2, __enable_if_t<
+            _CheckArgs::template __is_pair_constructible<const _U1&&, const _U2&&>()
+    >* = nullptr>
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    explicit(!_CheckArgs::template __is_implicit<const _U1&&, const _U2&&>())
+    pair(const pair<_U1, _U2>&& __p)
+        noexcept(is_nothrow_constructible<first_type, const _U1&&>::value &&
+                 is_nothrow_constructible<second_type, const _U2&&>::value)
+        : first(std::move(__p.first)), second(std::move(__p.second)) {}
+#endif
     template<class _Tuple, typename enable_if<
             _CheckTLC<_Tuple>::template __enable_explicit<_Tuple>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     explicit pair(_Tuple&& __p)
         : first(_VSTD::get<0>(_VSTD::forward<_Tuple>(__p))),
           second(_VSTD::get<1>(_VSTD::forward<_Tuple>(__p))) {}
 @@ -243,13 +291,13 @@ struct _LIBCPP_TEMPLATE_VIS pair
     template<class _Tuple, typename enable_if<
             _CheckTLC<_Tuple>::template __enable_implicit<_Tuple>()
     >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     pair(_Tuple&& __p)
         : first(_VSTD::get<0>(_VSTD::forward<_Tuple>(__p))),
           second(_VSTD::get<1>(_VSTD::forward<_Tuple>(__p))) {}
     template <class... _Args1, class... _Args2>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     pair(piecewise_construct_t __pc,
          tuple<_Args1...> __first_args, tuple<_Args2...> __second_args)
         _NOEXCEPT_((is_nothrow_constructible<first_type, _Args1...>::value &&
 @@ -258,11 +306,11 @@ struct _LIBCPP_TEMPLATE_VIS pair
                 typename __make_tuple_indices<sizeof...(_Args1)>::type(),
                 typename __make_tuple_indices<sizeof...(_Args2) >::type()) {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
-    pair& operator=(typename conditional<
+    pair& operator=(__conditional_t<
                         is_copy_assignable<first_type>::value &&
                         is_copy_assignable<second_type>::value,
-                    pair, __nat>::type const& __p)
+                    pair, __nat> const& __p)
         _NOEXCEPT_(is_nothrow_copy_assignable<first_type>::value &&
                    is_nothrow_copy_assignable<second_type>::value)
     {
 @@ -271,11 +319,11 @@ struct _LIBCPP_TEMPLATE_VIS pair
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
-    pair& operator=(typename conditional<
+    pair& operator=(__conditional_t<
                         is_move_assignable<first_type>::value &&
                         is_move_assignable<second_type>::value,
-                    pair, __nat>::type&& __p)
+                    pair, __nat>&& __p)
         _NOEXCEPT_(is_nothrow_move_assignable<first_type>::value &&
                    is_nothrow_move_assignable<second_type>::value)
     {
 @@ -284,10 +332,54 @@ struct _LIBCPP_TEMPLATE_VIS pair
         return *this;
     }
+#if _LIBCPP_STD_VER > 20
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    const pair& operator=(pair const& __p) const
+      noexcept(is_nothrow_copy_assignable_v<const first_type> &&
+               is_nothrow_copy_assignable_v<const second_type>)
+      requires(is_copy_assignable_v<const first_type> &&
+               is_copy_assignable_v<const second_type>) {
+        first = __p.first;
+        second = __p.second;
+        return *this;
+    }
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    const pair& operator=(pair&& __p) const
+      noexcept(is_nothrow_assignable_v<const first_type&, first_type> &&
+               is_nothrow_assignable_v<const second_type&, second_type>)
+      requires(is_assignable_v<const first_type&, first_type> &&
+               is_assignable_v<const second_type&, second_type>) {
+        first = std::forward<first_type>(__p.first);
+        second = std::forward<second_type>(__p.second);
+        return *this;
+    }
+    template<class _U1, class _U2>
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    const pair& operator=(const pair<_U1, _U2>& __p) const
+      requires(is_assignable_v<const first_type&, const _U1&> &&
+               is_assignable_v<const second_type&, const _U2&>) {
+        first = __p.first;
+        second = __p.second;
+        return *this;
+    }
+    template<class _U1, class _U2>
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    const pair& operator=(pair<_U1, _U2>&& __p) const
+      requires(is_assignable_v<const first_type&, _U1> &&
+               is_assignable_v<const second_type&, _U2>) {
+        first = std::forward<_U1>(__p.first);
+        second = std::forward<_U2>(__p.second);
+        return *this;
+    }
+#endif // _LIBCPP_STD_VER > 20
     template <class _Tuple, typename enable_if<
             _CheckTLC<_Tuple>::template __enable_assign<_Tuple>()
      >::type* = nullptr>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     pair& operator=(_Tuple&& __p) {
         first = _VSTD::get<0>(_VSTD::forward<_Tuple>(__p));
         second = _VSTD::get<1>(_VSTD::forward<_Tuple>(__p));
 @@ -295,7 +387,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void
     swap(pair& __p) _NOEXCEPT_(__is_nothrow_swappable<first_type>::value &&
                                __is_nothrow_swappable<second_type>::value)
 @@ -304,11 +396,23 @@ struct _LIBCPP_TEMPLATE_VIS pair
         swap(first,  __p.first);
         swap(second, __p.second);
     }
+#if _LIBCPP_STD_VER > 20
+    _LIBCPP_HIDE_FROM_ABI constexpr
+    void swap(const pair& __p) const
+        noexcept(__is_nothrow_swappable<const first_type>::value &&
+                 __is_nothrow_swappable<const second_type>::value)
+    {
+        using std::swap;
+        swap(first,  __p.first);
+        swap(second, __p.second);
+    }
+#endif
 private:
 #ifndef _LIBCPP_CXX03_LANG
     template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     pair(piecewise_construct_t,
          tuple<_Args1...>& __first_args, tuple<_Args2...>& __second_args,
          __tuple_indices<_I1...>, __tuple_indices<_I2...>);
 @@ -323,7 +427,7 @@ pair(_T1, _T2) -> pair<_T1, _T2>;
 // [pairs.spec], specialized algorithms
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator==(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -348,7 +452,7 @@ operator<=>(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 #else // _LIBCPP_STD_VER > 17
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator!=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -356,7 +460,7 @@ operator!=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 }
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator< (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -364,7 +468,7 @@ operator< (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 }
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator> (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -372,7 +476,7 @@ operator> (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 }
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator>=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -380,7 +484,7 @@ operator>=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 }
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator<=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
 {
 @@ -406,7 +510,7 @@ struct common_type<pair<_T1, _T2>, pair<_U1, _U2>> {
 #endif // _LIBCPP_STD_VER > 20
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 typename enable_if
 <
     __is_swappable<_T1>::value &&
 @@ -420,10 +524,20 @@ swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
     __x.swap(__y);
 }
-#ifndef _LIBCPP_CXX03_LANG
+#if _LIBCPP_STD_VER > 20
+template <class _T1, class _T2>
+  requires (__is_swappable<const _T1>::value &&
+            __is_swappable<const _T2>::value)
+_LIBCPP_HIDE_FROM_ABI constexpr
+void swap(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
+    noexcept(noexcept(__x.swap(__y)))
+{
+    __x.swap(__y);
+}
+#endif
 template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 pair<typename __unwrap_ref_decay<_T1>::type, typename __unwrap_ref_decay<_T2>::type>
 make_pair(_T1&& __t1, _T2&& __t2)
 {
 @@ -431,18 +545,6 @@ make_pair(_T1&& __t1, _T2&& __t2)
                (_VSTD::forward<_T1>(__t1), _VSTD::forward<_T2>(__t2));
 }
-#else  // _LIBCPP_CXX03_LANG
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_T1,_T2>
-make_pair(_T1 __x, _T2 __y)
-{
-    return pair<_T1, _T2>(__x, __y);
-}
-#endif // _LIBCPP_CXX03_LANG
 template <class _T1, class _T2>
   struct _LIBCPP_TEMPLATE_VIS tuple_size<pair<_T1, _T2> >
     : public integral_constant<size_t, 2> {};
 @@ -472,29 +574,27 @@ struct __get_pair<0>
 {
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     _T1&
     get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const _T1&
     get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
-#ifndef _LIBCPP_CXX03_LANG
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     _T1&&
     get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T1>(__p.first);}
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const _T1&&
     get(const pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<const _T1>(__p.first);}
-#endif // _LIBCPP_CXX03_LANG
 };
 template <>
 @@ -502,33 +602,31 @@ struct __get_pair<1>
 {
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     _T2&
     get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const _T2&
     get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
-#ifndef _LIBCPP_CXX03_LANG
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     _T2&&
     get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T2>(__p.second);}
     template <class _T1, class _T2>
     static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const _T2&&
     get(const pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<const _T2>(__p.second);}
-#endif // _LIBCPP_CXX03_LANG
 };
 template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 typename tuple_element<_Ip, pair<_T1, _T2> >::type&
 get(pair<_T1, _T2>& __p) _NOEXCEPT
 {
 @@ -536,16 +634,15 @@ get(pair<_T1, _T2>& __p) _NOEXCEPT
 }
 template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
 get(const pair<_T1, _T2>& __p) _NOEXCEPT
 {
     return __get_pair<_Ip>::get(__p);
 }
-#ifndef _LIBCPP_CXX03_LANG
 template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
 get(pair<_T1, _T2>&& __p) _NOEXCEPT
 {
 @@ -553,13 +650,12 @@ get(pair<_T1, _T2>&& __p) _NOEXCEPT
 }
 template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
 get(const pair<_T1, _T2>&& __p) _NOEXCEPT
 {
     return __get_pair<_Ip>::get(_VSTD::move(__p));
 }
-#endif // _LIBCPP_CXX03_LANG
 #if _LIBCPP_STD_VER > 11
 template <class _T1, class _T2>
 @@ -618,7 +714,7 @@ constexpr _T1 const && get(pair<_T2, _T1> const&& __p) _NOEXCEPT
     return __get_pair<1>::get(_VSTD::move(__p));
 }
-#endif
+#endif // _LIBCPP_STD_VER > 11
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__utility/rel_ops.h-3

 @@ -10,9 +10,6 @@
 #define _LIBCPP___UTILITY_REL_OPS_H
 #include <__config>
-#include <__utility/forward.h>
-#include <__utility/move.h>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

lib/libcxx/include/__utility/swap.h+7-3

 @@ -10,10 +10,14 @@
 #define _LIBCPP___UTILITY_SWAP_H
 #include <__config>
+#include <__type_traits/is_move_assignable.h>
+#include <__type_traits/is_move_constructible.h>
+#include <__type_traits/is_nothrow_move_assignable.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/is_swappable.h>
 #include <__utility/declval.h>
 #include <__utility/move.h>
 #include <cstddef>
-#include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -30,7 +34,7 @@ using __swap_result_t = void;
 #endif
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY __swap_result_t<_Tp> _LIBCPP_CONSTEXPR_AFTER_CXX17 swap(_Tp& __x, _Tp& __y)
+inline _LIBCPP_INLINE_VISIBILITY __swap_result_t<_Tp> _LIBCPP_CONSTEXPR_SINCE_CXX20 swap(_Tp& __x, _Tp& __y)
     _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value&& is_nothrow_move_assignable<_Tp>::value) {
   _Tp __t(_VSTD::move(__x));
   __x = _VSTD::move(__y);
 @@ -38,7 +42,7 @@ inline _LIBCPP_INLINE_VISIBILITY __swap_result_t<_Tp> _LIBCPP_CONSTEXPR_AFTER_CX
 }
 template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if<__is_swappable<_Tp>::value>::type
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 typename enable_if<__is_swappable<_Tp>::value>::type
 swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value) {
   for (size_t __i = 0; __i != _Np; ++__i) {
     swap(__a[__i], __b[__i]);

lib/libcxx/include/__utility/to_underlying.h+1-1

...	@@ -11,7 +11,7 @@	...	@@ -11,7 +11,7 @@
11	#define _LIBCPP___UTILITY_TO_UNDERLYING_H	11	#define _LIBCPP___UTILITY_TO_UNDERLYING_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <type_traits>	14	#include <__type_traits/underlying_type.h>
15		15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	17	# pragma GCC system_header

lib/libcxx/include/__utility/transaction.h deleted-96

...	@@ -1,96 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___UTILITY_TRANSACTION_H
10	#define _LIBCPP___UTILITY_TRANSACTION_H
11
12	#include <__config>
13	#include <__utility/exchange.h>
14	#include <__utility/move.h>
15	#include <type_traits>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	// __transaction is a helper class for writing code with the strong exception guarantee.
24	//
25	// When writing code that can throw an exception, one can store rollback instructions in a
26	// transaction so that if an exception is thrown at any point during the lifetime of the
27	// transaction, it will be rolled back automatically. When the transaction is done, one
28	// must mark it as being complete so it isn't rolled back when the transaction is destroyed.
29	//
30	// Transactions are not default constructible, they can't be copied or assigned to, but
31	// they can be moved around for convenience.
32	//
33	// __transaction can help greatly simplify code that would normally be cluttered by
34	// `#if _LIBCPP_NO_EXCEPTIONS`. For example:
35	//
36	// template <class Iterator, class Size, class OutputIterator>
37	// Iterator uninitialized_copy_n(Iterator iter, Size n, OutputIterator out) {
38	// typedef typename iterator_traits<Iterator>::value_type value_type;
39	// __transaction transaction([start=out, &out] {
40	// std::destroy(start, out);
41	// });
42	//
43	// for (; n > 0; ++iter, ++out, --n) {
44	// ::new ((void)std::addressof(out)) value_type(*iter);
45	// }
46	// transaction.__complete();
47	// return out;
48	// }
49	//
50	template <class _Rollback>
51	struct __transaction {
52	__transaction() = delete;
53
54	_LIBCPP_HIDE_FROM_ABI
55	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit __transaction(_Rollback __rollback)
56	: __rollback_(_VSTD::move(__rollback))
57	, __completed_(false)
58	{ }
59
60	_LIBCPP_HIDE_FROM_ABI
61	_LIBCPP_CONSTEXPR_AFTER_CXX17 __transaction(__transaction&& __other)
62	_NOEXCEPT_(is_nothrow_move_constructible<_Rollback>::value)
63	: __rollback_(_VSTD::move(__other.__rollback_))
64	, __completed_(__other.__completed_)
65	{
66	__other.__completed_ = true;
67	}
68
69	__transaction(__transaction const&) = delete;
70	__transaction& operator=(__transaction const&) = delete;
71	__transaction& operator=(__transaction&&) = delete;
72
73	_LIBCPP_HIDE_FROM_ABI
74	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __complete() _NOEXCEPT {
75	__completed_ = true;
76	}
77
78	_LIBCPP_HIDE_FROM_ABI
79	_LIBCPP_CONSTEXPR_AFTER_CXX17 ~__transaction() {
80	if (!__completed_)
81	__rollback_();
82	}
83
84	private:
85	_Rollback __rollback_;
86	bool __completed_;
87	};
88
89	template <class _Rollback>
90	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __transaction<_Rollback> __make_transaction(_Rollback __rollback) {
91	return __transaction<_Rollback>(std::move(__rollback));
92	}
93
94	_LIBCPP_END_NAMESPACE_STD
95
96	#endif // _LIBCPP___UTILITY_TRANSACTION_H

lib/libcxx/include/__utility/unreachable.h+6-10

 @@ -9,8 +9,8 @@
 #ifndef _LIBCPP___UTILITY_UNREACHABLE_H
 #define _LIBCPP___UTILITY_UNREACHABLE_H
+#include <__assert>
 #include <__config>
-#include <cstdlib>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -18,21 +18,17 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI inline void __libcpp_unreachable()
+_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI inline void __libcpp_unreachable() {
-{
+    _LIBCPP_ASSERT(false, "std::unreachable() was reached");
-#if __has_builtin(__builtin_unreachable)
+    __builtin_unreachable();
-  __builtin_unreachable();
-#else
-  std::abort();
-#endif
 }
 #if _LIBCPP_STD_VER > 20
 [[noreturn]] _LIBCPP_HIDE_FROM_ABI inline void unreachable() { __libcpp_unreachable(); }
-#endif // _LIBCPP_STD_VER > 20
+#endif
 _LIBCPP_END_NAMESPACE_STD
-#endif
+#endif // _LIBCPP___UTILITY_UNREACHABLE_H

lib/libcxx/include/__variant/monostate.h+18-14

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#ifndef _LIBCPP___VARIANT_MONOSTATE_H	10	#ifndef _LIBCPP___VARIANT_MONOSTATE_H
11	#define _LIBCPP___VARIANT_MONOSTATE_H	11	#define _LIBCPP___VARIANT_MONOSTATE_H
12		12
		13	#include <__compare/ordering.h>
13	#include <__config>	14	#include <__config>
14	#include <__functional/hash.h>	15	#include <__functional/hash.h>
15	#include <cstddef>	16	#include <cstddef>
...	@@ -24,31 +25,34 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,31 +25,34 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24		25
25	struct _LIBCPP_TEMPLATE_VIS monostate {};	26	struct _LIBCPP_TEMPLATE_VIS monostate {};
26		27
27	inline _LIBCPP_INLINE_VISIBILITY	28	_LIBCPP_HIDE_FROM_ABI constexpr bool operator==(monostate, monostate) noexcept { return true; }
28	constexpr bool operator<(monostate, monostate) noexcept { return false; }
29		29
30	inline _LIBCPP_INLINE_VISIBILITY	30	# if _LIBCPP_STD_VER > 17
31	constexpr bool operator>(monostate, monostate) noexcept { return false; }
32		31
33	inline _LIBCPP_INLINE_VISIBILITY	32	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(monostate, monostate) noexcept {
34	constexpr bool operator<=(monostate, monostate) noexcept { return true; }	33	return strong_ordering::equal;
		34	}
35		35
36	inline _LIBCPP_INLINE_VISIBILITY	36	# else // _LIBCPP_STD_VER > 17
37	constexpr bool operator>=(monostate, monostate) noexcept { return true; }
38		37
39	inline _LIBCPP_INLINE_VISIBILITY	38	_LIBCPP_HIDE_FROM_ABI constexpr bool operator!=(monostate, monostate) noexcept { return false; }
40	constexpr bool operator==(monostate, monostate) noexcept { return true; }
41		39
42	inline _LIBCPP_INLINE_VISIBILITY	40	_LIBCPP_HIDE_FROM_ABI constexpr bool operator<(monostate, monostate) noexcept { return false; }
43	constexpr bool operator!=(monostate, monostate) noexcept { return false; }	41
		42	_LIBCPP_HIDE_FROM_ABI constexpr bool operator>(monostate, monostate) noexcept { return false; }
		43
		44	_LIBCPP_HIDE_FROM_ABI constexpr bool operator<=(monostate, monostate) noexcept { return true; }
		45
		46	_LIBCPP_HIDE_FROM_ABI constexpr bool operator>=(monostate, monostate) noexcept { return true; }
		47
		48	# endif // _LIBCPP_STD_VER > 17
44		49
45	template <>	50	template <>
46	struct _LIBCPP_TEMPLATE_VIS hash<monostate> {	51	struct _LIBCPP_TEMPLATE_VIS hash<monostate> {
47	using argument_type = monostate;	52	using argument_type = monostate;
48	using result_type = size_t;	53	using result_type = size_t;
49		54
50	inline _LIBCPP_INLINE_VISIBILITY	55	inline _LIBCPP_HIDE_FROM_ABI result_type operator()(const argument_type&) const _NOEXCEPT {
51	result_type operator()(const argument_type&) const _NOEXCEPT {
52	return 66740831; // return a fundamentally attractive random value.	56	return 66740831; // return a fundamentally attractive random value.
53	}	57	}
54	};	58	};

lib/libcxx/include/__verbose_abort+30-24

 @@ -17,35 +17,41 @@
 #  pragma GCC system_header
 #endif
-// Provide a default implementation of __libcpp_verbose_abort if we know that neither the built
-// library not the user is providing one. Otherwise, just declare it and use the one from the
-// built library or the one provided by the user.
-//
-// We can't provide a great implementation because it needs to be pretty much
-// dependency-free (this is included everywhere else in the library).
-#if defined(_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY) && !defined(_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED)
-extern "C" void abort();
-_LIBCPP_BEGIN_NAMESPACE_STD
-_LIBCPP_NORETURN _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 1, 2) _LIBCPP_HIDE_FROM_ABI inline
-void __libcpp_verbose_abort(const char *, ...) {
-  ::abort();
-  __builtin_unreachable(); // never reached, but needed to tell the compiler that the function never returns
-}
-_LIBCPP_END_NAMESPACE_STD
-#else
 _LIBCPP_BEGIN_NAMESPACE_STD
+// This function should never be called directly from the code -- it should only be called through
+// the _LIBCPP_VERBOSE_ABORT macro.
 _LIBCPP_NORETURN _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 1, 2)
 void __libcpp_verbose_abort(const char *__format, ...);
-_LIBCPP_END_NAMESPACE_STD
+// _LIBCPP_VERBOSE_ABORT(format, args...)
+//
+// This macro is used to abort the program abnormally while providing additional diagnostic information.
+//
+// The first argument is a printf-style format string, and the remaining arguments are values to format
+// into the format-string. This macro can be customized by users to provide fine-grained control over
+// how verbose termination is triggered.
+//
+// If the user does not supply their own version of the _LIBCPP_VERBOSE_ABORT macro, we pick the default
+// behavior based on whether we know the built library we're running against provides support for the
+// verbose termination handler or not. If it does, we call it. If it doesn't, we call __builtin_abort to
+// make sure that the program terminates but without taking any complex dependencies in this header.
+#if !defined(_LIBCPP_VERBOSE_ABORT)
+// Support _LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED until LLVM 18, but tell people
+// to move to customizing _LIBCPP_VERBOSE_ABORT instead.
+#  if defined(_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY) && defined(_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED)
+#    undef _LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY
+#    warning _LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED is deprecated, please customize _LIBCPP_VERBOSE_ABORT instead
+#  endif
+#  if defined(_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY)
+#    define _LIBCPP_VERBOSE_ABORT(...) __builtin_abort()
+#  else
+#    define _LIBCPP_VERBOSE_ABORT(...) ::std::__libcpp_verbose_abort(__VA_ARGS__)
+#  endif
+#endif // !defined(_LIBCPP_VERBOSE_ABORT)
-#endif
+_LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP___VERBOSE_ABORT

lib/libcxx/include/algorithm+17-10

 @@ -1704,12 +1704,9 @@ template <class BidirectionalIterator, class Compare>
 */
 #include <__assert> // all public C++ headers provide the assertion handler
-#include <__bits>
 #include <__config>
 #include <__debug>
 #include <cstddef>
-#include <cstring>
-#include <memory>
 #include <type_traits>
 #include <version>
 @@ -1899,13 +1896,9 @@ template <class BidirectionalIterator, class Compare>
 #include <__algorithm/unwrap_iter.h>
 #include <__algorithm/upper_bound.h>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <chrono>
-#  include <iterator>
-#  include <utility>
-#endif
 // standard-mandated includes
+// [algorithm.syn]
 #include <initializer_list>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -1913,7 +1906,21 @@ template <class BidirectionalIterator, class Compare>
 #endif
 #if defined(_LIBCPP_HAS_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
-#   include <__pstl_algorithm>
+#  include <__pstl_algorithm>
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  include <chrono>
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <concepts>
+#  include <cstring>
+#  include <iterator>
+#  include <memory>
+#  include <stdexcept>
+#  include <utility>
 #endif
 #endif // _LIBCPP_ALGORITHM

lib/libcxx/include/any+57-43

 @@ -83,21 +83,20 @@ namespace std {
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__availability>
 #include <__config>
+#include <__memory/allocator.h>
+#include <__memory/allocator_destructor.h>
+#include <__memory/allocator_traits.h>
+#include <__memory/unique_ptr.h>
 #include <__utility/forward.h>
 #include <__utility/in_place.h>
 #include <__utility/move.h>
 #include <__utility/unreachable.h>
 #include <cstdlib>
 #include <initializer_list>
-#include <memory>
 #include <type_traits>
 #include <typeinfo>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <chrono>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -106,7 +105,7 @@ namespace std {
 class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_ANY_CAST bad_any_cast : public bad_cast
 {
 public:
-    virtual const char* what() const _NOEXCEPT;
+    const char* what() const _NOEXCEPT override;
 };
 } // namespace std
 @@ -139,7 +138,9 @@ add_pointer_t<_ValueType> any_cast(any *) _NOEXCEPT;
 namespace __any_imp
 {
+  _LIBCPP_SUPPRESS_DEPRECATED_PUSH
   using _Buffer = aligned_storage_t<3*sizeof(void*), alignment_of<void*>::value>;
+  _LIBCPP_SUPPRESS_DEPRECATED_POP
   template <class _Tp>
   using _IsSmallObject = integral_constant<bool
 @@ -194,18 +195,18 @@ class _LIBCPP_TEMPLATE_VIS any
 public:
   // construct/destruct
   _LIBCPP_INLINE_VISIBILITY
-  constexpr any() _NOEXCEPT : __h(nullptr) {}
+  constexpr any() _NOEXCEPT : __h_(nullptr) {}
   _LIBCPP_INLINE_VISIBILITY
-  any(any const & __other) : __h(nullptr)
+  any(any const & __other) : __h_(nullptr)
   {
-    if (__other.__h) __other.__call(_Action::_Copy, this);
+    if (__other.__h_) __other.__call(_Action::_Copy, this);
   }
   _LIBCPP_INLINE_VISIBILITY
-  any(any && __other) _NOEXCEPT : __h(nullptr)
+  any(any && __other) _NOEXCEPT : __h_(nullptr)
   {
-    if (__other.__h) __other.__call(_Action::_Move, this);
+    if (__other.__h_) __other.__call(_Action::_Move, this);
   }
   template <
 @@ -284,19 +285,19 @@ public:
   // 6.3.3 any modifiers
   _LIBCPP_INLINE_VISIBILITY
-  void reset() _NOEXCEPT { if (__h) this->__call(_Action::_Destroy); }
+  void reset() _NOEXCEPT { if (__h_) this->__call(_Action::_Destroy); }
   _LIBCPP_INLINE_VISIBILITY
   void swap(any & __rhs) _NOEXCEPT;
   // 6.3.4 any observers
   _LIBCPP_INLINE_VISIBILITY
-  bool has_value() const _NOEXCEPT { return __h != nullptr; }
+  bool has_value() const _NOEXCEPT { return __h_ != nullptr; }
 #if !defined(_LIBCPP_NO_RTTI)
   _LIBCPP_INLINE_VISIBILITY
   const type_info & type() const _NOEXCEPT {
-    if (__h) {
+    if (__h_) {
         return *static_cast<type_info const *>(this->__call(_Action::_TypeInfo));
     } else {
         return typeid(void);
 @@ -320,7 +321,7 @@ private:
                   type_info const * __info = nullptr,
                    const void* __fallback_info = nullptr) const
     {
-        return __h(__a, this, __other, __info, __fallback_info);
+        return __h_(__a, this, __other, __info, __fallback_info);
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -328,7 +329,7 @@ private:
                   type_info const * __info = nullptr,
                   const void* __fallback_info = nullptr)
     {
-        return __h(__a, this, __other, __info, __fallback_info);
+        return __h_(__a, this, __other, __info, __fallback_info);
     }
     template <class>
 @@ -344,8 +345,8 @@ private:
     friend add_pointer_t<_ValueType>
     any_cast(any *) _NOEXCEPT;
-    _HandleFuncPtr __h = nullptr;
+    _HandleFuncPtr __h_ = nullptr;
-    _Storage __s;
+    _Storage __s_;
 };
 namespace __any_imp
 @@ -382,9 +383,9 @@ namespace __any_imp
         typedef allocator<_Tp> _Alloc;
         typedef allocator_traits<_Alloc> _ATraits;
         _Alloc __a;
-        _Tp * __ret = static_cast<_Tp*>(static_cast<void*>(&__dest.__s.__buf));
+        _Tp * __ret = static_cast<_Tp*>(static_cast<void*>(&__dest.__s_.__buf));
         _ATraits::construct(__a, __ret, _VSTD::forward<_Args>(__args)...);
-        __dest.__h = &_SmallHandler::__handle;
+        __dest.__h_ = &_SmallHandler::__handle;
         return *__ret;
     }
 @@ -394,21 +395,21 @@ namespace __any_imp
         typedef allocator<_Tp> _Alloc;
         typedef allocator_traits<_Alloc> _ATraits;
         _Alloc __a;
-        _Tp * __p = static_cast<_Tp *>(static_cast<void*>(&__this.__s.__buf));
+        _Tp * __p = static_cast<_Tp *>(static_cast<void*>(&__this.__s_.__buf));
         _ATraits::destroy(__a, __p);
-        __this.__h = nullptr;
+        __this.__h_ = nullptr;
     }
     _LIBCPP_INLINE_VISIBILITY
     static void __copy(any const & __this, any & __dest) {
         _SmallHandler::__create(__dest, *static_cast<_Tp const *>(
-            static_cast<void const *>(&__this.__s.__buf)));
+            static_cast<void const *>(&__this.__s_.__buf)));
     }
     _LIBCPP_INLINE_VISIBILITY
     static void __move(any & __this, any & __dest) {
         _SmallHandler::__create(__dest, _VSTD::move(
-            *static_cast<_Tp*>(static_cast<void*>(&__this.__s.__buf))));
+            *static_cast<_Tp*>(static_cast<void*>(&__this.__s_.__buf))));
         __destroy(__this);
     }
 @@ -418,7 +419,7 @@ namespace __any_imp
                        const void* __fallback_id)
     {
         if (__any_imp::__compare_typeid<_Tp>(__info, __fallback_id))
-            return static_cast<void*>(&__this.__s.__buf);
+            return static_cast<void*>(&__this.__s_.__buf);
         return nullptr;
     }
 @@ -470,8 +471,8 @@ namespace __any_imp
         unique_ptr<_Tp, _Dp> __hold(_ATraits::allocate(__a, 1), _Dp(__a, 1));
         _Tp * __ret = __hold.get();
         _ATraits::construct(__a, __ret, _VSTD::forward<_Args>(__args)...);
-        __dest.__s.__ptr = __hold.release();
+        __dest.__s_.__ptr = __hold.release();
-        __dest.__h = &_LargeHandler::__handle;
+        __dest.__h_ = &_LargeHandler::__handle;
         return *__ret;
     }
 @@ -482,22 +483,22 @@ namespace __any_imp
         typedef allocator<_Tp> _Alloc;
         typedef allocator_traits<_Alloc> _ATraits;
         _Alloc __a;
-        _Tp * __p = static_cast<_Tp *>(__this.__s.__ptr);
+        _Tp * __p = static_cast<_Tp *>(__this.__s_.__ptr);
         _ATraits::destroy(__a, __p);
         _ATraits::deallocate(__a, __p, 1);
-        __this.__h = nullptr;
+        __this.__h_ = nullptr;
     }
     _LIBCPP_INLINE_VISIBILITY
     static void __copy(any const & __this, any & __dest) {
-        _LargeHandler::__create(__dest, *static_cast<_Tp const *>(__this.__s.__ptr));
+        _LargeHandler::__create(__dest, *static_cast<_Tp const *>(__this.__s_.__ptr));
     }
     _LIBCPP_INLINE_VISIBILITY
     static void __move(any & __this, any & __dest) {
-      __dest.__s.__ptr = __this.__s.__ptr;
+      __dest.__s_.__ptr = __this.__s_.__ptr;
-      __dest.__h = &_LargeHandler::__handle;
+      __dest.__h_ = &_LargeHandler::__handle;
-      __this.__h = nullptr;
+      __this.__h_ = nullptr;
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -505,7 +506,7 @@ namespace __any_imp
                        void const* __fallback_info)
     {
         if (__any_imp::__compare_typeid<_Tp>(__info, __fallback_info))
-            return static_cast<void*>(__this.__s.__ptr);
+            return static_cast<void*>(__this.__s_.__ptr);
         return nullptr;
     }
 @@ -525,7 +526,7 @@ namespace __any_imp
 template <class _ValueType, class _Tp, class>
-any::any(_ValueType && __v) : __h(nullptr)
+any::any(_ValueType && __v) : __h_(nullptr)
 {
   __any_imp::_Handler<_Tp>::__create(*this, _VSTD::forward<_ValueType>(__v));
 }
 @@ -567,16 +568,16 @@ void any::swap(any & __rhs) _NOEXCEPT
 {
     if (this == &__rhs)
       return;
-    if (__h && __rhs.__h) {
+    if (__h_ && __rhs.__h_) {
         any __tmp;
         __rhs.__call(_Action::_Move, &__tmp);
         this->__call(_Action::_Move, &__rhs);
         __tmp.__call(_Action::_Move, this);
     }
-    else if (__h) {
+    else if (__h_) {
         this->__call(_Action::_Move, &__rhs);
     }
-    else if (__rhs.__h) {
+    else if (__rhs.__h_) {
         __rhs.__call(_Action::_Move, this);
     }
 }
 @@ -606,7 +607,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST
 _ValueType any_cast(any const & __v)
 {
-    using _RawValueType = __uncvref_t<_ValueType>;
+    using _RawValueType = __remove_cvref_t<_ValueType>;
     static_assert(is_constructible<_ValueType, _RawValueType const &>::value,
                   "ValueType is required to be a const lvalue reference "
                   "or a CopyConstructible type");
 @@ -621,7 +622,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST
 _ValueType any_cast(any & __v)
 {
-    using _RawValueType = __uncvref_t<_ValueType>;
+    using _RawValueType = __remove_cvref_t<_ValueType>;
     static_assert(is_constructible<_ValueType, _RawValueType &>::value,
                   "ValueType is required to be an lvalue reference "
                   "or a CopyConstructible type");
 @@ -636,7 +637,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST
 _ValueType any_cast(any && __v)
 {
-    using _RawValueType = __uncvref_t<_ValueType>;
+    using _RawValueType = __remove_cvref_t<_ValueType>;
     static_assert(is_constructible<_ValueType, _RawValueType>::value,
                   "ValueType is required to be an rvalue reference "
                   "or a CopyConstructible type");
 @@ -676,8 +677,8 @@ any_cast(any * __any) _NOEXCEPT
     using __any_imp::_Action;
     static_assert(!is_reference<_ValueType>::value,
                   "_ValueType may not be a reference.");
-    typedef typename add_pointer<_ValueType>::type _ReturnType;
+    typedef add_pointer_t<_ValueType> _ReturnType;
-    if (__any && __any->__h) {
+    if (__any && __any->__h_) {
       void *__p = __any->__call(_Action::_Get, nullptr,
 #if !defined(_LIBCPP_NO_RTTI)
                           &typeid(_ValueType),
 @@ -695,4 +696,17 @@ any_cast(any * __any) _NOEXCEPT
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  include <chrono>
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <concepts>
+#  include <iosfwd>
+#  include <iterator>
+#  include <memory>
+#  include <variant>
+#endif
 #endif // _LIBCPP_ANY

lib/libcxx/include/array+72-68

 @@ -115,7 +115,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <__iterator/reverse_iterator.h>
-#include <__tuple>
+#include <__tuple_dir/sfinae_helpers.h>
 #include <__utility/integer_sequence.h>
 #include <__utility/move.h>
 #include <__utility/unreachable.h>
 @@ -123,12 +123,6 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <iterator>
-#  include <utility>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -142,6 +136,10 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <compare>
 #include <initializer_list>
+// [tuple.helper]
+#include <__tuple_dir/tuple_element.h>
+#include <__tuple_dir/tuple_size.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -168,42 +166,42 @@ struct _LIBCPP_TEMPLATE_VIS array
     _Tp __elems_[_Size];
     // No explicit construct/copy/destroy for aggregate type
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void fill(const value_type& __u) {
         _VSTD::fill_n(data(), _Size, __u);
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void swap(array& __a) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value) {
         _VSTD::swap_ranges(data(), data() + _Size, __a.data());
     }
     // iterators:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     iterator begin() _NOEXCEPT {return iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator begin() const _NOEXCEPT {return const_iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     iterator end() _NOEXCEPT {return iterator(data() + _Size);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator end() const _NOEXCEPT {return const_iterator(data() + _Size);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator rbegin() const _NOEXCEPT {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator rend() const _NOEXCEPT {return const_reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator crend() const _NOEXCEPT {return rend();}
     // capacity:
 @@ -215,39 +213,39 @@ struct _LIBCPP_TEMPLATE_VIS array
     _LIBCPP_CONSTEXPR bool empty() const _NOEXCEPT {return _Size == 0;}
     // element access:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator[](size_type __n) _NOEXCEPT {
         _LIBCPP_ASSERT(__n < _Size, "out-of-bounds access in std::array<T, N>");
         return __elems_[__n];
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const_reference operator[](size_type __n) const _NOEXCEPT {
         _LIBCPP_ASSERT(__n < _Size, "out-of-bounds access in std::array<T, N>");
         return __elems_[__n];
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX14 reference at(size_type __n)
+    _LIBCPP_CONSTEXPR_SINCE_CXX17 reference at(size_type __n)
     {
         if (__n >= _Size)
             __throw_out_of_range("array::at");
         return __elems_[__n];
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference at(size_type __n) const
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 const_reference at(size_type __n) const
     {
         if (__n >= _Size)
             __throw_out_of_range("array::at");
         return __elems_[__n];
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference front()             _NOEXCEPT {return (*this)[0];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 reference front()             _NOEXCEPT {return (*this)[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference front() const _NOEXCEPT {return (*this)[0];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 const_reference front() const _NOEXCEPT {return (*this)[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference back()              _NOEXCEPT {return (*this)[_Size - 1];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 reference back()              _NOEXCEPT {return (*this)[_Size - 1];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference back() const  _NOEXCEPT {return (*this)[_Size - 1];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 const_reference back() const  _NOEXCEPT {return (*this)[_Size - 1];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     value_type* data() _NOEXCEPT {return __elems_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const value_type* data() const _NOEXCEPT {return __elems_;}
 };
 @@ -268,56 +266,55 @@ struct _LIBCPP_TEMPLATE_VIS array<_Tp, 0>
     typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
     typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-    typedef typename conditional<is_const<_Tp>::value, const char,
+    typedef __conditional_t<is_const<_Tp>::value, const char, char> _CharType;
-                                char>::type _CharType;
     struct  _ArrayInStructT { _Tp __data_[1]; };
     _ALIGNAS_TYPE(_ArrayInStructT) _CharType __elems_[sizeof(_ArrayInStructT)];
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     value_type* data() _NOEXCEPT {return nullptr;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const value_type* data() const _NOEXCEPT {return nullptr;}
     // No explicit construct/copy/destroy for aggregate type
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void fill(const value_type&) {
       static_assert(!is_const<_Tp>::value,
                     "cannot fill zero-sized array of type 'const T'");
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     void swap(array&) _NOEXCEPT {
       static_assert(!is_const<_Tp>::value,
                     "cannot swap zero-sized array of type 'const T'");
     }
     // iterators:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     iterator begin() _NOEXCEPT {return iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator begin() const _NOEXCEPT {return const_iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     iterator end() _NOEXCEPT {return iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator end() const _NOEXCEPT {return const_iterator(data());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator rbegin() const _NOEXCEPT {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator rend() const _NOEXCEPT {return const_reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     const_reverse_iterator crend() const _NOEXCEPT {return rend();}
     // capacity:
 @@ -329,49 +326,49 @@ struct _LIBCPP_TEMPLATE_VIS array<_Tp, 0>
     _LIBCPP_CONSTEXPR bool empty() const _NOEXCEPT {return true;}
     // element access:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference operator[](size_type) _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::operator[] on a zero-sized array");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const_reference operator[](size_type) const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::operator[] on a zero-sized array");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference at(size_type) {
       __throw_out_of_range("array<T, 0>::at");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const_reference at(size_type) const {
       __throw_out_of_range("array<T, 0>::at");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference front() _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::front() on a zero-sized array");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const_reference front() const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::front() on a zero-sized array");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
     reference back() _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::back() on a zero-sized array");
       __libcpp_unreachable();
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     const_reference back() const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::back() on a zero-sized array");
       __libcpp_unreachable();
 @@ -389,7 +386,7 @@ array(_Tp, _Args...)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator==(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return _VSTD::equal(__x.begin(), __x.end(), __y.begin());
 @@ -397,7 +394,7 @@ operator==(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator!=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return !(__x == __y);
 @@ -405,7 +402,7 @@ operator!=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator<(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return _VSTD::lexicographical_compare(__x.begin(), __x.end(),
 @@ -414,7 +411,7 @@ operator<(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator>(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return __y < __x;
 @@ -422,7 +419,7 @@ operator>(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator<=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return !(__y < __x);
 @@ -430,14 +427,14 @@ operator<=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 template <class _Tp, size_t _Size>
 inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX17 bool
+_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
 operator>=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
 {
     return !(__x < __y);
 }
 template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 __enable_if_t<_Size == 0 || __is_swappable<_Tp>::value, void>
 swap(array<_Tp, _Size>& __x, array<_Tp, _Size>& __y)
                                   _NOEXCEPT_(noexcept(__x.swap(__y)))
 @@ -457,7 +454,7 @@ struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, array<_Tp, _Size> >
 };
 template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp&
 get(array<_Tp, _Size>& __a) _NOEXCEPT
 {
 @@ -466,7 +463,7 @@ get(array<_Tp, _Size>& __a) _NOEXCEPT
 }
 template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&
 get(const array<_Tp, _Size>& __a) _NOEXCEPT
 {
 @@ -475,7 +472,7 @@ get(const array<_Tp, _Size>& __a) _NOEXCEPT
 }
 template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp&&
 get(array<_Tp, _Size>&& __a) _NOEXCEPT
 {
 @@ -484,7 +481,7 @@ get(array<_Tp, _Size>&& __a) _NOEXCEPT
 }
 template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 const _Tp&&
 get(const array<_Tp, _Size>&& __a) _NOEXCEPT
 {
 @@ -535,4 +532,11 @@ to_array(_Tp(&&__arr)[_Size]) noexcept(is_nothrow_move_constructible_v<_Tp>) {
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <concepts>
+#  include <iterator>
+#  include <utility>
+#endif
 #endif // _LIBCPP_ARRAY

lib/libcxx/include/atomic+85-89

 @@ -377,23 +377,23 @@ template<class T>
                               memory_order) noexcept;
 template<class T>
-  void atomic_wait(const volatile atomic<T>*, atomic<T>::value_type);
+  void atomic_wait(const volatile atomic<T>*, atomic<T>::value_type) noexcept;
 template<class T>
-  void atomic_wait(const atomic<T>*, atomic<T>::value_type);
+  void atomic_wait(const atomic<T>*, atomic<T>::value_type) noexcept;
 template<class T>
   void atomic_wait_explicit(const volatile atomic<T>*, atomic<T>::value_type,
-                            memory_order);
+                            memory_order) noexcept;
 template<class T>
   void atomic_wait_explicit(const atomic<T>*, atomic<T>::value_type,
-                            memory_order);
+                            memory_order) noexcept;
 template<class T>
-  void atomic_notify_one(volatile atomic<T>*);
+  void atomic_notify_one(volatile atomic<T>*) noexcept;
 template<class T>
-  void atomic_notify_one(atomic<T>*);
+  void atomic_notify_one(atomic<T>*) noexcept;
 template<class T>
-  void atomic_notify_all(volatile atomic<T>*);
+  void atomic_notify_all(volatile atomic<T>*) noexcept;
 template<class T>
-  void atomic_notify_all(atomic<T>*);
+  void atomic_notify_all(atomic<T>*) noexcept;
 // Atomics for standard typedef types
 @@ -524,20 +524,25 @@ template <class T>
 #include <__config>
 #include <__thread/poll_with_backoff.h>
 #include <__thread/timed_backoff_policy.h>
+#include <__type_traits/conditional.h>
+#include <__type_traits/decay.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_function.h>
+#include <__type_traits/is_nothrow_default_constructible.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/is_trivially_copyable.h>
+#include <__type_traits/remove_const.h>
+#include <__type_traits/remove_pointer.h>
+#include <__type_traits/underlying_type.h>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
-#include <type_traits>
 #include <version>
 #ifndef _LIBCPP_HAS_NO_THREADS
 # include <__threading_support>
 #endif
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <chrono>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -948,13 +953,13 @@ void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp> * __a, _Tp __val, memory_ord
 template<class _Tp>
 _LIBCPP_INLINE_VISIBILITY
 _Tp __cxx_atomic_load(__cxx_atomic_base_impl<_Tp> const volatile* __a, memory_order __order) _NOEXCEPT {
-    using __ptr_type = typename remove_const<decltype(__a->__a_value)>::type*;
+    using __ptr_type = __remove_const_t<decltype(__a->__a_value)>*;
     return __c11_atomic_load(const_cast<__ptr_type>(&__a->__a_value), static_cast<__memory_order_underlying_t>(__order));
 }
 template<class _Tp>
 _LIBCPP_INLINE_VISIBILITY
 _Tp __cxx_atomic_load(__cxx_atomic_base_impl<_Tp> const* __a, memory_order __order) _NOEXCEPT {
-    using __ptr_type = typename remove_const<decltype(__a->__a_value)>::type*;
+    using __ptr_type = __remove_const_t<decltype(__a->__a_value)>*;
     return __c11_atomic_load(const_cast<__ptr_type>(&__a->__a_value), static_cast<__memory_order_underlying_t>(__order));
 }
 @@ -1435,17 +1440,7 @@ struct __cxx_atomic_impl : public _Base {
 using __cxx_atomic_contention_t = __cxx_atomic_impl<__cxx_contention_t>;
-#if defined(_LIBCPP_HAS_NO_THREADS)
+#ifndef _LIBCPP_HAS_NO_THREADS
-#   define _LIBCPP_HAS_NO_PLATFORM_WAIT
-#endif
-// TODO:
-// _LIBCPP_HAS_NO_PLATFORM_WAIT is currently a "dead" macro, in the sense that
-// it is not tied anywhere into the build system or even documented. We should
-// clean it up because it is technically never defined except when threads are
-// disabled. We should clean it up in its own changeset in case we break "bad"
-// users.
-#ifndef _LIBCPP_HAS_NO_PLATFORM_WAIT
 _LIBCPP_AVAILABILITY_SYNC _LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_one(void const volatile*);
 _LIBCPP_AVAILABILITY_SYNC _LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_all(void const volatile*);
 @@ -1466,10 +1461,10 @@ struct __libcpp_atomic_wait_backoff_impl {
     {
         if(__elapsed > chrono::microseconds(64))
         {
-            auto const __monitor = __libcpp_atomic_monitor(__a);
+            auto const __monitor = std::__libcpp_atomic_monitor(__a);
             if(__test_fn())
                 return true;
-            __libcpp_atomic_wait(__a, __monitor);
+            std::__libcpp_atomic_wait(__a, __monitor);
         }
         else if(__elapsed > chrono::microseconds(4))
             __libcpp_thread_yield();
 @@ -1484,10 +1479,10 @@ _LIBCPP_AVAILABILITY_SYNC
 _LIBCPP_INLINE_VISIBILITY bool __cxx_atomic_wait(_Atp* __a, _Fn && __test_fn)
 {
     __libcpp_atomic_wait_backoff_impl<_Atp, typename decay<_Fn>::type> __backoff_fn = {__a, __test_fn};
-    return __libcpp_thread_poll_with_backoff(__test_fn, __backoff_fn);
+    return std::__libcpp_thread_poll_with_backoff(__test_fn, __backoff_fn);
 }
-#else // _LIBCPP_HAS_NO_PLATFORM_WAIT
+#else // _LIBCPP_HAS_NO_THREADS
 template <class _Tp>
 _LIBCPP_INLINE_VISIBILITY void __cxx_atomic_notify_all(__cxx_atomic_impl<_Tp> const volatile*) { }
 @@ -1496,15 +1491,10 @@ _LIBCPP_INLINE_VISIBILITY void __cxx_atomic_notify_one(__cxx_atomic_impl<_Tp> co
 template <class _Atp, class _Fn>
 _LIBCPP_INLINE_VISIBILITY bool __cxx_atomic_wait(_Atp*, _Fn && __test_fn)
 {
-#if defined(_LIBCPP_HAS_NO_THREADS)
+    return __libcpp_thread_poll_with_backoff(__test_fn, __spinning_backoff_policy());
-    using _Policy = __spinning_backoff_policy;
-#else
-    using _Policy = __libcpp_timed_backoff_policy;
-#endif
-    return __libcpp_thread_poll_with_backoff(__test_fn, _Policy());
 }
-#endif // _LIBCPP_HAS_NO_PLATFORM_WAIT
+#endif // _LIBCPP_HAS_NO_THREADS
 template <class _Atp, class _Tp>
 struct __cxx_atomic_wait_test_fn_impl {
 @@ -1513,7 +1503,7 @@ struct __cxx_atomic_wait_test_fn_impl {
     memory_order __order;
     _LIBCPP_INLINE_VISIBILITY bool operator()() const
     {
-        return !__cxx_nonatomic_compare_equal(__cxx_atomic_load(__a, __order), __val);
+        return !std::__cxx_nonatomic_compare_equal(std::__cxx_atomic_load(__a, __order), __val);
     }
 };
 @@ -1522,7 +1512,7 @@ _LIBCPP_AVAILABILITY_SYNC
 _LIBCPP_INLINE_VISIBILITY bool __cxx_atomic_wait(_Atp* __a, _Tp const __val, memory_order __order)
 {
     __cxx_atomic_wait_test_fn_impl<_Atp, _Tp> __test_fn = {__a, __val, __order};
-    return __cxx_atomic_wait(__a, __test_fn);
+    return std::__cxx_atomic_wait(__a, __test_fn);
 }
 // general atomic<T>
 @@ -1545,78 +1535,78 @@ struct __atomic_base  // false
     _LIBCPP_INLINE_VISIBILITY
     void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
       _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
-        {__cxx_atomic_store(&__a_, __d, __m);}
+        {std::__cxx_atomic_store(&__a_, __d, __m);}
     _LIBCPP_INLINE_VISIBILITY
     void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
       _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
-        {__cxx_atomic_store(&__a_, __d, __m);}
+        {std::__cxx_atomic_store(&__a_, __d, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
       _LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
-        {return __cxx_atomic_load(&__a_, __m);}
+        {return std::__cxx_atomic_load(&__a_, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT
       _LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
-        {return __cxx_atomic_load(&__a_, __m);}
+        {return std::__cxx_atomic_load(&__a_, __m);}
     _LIBCPP_INLINE_VISIBILITY
     operator _Tp() const volatile _NOEXCEPT {return load();}
     _LIBCPP_INLINE_VISIBILITY
     operator _Tp() const _NOEXCEPT          {return load();}
     _LIBCPP_INLINE_VISIBILITY
     _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_exchange(&__a_, __d, __m);}
+        {return std::__cxx_atomic_exchange(&__a_, __d, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_exchange(&__a_, __d, __m);}
+        {return std::__cxx_atomic_exchange(&__a_, __d, __m);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_weak(_Tp& __e, _Tp __d,
                                memory_order __s, memory_order __f) volatile _NOEXCEPT
       _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
-        {return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
+        {return std::__cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_weak(_Tp& __e, _Tp __d,
                                memory_order __s, memory_order __f) _NOEXCEPT
       _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
-        {return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
+        {return std::__cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_strong(_Tp& __e, _Tp __d,
                                  memory_order __s, memory_order __f) volatile _NOEXCEPT
       _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
-        {return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
+        {return std::__cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_strong(_Tp& __e, _Tp __d,
                                  memory_order __s, memory_order __f) _NOEXCEPT
       _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
-        {return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
+        {return std::__cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_weak(_Tp& __e, _Tp __d,
                               memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
+        {return std::__cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_weak(_Tp& __e, _Tp __d,
                                memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
+        {return std::__cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_strong(_Tp& __e, _Tp __d,
                               memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
+        {return std::__cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
     _LIBCPP_INLINE_VISIBILITY
     bool compare_exchange_strong(_Tp& __e, _Tp __d,
                                  memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
+        {return std::__cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void wait(_Tp __v, memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
-        {__cxx_atomic_wait(&__a_, __v, __m);}
+        {std::__cxx_atomic_wait(&__a_, __v, __m);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void wait(_Tp __v, memory_order __m = memory_order_seq_cst) const _NOEXCEPT
-        {__cxx_atomic_wait(&__a_, __v, __m);}
+        {std::__cxx_atomic_wait(&__a_, __v, __m);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void notify_one() volatile _NOEXCEPT
-        {__cxx_atomic_notify_one(&__a_);}
+        {std::__cxx_atomic_notify_one(&__a_);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void notify_one() _NOEXCEPT
-        {__cxx_atomic_notify_one(&__a_);}
+        {std::__cxx_atomic_notify_one(&__a_);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void notify_all() volatile _NOEXCEPT
-        {__cxx_atomic_notify_all(&__a_);}
+        {std::__cxx_atomic_notify_all(&__a_);}
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void notify_all() _NOEXCEPT
-        {__cxx_atomic_notify_all(&__a_);}
+        {std::__cxx_atomic_notify_all(&__a_);}
 #if _LIBCPP_STD_VER > 17
     _LIBCPP_INLINE_VISIBILITY constexpr
 @@ -1645,7 +1635,7 @@ struct __atomic_base<_Tp, true>
 {
     typedef __atomic_base<_Tp, false> __base;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     __atomic_base() _NOEXCEPT = default;
     _LIBCPP_INLINE_VISIBILITY
 @@ -1653,34 +1643,34 @@ struct __atomic_base<_Tp, true>
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_add(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_add(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_fetch_and(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_and(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_fetch_and(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_and(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_fetch_or(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_or(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_fetch_or(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_or(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
+        {return std::__cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
     _LIBCPP_INLINE_VISIBILITY
     _Tp operator++(int) volatile _NOEXCEPT      {return fetch_add(_Tp(1));}
 @@ -1778,29 +1768,29 @@ struct atomic<_Tp*>
     _LIBCPP_INLINE_VISIBILITY
     _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT {
         // __atomic_fetch_add accepts function pointers, guard against them.
-        static_assert(!is_function<typename remove_pointer<_Tp>::type>::value, "Pointer to function isn't allowed");
+        static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
-        return __cxx_atomic_fetch_add(&this->__a_, __op, __m);
+        return std::__cxx_atomic_fetch_add(&this->__a_, __op, __m);
     }
     _LIBCPP_INLINE_VISIBILITY
     _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT {
         // __atomic_fetch_add accepts function pointers, guard against them.
-        static_assert(!is_function<typename remove_pointer<_Tp>::type>::value, "Pointer to function isn't allowed");
+        static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
-        return __cxx_atomic_fetch_add(&this->__a_, __op, __m);
+        return std::__cxx_atomic_fetch_add(&this->__a_, __op, __m);
     }
     _LIBCPP_INLINE_VISIBILITY
     _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT {
         // __atomic_fetch_add accepts function pointers, guard against them.
-        static_assert(!is_function<typename remove_pointer<_Tp>::type>::value, "Pointer to function isn't allowed");
+        static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
-        return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);
+        return std::__cxx_atomic_fetch_sub(&this->__a_, __op, __m);
     }
     _LIBCPP_INLINE_VISIBILITY
     _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT {
         // __atomic_fetch_add accepts function pointers, guard against them.
-        static_assert(!is_function<typename remove_pointer<_Tp>::type>::value, "Pointer to function isn't allowed");
+        static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
-        return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);
+        return std::__cxx_atomic_fetch_sub(&this->__a_, __op, __m);
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -1857,7 +1847,7 @@ _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_INLINE_VISIBILITY
 void
 atomic_init(volatile atomic<_Tp>* __o, typename atomic<_Tp>::value_type __d) _NOEXCEPT
 {
-    __cxx_atomic_init(&__o->__a_, __d);
+    std::__cxx_atomic_init(&__o->__a_, __d);
 }
 template <class _Tp>
 @@ -1865,7 +1855,7 @@ _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_INLINE_VISIBILITY
 void
 atomic_init(atomic<_Tp>* __o, typename atomic<_Tp>::value_type __d) _NOEXCEPT
 {
-    __cxx_atomic_init(&__o->__a_, __d);
+    std::__cxx_atomic_init(&__o->__a_, __d);
 }
 // atomic_store
 @@ -2118,7 +2108,7 @@ void atomic_notify_one(atomic<_Tp>* __o) _NOEXCEPT
     __o->notify_one();
 }
-// atomic_notify_one
+// atomic_notify_all
 template <class _Tp>
 _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
 @@ -2642,17 +2632,17 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
 #endif
 #if ATOMIC_LLONG_LOCK_FREE == 2
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, long long>::type          __libcpp_signed_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, long long>          __libcpp_signed_lock_free;
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned long long>::type __libcpp_unsigned_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned long long> __libcpp_unsigned_lock_free;
 #elif ATOMIC_INT_LOCK_FREE == 2
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, int>::type                __libcpp_signed_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, int>                __libcpp_signed_lock_free;
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned int>::type       __libcpp_unsigned_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned int>       __libcpp_unsigned_lock_free;
 #elif ATOMIC_SHORT_LOCK_FREE == 2
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, short>::type              __libcpp_signed_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, short>              __libcpp_signed_lock_free;
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned short>::type     __libcpp_unsigned_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned short>     __libcpp_unsigned_lock_free;
 #elif ATOMIC_CHAR_LOCK_FREE == 2
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, char>::type               __libcpp_signed_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, char>               __libcpp_signed_lock_free;
-typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>::type      __libcpp_unsigned_lock_free;
+typedef __conditional_t<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>      __libcpp_unsigned_lock_free;
 #else
     // No signed/unsigned lock-free types
 #define _LIBCPP_NO_LOCK_FREE_TYPES
 @@ -2674,4 +2664,10 @@ typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free;
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <cmath>
+#  include <compare>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_ATOMIC

lib/libcxx/include/barrier+17-8

...	@@ -48,10 +48,11 @@ namespace std	...	@@ -48,10 +48,11 @@ namespace std
48	#include <__assert> // all public C++ headers provide the assertion handler	48	#include <__assert> // all public C++ headers provide the assertion handler
49	#include <__availability>	49	#include <__availability>
50	#include <__config>	50	#include <__config>
		51	#include <__memory/unique_ptr.h>
51	#include <__thread/timed_backoff_policy.h>	52	#include <__thread/timed_backoff_policy.h>
		53	#include <__utility/move.h>
52	#include <atomic>	54	#include <atomic>
53	#include <limits>	55	#include <limits>
54	#include <memory>
55		56
56	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	57	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
57	# pragma GCC system_header	58	# pragma GCC system_header
...	@@ -124,7 +125,7 @@ public:	...	@@ -124,7 +125,7 @@ public:
124		125
125	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	126	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
126	__barrier_base(ptrdiff_t __expected, _CompletionF __completion = _CompletionF())	127	__barrier_base(ptrdiff_t __expected, _CompletionF __completion = _CompletionF())
127	: __expected_(__expected), __base_(__construct_barrier_algorithm_base(this->__expected_),	128	: __expected_(__expected), __base_(std::__construct_barrier_algorithm_base(this->__expected_),
128	&__destroy_barrier_algorithm_base),	129	&__destroy_barrier_algorithm_base),
129	__expected_adjustment_(0), __completion_(std::move(__completion)), __phase_(0)	130	__expected_adjustment_(0), __completion_(std::move(__completion)), __phase_(0)
130	{	131	{
...	@@ -149,7 +150,7 @@ public:	...	@@ -149,7 +150,7 @@ public:
149	auto const __test_fn = [this, __old_phase]() -> bool {	150	auto const __test_fn = [this, __old_phase]() -> bool {
150	return __phase_.load(memory_order_acquire) != __old_phase;	151	return __phase_.load(memory_order_acquire) != __old_phase;
151	};	152	};
152	__libcpp_thread_poll_with_backoff(__test_fn, __libcpp_timed_backoff_policy());	153	std::__libcpp_thread_poll_with_backoff(__test_fn, __libcpp_timed_backoff_policy());
153	}	154	}
154	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	155	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
155	void arrive_and_drop()	156	void arrive_and_drop()
...	@@ -283,7 +284,7 @@ public:	...	@@ -283,7 +284,7 @@ public:
283	template<class _CompletionF = __empty_completion>	284	template<class _CompletionF = __empty_completion>
284	class barrier {	285	class barrier {
285		286
286	__barrier_base<_CompletionF> __b;	287	__barrier_base<_CompletionF> __b_;
287	public:	288	public:
288	using arrival_token = typename __barrier_base<_CompletionF>::arrival_token;	289	using arrival_token = typename __barrier_base<_CompletionF>::arrival_token;
289		290
...	@@ -293,7 +294,7 @@ public:	...	@@ -293,7 +294,7 @@ public:
293		294
294	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	295	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
295	barrier(ptrdiff_t __count, _CompletionF __completion = _CompletionF())	296	barrier(ptrdiff_t __count, _CompletionF __completion = _CompletionF())
296	: __b(__count, _VSTD::move(__completion)) {	297	: __b_(__count, _VSTD::move(__completion)) {
297	}	298	}
298		299
299	barrier(barrier const&) = delete;	300	barrier(barrier const&) = delete;
...	@@ -302,12 +303,12 @@ public:	...	@@ -302,12 +303,12 @@ public:
302	[[nodiscard]] _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	303	[[nodiscard]] _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
303	arrival_token arrive(ptrdiff_t __update = 1)	304	arrival_token arrive(ptrdiff_t __update = 1)
304	{	305	{
305	return __b.arrive(__update);	306	return __b_.arrive(__update);
306	}	307	}
307	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	308	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
308	void wait(arrival_token&& __phase) const	309	void wait(arrival_token&& __phase) const
309	{	310	{
310	__b.wait(_VSTD::move(__phase));	311	__b_.wait(_VSTD::move(__phase));
311	}	312	}
312	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	313	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
313	void arrive_and_wait()	314	void arrive_and_wait()
...	@@ -317,7 +318,7 @@ public:	...	@@ -317,7 +318,7 @@ public:
317	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	318	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
318	void arrive_and_drop()	319	void arrive_and_drop()
319	{	320	{
320	__b.arrive_and_drop();	321	__b_.arrive_and_drop();
321	}	322	}
322	};	323	};
323		324
...	@@ -327,4 +328,12 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -327,4 +328,12 @@ _LIBCPP_END_NAMESPACE_STD
327		328
328	_LIBCPP_POP_MACROS	329	_LIBCPP_POP_MACROS
329		330
		331	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		332	# include <concepts>
		333	# include <iterator>
		334	# include <memory>
		335	# include <stdexcept>
		336	# include <variant>
		337	#endif
		338
330	#endif //_LIBCPP_BARRIER	339	#endif //_LIBCPP_BARRIER

lib/libcxx/include/bit+16-184

...	@@ -63,197 +63,29 @@ namespace std {	...	@@ -63,197 +63,29 @@ namespace std {
63		63
64	#include <__assert> // all public C++ headers provide the assertion handler	64	#include <__assert> // all public C++ headers provide the assertion handler
65	#include <__bit/bit_cast.h>	65	#include <__bit/bit_cast.h>
		66	#include <__bit/bit_ceil.h>
		67	#include <__bit/bit_floor.h>
		68	#include <__bit/bit_log2.h>
		69	#include <__bit/bit_width.h>
		70	#include <__bit/blsr.h>
66	#include <__bit/byteswap.h>	71	#include <__bit/byteswap.h>
67	#include <__bits> // __libcpp_clz	72	#include <__bit/countl.h>
68	#include <__concepts/arithmetic.h>	73	#include <__bit/countr.h>
		74	#include <__bit/endian.h>
		75	#include <__bit/has_single_bit.h>
		76	#include <__bit/popcount.h>
		77	#include <__bit/rotate.h>
69	#include <__config>	78	#include <__config>
70	#include <limits>
71	#include <type_traits>
72	#include <version>	79	#include <version>
73		80
74	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
75	# include <iosfwd>
76	#endif
77
78	#if defined(_LIBCPP_COMPILER_MSVC)
79	# include <intrin.h>
80	#endif
81
82	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	81	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
83	# pragma GCC system_header	82	# pragma GCC system_header
84	#endif	83	#endif
85		84
86	_LIBCPP_PUSH_MACROS	85	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
87	#include <__undef_macros>	86	# include <iosfwd>
88		87	# include <limits>
89	_LIBCPP_BEGIN_NAMESPACE_STD	88	# include <type_traits>
90		89	#endif
91	template<class _Tp>
92	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
93	_Tp __rotr(_Tp __t, unsigned int __cnt) _NOEXCEPT
94	{
95	static_assert(__libcpp_is_unsigned_integer<_Tp>::value, "__rotr requires an unsigned integer type");
96	const unsigned int __dig = numeric_limits<_Tp>::digits;
97	if ((__cnt % __dig) == 0)
98	return __t;
99	return (__t >> (__cnt % __dig)) \| (__t << (__dig - (__cnt % __dig)));
100	}
101
102	template<class _Tp>
103	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
104	int __countl_zero(_Tp __t) _NOEXCEPT
105	{
106	static_assert(__libcpp_is_unsigned_integer<_Tp>::value, "__countl_zero requires an unsigned integer type");
107	if (__t == 0)
108	return numeric_limits<_Tp>::digits;
109
110	if (sizeof(_Tp) <= sizeof(unsigned int))
111	return std::__libcpp_clz(static_cast<unsigned int>(__t))
112	- (numeric_limits<unsigned int>::digits - numeric_limits<_Tp>::digits);
113	else if (sizeof(_Tp) <= sizeof(unsigned long))
114	return std::__libcpp_clz(static_cast<unsigned long>(__t))
115	- (numeric_limits<unsigned long>::digits - numeric_limits<_Tp>::digits);
116	else if (sizeof(_Tp) <= sizeof(unsigned long long))
117	return std::__libcpp_clz(static_cast<unsigned long long>(__t))
118	- (numeric_limits<unsigned long long>::digits - numeric_limits<_Tp>::digits);
119	else
120	{
121	int __ret = 0;
122	int __iter = 0;
123	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
124	while (true) {
125	__t = std::__rotr(__t, __ulldigits);
126	if ((__iter = std::__countl_zero(static_cast<unsigned long long>(__t))) != __ulldigits)
127	break;
128	__ret += __iter;
129	}
130	return __ret + __iter;
131	}
132	}
133
134	#if _LIBCPP_STD_VER > 17
135
136	template <__libcpp_unsigned_integer _Tp>
137	_LIBCPP_HIDE_FROM_ABI constexpr _Tp rotl(_Tp __t, unsigned int __cnt) noexcept {
138	const unsigned int __dig = numeric_limits<_Tp>::digits;
139	if ((__cnt % __dig) == 0)
140	return __t;
141	return (__t << (__cnt % __dig)) \| (__t >> (__dig - (__cnt % __dig)));
142	}
143
144	template <__libcpp_unsigned_integer _Tp>
145	_LIBCPP_HIDE_FROM_ABI constexpr _Tp rotr(_Tp __t, unsigned int __cnt) noexcept {
146	return std::__rotr(__t, __cnt);
147	}
148
149	template <__libcpp_unsigned_integer _Tp>
150	_LIBCPP_HIDE_FROM_ABI constexpr int countl_zero(_Tp __t) noexcept {
151	return std::__countl_zero(__t);
152	}
153
154	template <__libcpp_unsigned_integer _Tp>
155	_LIBCPP_HIDE_FROM_ABI constexpr int countl_one(_Tp __t) noexcept {
156	return __t != numeric_limits<_Tp>::max() ? std::countl_zero(static_cast<_Tp>(~__t)) : numeric_limits<_Tp>::digits;
157	}
158
159	template <__libcpp_unsigned_integer _Tp>
160	_LIBCPP_HIDE_FROM_ABI constexpr int countr_zero(_Tp __t) noexcept {
161	if (__t == 0)
162	return numeric_limits<_Tp>::digits;
163
164	if (sizeof(_Tp) <= sizeof(unsigned int))
165	return std::__libcpp_ctz(static_cast<unsigned int>(__t));
166	else if (sizeof(_Tp) <= sizeof(unsigned long))
167	return std::__libcpp_ctz(static_cast<unsigned long>(__t));
168	else if (sizeof(_Tp) <= sizeof(unsigned long long))
169	return std::__libcpp_ctz(static_cast<unsigned long long>(__t));
170	else {
171	int __ret = 0;
172	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
173	while (static_cast<unsigned long long>(__t) == 0uLL) {
174	__ret += __ulldigits;
175	__t >>= __ulldigits;
176	}
177	return __ret + std::__libcpp_ctz(static_cast<unsigned long long>(__t));
178	}
179	}
180
181	template <__libcpp_unsigned_integer _Tp>
182	_LIBCPP_HIDE_FROM_ABI constexpr int countr_one(_Tp __t) noexcept {
183	return __t != numeric_limits<_Tp>::max() ? std::countr_zero(static_cast<_Tp>(~__t)) : numeric_limits<_Tp>::digits;
184	}
185
186	template <__libcpp_unsigned_integer _Tp>
187	_LIBCPP_HIDE_FROM_ABI constexpr int popcount(_Tp __t) noexcept {
188	if (sizeof(_Tp) <= sizeof(unsigned int))
189	return std::__libcpp_popcount(static_cast<unsigned int>(__t));
190	else if (sizeof(_Tp) <= sizeof(unsigned long))
191	return std::__libcpp_popcount(static_cast<unsigned long>(__t));
192	else if (sizeof(_Tp) <= sizeof(unsigned long long))
193	return std::__libcpp_popcount(static_cast<unsigned long long>(__t));
194	else {
195	int __ret = 0;
196	while (__t != 0) {
197	__ret += std::__libcpp_popcount(static_cast<unsigned long long>(__t));
198	__t >>= numeric_limits<unsigned long long>::digits;
199	}
200	return __ret;
201	}
202	}
203
204	template <__libcpp_unsigned_integer _Tp>
205	_LIBCPP_HIDE_FROM_ABI constexpr bool has_single_bit(_Tp __t) noexcept {
206	return __t != 0 && (((__t & (__t - 1)) == 0));
207	}
208
209	// integral log base 2
210	template <__libcpp_unsigned_integer _Tp>
211	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __bit_log2(_Tp __t) noexcept {
212	return numeric_limits<_Tp>::digits - 1 - std::countl_zero(__t);
213	}
214
215	template <__libcpp_unsigned_integer _Tp>
216	_LIBCPP_HIDE_FROM_ABI constexpr _Tp bit_floor(_Tp __t) noexcept {
217	return __t == 0 ? 0 : _Tp{1} << std::__bit_log2(__t);
218	}
219
220	template <__libcpp_unsigned_integer _Tp>
221	_LIBCPP_HIDE_FROM_ABI constexpr _Tp bit_ceil(_Tp __t) noexcept {
222	if (__t < 2)
223	return 1;
224	const unsigned __n = numeric_limits<_Tp>::digits - std::countl_zero((_Tp)(__t - 1u));
225	_LIBCPP_ASSERT(__n != numeric_limits<_Tp>::digits, "Bad input to bit_ceil");
226
227	if constexpr (sizeof(_Tp) >= sizeof(unsigned))
228	return _Tp{1} << __n;
229	else {
230	const unsigned __extra = numeric_limits<unsigned>::digits - numeric_limits<_Tp>::digits;
231	const unsigned __retVal = 1u << (__n + __extra);
232	return (_Tp)(__retVal >> __extra);
233	}
234	}
235
236	template <__libcpp_unsigned_integer _Tp>
237	_LIBCPP_HIDE_FROM_ABI constexpr int bit_width(_Tp __t) noexcept {
238	return __t == 0 ? 0 : std::__bit_log2(__t) + 1;
239	}
240
241	enum class endian {
242	little = 0xDEAD,
243	big = 0xFACE,
244	# if defined(_LIBCPP_LITTLE_ENDIAN)
245	native = little
246	# elif defined(_LIBCPP_BIG_ENDIAN)
247	native = big
248	# else
249	native = 0xCAFE
250	# endif
251	};
252
253	#endif // _LIBCPP_STD_VER > 17
254
255	_LIBCPP_END_NAMESPACE_STD
256
257	_LIBCPP_POP_MACROS
258		90
259	#endif // _LIBCPP_BIT	91	#endif // _LIBCPP_BIT

lib/libcxx/include/bitset+164-117

 @@ -42,61 +42,61 @@ public:
     template <class charT>
         explicit bitset(const charT* str,
                         typename basic_string<charT>::size_type n = basic_string<charT>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
+                        charT zero = charT('0'), charT one = charT('1')); // constexpr since C++23
     template<class charT, class traits, class Allocator>
         explicit bitset(const basic_string<charT,traits,Allocator>& str,
                         typename basic_string<charT,traits,Allocator>::size_type pos = 0,
                         typename basic_string<charT,traits,Allocator>::size_type n =
                                  basic_string<charT,traits,Allocator>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
+                        charT zero = charT('0'), charT one = charT('1')); // constexpr since C++23
     // 23.3.5.2 bitset operations:
-    bitset& operator&=(const bitset& rhs) noexcept;
+    bitset& operator&=(const bitset& rhs) noexcept; // constexpr since C++23
-    bitset& operator|=(const bitset& rhs) noexcept;
+    bitset& operator|=(const bitset& rhs) noexcept; // constexpr since C++23
-    bitset& operator^=(const bitset& rhs) noexcept;
+    bitset& operator^=(const bitset& rhs) noexcept; // constexpr since C++23
-    bitset& operator<<=(size_t pos) noexcept;
+    bitset& operator<<=(size_t pos) noexcept;       // constexpr since C++23
-    bitset& operator>>=(size_t pos) noexcept;
+    bitset& operator>>=(size_t pos) noexcept;       // constexpr since C++23
-    bitset& set() noexcept;
+    bitset& set() noexcept;                         // constexpr since C++23
-    bitset& set(size_t pos, bool val = true);
+    bitset& set(size_t pos, bool val = true);       // constexpr since C++23
-    bitset& reset() noexcept;
+    bitset& reset() noexcept;                       // constexpr since C++23
-    bitset& reset(size_t pos);
+    bitset& reset(size_t pos);                      // constexpr since C++23
-    bitset operator~() const noexcept;
+    bitset operator~() const noexcept;              // constexpr since C++23
-    bitset& flip() noexcept;
+    bitset& flip() noexcept;                        // constexpr since C++23
-    bitset& flip(size_t pos);
+    bitset& flip(size_t pos);                       // constexpr since C++23
     // element access:
-    constexpr bool operator[](size_t pos) const; // for b[i];
+    constexpr bool operator[](size_t pos) const;
-    reference operator[](size_t pos);            // for b[i];
+    reference operator[](size_t pos);            // constexpr since C++23
-    unsigned long to_ulong() const;
+    unsigned long to_ulong() const;              // constexpr since C++23
-    unsigned long long to_ullong() const;
+    unsigned long long to_ullong() const;        // constexpr since C++23
-    template <class charT, class traits, class Allocator>
+    template <class charT, class traits, class Allocator> // constexpr since C++23
         basic_string<charT, traits, Allocator> to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT, class traits>
+    template <class charT, class traits> // constexpr since C++23
         basic_string<charT, traits, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT>
+    template <class charT> // constexpr since C++23
         basic_string<charT, char_traits<charT>, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    basic_string<char, char_traits<char>, allocator<char> > to_string(char zero = '0', char one = '1') const;
+    basic_string<char, char_traits<char>, allocator<char> > to_string(char zero = '0', char one = '1') const; // constexpr since C++23
-    size_t count() const noexcept;
+    size_t count() const noexcept;                     // constexpr since C++23
-    constexpr size_t size() const noexcept;
+    constexpr size_t size() const noexcept;            // constexpr since C++23
-    bool operator==(const bitset& rhs) const noexcept;
+    bool operator==(const bitset& rhs) const noexcept; // constexpr since C++23
-    bool operator!=(const bitset& rhs) const noexcept;
+    bool operator!=(const bitset& rhs) const noexcept; // constexpr since C++23
-    bool test(size_t pos) const;
+    bool test(size_t pos) const;                       // constexpr since C++23
-    bool all() const noexcept;
+    bool all() const noexcept;                         // constexpr since C++23
-    bool any() const noexcept;
+    bool any() const noexcept;                         // constexpr since C++23
-    bool none() const noexcept;
+    bool none() const noexcept;                        // constexpr since C++23
-    bitset operator<<(size_t pos) const noexcept;
+    bitset<N> operator<<(size_t pos) const noexcept;   // constexpr since C++23
-    bitset operator>>(size_t pos) const noexcept;
+    bitset<N> operator>>(size_t pos) const noexcept;   // constexpr since C++23
 };
 // 23.3.5.3 bitset operators:
 template <size_t N>
-bitset<N> operator&(const bitset<N>&, const bitset<N>&) noexcept;
+bitset<N> operator&(const bitset<N>&, const bitset<N>&) noexcept; // constexpr since C++23
 template <size_t N>
-bitset<N> operator|(const bitset<N>&, const bitset<N>&) noexcept;
+bitset<N> operator|(const bitset<N>&, const bitset<N>&) noexcept; // constexpr since C++23
 template <size_t N>
-bitset<N> operator^(const bitset<N>&, const bitset<N>&) noexcept;
+bitset<N> operator^(const bitset<N>&, const bitset<N>&) noexcept; // constexpr since C++23
 template <class charT, class traits, size_t N>
 basic_istream<charT, traits>&
 @@ -118,12 +118,15 @@ template <size_t N> struct hash<std::bitset<N>>;
 #include <__config>
 #include <__functional/hash.h>
 #include <__functional/unary_function.h>
+#include <__type_traits/is_char_like_type.h>
 #include <climits>
 #include <cstddef>
 #include <stdexcept>
 #include <version>
 // standard-mandated includes
+// [bitset.syn]
 #include <iosfwd>
 #include <string>
 @@ -177,30 +180,30 @@ protected:
     _LIBCPP_INLINE_VISIBILITY
     explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 reference __make_ref(size_t __pos) _NOEXCEPT
         {return reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
         {return const_reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 iterator __make_iter(size_t __pos) _NOEXCEPT
         {return iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 const_iterator __make_iter(size_t __pos) const _NOEXCEPT
         {return const_iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator&=(const __bitset& __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator|=(const __bitset& __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator^=(const __bitset& __v) _NOEXCEPT;
-    void flip() _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void flip() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long to_ulong() const
         {return to_ulong(integral_constant<bool, _Size < sizeof(unsigned long) * CHAR_BIT>());}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long to_ullong() const
         {return to_ullong(integral_constant<bool, _Size < sizeof(unsigned long long) * CHAR_BIT>());}
-    bool all() const _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool any() const _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
     size_t __hash_code() const _NOEXCEPT;
 private:
 @@ -209,14 +212,17 @@ private:
     _LIBCPP_INLINE_VISIBILITY
     void __init(unsigned long long __v, true_type) _NOEXCEPT;
 #endif // _LIBCPP_CXX03_LANG
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long to_ulong(false_type) const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long to_ulong(true_type) const;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong(false_type) const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong(true_type) const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong(true_type, false_type) const;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong(true_type, true_type) const;
 };
 @@ -289,7 +295,7 @@ __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
 template <size_t _N_words, size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<_N_words, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
 {
     for (size_type __i = 0; __i < _N_words; ++__i)
 @@ -298,7 +304,7 @@ __bitset<_N_words, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
 template <size_t _N_words, size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<_N_words, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
 {
     for (size_type __i = 0; __i < _N_words; ++__i)
 @@ -307,7 +313,7 @@ __bitset<_N_words, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
 template <size_t _N_words, size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<_N_words, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
 {
     for (size_type __i = 0; __i < _N_words; ++__i)
 @@ -315,7 +321,7 @@ __bitset<_N_words, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
 }
 template <size_t _N_words, size_t _Size>
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<_N_words, _Size>::flip() _NOEXCEPT
 {
     // do middle whole words
 @@ -334,7 +340,7 @@ __bitset<_N_words, _Size>::flip() _NOEXCEPT
 }
 template <size_t _N_words, size_t _Size>
-unsigned long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long
 __bitset<_N_words, _Size>::to_ulong(false_type) const
 {
     const_iterator __e = __make_iter(_Size);
 @@ -347,14 +353,14 @@ __bitset<_N_words, _Size>::to_ulong(false_type) const
 template <size_t _N_words, size_t _Size>
 inline
-unsigned long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long
 __bitset<_N_words, _Size>::to_ulong(true_type) const
 {
     return __first_[0];
 }
 template <size_t _N_words, size_t _Size>
-unsigned long long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long
 __bitset<_N_words, _Size>::to_ullong(false_type) const
 {
     const_iterator __e = __make_iter(_Size);
 @@ -367,7 +373,7 @@ __bitset<_N_words, _Size>::to_ullong(false_type) const
 template <size_t _N_words, size_t _Size>
 inline
-unsigned long long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long
 __bitset<_N_words, _Size>::to_ullong(true_type) const
 {
     return to_ullong(true_type(), integral_constant<bool, sizeof(__storage_type) < sizeof(unsigned long long)>());
 @@ -375,14 +381,14 @@ __bitset<_N_words, _Size>::to_ullong(true_type) const
 template <size_t _N_words, size_t _Size>
 inline
-unsigned long long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long
 __bitset<_N_words, _Size>::to_ullong(true_type, false_type) const
 {
     return __first_[0];
 }
 template <size_t _N_words, size_t _Size>
-unsigned long long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long
 __bitset<_N_words, _Size>::to_ullong(true_type, true_type) const
 {
     unsigned long long __r = __first_[0];
 @@ -392,7 +398,7 @@ __bitset<_N_words, _Size>::to_ullong(true_type, true_type) const
 }
 template <size_t _N_words, size_t _Size>
-bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
 __bitset<_N_words, _Size>::all() const _NOEXCEPT
 {
     // do middle whole words
 @@ -412,7 +418,7 @@ __bitset<_N_words, _Size>::all() const _NOEXCEPT
 }
 template <size_t _N_words, size_t _Size>
-bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
 __bitset<_N_words, _Size>::any() const _NOEXCEPT
 {
     // do middle whole words
 @@ -473,33 +479,33 @@ protected:
     _LIBCPP_INLINE_VISIBILITY
     explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 reference __make_ref(size_t __pos) _NOEXCEPT
         {return reference(&__first_, __storage_type(1) << __pos);}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
         {return const_reference(&__first_, __storage_type(1) << __pos);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 iterator __make_iter(size_t __pos) _NOEXCEPT
         {return iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 const_iterator __make_iter(size_t __pos) const _NOEXCEPT
         {return const_iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator&=(const __bitset& __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator|=(const __bitset& __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void operator^=(const __bitset& __v) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     void flip() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long to_ulong() const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong() const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool all() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool any() const _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
 @@ -527,7 +533,7 @@ __bitset<1, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
 template <size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<1, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
 {
     __first_ &= __v.__first_;
 @@ -535,7 +541,7 @@ __bitset<1, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
 template <size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<1, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
 {
     __first_ |= __v.__first_;
 @@ -543,7 +549,7 @@ __bitset<1, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
 template <size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<1, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
 {
     __first_ ^= __v.__first_;
 @@ -551,7 +557,7 @@ __bitset<1, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
 template <size_t _Size>
 inline
-void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void
 __bitset<1, _Size>::flip() _NOEXCEPT
 {
     __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
 @@ -561,7 +567,7 @@ __bitset<1, _Size>::flip() _NOEXCEPT
 template <size_t _Size>
 inline
-unsigned long
+_LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long
 __bitset<1, _Size>::to_ulong() const
 {
     return __first_;
 @@ -569,7 +575,7 @@ __bitset<1, _Size>::to_ulong() const
 template <size_t _Size>
 inline
-unsigned long long
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long
 __bitset<1, _Size>::to_ullong() const
 {
     return __first_;
 @@ -577,7 +583,7 @@ __bitset<1, _Size>::to_ullong() const
 template <size_t _Size>
 inline
-bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
 __bitset<1, _Size>::all() const _NOEXCEPT
 {
     __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
 @@ -586,7 +592,7 @@ __bitset<1, _Size>::all() const _NOEXCEPT
 template <size_t _Size>
 inline
-bool
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool
 __bitset<1, _Size>::any() const _NOEXCEPT
 {
     __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
 @@ -630,26 +636,26 @@ protected:
     _LIBCPP_INLINE_VISIBILITY
     explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 reference __make_ref(size_t) _NOEXCEPT
         {return reference(nullptr, 1);}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t) const _NOEXCEPT
         {return const_reference(nullptr, 1);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t) _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 iterator __make_iter(size_t) _NOEXCEPT
         {return iterator(nullptr, 0);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t) const _NOEXCEPT
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 const_iterator __make_iter(size_t) const _NOEXCEPT
         {return const_iterator(nullptr, 0);}
-    _LIBCPP_INLINE_VISIBILITY void operator&=(const __bitset&) _NOEXCEPT {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void operator&=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator|=(const __bitset&) _NOEXCEPT {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void operator|=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator^=(const __bitset&) _NOEXCEPT {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void operator^=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 void flip() _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const {return 0;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long to_ulong() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const {return 0;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long to_ullong() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY bool all() const _NOEXCEPT {return true;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool all() const _NOEXCEPT {return true;}
-    _LIBCPP_INLINE_VISIBILITY bool any() const _NOEXCEPT {return false;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool any() const _NOEXCEPT {return false;}
     _LIBCPP_INLINE_VISIBILITY size_t __hash_code() const _NOEXCEPT {return 0;}
 };
 @@ -686,10 +692,12 @@ public:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
         bitset(unsigned long long __v) _NOEXCEPT : base(__v) {}
     template<class _CharT, class = __enable_if_t<_IsCharLikeType<_CharT>::value> >
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
         explicit bitset(const _CharT* __str,
                         typename basic_string<_CharT>::size_type __n = basic_string<_CharT>::npos,
                         _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
     template<class _CharT, class _Traits, class _Allocator>
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
         explicit bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
                         typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos = 0,
                         typename basic_string<_CharT,_Traits,_Allocator>::size_type __n =
 @@ -697,24 +705,29 @@ public:
                         _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
     // 23.3.5.2 bitset operations:
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& operator&=(const bitset& __rhs) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& operator|=(const bitset& __rhs) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& operator^=(const bitset& __rhs) _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& operator<<=(size_t __pos) _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& operator>>=(size_t __pos) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& set() _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& set(size_t __pos, bool __val = true);
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& reset() _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& reset(size_t __pos);
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset  operator~() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& flip() _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset& flip(size_t __pos);
     // element access:
 @@ -723,41 +736,43 @@ public:
 #else
     _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR const_reference operator[](size_t __p) const {return base::__make_ref(__p);}
 #endif
-    _LIBCPP_HIDE_FROM_ABI                         reference operator[](size_t __p)       {return base::__make_ref(__p);}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 reference operator[](size_t __p)       {return base::__make_ref(__p);}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long to_ulong() const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     unsigned long long to_ullong() const;
     template <class _CharT, class _Traits, class _Allocator>
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
         basic_string<_CharT, _Traits, _Allocator> to_string(_CharT __zero = _CharT('0'),
                                                             _CharT __one = _CharT('1')) const;
     template <class _CharT, class _Traits>
-        _LIBCPP_INLINE_VISIBILITY
+        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
         basic_string<_CharT, _Traits, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
                                                                     _CharT __one = _CharT('1')) const;
     template <class _CharT>
-        _LIBCPP_INLINE_VISIBILITY
+        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
         basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
                                                                                 _CharT __one = _CharT('1')) const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     basic_string<char, char_traits<char>, allocator<char> > to_string(char __zero = '0',
                                                                       char __one = '1') const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     size_t count() const _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR size_t size() const _NOEXCEPT {return _Size;}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool operator==(const bitset& __rhs) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool operator!=(const bitset& __rhs) const _NOEXCEPT;
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool test(size_t __pos) const;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool all() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bool any() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY bool none() const _NOEXCEPT {return !any();}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 bool none() const _NOEXCEPT {return !any();}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset operator<<(size_t __pos) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
     bitset operator>>(size_t __pos) const _NOEXCEPT;
 private:
 @@ -770,6 +785,7 @@ private:
 template <size_t _Size>
 template<class _CharT, class>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>::bitset(const _CharT* __str,
                       typename basic_string<_CharT>::size_type __n,
                       _CharT __zero, _CharT __one)
 @@ -791,6 +807,7 @@ bitset<_Size>::bitset(const _CharT* __str,
 template <size_t _Size>
 template<class _CharT, class _Traits, class _Allocator>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>::bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
        typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos,
        typename basic_string<_CharT,_Traits,_Allocator>::size_type __n,
 @@ -816,6 +833,7 @@ bitset<_Size>::bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::operator&=(const bitset& __rhs) _NOEXCEPT
 {
 @@ -825,6 +843,7 @@ bitset<_Size>::operator&=(const bitset& __rhs) _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::operator|=(const bitset& __rhs) _NOEXCEPT
 {
 @@ -834,6 +853,7 @@ bitset<_Size>::operator|=(const bitset& __rhs) _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::operator^=(const bitset& __rhs) _NOEXCEPT
 {
 @@ -842,6 +862,7 @@ bitset<_Size>::operator^=(const bitset& __rhs) _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::operator<<=(size_t __pos) _NOEXCEPT
 {
 @@ -852,6 +873,7 @@ bitset<_Size>::operator<<=(size_t __pos) _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::operator>>=(size_t __pos) _NOEXCEPT
 {
 @@ -863,6 +885,7 @@ bitset<_Size>::operator>>=(size_t __pos) _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::set() _NOEXCEPT
 {
 @@ -871,6 +894,7 @@ bitset<_Size>::set() _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::set(size_t __pos, bool __val)
 {
 @@ -883,6 +907,7 @@ bitset<_Size>::set(size_t __pos, bool __val)
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::reset() _NOEXCEPT
 {
 @@ -891,6 +916,7 @@ bitset<_Size>::reset() _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::reset(size_t __pos)
 {
 @@ -903,6 +929,7 @@ bitset<_Size>::reset(size_t __pos)
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 bitset<_Size>::operator~() const _NOEXCEPT
 {
 @@ -913,6 +940,7 @@ bitset<_Size>::operator~() const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::flip() _NOEXCEPT
 {
 @@ -921,6 +949,7 @@ bitset<_Size>::flip() _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>&
 bitset<_Size>::flip(size_t __pos)
 {
 @@ -934,6 +963,7 @@ bitset<_Size>::flip(size_t __pos)
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 unsigned long
 bitset<_Size>::to_ulong() const
 {
 @@ -942,6 +972,7 @@ bitset<_Size>::to_ulong() const
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 unsigned long long
 bitset<_Size>::to_ullong() const
 {
 @@ -950,6 +981,7 @@ bitset<_Size>::to_ullong() const
 template <size_t _Size>
 template <class _CharT, class _Traits, class _Allocator>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 basic_string<_CharT, _Traits, _Allocator>
 bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 {
 @@ -965,6 +997,7 @@ bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 template <size_t _Size>
 template <class _CharT, class _Traits>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 basic_string<_CharT, _Traits, allocator<_CharT> >
 bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 {
 @@ -974,6 +1007,7 @@ bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 template <size_t _Size>
 template <class _CharT>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >
 bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 {
 @@ -982,6 +1016,7 @@ bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 basic_string<char, char_traits<char>, allocator<char> >
 bitset<_Size>::to_string(char __zero, char __one) const
 {
 @@ -990,6 +1025,7 @@ bitset<_Size>::to_string(char __zero, char __one) const
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 size_t
 bitset<_Size>::count() const _NOEXCEPT
 {
 @@ -998,6 +1034,7 @@ bitset<_Size>::count() const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bool
 bitset<_Size>::operator==(const bitset& __rhs) const _NOEXCEPT
 {
 @@ -1006,6 +1043,7 @@ bitset<_Size>::operator==(const bitset& __rhs) const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bool
 bitset<_Size>::operator!=(const bitset& __rhs) const _NOEXCEPT
 {
 @@ -1013,6 +1051,7 @@ bitset<_Size>::operator!=(const bitset& __rhs) const _NOEXCEPT
 }
 template <size_t _Size>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bool
 bitset<_Size>::test(size_t __pos) const
 {
 @@ -1024,6 +1063,7 @@ bitset<_Size>::test(size_t __pos) const
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bool
 bitset<_Size>::all() const _NOEXCEPT
 {
 @@ -1032,6 +1072,7 @@ bitset<_Size>::all() const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bool
 bitset<_Size>::any() const _NOEXCEPT
 {
 @@ -1040,6 +1081,7 @@ bitset<_Size>::any() const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 bitset<_Size>::operator<<(size_t __pos) const _NOEXCEPT
 {
 @@ -1050,6 +1092,7 @@ bitset<_Size>::operator<<(size_t __pos) const _NOEXCEPT
 template <size_t _Size>
 inline
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 bitset<_Size>::operator>>(size_t __pos) const _NOEXCEPT
 {
 @@ -1059,7 +1102,7 @@ bitset<_Size>::operator>>(size_t __pos) const _NOEXCEPT
 }
 template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 operator&(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
 {
 @@ -1069,7 +1112,7 @@ operator&(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
 }
 template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 operator|(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
 {
 @@ -1079,7 +1122,7 @@ operator|(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
 }
 template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23
 bitset<_Size>
 operator^(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
 {
 @@ -1098,15 +1141,19 @@ struct _LIBCPP_TEMPLATE_VIS hash<bitset<_Size> >
 };
 template <class _CharT, class _Traits, size_t _Size>
-basic_istream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x);
 template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x);
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#endif
 #endif // _LIBCPP_BITSET

lib/libcxx/include/cassert+8-1

...	@@ -18,7 +18,14 @@ Macros:	...	@@ -18,7 +18,14 @@ Macros:
18		18
19	#include <__assert> // all public C++ headers provide the assertion handler	19	#include <__assert> // all public C++ headers provide the assertion handler
20	#include <__config>	20	#include <__config>
21	#include <assert.h>	21
		22	// <assert.h> is not provided by libc++
		23	#if __has_include(<assert.h>)
		24	# include <assert.h>
		25	# ifdef _LIBCPP_ASSERT_H
		26	# error "If libc++ starts defining <assert.h>, the __has_include check should move to libc++'s <assert.h>"
		27	# endif
		28	#endif
22		29
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
24	# pragma GCC system_header	31	# pragma GCC system_header

lib/libcxx/include/cctype+8

...	@@ -36,8 +36,16 @@ int toupper(int c);	...	@@ -36,8 +36,16 @@ int toupper(int c);
36		36
37	#include <__assert> // all public C++ headers provide the assertion handler	37	#include <__assert> // all public C++ headers provide the assertion handler
38	#include <__config>	38	#include <__config>
		39
39	#include <ctype.h>	40	#include <ctype.h>
40		41
		42	#ifndef _LIBCPP_CTYPE_H
		43	# error <cctype> tried including <ctype.h> but didn't find libc++'s <ctype.h> header. \
		44	This usually means that your header search paths are not configured properly. \
		45	The header search paths should contain the C++ Standard Library headers before \
		46	any C Standard Library.
		47	#endif
		48
41	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	49	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
42	# pragma GCC system_header	50	# pragma GCC system_header
43	#endif	51	#endif

lib/libcxx/include/cerrno+9

...	@@ -24,8 +24,17 @@ Macros:	...	@@ -24,8 +24,17 @@ Macros:
24		24
25	#include <__assert> // all public C++ headers provide the assertion handler	25	#include <__assert> // all public C++ headers provide the assertion handler
26	#include <__config>	26	#include <__config>
		27
27	#include <errno.h>	28	#include <errno.h>
28		29
		30	#ifndef _LIBCPP_ERRNO_H
		31	# error <cerrno> tried including <errno.h> but didn't find libc++'s <errno.h> header. \
		32	This usually means that your header search paths are not configured properly. \
		33	The header search paths should contain the C++ Standard Library headers before \
		34	any C Standard Library, and you are probably using compiler flags that make that \
		35	not be the case.
		36	#endif
		37
29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	38	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
30	# pragma GCC system_header	39	# pragma GCC system_header
31	#endif	40	#endif

lib/libcxx/include/cfenv+9

...	@@ -54,8 +54,17 @@ int feupdateenv(const fenv_t* envp);	...	@@ -54,8 +54,17 @@ int feupdateenv(const fenv_t* envp);
54		54
55	#include <__assert> // all public C++ headers provide the assertion handler	55	#include <__assert> // all public C++ headers provide the assertion handler
56	#include <__config>	56	#include <__config>
		57
57	#include <fenv.h>	58	#include <fenv.h>
58		59
		60	#ifndef _LIBCPP_FENV_H
		61	# error <cfenv> tried including <fenv.h> but didn't find libc++'s <fenv.h> header. \
		62	This usually means that your header search paths are not configured properly. \
		63	The header search paths should contain the C++ Standard Library headers before \
		64	any C Standard Library, and you are probably using compiler flags that make that \
		65	not be the case.
		66	#endif
		67
59	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	68	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
60	# pragma GCC system_header	69	# pragma GCC system_header
61	#endif	70	#endif

lib/libcxx/include/cfloat+9

...	@@ -71,8 +71,17 @@ Macros:	...	@@ -71,8 +71,17 @@ Macros:
71		71
72	#include <__assert> // all public C++ headers provide the assertion handler	72	#include <__assert> // all public C++ headers provide the assertion handler
73	#include <__config>	73	#include <__config>
		74
74	#include <float.h>	75	#include <float.h>
75		76
		77	#ifndef _LIBCPP_FLOAT_H
		78	# error <cfloat> tried including <float.h> but didn't find libc++'s <float.h> header. \
		79	This usually means that your header search paths are not configured properly. \
		80	The header search paths should contain the C++ Standard Library headers before \
		81	any C Standard Library, and you are probably using compiler flags that make that \
		82	not be the case.
		83	#endif
		84
76	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	85	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
77	# pragma GCC system_header	86	# pragma GCC system_header
78	#endif	87	#endif

lib/libcxx/include/charconv+125-105

 @@ -30,8 +30,8 @@ namespace std {
     friend bool operator==(const to_chars_result&, const to_chars_result&) = default; // since C++20
   };
-  to_chars_result to_chars(char* first, char* last, see below value,
+  constexpr to_chars_result to_chars(char* first, char* last, see below value,
-                           int base = 10);
+                                     int base = 10);                                  // constexpr since C++23
   to_chars_result to_chars(char* first, char* last, bool value,
                            int base = 10) = delete;
 @@ -60,8 +60,8 @@ namespace std {
     friend bool operator==(const from_chars_result&, const from_chars_result&) = default; // since C++20
   };
-  from_chars_result from_chars(const char* first, const char* last,
+  constexpr from_chars_result from_chars(const char* first, const char* last,
-                               see below& value, int base = 10);
+                               see below& value, int base = 10);                         // constexpr since C++23
   from_chars_result from_chars(const char* first, const char* last,
                                float& value,
 @@ -77,9 +77,10 @@ namespace std {
 */
+#include <__algorithm/copy_n.h>
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__availability>
-#include <__bits>
+#include <__bit/countl.h>
 #include <__charconv/chars_format.h>
 #include <__charconv/from_chars_result.h>
 #include <__charconv/tables.h>
 @@ -88,6 +89,7 @@ namespace std {
 #include <__config>
 #include <__debug>
 #include <__errc>
+#include <__memory/addressof.h>
 #include <__type_traits/make_32_64_or_128_bit.h>
 #include <__utility/unreachable.h>
 #include <cmath> // for log2f
 @@ -97,10 +99,6 @@ namespace std {
 #include <limits>
 #include <type_traits>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iosfwd>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -110,7 +108,7 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
-#ifndef _LIBCPP_CXX03_LANG
+#if _LIBCPP_STD_VER > 14
 to_chars_result to_chars(char*, char*, bool, int = 10) = delete;
 from_chars_result from_chars(const char*, const char*, bool, int = 10) = delete;
 @@ -134,18 +132,18 @@ struct _LIBCPP_HIDDEN __traits_base<_Tp, __enable_if_t<sizeof(_Tp) <= sizeof(uin
     /// function requires its input to have at least one bit set the value of
     /// zero is set to one. This means the first element of the lookup table is
     /// zero.
-    static _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v)
+    static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v)
     {
         auto __t = (32 - std::__libcpp_clz(static_cast<type>(__v | 1))) * 1233 >> 12;
-        return __t - (__v < __table<>::__pow10_32[__t]) + 1;
+        return __t - (__v < __itoa::__pow10_32[__t]) + 1;
     }
-    static _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v)
+    static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v)
     {
         return __itoa::__base_10_u32(__p, __v);
     }
-    static _LIBCPP_HIDE_FROM_ABI decltype(__table<>::__pow10_32)& __pow() { return __table<>::__pow10_32; }
+    static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI decltype(__pow10_32)& __pow() { return __itoa::__pow10_32; }
 };
 template <typename _Tp>
 @@ -161,14 +159,14 @@ struct _LIBCPP_HIDDEN
   /// function requires its input to have at least one bit set the value of
   /// zero is set to one. This means the first element of the lookup table is
   /// zero.
-  static _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v) {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v) {
     auto __t = (64 - std::__libcpp_clz(static_cast<type>(__v | 1))) * 1233 >> 12;
-    return __t - (__v < __table<>::__pow10_64[__t]) + 1;
+    return __t - (__v < __itoa::__pow10_64[__t]) + 1;
   }
-  static _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v) { return __itoa::__base_10_u64(__p, __v); }
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v) { return __itoa::__base_10_u64(__p, __v); }
-  static _LIBCPP_HIDE_FROM_ABI decltype(__table<>::__pow10_64)& __pow() { return __table<>::__pow10_64; }
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI decltype(__pow10_64)& __pow() { return __itoa::__pow10_64; }
 };
 @@ -186,25 +184,25 @@ struct _LIBCPP_HIDDEN
   /// function requires its input to have at least one bit set the value of
   /// zero is set to one. This means the first element of the lookup table is
   /// zero.
-  static _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v) {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int __width(_Tp __v) {
     _LIBCPP_ASSERT(__v > numeric_limits<uint64_t>::max(), "The optimizations for this algorithm fail when this isn't true.");
     // There's always a bit set in the upper 64-bits.
     auto __t = (128 - std::__libcpp_clz(static_cast<uint64_t>(__v >> 64))) * 1233 >> 12;
-    _LIBCPP_ASSERT(__t >= __table<>::__pow10_128_offset, "Index out of bounds");
+    _LIBCPP_ASSERT(__t >= __itoa::__pow10_128_offset, "Index out of bounds");
     // __t is adjusted since the lookup table misses the lower entries.
-    return __t - (__v < __table<>::__pow10_128[__t - __table<>::__pow10_128_offset]) + 1;
+    return __t - (__v < __itoa::__pow10_128[__t - __itoa::__pow10_128_offset]) + 1;
   }
-  static _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v) { return __itoa::__base_10_u128(__p, __v); }
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI char* __convert(char* __p, _Tp __v) { return __itoa::__base_10_u128(__p, __v); }
   // TODO FMT This pow function should get an index.
   // By moving this to its own header it can be reused by the pow function in to_chars_base_10.
-  static _LIBCPP_HIDE_FROM_ABI decltype(__table<>::__pow10_128)& __pow() { return __table<>::__pow10_128; }
+  static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI decltype(__pow10_128)& __pow() { return __itoa::__pow10_128; }
 };
 #endif
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool
 __mul_overflowed(unsigned char __a, _Tp __b, unsigned char& __r)
 {
     auto __c = __a * __b;
 @@ -213,7 +211,7 @@ __mul_overflowed(unsigned char __a, _Tp __b, unsigned char& __r)
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool
 __mul_overflowed(unsigned short __a, _Tp __b, unsigned short& __r)
 {
     auto __c = __a * __b;
 @@ -222,24 +220,18 @@ __mul_overflowed(unsigned short __a, _Tp __b, unsigned short& __r)
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool
 __mul_overflowed(_Tp __a, _Tp __b, _Tp& __r)
 {
     static_assert(is_unsigned<_Tp>::value, "");
-#if !defined(_LIBCPP_COMPILER_MSVC)
     return __builtin_mul_overflow(__a, __b, &__r);
-#else
-    bool __did = __b && (numeric_limits<_Tp>::max() / __b) < __a;
-    __r = __a * __b;
-    return __did;
-#endif
 }
 template <typename _Tp, typename _Up>
 inline _LIBCPP_HIDE_FROM_ABI bool
-__mul_overflowed(_Tp __a, _Up __b, _Tp& __r)
+_LIBCPP_CONSTEXPR_SINCE_CXX23 __mul_overflowed(_Tp __a, _Up __b, _Tp& __r)
 {
-    return __mul_overflowed(__a, static_cast<_Tp>(__b), __r);
+    return __itoa::__mul_overflowed(__a, static_cast<_Tp>(__b), __r);
 }
 template <typename _Tp>
 @@ -250,7 +242,7 @@ struct _LIBCPP_HIDDEN __traits : __traits_base<_Tp>
     using typename __traits_base<_Tp>::type;
     // precondition: at least one non-zero character available
-    static _LIBCPP_HIDE_FROM_ABI char const*
+    static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI char const*
     __read(char const* __p, char const* __ep, type& __a, type& __b)
     {
         type __cprod[digits];
 @@ -258,20 +250,20 @@ struct _LIBCPP_HIDDEN __traits : __traits_base<_Tp>
         int __i = digits;
         do
         {
-            if (!('0' <= *__p && *__p <= '9'))
+            if (*__p < '0' || *__p > '9')
                 break;
             __cprod[--__i] = *__p++ - '0';
         } while (__p != __ep && __i != 0);
         __a = __inner_product(__cprod + __i + 1, __cprod + __j, __pow() + 1,
                               __cprod[__i]);
-        if (__mul_overflowed(__cprod[__j], __pow()[__j - __i], __b))
+        if (__itoa::__mul_overflowed(__cprod[__j], __pow()[__j - __i], __b))
             --__p;
         return __p;
     }
     template <typename _It1, typename _It2, class _Up>
-    static _LIBCPP_HIDE_FROM_ABI _Up
+    static _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI _Up
     __inner_product(_It1 __first1, _It1 __last1, _It2 __first2, _Up __init)
     {
         for (; __first1 < __last1; ++__first1, ++__first2)
 @@ -283,7 +275,7 @@ struct _LIBCPP_HIDDEN __traits : __traits_base<_Tp>
 }  // namespace __itoa
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI _Tp
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI _Tp
 __complement(_Tp __x)
 {
     static_assert(is_unsigned<_Tp>::value, "cast to unsigned first");
 @@ -291,21 +283,25 @@ __complement(_Tp __x)
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
+__to_chars_itoa(char* __first, char* __last, _Tp __value, false_type);
+template <typename _Tp>
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_itoa(char* __first, char* __last, _Tp __value, true_type)
 {
-    auto __x = __to_unsigned_like(__value);
+    auto __x = std::__to_unsigned_like(__value);
     if (__value < 0 && __first != __last)
     {
         *__first++ = '-';
-        __x = __complement(__x);
+        __x = std::__complement(__x);
     }
-    return __to_chars_itoa(__first, __last, __x, false_type());
+    return std::__to_chars_itoa(__first, __last, __x, false_type());
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type)
 {
     using __tx = __itoa::__traits<_Tp>;
 @@ -319,7 +315,7 @@ __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type)
 #  ifndef _LIBCPP_HAS_NO_INT128
 template <>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_itoa(char* __first, char* __last, __uint128_t __value, false_type)
 {
     // When the value fits in 64-bits use the 64-bit code path. This reduces
 @@ -339,19 +335,23 @@ __to_chars_itoa(char* __first, char* __last, __uint128_t __value, false_type)
 }
 #endif
+template <class _Tp>
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
+__to_chars_integral(char* __first, char* __last, _Tp __value, int __base, false_type);
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_integral(char* __first, char* __last, _Tp __value, int __base,
                     true_type)
 {
-    auto __x = __to_unsigned_like(__value);
+    auto __x = std::__to_unsigned_like(__value);
     if (__value < 0 && __first != __last)
     {
         *__first++ = '-';
-        __x = __complement(__x);
+        __x = std::__complement(__x);
     }
-    return __to_chars_integral(__first, __last, __x, __base, false_type());
+    return std::__to_chars_integral(__first, __last, __x, __base, false_type());
 }
 namespace __itoa {
 @@ -370,7 +370,7 @@ struct _LIBCPP_HIDDEN __integral<2> {
   }
   template <typename _Tp>
-  _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
     ptrdiff_t __cap = __last - __first;
     int __n = __width(__value);
     if (__n > __cap)
 @@ -383,7 +383,7 @@ struct _LIBCPP_HIDDEN __integral<2> {
       unsigned __c = __value % __divisor;
       __value /= __divisor;
       __p -= 4;
-      std::memcpy(__p, &__table<>::__base_2_lut[4 * __c], 4);
+      std::copy_n(&__base_2_lut[4 * __c], 4, __p);
     }
     do {
       unsigned __c = __value % 2;
 @@ -405,7 +405,7 @@ struct _LIBCPP_HIDDEN __integral<8> {
   }
   template <typename _Tp>
-  _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
     ptrdiff_t __cap = __last - __first;
     int __n = __width(__value);
     if (__n > __cap)
 @@ -418,7 +418,7 @@ struct _LIBCPP_HIDDEN __integral<8> {
       unsigned __c = __value % __divisor;
       __value /= __divisor;
       __p -= 2;
-      std::memcpy(__p, &__table<>::__base_8_lut[2 * __c], 2);
+      std::copy_n(&__base_8_lut[2 * __c], 2, __p);
     }
     do {
       unsigned __c = __value % 8;
 @@ -441,7 +441,7 @@ struct _LIBCPP_HIDDEN __integral<16> {
   }
   template <typename _Tp>
-  _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI static to_chars_result __to_chars(char* __first, char* __last, _Tp __value) {
     ptrdiff_t __cap = __last - __first;
     int __n = __width(__value);
     if (__n > __cap)
 @@ -454,7 +454,7 @@ struct _LIBCPP_HIDDEN __integral<16> {
       unsigned __c = __value % __divisor;
       __value /= __divisor;
       __p -= 2;
-      std::memcpy(__p, &__table<>::__base_16_lut[2 * __c], 2);
+      std::copy_n(&__base_16_lut[2 * __c], 2, __p);
     }
     if (__first != __last)
       do {
 @@ -470,34 +470,34 @@ struct _LIBCPP_HIDDEN __integral<16> {
 template <unsigned _Base, typename _Tp,
           typename enable_if<(sizeof(_Tp) >= sizeof(unsigned)), int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI int
+_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int
 __to_chars_integral_width(_Tp __value) {
   return __itoa::__integral<_Base>::__width(__value);
 }
 template <unsigned _Base, typename _Tp,
           typename enable_if<(sizeof(_Tp) < sizeof(unsigned)), int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI int
+_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int
 __to_chars_integral_width(_Tp __value) {
   return std::__to_chars_integral_width<_Base>(static_cast<unsigned>(__value));
 }
 template <unsigned _Base, typename _Tp,
           typename enable_if<(sizeof(_Tp) >= sizeof(unsigned)), int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI to_chars_result
+_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_integral(char* __first, char* __last, _Tp __value) {
   return __itoa::__integral<_Base>::__to_chars(__first, __last, __value);
 }
 template <unsigned _Base, typename _Tp,
           typename enable_if<(sizeof(_Tp) < sizeof(unsigned)), int>::type = 0>
-_LIBCPP_HIDE_FROM_ABI to_chars_result
+_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_integral(char* __first, char* __last, _Tp __value) {
   return std::__to_chars_integral<_Base>(__first, __last, static_cast<unsigned>(__value));
 }
 template <typename _Tp>
-_LIBCPP_HIDE_FROM_ABI int
+_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI int
 __to_chars_integral_width(_Tp __value, unsigned __base) {
   _LIBCPP_ASSERT(__value >= 0, "The function requires a non-negative value.");
 @@ -524,24 +524,24 @@ __to_chars_integral_width(_Tp __value, unsigned __base) {
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 __to_chars_integral(char* __first, char* __last, _Tp __value, int __base,
                     false_type)
 {
   if (__base == 10) [[likely]]
-    return __to_chars_itoa(__first, __last, __value, false_type());
+    return std::__to_chars_itoa(__first, __last, __value, false_type());
   switch (__base) {
   case 2:
-    return __to_chars_integral<2>(__first, __last, __value);
+    return std::__to_chars_integral<2>(__first, __last, __value);
   case 8:
-    return __to_chars_integral<8>(__first, __last, __value);
+    return std::__to_chars_integral<8>(__first, __last, __value);
   case 16:
-    return __to_chars_integral<16>(__first, __last, __value);
+    return std::__to_chars_integral<16>(__first, __last, __value);
   }
   ptrdiff_t __cap = __last - __first;
-  int __n = __to_chars_integral_width(__value, __base);
+  int __n = std::__to_chars_integral_width(__value, __base);
   if (__n > __cap)
     return {__last, errc::value_too_large};
 @@ -556,7 +556,7 @@ __to_chars_integral(char* __first, char* __last, _Tp __value, int __base,
 }
 template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 to_chars(char* __first, char* __last, _Tp __value)
 {
   using _Type = __make_32_64_or_128_bit_t<_Tp>;
 @@ -565,7 +565,7 @@ to_chars(char* __first, char* __last, _Tp __value)
 }
 template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI to_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI to_chars_result
 to_chars(char* __first, char* __last, _Tp __value, int __base)
 {
   _LIBCPP_ASSERT(2 <= __base && __base <= 36, "base not in [2, 36]");
 @@ -575,11 +575,11 @@ to_chars(char* __first, char* __last, _Tp __value, int __base)
 }
 template <typename _It, typename _Tp, typename _Fn, typename... _Ts>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __sign_combinator(_It __first, _It __last, _Tp& __value, _Fn __f, _Ts... __args)
 {
     using __tl = numeric_limits<_Tp>;
-    decltype(__to_unsigned_like(__value)) __x;
+    decltype(std::__to_unsigned_like(__value)) __x;
     bool __neg = (__first != __last && *__first == '-');
     auto __r = __f(__neg ? __first + 1 : __first, __last, __x, __args...);
 @@ -595,16 +595,16 @@ __sign_combinator(_It __first, _It __last, _Tp& __value, _Fn __f, _Ts... __args)
     if (__neg)
     {
-        if (__x <= __complement(__to_unsigned_like(__tl::min())))
+        if (__x <= std::__complement(std::__to_unsigned_like(__tl::min())))
         {
-            __x = __complement(__x);
+            __x = std::__complement(__x);
-            std::memcpy(&__value, &__x, sizeof(__x));
+            std::copy_n(std::addressof(__x), 1, std::addressof(__value));
             return __r;
         }
     }
     else
     {
-        if (__x <= __to_unsigned_like(__tl::max()))
+        if (__x <= std::__to_unsigned_like(__tl::max()))
         {
             __value = __x;
             return __r;
 @@ -615,7 +615,7 @@ __sign_combinator(_It __first, _It __last, _Tp& __value, _Fn __f, _Ts... __args)
 }
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool
 __in_pattern(_Tp __c)
 {
     return '0' <= __c && __c <= '9';
 @@ -626,16 +626,16 @@ struct _LIBCPP_HIDDEN __in_pattern_result
     bool __ok;
     int __val;
-    explicit _LIBCPP_HIDE_FROM_ABI operator bool() const { return __ok; }
+    explicit _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI operator bool() const { return __ok; }
 };
 template <typename _Tp>
-inline _LIBCPP_HIDE_FROM_ABI __in_pattern_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI __in_pattern_result
 __in_pattern(_Tp __c, int __base)
 {
     if (__base <= 10)
         return {'0' <= __c && __c < '0' + __base, __c - '0'};
-    else if (__in_pattern(__c))
+    else if (std::__in_pattern(__c))
         return {true, __c - '0'};
     else if ('a' <= __c && __c < 'a' + __base - 10)
         return {true, __c - 'a' + 10};
 @@ -644,7 +644,7 @@ __in_pattern(_Tp __c, int __base)
 }
 template <typename _It, typename _Tp, typename _Fn, typename... _Ts>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
                          _Ts... __args)
 {
 @@ -656,7 +656,7 @@ __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
     };
     auto __p = __find_non_zero(__first, __last);
-    if (__p == __last || !__in_pattern(*__p, __args...))
+    if (__p == __last || !std::__in_pattern(*__p, __args...))
     {
         if (__p == __first)
             return {__first, errc::invalid_argument};
 @@ -672,7 +672,7 @@ __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
     {
         for (; __r.ptr != __last; ++__r.ptr)
         {
-            if (!__in_pattern(*__r.ptr, __args...))
+            if (!std::__in_pattern(*__r.ptr, __args...))
                 break;
         }
     }
 @@ -681,19 +681,19 @@ __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
 }
 template <typename _Tp, typename enable_if<is_unsigned<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
 {
     using __tx = __itoa::__traits<_Tp>;
     using __output_type = typename __tx::type;
-    return __subject_seq_combinator(
+    return std::__subject_seq_combinator(
         __first, __last, __value,
         [](const char* __f, const char* __l,
            _Tp& __val) -> from_chars_result {
             __output_type __a, __b;
             auto __p = __tx::__read(__f, __l, __a, __b);
-            if (__p == __l || !__in_pattern(*__p))
+            if (__p == __l || !std::__in_pattern(*__p))
             {
                 __output_type __m = numeric_limits<_Tp>::max();
                 if (__m >= __a && __m - __a >= __b)
 @@ -707,27 +707,47 @@ __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
 }
 template <typename _Tp, typename enable_if<is_signed<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
 {
-    using __t = decltype(__to_unsigned_like(__value));
+    using __t = decltype(std::__to_unsigned_like(__value));
-    return __sign_combinator(__first, __last, __value, __from_chars_atoi<__t>);
+    return std::__sign_combinator(__first, __last, __value, __from_chars_atoi<__t>);
+}
+/*
+// Code used to generate __from_chars_log2f_lut.
+#include <cmath>
+#include <iostream>
+#include <format>
+int main() {
+  for (int i = 2; i <= 36; ++i)
+    std::cout << std::format("{},\n", log2f(i));
 }
+*/
+/// log2f table for bases [2, 36].
+inline constexpr float __from_chars_log2f_lut[35] = {
+    1,         1.5849625, 2,         2.321928, 2.5849626, 2.807355, 3,        3.169925,  3.321928,
+    3.4594316, 3.5849626, 3.7004397, 3.807355, 3.9068906, 4,        4.087463, 4.169925,  4.2479277,
+    4.321928,  4.3923173, 4.4594316, 4.523562, 4.5849624, 4.643856, 4.70044,  4.7548876, 4.807355,
+    4.857981,  4.9068904, 4.9541965, 5,        5.044394,  5.087463, 5.129283, 5.169925};
 template <typename _Tp, typename enable_if<is_unsigned<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __from_chars_integral(const char* __first, const char* __last, _Tp& __value,
                       int __base)
 {
     if (__base == 10)
-        return __from_chars_atoi(__first, __last, __value);
+        return std::__from_chars_atoi(__first, __last, __value);
-    return __subject_seq_combinator(
+    return std::__subject_seq_combinator(
         __first, __last, __value,
         [](const char* __p, const char* __lastp, _Tp& __val,
            int __b) -> from_chars_result {
             using __tl = numeric_limits<_Tp>;
-            auto __digits = __tl::digits / log2f(float(__b));
+            // __base is always between 2 and 36 inclusive.
+            auto __digits = __tl::digits / __from_chars_log2f_lut[__b - 2];
             _Tp __x = __in_pattern(*__p++, __b).__val, __y = 0;
             for (int __i = 1; __p != __lastp; ++__i, ++__p)
 @@ -762,34 +782,30 @@ __from_chars_integral(const char* __first, const char* __last, _Tp& __value,
 }
 template <typename _Tp, typename enable_if<is_signed<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 __from_chars_integral(const char* __first, const char* __last, _Tp& __value,
                       int __base)
 {
-    using __t = decltype(__to_unsigned_like(__value));
+    using __t = decltype(std::__to_unsigned_like(__value));
-    return __sign_combinator(__first, __last, __value,
+    return std::__sign_combinator(__first, __last, __value,
-                             __from_chars_integral<__t>, __base);
+                                  __from_chars_integral<__t>, __base);
 }
 template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 from_chars(const char* __first, const char* __last, _Tp& __value)
 {
-    return __from_chars_atoi(__first, __last, __value);
+    return std::__from_chars_atoi(__first, __last, __value);
 }
 template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
-inline _LIBCPP_HIDE_FROM_ABI from_chars_result
+inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI from_chars_result
 from_chars(const char* __first, const char* __last, _Tp& __value, int __base)
 {
     _LIBCPP_ASSERT(2 <= __base && __base <= 36, "base not in [2, 36]");
-    return __from_chars_integral(__first, __last, __value, __base);
+    return std::__from_chars_integral(__first, __last, __value, __base);
 }
-// Floating-point implementation starts here.
-// Unlike the other parts of charconv this is only available in C++17 and newer.
-#if _LIBCPP_STD_VER > 14
 _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_FUNC_VIS
 to_chars_result to_chars(char* __first, char* __last, float __value);
 @@ -817,11 +833,15 @@ to_chars_result to_chars(char* __first, char* __last, double __value, chars_form
 _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_FUNC_VIS
 to_chars_result to_chars(char* __first, char* __last, long double __value, chars_format __fmt, int __precision);
-#  endif // _LIBCPP_STD_VER > 14
+#endif // _LIBCPP_STD_VER > 14
-#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <iosfwd>
+#endif
 #endif // _LIBCPP_CHARCONV

lib/libcxx/include/chrono+106-43

...	@@ -207,7 +207,11 @@ template <class ToDuration, class Rep, class Period>	...	@@ -207,7 +207,11 @@ template <class ToDuration, class Rep, class Period>
207	template <class ToDuration, class Rep, class Period>	207	template <class ToDuration, class Rep, class Period>
208	constexpr ToDuration round(const duration<Rep, Period>& d); // C++17	208	constexpr ToDuration round(const duration<Rep, Period>& d); // C++17
209		209
210	// duration I/O is elsewhere	210	// duration I/O
		211	template<class charT, class traits, class Rep, class Period> // C++20
		212	basic_ostream<charT, traits>&
		213	operator<<(basic_ostream<charT, traits>& os,
		214	const duration<Rep, Period>& d);
211		215
212	// time_point arithmetic (all constexpr in C++14)	216	// time_point arithmetic (all constexpr in C++14)
213	template <class Clock, class Duration1, class Rep2, class Period2>	217	template <class Clock, class Duration1, class Rep2, class Period2>
...	@@ -332,32 +336,35 @@ constexpr day operator+(const day& x, const days& y) noexcept;	...	@@ -332,32 +336,35 @@ constexpr day operator+(const day& x, const days& y) noexcept;
332	constexpr day operator+(const days& x, const day& y) noexcept;	336	constexpr day operator+(const days& x, const day& y) noexcept;
333	constexpr day operator-(const day& x, const days& y) noexcept;	337	constexpr day operator-(const day& x, const days& y) noexcept;
334	constexpr days operator-(const day& x, const day& y) noexcept;	338	constexpr days operator-(const day& x, const day& y) noexcept;
		339	template<class charT, class traits>
		340	basic_ostream<charT, traits>&
		341	operator<<(basic_ostream<charT, traits>& os, const day& d);
335		342
336	// 25.8.4, class month // C++20	343	// 25.8.4, class month // C++20
337	class month;	344	class month;
338	constexpr bool operator==(const month& x, const month& y) noexcept;	345	constexpr bool operator==(const month& x, const month& y) noexcept;
339	constexpr bool operator!=(const month& x, const month& y) noexcept;	346	constexpr strong_ordering operator<=>(const month& x, const month& y) noexcept;
340	constexpr bool operator< (const month& x, const month& y) noexcept;	347
341	constexpr bool operator> (const month& x, const month& y) noexcept;
342	constexpr bool operator<=(const month& x, const month& y) noexcept;
343	constexpr bool operator>=(const month& x, const month& y) noexcept;
344	constexpr month operator+(const month& x, const months& y) noexcept;	348	constexpr month operator+(const month& x, const months& y) noexcept;
345	constexpr month operator+(const months& x, const month& y) noexcept;	349	constexpr month operator+(const months& x, const month& y) noexcept;
346	constexpr month operator-(const month& x, const months& y) noexcept;	350	constexpr month operator-(const month& x, const months& y) noexcept;
347	constexpr months operator-(const month& x, const month& y) noexcept;	351	constexpr months operator-(const month& x, const month& y) noexcept;
		352	template<class charT, class traits>
		353	basic_ostream<charT, traits>&
		354	operator<<(basic_ostream<charT, traits>& os, const month& m);
348		355
349	// 25.8.5, class year // C++20	356	// 25.8.5, class year // C++20
350	class year;	357	class year;
351	constexpr bool operator==(const year& x, const year& y) noexcept;	358	constexpr bool operator==(const year& x, const year& y) noexcept;
352	constexpr bool operator!=(const year& x, const year& y) noexcept;	359	constexpr strong_ordering operator<=>(const year& x, const year& y) noexcept;
353	constexpr bool operator< (const year& x, const year& y) noexcept;	360
354	constexpr bool operator> (const year& x, const year& y) noexcept;
355	constexpr bool operator<=(const year& x, const year& y) noexcept;
356	constexpr bool operator>=(const year& x, const year& y) noexcept;
357	constexpr year operator+(const year& x, const years& y) noexcept;	361	constexpr year operator+(const year& x, const years& y) noexcept;
358	constexpr year operator+(const years& x, const year& y) noexcept;	362	constexpr year operator+(const years& x, const year& y) noexcept;
359	constexpr year operator-(const year& x, const years& y) noexcept;	363	constexpr year operator-(const year& x, const years& y) noexcept;
360	constexpr years operator-(const year& x, const year& y) noexcept;	364	constexpr years operator-(const year& x, const year& y) noexcept;
		365	template<class charT, class traits>
		366	basic_ostream<charT, traits>&
		367	operator<<(basic_ostream<charT, traits>& os, const year& y);
361		368
362	// 25.8.6, class weekday // C++20	369	// 25.8.6, class weekday // C++20
363	class weekday;	370	class weekday;
...	@@ -368,6 +375,9 @@ constexpr weekday operator+(const weekday& x, const days& y) noexcept;	...	@@ -368,6 +375,9 @@ constexpr weekday operator+(const weekday& x, const days& y) noexcept;
368	constexpr weekday operator+(const days& x, const weekday& y) noexcept;	375	constexpr weekday operator+(const days& x, const weekday& y) noexcept;
369	constexpr weekday operator-(const weekday& x, const days& y) noexcept;	376	constexpr weekday operator-(const weekday& x, const days& y) noexcept;
370	constexpr days operator-(const weekday& x, const weekday& y) noexcept;	377	constexpr days operator-(const weekday& x, const weekday& y) noexcept;
		378	template<class charT, class traits>
		379	basic_ostream<charT, traits>&
		380	operator<<(basic_ostream<charT, traits>& os, const weekday& wd);
371		381
372	// 25.8.7, class weekday_indexed // C++20	382	// 25.8.7, class weekday_indexed // C++20
373		383
...	@@ -375,32 +385,39 @@ class weekday_indexed;	...	@@ -375,32 +385,39 @@ class weekday_indexed;
375	constexpr bool operator==(const weekday_indexed& x, const weekday_indexed& y) noexcept;	385	constexpr bool operator==(const weekday_indexed& x, const weekday_indexed& y) noexcept;
376	constexpr bool operator!=(const weekday_indexed& x, const weekday_indexed& y) noexcept;	386	constexpr bool operator!=(const weekday_indexed& x, const weekday_indexed& y) noexcept;
377		387
		388	template<class charT, class traits>
		389	basic_ostream<charT, traits>&
		390	operator<<(basic_ostream<charT, traits>& os, const weekday_indexed& wdi);
		391
378	// 25.8.8, class weekday_last // C++20	392	// 25.8.8, class weekday_last // C++20
379	class weekday_last;	393	class weekday_last;
380		394
381	constexpr bool operator==(const weekday_last& x, const weekday_last& y) noexcept;	395	constexpr bool operator==(const weekday_last& x, const weekday_last& y) noexcept;
382	constexpr bool operator!=(const weekday_last& x, const weekday_last& y) noexcept;	396	constexpr bool operator!=(const weekday_last& x, const weekday_last& y) noexcept;
383		397
		398	template<class charT, class traits>
		399	basic_ostream<charT, traits>&
		400	operator<<(basic_ostream<charT, traits>& os, const weekday_last& wdl);
		401
384	// 25.8.9, class month_day // C++20	402	// 25.8.9, class month_day // C++20
385	class month_day;	403	class month_day;
386		404
387	constexpr bool operator==(const month_day& x, const month_day& y) noexcept;	405	constexpr bool operator==(const month_day& x, const month_day& y) noexcept;
388	constexpr bool operator!=(const month_day& x, const month_day& y) noexcept;	406	constexpr strong_ordering operator<=>(const month_day& x, const month_day& y) noexcept;
389	constexpr bool operator< (const month_day& x, const month_day& y) noexcept;
390	constexpr bool operator> (const month_day& x, const month_day& y) noexcept;
391	constexpr bool operator<=(const month_day& x, const month_day& y) noexcept;
392	constexpr bool operator>=(const month_day& x, const month_day& y) noexcept;
393		407
		408	template<class charT, class traits>
		409	basic_ostream<charT, traits>&
		410	operator<<(basic_ostream<charT, traits>& os, const month_day& md);
394		411
395	// 25.8.10, class month_day_last // C++20	412	// 25.8.10, class month_day_last // C++20
396	class month_day_last;	413	class month_day_last;
397		414
398	constexpr bool operator==(const month_day_last& x, const month_day_last& y) noexcept;	415	constexpr bool operator==(const month_day_last& x, const month_day_last& y) noexcept;
399	constexpr bool operator!=(const month_day_last& x, const month_day_last& y) noexcept;	416	constexpr strong_ordering operator<=>(const month_day_last& x, const month_day_last& y) noexcept;
400	constexpr bool operator< (const month_day_last& x, const month_day_last& y) noexcept;	417
401	constexpr bool operator> (const month_day_last& x, const month_day_last& y) noexcept;	418	template<class charT, class traits>
402	constexpr bool operator<=(const month_day_last& x, const month_day_last& y) noexcept;	419	basic_ostream<charT, traits>&
403	constexpr bool operator>=(const month_day_last& x, const month_day_last& y) noexcept;	420	operator<<(basic_ostream<charT, traits>& os, const month_day_last& mdl);
404		421
405	// 25.8.11, class month_weekday // C++20	422	// 25.8.11, class month_weekday // C++20
406	class month_weekday;	423	class month_weekday;
...	@@ -408,22 +425,26 @@ class month_weekday;	...	@@ -408,22 +425,26 @@ class month_weekday;
408	constexpr bool operator==(const month_weekday& x, const month_weekday& y) noexcept;	425	constexpr bool operator==(const month_weekday& x, const month_weekday& y) noexcept;
409	constexpr bool operator!=(const month_weekday& x, const month_weekday& y) noexcept;	426	constexpr bool operator!=(const month_weekday& x, const month_weekday& y) noexcept;
410		427
		428	template<class charT, class traits>
		429	basic_ostream<charT, traits>&
		430	operator<<(basic_ostream<charT, traits>& os, const month_weekday& mwd);
		431
411	// 25.8.12, class month_weekday_last // C++20	432	// 25.8.12, class month_weekday_last // C++20
412	class month_weekday_last;	433	class month_weekday_last;
413		434
414	constexpr bool operator==(const month_weekday_last& x, const month_weekday_last& y) noexcept;	435	constexpr bool operator==(const month_weekday_last& x, const month_weekday_last& y) noexcept;
415	constexpr bool operator!=(const month_weekday_last& x, const month_weekday_last& y) noexcept;	436	constexpr bool operator!=(const month_weekday_last& x, const month_weekday_last& y) noexcept;
416		437
		438	template<class charT, class traits>
		439	basic_ostream<charT, traits>&
		440	operator<<(basic_ostream<charT, traits>& os, const month_weekday_last& mwdl);
		441
417		442
418	// 25.8.13, class year_month // C++20	443	// 25.8.13, class year_month // C++20
419	class year_month;	444	class year_month;
420		445
421	constexpr bool operator==(const year_month& x, const year_month& y) noexcept;	446	constexpr bool operator==(const year_month& x, const year_month& y) noexcept;
422	constexpr bool operator!=(const year_month& x, const year_month& y) noexcept;	447	constexpr strong_ordering operator<=>(const year_month& x, const year_month& y) noexcept;
423	constexpr bool operator< (const year_month& x, const year_month& y) noexcept;
424	constexpr bool operator> (const year_month& x, const year_month& y) noexcept;
425	constexpr bool operator<=(const year_month& x, const year_month& y) noexcept;
426	constexpr bool operator>=(const year_month& x, const year_month& y) noexcept;
427		448
428	constexpr year_month operator+(const year_month& ym, const months& dm) noexcept;	449	constexpr year_month operator+(const year_month& ym, const months& dm) noexcept;
429	constexpr year_month operator+(const months& dm, const year_month& ym) noexcept;	450	constexpr year_month operator+(const months& dm, const year_month& ym) noexcept;
...	@@ -433,15 +454,15 @@ constexpr year_month operator+(const year_month& ym, const years& dy) noexcept;	...	@@ -433,15 +454,15 @@ constexpr year_month operator+(const year_month& ym, const years& dy) noexcept;
433	constexpr year_month operator+(const years& dy, const year_month& ym) noexcept;	454	constexpr year_month operator+(const years& dy, const year_month& ym) noexcept;
434	constexpr year_month operator-(const year_month& ym, const years& dy) noexcept;	455	constexpr year_month operator-(const year_month& ym, const years& dy) noexcept;
435		456
		457	template<class charT, class traits>
		458	basic_ostream<charT, traits>&
		459	operator<<(basic_ostream<charT, traits>& os, const year_month& ym);
		460
436	// 25.8.14, class year_month_day class // C++20	461	// 25.8.14, class year_month_day class // C++20
437	year_month_day;	462	year_month_day;
438		463
439	constexpr bool operator==(const year_month_day& x, const year_month_day& y) noexcept;	464	constexpr bool operator==(const year_month_day& x, const year_month_day& y) noexcept;
440	constexpr bool operator!=(const year_month_day& x, const year_month_day& y) noexcept;	465	constexpr strong_ordering operator<=>(const year_month_day& x, const year_month_day& y) noexcept;
441	constexpr bool operator< (const year_month_day& x, const year_month_day& y) noexcept;
442	constexpr bool operator> (const year_month_day& x, const year_month_day& y) noexcept;
443	constexpr bool operator<=(const year_month_day& x, const year_month_day& y) noexcept;
444	constexpr bool operator>=(const year_month_day& x, const year_month_day& y) noexcept;
445		466
446	constexpr year_month_day operator+(const year_month_day& ymd, const months& dm) noexcept;	467	constexpr year_month_day operator+(const year_month_day& ymd, const months& dm) noexcept;
447	constexpr year_month_day operator+(const months& dm, const year_month_day& ymd) noexcept;	468	constexpr year_month_day operator+(const months& dm, const year_month_day& ymd) noexcept;
...	@@ -450,22 +471,15 @@ constexpr year_month_day operator+(const years& dy, const year_month_day& ymd) n	...	@@ -450,22 +471,15 @@ constexpr year_month_day operator+(const years& dy, const year_month_day& ymd) n
450	constexpr year_month_day operator-(const year_month_day& ymd, const months& dm) noexcept;	471	constexpr year_month_day operator-(const year_month_day& ymd, const months& dm) noexcept;
451	constexpr year_month_day operator-(const year_month_day& ymd, const years& dy) noexcept;	472	constexpr year_month_day operator-(const year_month_day& ymd, const years& dy) noexcept;
452		473
		474	template<class charT, class traits>
		475	basic_ostream<charT, traits>&
		476	operator<<(basic_ostream<charT, traits>& os, const year_month_day& ymd);
453		477
454	// 25.8.15, class year_month_day_last // C++20	478	// 25.8.15, class year_month_day_last // C++20
455	class year_month_day_last;	479	class year_month_day_last;
456		480
457	constexpr bool operator==(const year_month_day_last& x,	481	constexpr bool operator==(const year_month_day_last& x, const year_month_day_last& y) noexcept;
458	const year_month_day_last& y) noexcept;	482	constexpr strong_ordering operator<=>(const year_month_day_last_day& x, const year_month_day_last_day& y) noexcept;
459	constexpr bool operator!=(const year_month_day_last& x,
460	const year_month_day_last& y) noexcept;
461	constexpr bool operator< (const year_month_day_last& x,
462	const year_month_day_last& y) noexcept;
463	constexpr bool operator> (const year_month_day_last& x,
464	const year_month_day_last& y) noexcept;
465	constexpr bool operator<=(const year_month_day_last& x,
466	const year_month_day_last& y) noexcept;
467	constexpr bool operator>=(const year_month_day_last& x,
468	const year_month_day_last& y) noexcept;
469		483
470	constexpr year_month_day_last	484	constexpr year_month_day_last
471	operator+(const year_month_day_last& ymdl, const months& dm) noexcept;	485	operator+(const year_month_day_last& ymdl, const months& dm) noexcept;
...	@@ -480,6 +494,10 @@ constexpr year_month_day_last	...	@@ -480,6 +494,10 @@ constexpr year_month_day_last
480	constexpr year_month_day_last	494	constexpr year_month_day_last
481	operator-(const year_month_day_last& ymdl, const years& dy) noexcept;	495	operator-(const year_month_day_last& ymdl, const years& dy) noexcept;
482		496
		497	template<class charT, class traits>
		498	basic_ostream<charT, traits>&
		499	operator<<(basic_ostream<charT, traits>& os, const year_month_day_last& ymdl);
		500
483	// 25.8.16, class year_month_weekday // C++20	501	// 25.8.16, class year_month_weekday // C++20
484	class year_month_weekday;	502	class year_month_weekday;
485		503
...	@@ -501,6 +519,10 @@ constexpr year_month_weekday	...	@@ -501,6 +519,10 @@ constexpr year_month_weekday
501	constexpr year_month_weekday	519	constexpr year_month_weekday
502	operator-(const year_month_weekday& ymwd, const years& dy) noexcept;	520	operator-(const year_month_weekday& ymwd, const years& dy) noexcept;
503		521
		522	template<class charT, class traits>
		523	basic_ostream<charT, traits>&
		524	operator<<(basic_ostream<charT, traits>& os, const year_month_weekday& ymwd);
		525
504	// 25.8.17, class year_month_weekday_last // C++20	526	// 25.8.17, class year_month_weekday_last // C++20
505	class year_month_weekday_last;	527	class year_month_weekday_last;
506		528
...	@@ -521,6 +543,10 @@ constexpr year_month_weekday_last	...	@@ -521,6 +543,10 @@ constexpr year_month_weekday_last
521	constexpr year_month_weekday_last	543	constexpr year_month_weekday_last
522	operator-(const year_month_weekday_last& ymwdl, const years& dy) noexcept;	544	operator-(const year_month_weekday_last& ymwdl, const years& dy) noexcept;
523		545
		546	template<class charT, class traits>
		547	basic_ostream<charT, traits>&
		548	operator<<(basic_ostream<charT, traits>& os, const year_month_weekday_last& ymwdl);
		549
524	// 25.8.18, civil calendar conventional syntax operators // C++20	550	// 25.8.18, civil calendar conventional syntax operators // C++20
525	constexpr year_month	551	constexpr year_month
526	operator/(const year& y, const month& m) noexcept;	552	operator/(const year& y, const month& m) noexcept;
...	@@ -645,7 +671,29 @@ bool operator<(const time_zone& x, const time_zone& y) noexcept;	...	@@ -645,7 +671,29 @@ bool operator<(const time_zone& x, const time_zone& y) noexcept;
645	bool operator>(const time_zone& x, const time_zone& y) noexcept;	671	bool operator>(const time_zone& x, const time_zone& y) noexcept;
646	bool operator<=(const time_zone& x, const time_zone& y) noexcept;	672	bool operator<=(const time_zone& x, const time_zone& y) noexcept;
647	bool operator>=(const time_zone& x, const time_zone& y) noexcept;	673	bool operator>=(const time_zone& x, const time_zone& y) noexcept;
		674	} // chrono
		675
		676	namespace std {
		677	template<class Rep, class Period, class charT>
		678	struct formatter<chrono::duration<Rep, Period>, charT>; // C++20
		679	template<class charT> struct formatter<chrono::day, charT>; // C++20
		680	template<class charT> struct formatter<chrono::month, charT>; // C++20
		681	template<class charT> struct formatter<chrono::year, charT>; // C++20
		682	template<class charT> struct formatter<chrono::weekday, charT>; // C++20
		683	template<class charT> struct formatter<chrono::weekday_indexed, charT>; // C++20
		684	template<class charT> struct formatter<chrono::weekday_last, charT>; // C++20
		685	template<class charT> struct formatter<chrono::month_day, charT>; // C++20
		686	template<class charT> struct formatter<chrono::month_day_last, charT>; // C++20
		687	template<class charT> struct formatter<chrono::month_weekday, charT>; // C++20
		688	template<class charT> struct formatter<chrono::month_weekday_last, charT>; // C++20
		689	template<class charT> struct formatter<chrono::year_month, charT>; // C++20
		690	template<class charT> struct formatter<chrono::year_month_day, charT>; // C++20
		691	template<class charT> struct formatter<chrono::year_month_day_last, charT>; // C++20
		692	template<class charT> struct formatter<chrono::year_month_weekday, charT>; // C++20
		693	template<class charT> struct formatter<chrono::year_month_weekday_last, charT>; // C++20
		694	} // namespace std
648		695
		696	namespace chrono {
649	// calendrical constants	697	// calendrical constants
650	inline constexpr last_spec last{}; // C++20	698	inline constexpr last_spec last{}; // C++20
651	inline constexpr chrono::weekday Sunday{0}; // C++20	699	inline constexpr chrono::weekday Sunday{0}; // C++20
...	@@ -695,6 +743,7 @@ constexpr chrono::year operator ""y(unsigned lo	...	@@ -695,6 +743,7 @@ constexpr chrono::year operator ""y(unsigned lo
695	#include <__assert> // all public C++ headers provide the assertion handler	743	#include <__assert> // all public C++ headers provide the assertion handler
696	#include <__chrono/calendar.h>	744	#include <__chrono/calendar.h>
697	#include <__chrono/convert_to_timespec.h>	745	#include <__chrono/convert_to_timespec.h>
		746	#include <__chrono/convert_to_tm.h>
698	#include <__chrono/day.h>	747	#include <__chrono/day.h>
699	#include <__chrono/duration.h>	748	#include <__chrono/duration.h>
700	#include <__chrono/file_clock.h>	749	#include <__chrono/file_clock.h>
...	@@ -716,10 +765,24 @@ constexpr chrono::year operator ""y(unsigned lo	...	@@ -716,10 +765,24 @@ constexpr chrono::year operator ""y(unsigned lo
716	#include <version>	765	#include <version>
717		766
718	// standard-mandated includes	767	// standard-mandated includes
		768
		769	// [time.syn]
719	#include <compare>	770	#include <compare>
720		771
		772	#if !defined(_LIBCPP_HAS_NO_LOCALIZATION) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT) && _LIBCPP_STD_VER > 17
		773	# include <__chrono/formatter.h>
		774	# include <__chrono/ostream.h>
		775	# include <__chrono/parser_std_format_spec.h>
		776	# include <__chrono/statically_widen.h>
		777	#endif
		778
		779
721	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	780	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
722	# pragma GCC system_header	781	# pragma GCC system_header
723	#endif	782	#endif
724		783
		784	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		785	# include <concepts>
		786	#endif
		787
725	#endif // _LIBCPP_CHRONO	788	#endif // _LIBCPP_CHRONO

lib/libcxx/include/cinttypes+13

...	@@ -236,9 +236,22 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int	...	@@ -236,9 +236,22 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
236		236
237	#include <__assert> // all public C++ headers provide the assertion handler	237	#include <__assert> // all public C++ headers provide the assertion handler
238	#include <__config>	238	#include <__config>
		239
		240	// standard-mandated includes
		241
		242	// [cinttypes.syn]
239	#include <cstdint>	243	#include <cstdint>
		244
240	#include <inttypes.h>	245	#include <inttypes.h>
241		246
		247	#ifndef _LIBCPP_INTTYPES_H
		248	# error <cinttypes> tried including <inttypes.h> but didn't find libc++'s <inttypes.h> header. \
		249	This usually means that your header search paths are not configured properly. \
		250	The header search paths should contain the C++ Standard Library headers before \
		251	any C Standard Library, and you are probably using compiler flags that make that \
		252	not be the case.
		253	#endif
		254
242	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	255	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
243	# pragma GCC system_header	256	# pragma GCC system_header
244	#endif	257	#endif

lib/libcxx/include/climits+9

...	@@ -39,8 +39,17 @@ Macros:	...	@@ -39,8 +39,17 @@ Macros:
39		39
40	#include <__assert> // all public C++ headers provide the assertion handler	40	#include <__assert> // all public C++ headers provide the assertion handler
41	#include <__config>	41	#include <__config>
		42
42	#include <limits.h>	43	#include <limits.h>
43		44
		45	#ifndef _LIBCPP_LIMITS_H
		46	# error <climits> tried including <limits.h> but didn't find libc++'s <limits.h> header. \
		47	This usually means that your header search paths are not configured properly. \
		48	The header search paths should contain the C++ Standard Library headers before \
		49	any C Standard Library, and you are probably using compiler flags that make that \
		50	not be the case.
		51	#endif
		52
44	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	53	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
45	# pragma GCC system_header	54	# pragma GCC system_header
46	#endif	55	#endif

lib/libcxx/include/clocale+9

...	@@ -36,8 +36,17 @@ lconv* localeconv();	...	@@ -36,8 +36,17 @@ lconv* localeconv();
36		36
37	#include <__assert> // all public C++ headers provide the assertion handler	37	#include <__assert> // all public C++ headers provide the assertion handler
38	#include <__config>	38	#include <__config>
		39
39	#include <locale.h>	40	#include <locale.h>
40		41
		42	#ifndef _LIBCPP_LOCALE_H
		43	# error <clocale> tried including <locale.h> but didn't find libc++'s <locale.h> header. \
		44	This usually means that your header search paths are not configured properly. \
		45	The header search paths should contain the C++ Standard Library headers before \
		46	any C Standard Library, and you are probably using compiler flags that make that \
		47	not be the case.
		48	#endif
		49
41	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	50	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
42	# pragma GCC system_header	51	# pragma GCC system_header
43	#endif	52	#endif

lib/libcxx/include/cmath+190-17

...	@@ -306,10 +306,24 @@ constexpr long double lerp(long double a, long double b, long double t) noexcept	...	@@ -306,10 +306,24 @@ constexpr long double lerp(long double a, long double b, long double t) noexcept
306		306
307	#include <__assert> // all public C++ headers provide the assertion handler	307	#include <__assert> // all public C++ headers provide the assertion handler
308	#include <__config>	308	#include <__config>
309	#include <math.h>	309	#include <__type_traits/enable_if.h>
310	#include <type_traits>	310	#include <__type_traits/is_arithmetic.h>
		311	#include <__type_traits/is_constant_evaluated.h>
		312	#include <__type_traits/is_floating_point.h>
		313	#include <__type_traits/is_same.h>
		314	#include <__type_traits/remove_cv.h>
311	#include <version>	315	#include <version>
312		316
		317	#include <math.h>
		318
		319	#ifndef _LIBCPP_MATH_H
		320	# error <cmath> tried including <math.h> but didn't find libc++'s <math.h> header. \
		321	This usually means that your header search paths are not configured properly. \
		322	The header search paths should contain the C++ Standard Library headers before \
		323	any C Standard Library, and you are probably using compiler flags that make that \
		324	not be the case.
		325	#endif
		326
313	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	327	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
314	# pragma GCC system_header	328	# pragma GCC system_header
315	#endif	329	#endif
...	@@ -549,14 +563,14 @@ hypot(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT	...	@@ -549,14 +563,14 @@ hypot(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT
549	static_assert((!(is_same<_A1, __result_type>::value &&	563	static_assert((!(is_same<_A1, __result_type>::value &&
550	is_same<_A2, __result_type>::value &&	564	is_same<_A2, __result_type>::value &&
551	is_same<_A3, __result_type>::value)), "");	565	is_same<_A3, __result_type>::value)), "");
552	return hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);	566	return std::hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
553	}	567	}
554	#endif	568	#endif
555		569
556	template <class _A1>	570	template <class _A1>
557	_LIBCPP_INLINE_VISIBILITY	571	_LIBCPP_INLINE_VISIBILITY
558	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type	572	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
559	__libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT	573	__constexpr_isnan(_A1 __lcpp_x) _NOEXCEPT
560	{	574	{
561	#if __has_builtin(__builtin_isnan)	575	#if __has_builtin(__builtin_isnan)
562	return __builtin_isnan(__lcpp_x);	576	return __builtin_isnan(__lcpp_x);
...	@@ -568,15 +582,15 @@ __libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT	...	@@ -568,15 +582,15 @@ __libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT
568	template <class _A1>	582	template <class _A1>
569	_LIBCPP_INLINE_VISIBILITY	583	_LIBCPP_INLINE_VISIBILITY
570	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type	584	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
571	__libcpp_isnan_or_builtin(_A1 __lcpp_x) _NOEXCEPT	585	__constexpr_isnan(_A1 __lcpp_x) _NOEXCEPT
572	{	586	{
573	return isnan(__lcpp_x);	587	return std::isnan(__lcpp_x);
574	}	588	}
575		589
576	template <class _A1>	590	template <class _A1>
577	_LIBCPP_INLINE_VISIBILITY	591	_LIBCPP_INLINE_VISIBILITY
578	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type	592	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
579	__libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT	593	__constexpr_isinf(_A1 __lcpp_x) _NOEXCEPT
580	{	594	{
581	#if __has_builtin(__builtin_isinf)	595	#if __has_builtin(__builtin_isinf)
582	return __builtin_isinf(__lcpp_x);	596	return __builtin_isinf(__lcpp_x);
...	@@ -588,15 +602,15 @@ __libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT	...	@@ -588,15 +602,15 @@ __libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT
588	template <class _A1>	602	template <class _A1>
589	_LIBCPP_INLINE_VISIBILITY	603	_LIBCPP_INLINE_VISIBILITY
590	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type	604	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
591	__libcpp_isinf_or_builtin(_A1 __lcpp_x) _NOEXCEPT	605	__constexpr_isinf(_A1 __lcpp_x) _NOEXCEPT
592	{	606	{
593	return isinf(__lcpp_x);	607	return std::isinf(__lcpp_x);
594	}	608	}
595		609
596	template <class _A1>	610	template <class _A1>
597	_LIBCPP_INLINE_VISIBILITY	611	_LIBCPP_INLINE_VISIBILITY
598	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type	612	_LIBCPP_CONSTEXPR typename enable_if<is_floating_point<_A1>::value, bool>::type
599	__libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT	613	__constexpr_isfinite(_A1 __lcpp_x) _NOEXCEPT
600	{	614	{
601	#if __has_builtin(__builtin_isfinite)	615	#if __has_builtin(__builtin_isfinite)
602	return __builtin_isfinite(__lcpp_x);	616	return __builtin_isfinite(__lcpp_x);
...	@@ -608,14 +622,169 @@ __libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT	...	@@ -608,14 +622,169 @@ __libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT
608	template <class _A1>	622	template <class _A1>
609	_LIBCPP_INLINE_VISIBILITY	623	_LIBCPP_INLINE_VISIBILITY
610	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type	624	_LIBCPP_CONSTEXPR typename enable_if<!is_floating_point<_A1>::value, bool>::type
611	__libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT	625	__constexpr_isfinite(_A1 __lcpp_x) _NOEXCEPT
612	{	626	{
613	return isfinite(__lcpp_x);	627	return __builtin_isfinite(__lcpp_x);
		628	}
		629
		630	_LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI float __constexpr_copysign(float __x, float __y) _NOEXCEPT {
		631	return __builtin_copysignf(__x, __y);
		632	}
		633
		634	_LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI double __constexpr_copysign(double __x, double __y) _NOEXCEPT {
		635	return __builtin_copysign(__x, __y);
		636	}
		637
		638	_LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI long double
		639	__constexpr_copysign(long double __x, long double __y) _NOEXCEPT {
		640	return __builtin_copysignl(__x, __y);
		641	}
		642
		643	template <class _A1, class _A2>
		644	_LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI
		645	typename std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value,
		646	std::__promote<_A1, _A2> >::type
		647	__constexpr_copysign(_A1 __x, _A2 __y) _NOEXCEPT {
		648	typedef typename std::__promote<_A1, _A2>::type __result_type;
		649	static_assert((!(std::_IsSame<_A1, __result_type>::value && std::_IsSame<_A2, __result_type>::value)), "");
		650	return __builtin_copysign((__result_type)__x, (__result_type)__y);
		651	}
		652
		653	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR float __constexpr_fabs(float __x) _NOEXCEPT {
		654	return __builtin_fabsf(__x);
		655	}
		656
		657	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR double __constexpr_fabs(double __x) _NOEXCEPT {
		658	return __builtin_fabs(__x);
		659	}
		660
		661	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR long double __constexpr_fabs(long double __x) _NOEXCEPT {
		662	return __builtin_fabsl(__x);
		663	}
		664
		665	template <class _Tp, __enable_if_t<is_integral<_Tp>::value, int> = 0>
		666	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR double __constexpr_fabs(_Tp __x) _NOEXCEPT {
		667	return __builtin_fabs(static_cast<double>(__x));
		668	}
		669
		670	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 float __constexpr_fmax(float __x, float __y) _NOEXCEPT {
		671	#if !__has_constexpr_builtin(__builtin_fmaxf)
		672	if (__libcpp_is_constant_evaluated()) {
		673	if (std::__constexpr_isnan(__x))
		674	return __y;
		675	if (std::__constexpr_isnan(__y))
		676	return __x;
		677	return __x < __y ? __y : __x;
		678	}
		679	#endif
		680	return __builtin_fmaxf(__x, __y);
		681	}
		682
		683	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 double __constexpr_fmax(double __x, double __y) _NOEXCEPT {
		684	#if !__has_constexpr_builtin(__builtin_fmax)
		685	if (__libcpp_is_constant_evaluated()) {
		686	if (std::__constexpr_isnan(__x))
		687	return __y;
		688	if (std::__constexpr_isnan(__y))
		689	return __x;
		690	return __x < __y ? __y : __x;
		691	}
		692	#endif
		693	return __builtin_fmax(__x, __y);
		694	}
		695
		696	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 long double
		697	__constexpr_fmax(long double __x, long double __y) _NOEXCEPT {
		698	#if !__has_constexpr_builtin(__builtin_fmaxl)
		699	if (__libcpp_is_constant_evaluated()) {
		700	if (std::__constexpr_isnan(__x))
		701	return __y;
		702	if (std::__constexpr_isnan(__y))
		703	return __x;
		704	return __x < __y ? __y : __x;
		705	}
		706	#endif
		707	return __builtin_fmaxl(__x, __y);
		708	}
		709
		710	template <class _Tp, class _Up, __enable_if_t<is_arithmetic<_Tp>::value && is_arithmetic<_Up>::value, int> = 0>
		711	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 typename __promote<_Tp, _Up>::type
		712	__constexpr_fmax(_Tp __x, _Up __y) _NOEXCEPT {
		713	using __result_type = typename __promote<_Tp, _Up>::type;
		714	return std::__constexpr_fmax(static_cast<__result_type>(__x), static_cast<__result_type>(__y));
		715	}
		716
		717	template <class _Tp>
		718	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp __constexpr_logb(_Tp __x) {
		719	#if !__has_constexpr_builtin(__builtin_logb)
		720	if (__libcpp_is_constant_evaluated()) {
		721	if (__x == _Tp(0)) {
		722	// raise FE_DIVBYZERO
		723	return -numeric_limits<_Tp>::infinity();
		724	}
		725
		726	if (std::__constexpr_isinf(__x))
		727	return numeric_limits<_Tp>::infinity();
		728
		729	if (std::__constexpr_isnan(__x))
		730	return numeric_limits<_Tp>::quiet_NaN();
		731
		732	__x = std::__constexpr_fabs(__x);
		733	unsigned long long __exp = 0;
		734	while (__x >= numeric_limits<_Tp>::radix) {
		735	__x /= numeric_limits<_Tp>::radix;
		736	__exp += 1;
		737	}
		738	return _Tp(__exp);
		739	}
		740	#endif // !__has_constexpr_builtin(__builtin_logb)
		741	return __builtin_logb(__x);
		742	}
		743
		744	template <class _Tp>
		745	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp __constexpr_scalbn(_Tp __x, int __exp) {
		746	#if !__has_constexpr_builtin(__builtin_scalbln)
		747	if (__libcpp_is_constant_evaluated()) {
		748	if (__x == _Tp(0))
		749	return __x;
		750
		751	if (std::__constexpr_isinf(__x))
		752	return __x;
		753
		754	if (__exp == _Tp(0))
		755	return __x;
		756
		757	if (std::__constexpr_isnan(__x))
		758	return numeric_limits<_Tp>::quiet_NaN();
		759
		760	_Tp __mult(1);
		761	if (__exp > 0) {
		762	__mult = numeric_limits<_Tp>::radix;
		763	--__exp;
		764	} else {
		765	++__exp;
		766	__exp = -__exp;
		767	__mult /= numeric_limits<_Tp>::radix;
		768	}
		769
		770	while (__exp > 0) {
		771	if (!(__exp & 1)) {
		772	__mult *= __mult;
		773	__exp >>= 1;
		774	} else {
		775	__x *= __mult;
		776	--__exp;
		777	}
		778	}
		779	return __x;
		780	}
		781	#endif // !__has_constexpr_builtin(__builtin_scalbln)
		782	return __builtin_scalbn(__x, __exp);
614	}	783	}
615		784
616	#if _LIBCPP_STD_VER > 17	785	#if _LIBCPP_STD_VER > 17
617	template <typename _Fp>	786	template <typename _Fp>
618	constexpr	787	_LIBCPP_HIDE_FROM_ABI constexpr
619	_Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {	788	_Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {
620	if ((__a <= 0 && __b >= 0) \|\| (__a >= 0 && __b <= 0))	789	if ((__a <= 0 && __b >= 0) \|\| (__a >= 0 && __b <= 0))
621	return __t * __b + (1 - __t) * __a;	790	return __t * __b + (1 - __t) * __a;
...	@@ -628,13 +797,13 @@ _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {	...	@@ -628,13 +797,13 @@ _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {
628	return __x < __b ? __x : __b;	797	return __x < __b ? __x : __b;
629	}	798	}
630		799
631	constexpr float	800	_LIBCPP_HIDE_FROM_ABI constexpr float
632	lerp(float __a, float __b, float __t) _NOEXCEPT { return __lerp(__a, __b, __t); }	801	lerp(float __a, float __b, float __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
633		802
634	constexpr double	803	_LIBCPP_HIDE_FROM_ABI constexpr double
635	lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }	804	lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
636		805
637	constexpr long double	806	_LIBCPP_HIDE_FROM_ABI constexpr long double
638	lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }	807	lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
639		808
640	template <class _A1, class _A2, class _A3>	809	template <class _A1, class _A2, class _A3>
...	@@ -652,7 +821,7 @@ lerp(_A1 __a, _A2 __b, _A3 __t) noexcept	...	@@ -652,7 +821,7 @@ lerp(_A1 __a, _A2 __b, _A3 __t) noexcept
652	static_assert(!(_IsSame<_A1, __result_type>::value &&	821	static_assert(!(_IsSame<_A1, __result_type>::value &&
653	_IsSame<_A2, __result_type>::value &&	822	_IsSame<_A2, __result_type>::value &&
654	_IsSame<_A3, __result_type>::value));	823	_IsSame<_A3, __result_type>::value));
655	return __lerp((__result_type)__a, (__result_type)__b, (__result_type)__t);	824	return std::__lerp((__result_type)__a, (__result_type)__b, (__result_type)__t);
656	}	825	}
657	#endif // _LIBCPP_STD_VER > 17	826	#endif // _LIBCPP_STD_VER > 17
658		827
...	@@ -660,4 +829,8 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -660,4 +829,8 @@ _LIBCPP_END_NAMESPACE_STD
660		829
661	_LIBCPP_POP_MACROS	830	_LIBCPP_POP_MACROS
662		831
		832	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		833	# include <type_traits>
		834	#endif
		835
663	#endif // _LIBCPP_CMATH	836	#endif // _LIBCPP_CMATH

lib/libcxx/include/codecvt+208-240

...	@@ -81,9 +81,9 @@ template <>	...	@@ -81,9 +81,9 @@ template <>
81	class _LIBCPP_TYPE_VIS __codecvt_utf8<wchar_t>	81	class _LIBCPP_TYPE_VIS __codecvt_utf8<wchar_t>
82	: public codecvt<wchar_t, char, mbstate_t>	82	: public codecvt<wchar_t, char, mbstate_t>
83	{	83	{
84	unsigned long _Maxcode_;	84	unsigned long __maxcode_;
85	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	85	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
86	codecvt_mode _Mode_;	86	codecvt_mode __mode_;
87	_LIBCPP_SUPPRESS_DEPRECATED_POP	87	_LIBCPP_SUPPRESS_DEPRECATED_POP
88	public:	88	public:
89	typedef wchar_t intern_type;	89	typedef wchar_t intern_type;
...	@@ -94,26 +94,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH	...	@@ -94,26 +94,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
94	_LIBCPP_INLINE_VISIBILITY	94	_LIBCPP_INLINE_VISIBILITY
95	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,	95	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,
96	codecvt_mode __mode)	96	codecvt_mode __mode)
97	: codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	97	: codecvt<wchar_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
98	_Mode_(__mode) {}	98	__mode_(__mode) {}
99	_LIBCPP_SUPPRESS_DEPRECATED_POP	99	_LIBCPP_SUPPRESS_DEPRECATED_POP
100	protected:	100	protected:
101	virtual result	101	result do_out(state_type& __st,
102	do_out(state_type& __st,	102	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
103	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	103	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
104	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	104	result do_in(state_type& __st,
105	virtual result	105	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
106	do_in(state_type& __st,	106	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
107	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	107	result do_unshift(state_type& __st,
108	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	108	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
109	virtual result	109	int do_encoding() const _NOEXCEPT override;
110	do_unshift(state_type& __st,	110	bool do_always_noconv() const _NOEXCEPT override;
111	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	111	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
112	virtual int do_encoding() const _NOEXCEPT;	112	int do_max_length() const _NOEXCEPT override;
113	virtual bool do_always_noconv() const _NOEXCEPT;
114	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
115	size_t __mx) const;
116	virtual int do_max_length() const _NOEXCEPT;
117	};	113	};
118	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS	114	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
119		115
...	@@ -122,8 +118,8 @@ template <>	...	@@ -122,8 +118,8 @@ template <>
122	class _LIBCPP_TYPE_VIS __codecvt_utf8<char16_t>	118	class _LIBCPP_TYPE_VIS __codecvt_utf8<char16_t>
123	: public codecvt<char16_t, char, mbstate_t>	119	: public codecvt<char16_t, char, mbstate_t>
124	{	120	{
125	unsigned long _Maxcode_;	121	unsigned long __maxcode_;
126	codecvt_mode _Mode_;	122	codecvt_mode __mode_;
127	public:	123	public:
128	typedef char16_t intern_type;	124	typedef char16_t intern_type;
129	typedef char extern_type;	125	typedef char extern_type;
...	@@ -132,27 +128,23 @@ public:	...	@@ -132,27 +128,23 @@ public:
132	_LIBCPP_INLINE_VISIBILITY	128	_LIBCPP_INLINE_VISIBILITY
133	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,	129	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,
134	codecvt_mode __mode)	130	codecvt_mode __mode)
135	: codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	131	: codecvt<char16_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
136	_Mode_(__mode) {}	132	__mode_(__mode) {}
137	_LIBCPP_SUPPRESS_DEPRECATED_POP	133	_LIBCPP_SUPPRESS_DEPRECATED_POP
138		134
139	protected:	135	protected:
140	virtual result	136	result do_out(state_type& __st,
141	do_out(state_type& __st,	137	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
142	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	138	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
143	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	139	result do_in(state_type& __st,
144	virtual result	140	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
145	do_in(state_type& __st,	141	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
146	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	142	result do_unshift(state_type& __st,
147	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	143	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
148	virtual result	144	int do_encoding() const _NOEXCEPT override;
149	do_unshift(state_type& __st,	145	bool do_always_noconv() const _NOEXCEPT override;
150	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	146	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
151	virtual int do_encoding() const _NOEXCEPT;	147	int do_max_length() const _NOEXCEPT override;
152	virtual bool do_always_noconv() const _NOEXCEPT;
153	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
154	size_t __mx) const;
155	virtual int do_max_length() const _NOEXCEPT;
156	};	148	};
157		149
158	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	150	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -160,8 +152,8 @@ template <>	...	@@ -160,8 +152,8 @@ template <>
160	class _LIBCPP_TYPE_VIS __codecvt_utf8<char32_t>	152	class _LIBCPP_TYPE_VIS __codecvt_utf8<char32_t>
161	: public codecvt<char32_t, char, mbstate_t>	153	: public codecvt<char32_t, char, mbstate_t>
162	{	154	{
163	unsigned long _Maxcode_;	155	unsigned long __maxcode_;
164	codecvt_mode _Mode_;	156	codecvt_mode __mode_;
165	public:	157	public:
166	typedef char32_t intern_type;	158	typedef char32_t intern_type;
167	typedef char extern_type;	159	typedef char extern_type;
...	@@ -170,27 +162,23 @@ public:	...	@@ -170,27 +162,23 @@ public:
170	_LIBCPP_INLINE_VISIBILITY	162	_LIBCPP_INLINE_VISIBILITY
171	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,	163	explicit __codecvt_utf8(size_t __refs, unsigned long __maxcode,
172	codecvt_mode __mode)	164	codecvt_mode __mode)
173	: codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	165	: codecvt<char32_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
174	_Mode_(__mode) {}	166	__mode_(__mode) {}
175	_LIBCPP_SUPPRESS_DEPRECATED_POP	167	_LIBCPP_SUPPRESS_DEPRECATED_POP
176		168
177	protected:	169	protected:
178	virtual result	170	result do_out(state_type& __st,
179	do_out(state_type& __st,	171	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
180	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	172	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
181	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	173	result do_in(state_type& __st,
182	virtual result	174	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
183	do_in(state_type& __st,	175	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
184	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	176	result do_unshift(state_type& __st,
185	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	177	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
186	virtual result	178	int do_encoding() const _NOEXCEPT override;
187	do_unshift(state_type& __st,	179	bool do_always_noconv() const _NOEXCEPT override;
188	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	180	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
189	virtual int do_encoding() const _NOEXCEPT;	181	int do_max_length() const _NOEXCEPT override;
190	virtual bool do_always_noconv() const _NOEXCEPT;
191	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
192	size_t __mx) const;
193	virtual int do_max_length() const _NOEXCEPT;
194	};	182	};
195		183
196	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	184	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -218,9 +206,9 @@ template <>	...	@@ -218,9 +206,9 @@ template <>
218	class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, false>	206	class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, false>
219	: public codecvt<wchar_t, char, mbstate_t>	207	: public codecvt<wchar_t, char, mbstate_t>
220	{	208	{
221	unsigned long _Maxcode_;	209	unsigned long __maxcode_;
222	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	210	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
223	codecvt_mode _Mode_;	211	codecvt_mode __mode_;
224	_LIBCPP_SUPPRESS_DEPRECATED_POP	212	_LIBCPP_SUPPRESS_DEPRECATED_POP
225	public:	213	public:
226	typedef wchar_t intern_type;	214	typedef wchar_t intern_type;
...	@@ -231,35 +219,32 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH	...	@@ -231,35 +219,32 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
231	_LIBCPP_INLINE_VISIBILITY	219	_LIBCPP_INLINE_VISIBILITY
232	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	220	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
233	codecvt_mode __mode)	221	codecvt_mode __mode)
234	: codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	222	: codecvt<wchar_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
235	_Mode_(__mode) {}	223	__mode_(__mode) {}
236	_LIBCPP_SUPPRESS_DEPRECATED_POP	224	_LIBCPP_SUPPRESS_DEPRECATED_POP
237	protected:	225	protected:
238	virtual result	226	result do_out(state_type& __st,
239	do_out(state_type& __st,	227	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
240	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	228	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
241	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	229	result do_in(state_type& __st,
242	virtual result	230	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
243	do_in(state_type& __st,	231	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
244	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	232	result do_unshift(state_type& __st,
245	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	233	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
246	virtual result	234	int do_encoding() const _NOEXCEPT override;
247	do_unshift(state_type& __st,	235	bool do_always_noconv() const _NOEXCEPT override;
248	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	236	int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
249	virtual int do_encoding() const _NOEXCEPT;	237	size_t __mx) const override;
250	virtual bool do_always_noconv() const _NOEXCEPT;	238	int do_max_length() const _NOEXCEPT override;
251	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
252	size_t __mx) const;
253	virtual int do_max_length() const _NOEXCEPT;
254	};	239	};
255		240
256	template <>	241	template <>
257	class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, true>	242	class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, true>
258	: public codecvt<wchar_t, char, mbstate_t>	243	: public codecvt<wchar_t, char, mbstate_t>
259	{	244	{
260	unsigned long _Maxcode_;	245	unsigned long __maxcode_;
261	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	246	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
262	codecvt_mode _Mode_;	247	codecvt_mode __mode_;
263	_LIBCPP_SUPPRESS_DEPRECATED_POP	248	_LIBCPP_SUPPRESS_DEPRECATED_POP
264	public:	249	public:
265	typedef wchar_t intern_type;	250	typedef wchar_t intern_type;
...	@@ -270,26 +255,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH	...	@@ -270,26 +255,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
270	_LIBCPP_INLINE_VISIBILITY	255	_LIBCPP_INLINE_VISIBILITY
271	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	256	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
272	codecvt_mode __mode)	257	codecvt_mode __mode)
273	: codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	258	: codecvt<wchar_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
274	_Mode_(__mode) {}	259	__mode_(__mode) {}
275	_LIBCPP_SUPPRESS_DEPRECATED_POP	260	_LIBCPP_SUPPRESS_DEPRECATED_POP
276	protected:	261	protected:
277	virtual result	262	result do_out(state_type& __st,
278	do_out(state_type& __st,	263	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
279	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	264	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
280	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	265	result do_in(state_type& __st,
281	virtual result	266	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
282	do_in(state_type& __st,	267	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
283	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	268	result do_unshift(state_type& __st,
284	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	269	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
285	virtual result	270	int do_encoding() const _NOEXCEPT override;
286	do_unshift(state_type& __st,	271	bool do_always_noconv() const _NOEXCEPT override;
287	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	272	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
288	virtual int do_encoding() const _NOEXCEPT;	273	int do_max_length() const _NOEXCEPT override;
289	virtual bool do_always_noconv() const _NOEXCEPT;
290	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
291	size_t __mx) const;
292	virtual int do_max_length() const _NOEXCEPT;
293	};	274	};
294	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS	275	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
295		276
...	@@ -298,8 +279,8 @@ template <>	...	@@ -298,8 +279,8 @@ template <>
298	class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, false>	279	class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, false>
299	: public codecvt<char16_t, char, mbstate_t>	280	: public codecvt<char16_t, char, mbstate_t>
300	{	281	{
301	unsigned long _Maxcode_;	282	unsigned long __maxcode_;
302	codecvt_mode _Mode_;	283	codecvt_mode __mode_;
303	public:	284	public:
304	typedef char16_t intern_type;	285	typedef char16_t intern_type;
305	typedef char extern_type;	286	typedef char extern_type;
...	@@ -308,27 +289,23 @@ public:	...	@@ -308,27 +289,23 @@ public:
308	_LIBCPP_INLINE_VISIBILITY	289	_LIBCPP_INLINE_VISIBILITY
309	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	290	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
310	codecvt_mode __mode)	291	codecvt_mode __mode)
311	: codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	292	: codecvt<char16_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
312	_Mode_(__mode) {}	293	__mode_(__mode) {}
313	_LIBCPP_SUPPRESS_DEPRECATED_POP	294	_LIBCPP_SUPPRESS_DEPRECATED_POP
314		295
315	protected:	296	protected:
316	virtual result	297	result do_out(state_type& __st,
317	do_out(state_type& __st,	298	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
318	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	299	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
319	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	300	result do_in(state_type& __st,
320	virtual result	301	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
321	do_in(state_type& __st,	302	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
322	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	303	result do_unshift(state_type& __st,
323	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	304	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
324	virtual result	305	int do_encoding() const _NOEXCEPT override;
325	do_unshift(state_type& __st,	306	bool do_always_noconv() const _NOEXCEPT override;
326	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	307	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
327	virtual int do_encoding() const _NOEXCEPT;	308	int do_max_length() const _NOEXCEPT override;
328	virtual bool do_always_noconv() const _NOEXCEPT;
329	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
330	size_t __mx) const;
331	virtual int do_max_length() const _NOEXCEPT;
332	};	309	};
333		310
334	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	311	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -336,8 +313,8 @@ template <>	...	@@ -336,8 +313,8 @@ template <>
336	class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, true>	313	class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, true>
337	: public codecvt<char16_t, char, mbstate_t>	314	: public codecvt<char16_t, char, mbstate_t>
338	{	315	{
339	unsigned long _Maxcode_;	316	unsigned long __maxcode_;
340	codecvt_mode _Mode_;	317	codecvt_mode __mode_;
341	public:	318	public:
342	typedef char16_t intern_type;	319	typedef char16_t intern_type;
343	typedef char extern_type;	320	typedef char extern_type;
...	@@ -346,27 +323,23 @@ public:	...	@@ -346,27 +323,23 @@ public:
346	_LIBCPP_INLINE_VISIBILITY	323	_LIBCPP_INLINE_VISIBILITY
347	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	324	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
348	codecvt_mode __mode)	325	codecvt_mode __mode)
349	: codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	326	: codecvt<char16_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
350	_Mode_(__mode) {}	327	__mode_(__mode) {}
351	_LIBCPP_SUPPRESS_DEPRECATED_POP	328	_LIBCPP_SUPPRESS_DEPRECATED_POP
352		329
353	protected:	330	protected:
354	virtual result	331	result do_out(state_type& __st,
355	do_out(state_type& __st,	332	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
356	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	333	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
357	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	334	result do_in(state_type& __st,
358	virtual result	335	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
359	do_in(state_type& __st,	336	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
360	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	337	result do_unshift(state_type& __st,
361	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	338	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
362	virtual result	339	int do_encoding() const _NOEXCEPT override;
363	do_unshift(state_type& __st,	340	bool do_always_noconv() const _NOEXCEPT override;
364	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	341	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
365	virtual int do_encoding() const _NOEXCEPT;	342	int do_max_length() const _NOEXCEPT override;
366	virtual bool do_always_noconv() const _NOEXCEPT;
367	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
368	size_t __mx) const;
369	virtual int do_max_length() const _NOEXCEPT;
370	};	343	};
371		344
372	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	345	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -374,8 +347,8 @@ template <>	...	@@ -374,8 +347,8 @@ template <>
374	class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, false>	347	class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, false>
375	: public codecvt<char32_t, char, mbstate_t>	348	: public codecvt<char32_t, char, mbstate_t>
376	{	349	{
377	unsigned long _Maxcode_;	350	unsigned long __maxcode_;
378	codecvt_mode _Mode_;	351	codecvt_mode __mode_;
379	public:	352	public:
380	typedef char32_t intern_type;	353	typedef char32_t intern_type;
381	typedef char extern_type;	354	typedef char extern_type;
...	@@ -384,27 +357,23 @@ public:	...	@@ -384,27 +357,23 @@ public:
384	_LIBCPP_INLINE_VISIBILITY	357	_LIBCPP_INLINE_VISIBILITY
385	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	358	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
386	codecvt_mode __mode)	359	codecvt_mode __mode)
387	: codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	360	: codecvt<char32_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
388	_Mode_(__mode) {}	361	__mode_(__mode) {}
389	_LIBCPP_SUPPRESS_DEPRECATED_POP	362	_LIBCPP_SUPPRESS_DEPRECATED_POP
390		363
391	protected:	364	protected:
392	virtual result	365	result do_out(state_type& __st,
393	do_out(state_type& __st,	366	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
394	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	367	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
395	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	368	result do_in(state_type& __st,
396	virtual result	369	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
397	do_in(state_type& __st,	370	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
398	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	371	result do_unshift(state_type& __st,
399	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	372	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
400	virtual result	373	int do_encoding() const _NOEXCEPT override;
401	do_unshift(state_type& __st,	374	bool do_always_noconv() const _NOEXCEPT override;
402	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	375	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
403	virtual int do_encoding() const _NOEXCEPT;	376	int do_max_length() const _NOEXCEPT override;
404	virtual bool do_always_noconv() const _NOEXCEPT;
405	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
406	size_t __mx) const;
407	virtual int do_max_length() const _NOEXCEPT;
408	};	377	};
409		378
410	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	379	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -412,8 +381,8 @@ template <>	...	@@ -412,8 +381,8 @@ template <>
412	class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, true>	381	class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, true>
413	: public codecvt<char32_t, char, mbstate_t>	382	: public codecvt<char32_t, char, mbstate_t>
414	{	383	{
415	unsigned long _Maxcode_;	384	unsigned long __maxcode_;
416	codecvt_mode _Mode_;	385	codecvt_mode __mode_;
417	public:	386	public:
418	typedef char32_t intern_type;	387	typedef char32_t intern_type;
419	typedef char extern_type;	388	typedef char extern_type;
...	@@ -422,27 +391,23 @@ public:	...	@@ -422,27 +391,23 @@ public:
422	_LIBCPP_INLINE_VISIBILITY	391	_LIBCPP_INLINE_VISIBILITY
423	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,	392	explicit __codecvt_utf16(size_t __refs, unsigned long __maxcode,
424	codecvt_mode __mode)	393	codecvt_mode __mode)
425	: codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	394	: codecvt<char32_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
426	_Mode_(__mode) {}	395	__mode_(__mode) {}
427	_LIBCPP_SUPPRESS_DEPRECATED_POP	396	_LIBCPP_SUPPRESS_DEPRECATED_POP
428		397
429	protected:	398	protected:
430	virtual result	399	result do_out(state_type& __st,
431	do_out(state_type& __st,	400	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
432	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	401	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
433	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	402	result do_in(state_type& __st,
434	virtual result	403	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
435	do_in(state_type& __st,	404	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
436	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	405	result do_unshift(state_type& __st,
437	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	406	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
438	virtual result	407	int do_encoding() const _NOEXCEPT override;
439	do_unshift(state_type& __st,	408	bool do_always_noconv() const _NOEXCEPT override;
440	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	409	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
441	virtual int do_encoding() const _NOEXCEPT;	410	int do_max_length() const _NOEXCEPT override;
442	virtual bool do_always_noconv() const _NOEXCEPT;
443	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
444	size_t __mx) const;
445	virtual int do_max_length() const _NOEXCEPT;
446	};	411	};
447		412
448	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	413	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -470,9 +435,9 @@ template <>	...	@@ -470,9 +435,9 @@ template <>
470	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<wchar_t>	435	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<wchar_t>
471	: public codecvt<wchar_t, char, mbstate_t>	436	: public codecvt<wchar_t, char, mbstate_t>
472	{	437	{
473	unsigned long _Maxcode_;	438	unsigned long __maxcode_;
474	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	439	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
475	codecvt_mode _Mode_;	440	codecvt_mode __mode_;
476	_LIBCPP_SUPPRESS_DEPRECATED_POP	441	_LIBCPP_SUPPRESS_DEPRECATED_POP
477	public:	442	public:
478	typedef wchar_t intern_type;	443	typedef wchar_t intern_type;
...	@@ -483,26 +448,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH	...	@@ -483,26 +448,22 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH
483	_LIBCPP_INLINE_VISIBILITY	448	_LIBCPP_INLINE_VISIBILITY
484	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,	449	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,
485	codecvt_mode __mode)	450	codecvt_mode __mode)
486	: codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	451	: codecvt<wchar_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
487	_Mode_(__mode) {}	452	__mode_(__mode) {}
488	_LIBCPP_SUPPRESS_DEPRECATED_POP	453	_LIBCPP_SUPPRESS_DEPRECATED_POP
489	protected:	454	protected:
490	virtual result	455	result do_out(state_type& __st,
491	do_out(state_type& __st,	456	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
492	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	457	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
493	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	458	result do_in(state_type& __st,
494	virtual result	459	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
495	do_in(state_type& __st,	460	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
496	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	461	result do_unshift(state_type& __st,
497	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	462	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
498	virtual result	463	int do_encoding() const _NOEXCEPT override;
499	do_unshift(state_type& __st,	464	bool do_always_noconv() const _NOEXCEPT override;
500	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	465	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
501	virtual int do_encoding() const _NOEXCEPT;	466	int do_max_length() const _NOEXCEPT override;
502	virtual bool do_always_noconv() const _NOEXCEPT;
503	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
504	size_t __mx) const;
505	virtual int do_max_length() const _NOEXCEPT;
506	};	467	};
507	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS	468	#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
508		469
...	@@ -511,8 +472,8 @@ template <>	...	@@ -511,8 +472,8 @@ template <>
511	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char32_t>	472	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char32_t>
512	: public codecvt<char32_t, char, mbstate_t>	473	: public codecvt<char32_t, char, mbstate_t>
513	{	474	{
514	unsigned long _Maxcode_;	475	unsigned long __maxcode_;
515	codecvt_mode _Mode_;	476	codecvt_mode __mode_;
516	public:	477	public:
517	typedef char32_t intern_type;	478	typedef char32_t intern_type;
518	typedef char extern_type;	479	typedef char extern_type;
...	@@ -521,27 +482,23 @@ public:	...	@@ -521,27 +482,23 @@ public:
521	_LIBCPP_INLINE_VISIBILITY	482	_LIBCPP_INLINE_VISIBILITY
522	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,	483	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,
523	codecvt_mode __mode)	484	codecvt_mode __mode)
524	: codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	485	: codecvt<char32_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
525	_Mode_(__mode) {}	486	__mode_(__mode) {}
526	_LIBCPP_SUPPRESS_DEPRECATED_POP	487	_LIBCPP_SUPPRESS_DEPRECATED_POP
527		488
528	protected:	489	protected:
529	virtual result	490	result do_out(state_type& __st,
530	do_out(state_type& __st,	491	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
531	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	492	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
532	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	493	result do_in(state_type& __st,
533	virtual result	494	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
534	do_in(state_type& __st,	495	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
535	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	496	result do_unshift(state_type& __st,
536	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	497	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
537	virtual result	498	int do_encoding() const _NOEXCEPT override;
538	do_unshift(state_type& __st,	499	bool do_always_noconv() const _NOEXCEPT override;
539	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	500	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
540	virtual int do_encoding() const _NOEXCEPT;	501	int do_max_length() const _NOEXCEPT override;
541	virtual bool do_always_noconv() const _NOEXCEPT;
542	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
543	size_t __mx) const;
544	virtual int do_max_length() const _NOEXCEPT;
545	};	502	};
546		503
547	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	504	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -549,8 +506,8 @@ template <>	...	@@ -549,8 +506,8 @@ template <>
549	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char16_t>	506	class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char16_t>
550	: public codecvt<char16_t, char, mbstate_t>	507	: public codecvt<char16_t, char, mbstate_t>
551	{	508	{
552	unsigned long _Maxcode_;	509	unsigned long __maxcode_;
553	codecvt_mode _Mode_;	510	codecvt_mode __mode_;
554	public:	511	public:
555	typedef char16_t intern_type;	512	typedef char16_t intern_type;
556	typedef char extern_type;	513	typedef char extern_type;
...	@@ -559,27 +516,23 @@ public:	...	@@ -559,27 +516,23 @@ public:
559	_LIBCPP_INLINE_VISIBILITY	516	_LIBCPP_INLINE_VISIBILITY
560	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,	517	explicit __codecvt_utf8_utf16(size_t __refs, unsigned long __maxcode,
561	codecvt_mode __mode)	518	codecvt_mode __mode)
562	: codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(__maxcode),	519	: codecvt<char16_t, char, mbstate_t>(__refs), __maxcode_(__maxcode),
563	_Mode_(__mode) {}	520	__mode_(__mode) {}
564	_LIBCPP_SUPPRESS_DEPRECATED_POP	521	_LIBCPP_SUPPRESS_DEPRECATED_POP
565		522
566	protected:	523	protected:
567	virtual result	524	result do_out(state_type& __st,
568	do_out(state_type& __st,	525	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
569	const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,	526	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
570	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	527	result do_in(state_type& __st,
571	virtual result	528	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
572	do_in(state_type& __st,	529	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const override;
573	const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,	530	result do_unshift(state_type& __st,
574	intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;	531	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const override;
575	virtual result	532	int do_encoding() const _NOEXCEPT override;
576	do_unshift(state_type& __st,	533	bool do_always_noconv() const _NOEXCEPT override;
577	extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;	534	int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const override;
578	virtual int do_encoding() const _NOEXCEPT;	535	int do_max_length() const _NOEXCEPT override;
579	virtual bool do_always_noconv() const _NOEXCEPT;
580	virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
581	size_t __mx) const;
582	virtual int do_max_length() const _NOEXCEPT;
583	};	536	};
584		537
585	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	538	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
...	@@ -600,4 +553,19 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -600,4 +553,19 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
600		553
601	_LIBCPP_END_NAMESPACE_STD	554	_LIBCPP_END_NAMESPACE_STD
602		555
		556	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		557	# include <atomic>
		558	# include <concepts>
		559	# include <cstddef>
		560	# include <cstdlib>
		561	# include <cstring>
		562	# include <initializer_list>
		563	# include <iosfwd>
		564	# include <limits>
		565	# include <new>
		566	# include <stdexcept>
		567	# include <type_traits>
		568	# include <typeinfo>
		569	#endif
		570
603	#endif // _LIBCPP_CODECVT	571	#endif // _LIBCPP_CODECVT

lib/libcxx/include/compare+4

...	@@ -160,4 +160,8 @@ namespace std {	...	@@ -160,4 +160,8 @@ namespace std {
160	# pragma GCC system_header	160	# pragma GCC system_header
161	#endif	161	#endif
162		162
		163	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		164	# include <type_traits>
		165	#endif
		166
163	#endif // _LIBCPP_COMPARE	167	#endif // _LIBCPP_COMPARE

lib/libcxx/include/complex+422-349

 @@ -29,21 +29,21 @@ public:
     T real() const; // constexpr in C++14
     T imag() const; // constexpr in C++14
-    void real(T);
+    void real(T); // constexpr in C++20
-    void imag(T);
+    void imag(T); // constexpr in C++20
-    complex<T>& operator= (const T&);
+    complex<T>& operator= (const T&); // constexpr in C++20
-    complex<T>& operator+=(const T&);
+    complex<T>& operator+=(const T&); // constexpr in C++20
-    complex<T>& operator-=(const T&);
+    complex<T>& operator-=(const T&); // constexpr in C++20
-    complex<T>& operator*=(const T&);
+    complex<T>& operator*=(const T&); // constexpr in C++20
-    complex<T>& operator/=(const T&);
+    complex<T>& operator/=(const T&); // constexpr in C++20
-    complex& operator=(const complex&);
+    complex& operator=(const complex&); // constexpr in C++20
-    template<class X> complex<T>& operator= (const complex<X>&);
+    template<class X> complex<T>& operator= (const complex<X>&); // constexpr in C++20
-    template<class X> complex<T>& operator+=(const complex<X>&);
+    template<class X> complex<T>& operator+=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<T>& operator-=(const complex<X>&);
+    template<class X> complex<T>& operator-=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<T>& operator*=(const complex<X>&);
+    template<class X> complex<T>& operator*=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<T>& operator/=(const complex<X>&);
+    template<class X> complex<T>& operator/=(const complex<X>&); // constexpr in C++20
 };
 template<>
 @@ -57,22 +57,22 @@ public:
     explicit constexpr complex(const complex<long double>&);
     constexpr float real() const;
-    void real(float);
+    void real(float); // constexpr in C++20
     constexpr float imag() const;
-    void imag(float);
+    void imag(float); // constexpr in C++20
-    complex<float>& operator= (float);
+    complex<float>& operator= (float); // constexpr in C++20
-    complex<float>& operator+=(float);
+    complex<float>& operator+=(float); // constexpr in C++20
-    complex<float>& operator-=(float);
+    complex<float>& operator-=(float); // constexpr in C++20
-    complex<float>& operator*=(float);
+    complex<float>& operator*=(float); // constexpr in C++20
-    complex<float>& operator/=(float);
+    complex<float>& operator/=(float); // constexpr in C++20
-    complex<float>& operator=(const complex<float>&);
+    complex<float>& operator=(const complex<float>&); // constexpr in C++20
-    template<class X> complex<float>& operator= (const complex<X>&);
+    template<class X> complex<float>& operator= (const complex<X>&); // constexpr in C++20
-    template<class X> complex<float>& operator+=(const complex<X>&);
+    template<class X> complex<float>& operator+=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<float>& operator-=(const complex<X>&);
+    template<class X> complex<float>& operator-=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<float>& operator*=(const complex<X>&);
+    template<class X> complex<float>& operator*=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<float>& operator/=(const complex<X>&);
+    template<class X> complex<float>& operator/=(const complex<X>&); // constexpr in C++20
 };
 template<>
 @@ -86,22 +86,22 @@ public:
     explicit constexpr complex(const complex<long double>&);
     constexpr double real() const;
-    void real(double);
+    void real(double); // constexpr in C++20
     constexpr double imag() const;
-    void imag(double);
+    void imag(double); // constexpr in C++20
-    complex<double>& operator= (double);
+    complex<double>& operator= (double); // constexpr in C++20
-    complex<double>& operator+=(double);
+    complex<double>& operator+=(double); // constexpr in C++20
-    complex<double>& operator-=(double);
+    complex<double>& operator-=(double); // constexpr in C++20
-    complex<double>& operator*=(double);
+    complex<double>& operator*=(double); // constexpr in C++20
-    complex<double>& operator/=(double);
+    complex<double>& operator/=(double); // constexpr in C++20
-    complex<double>& operator=(const complex<double>&);
+    complex<double>& operator=(const complex<double>&); // constexpr in C++20
-    template<class X> complex<double>& operator= (const complex<X>&);
+    template<class X> complex<double>& operator= (const complex<X>&); // constexpr in C++20
-    template<class X> complex<double>& operator+=(const complex<X>&);
+    template<class X> complex<double>& operator+=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<double>& operator-=(const complex<X>&);
+    template<class X> complex<double>& operator-=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<double>& operator*=(const complex<X>&);
+    template<class X> complex<double>& operator*=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<double>& operator/=(const complex<X>&);
+    template<class X> complex<double>& operator/=(const complex<X>&); // constexpr in C++20
 };
 template<>
 @@ -115,39 +115,39 @@ public:
     constexpr complex(const complex<double>&);
     constexpr long double real() const;
-    void real(long double);
+    void real(long double); // constexpr in C++20
     constexpr long double imag() const;
-    void imag(long double);
+    void imag(long double); // constexpr in C++20
-    complex<long double>& operator=(const complex<long double>&);
+    complex<long double>& operator=(const complex<long double>&); // constexpr in C++20
-    complex<long double>& operator= (long double);
+    complex<long double>& operator= (long double); // constexpr in C++20
-    complex<long double>& operator+=(long double);
+    complex<long double>& operator+=(long double); // constexpr in C++20
-    complex<long double>& operator-=(long double);
+    complex<long double>& operator-=(long double); // constexpr in C++20
-    complex<long double>& operator*=(long double);
+    complex<long double>& operator*=(long double); // constexpr in C++20
-    complex<long double>& operator/=(long double);
+    complex<long double>& operator/=(long double); // constexpr in C++20
-    template<class X> complex<long double>& operator= (const complex<X>&);
+    template<class X> complex<long double>& operator= (const complex<X>&); // constexpr in C++20
-    template<class X> complex<long double>& operator+=(const complex<X>&);
+    template<class X> complex<long double>& operator+=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<long double>& operator-=(const complex<X>&);
+    template<class X> complex<long double>& operator-=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<long double>& operator*=(const complex<X>&);
+    template<class X> complex<long double>& operator*=(const complex<X>&); // constexpr in C++20
-    template<class X> complex<long double>& operator/=(const complex<X>&);
+    template<class X> complex<long double>& operator/=(const complex<X>&); // constexpr in C++20
 };
 // 26.3.6 operators:
-template<class T> complex<T> operator+(const complex<T>&, const complex<T>&);
+template<class T> complex<T> operator+(const complex<T>&, const complex<T>&); // constexpr in C++20
-template<class T> complex<T> operator+(const complex<T>&, const T&);
+template<class T> complex<T> operator+(const complex<T>&, const T&);          // constexpr in C++20
-template<class T> complex<T> operator+(const T&, const complex<T>&);
+template<class T> complex<T> operator+(const T&, const complex<T>&);          // constexpr in C++20
-template<class T> complex<T> operator-(const complex<T>&, const complex<T>&);
+template<class T> complex<T> operator-(const complex<T>&, const complex<T>&); // constexpr in C++20
-template<class T> complex<T> operator-(const complex<T>&, const T&);
+template<class T> complex<T> operator-(const complex<T>&, const T&);          // constexpr in C++20
-template<class T> complex<T> operator-(const T&, const complex<T>&);
+template<class T> complex<T> operator-(const T&, const complex<T>&);          // constexpr in C++20
-template<class T> complex<T> operator*(const complex<T>&, const complex<T>&);
+template<class T> complex<T> operator*(const complex<T>&, const complex<T>&); // constexpr in C++20
-template<class T> complex<T> operator*(const complex<T>&, const T&);
+template<class T> complex<T> operator*(const complex<T>&, const T&);          // constexpr in C++20
-template<class T> complex<T> operator*(const T&, const complex<T>&);
+template<class T> complex<T> operator*(const T&, const complex<T>&);          // constexpr in C++20
-template<class T> complex<T> operator/(const complex<T>&, const complex<T>&);
+template<class T> complex<T> operator/(const complex<T>&, const complex<T>&); // constexpr in C++20
-template<class T> complex<T> operator/(const complex<T>&, const T&);
+template<class T> complex<T> operator/(const complex<T>&, const T&);          // constexpr in C++20
-template<class T> complex<T> operator/(const T&, const complex<T>&);
+template<class T> complex<T> operator/(const T&, const complex<T>&);          // constexpr in C++20
-template<class T> complex<T> operator+(const complex<T>&);
+template<class T> complex<T> operator+(const complex<T>&);                    // constexpr in C++20
-template<class T> complex<T> operator-(const complex<T>&);
+template<class T> complex<T> operator-(const complex<T>&);                    // constexpr in C++20
 template<class T> bool operator==(const complex<T>&, const complex<T>&); // constexpr in C++14
 template<class T> bool operator==(const complex<T>&, const T&); // constexpr in C++14
 template<class T> bool operator==(const T&, const complex<T>&); // constexpr in C++14
 @@ -184,17 +184,17 @@ template<class T>              T arg(const complex<T>&);
 template<Integral T>      double arg(T);
                           float  arg(float);
-template<class T>              T norm(const complex<T>&);
+template<class T>              T norm(const complex<T>&); // constexpr in C++20
-                     long double norm(long double);
+                     long double norm(long double);       // constexpr in C++20
-                          double norm(double);
+                          double norm(double);            // constexpr in C++20
-template<Integral T>      double norm(T);
+template<Integral T>      double norm(T);                 // constexpr in C++20
-                          float  norm(float);
+                          float  norm(float);             // constexpr in C++20
-template<class T>      complex<T>           conj(const complex<T>&);
+template<class T>      complex<T>           conj(const complex<T>&); // constexpr in C++20
-                       complex<long double> conj(long double);
+                       complex<long double> conj(long double);       // constexpr in C++20
-                       complex<double>      conj(double);
+                       complex<double>      conj(double);            // constexpr in C++20
-template<Integral T>   complex<double>      conj(T);
+template<Integral T>   complex<double>      conj(T);                 // constexpr in C++20
-                       complex<float>       conj(float);
+                       complex<float>       conj(float);             // constexpr in C++20
 template<class T>    complex<T>           proj(const complex<T>&);
                      complex<long double> proj(long double);
 @@ -251,8 +251,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template<class _Tp> class _LIBCPP_TEMPLATE_VIS complex;
-template<class _Tp> complex<_Tp> operator*(const complex<_Tp>& __z, const complex<_Tp>& __w);
+template<class _Tp> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 complex<_Tp> operator*(const complex<_Tp>& __z, const complex<_Tp>& __w);
-template<class _Tp> complex<_Tp> operator/(const complex<_Tp>& __x, const complex<_Tp>& __y);
+template<class _Tp> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 complex<_Tp> operator/(const complex<_Tp>& __x, const complex<_Tp>& __y);
 template<class _Tp>
 class _LIBCPP_TEMPLATE_VIS complex
 @@ -263,50 +263,50 @@ private:
     value_type __re_;
     value_type __im_;
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     complex(const value_type& __re = value_type(), const value_type& __im = value_type())
         : __re_(__re), __im_(__im) {}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
     complex(const complex<_Xp>& __c)
         : __re_(__c.real()), __im_(__c.imag()) {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type real() const {return __re_;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 value_type real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type imag() const {return __im_;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 value_type imag() const {return __im_;}
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void imag(value_type __im) {__im_ = __im;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (const value_type& __re)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (const value_type& __re)
         {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(const value_type& __re) {__re_ += __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(const value_type& __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(const value_type& __re) {__re_ -= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(const value_type& __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(const value_type& __re) {__re_ *= __re; __im_ *= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(const value_type& __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(const value_type& __re) {__re_ /= __re; __im_ /= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(const value_type& __re) {__re_ /= __re; __im_ /= __re; return *this;}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (const complex<_Xp>& __c)
         {
             __re_ = __c.real();
             __im_ = __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(const complex<_Xp>& __c)
         {
             __re_ += __c.real();
             __im_ += __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(const complex<_Xp>& __c)
         {
             __re_ -= __c.real();
             __im_ -= __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(const complex<_Xp>& __c)
         {
             *this = *this * complex(__c.real(), __c.imag());
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(const complex<_Xp>& __c)
         {
             *this = *this / complex(__c.real(), __c.imag());
             return *this;
 @@ -334,40 +334,40 @@ public:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float real() const {return __re_;}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float imag() const {return __im_;}
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void imag(value_type __im) {__im_ = __im;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (float __re)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (float __re)
         {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(float __re) {__re_ += __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(float __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(float __re) {__re_ -= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(float __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(float __re) {__re_ *= __re; __im_ *= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(float __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(float __re) {__re_ /= __re; __im_ /= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(float __re) {__re_ /= __re; __im_ /= __re; return *this;}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (const complex<_Xp>& __c)
         {
             __re_ = __c.real();
             __im_ = __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(const complex<_Xp>& __c)
         {
             __re_ += __c.real();
             __im_ += __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(const complex<_Xp>& __c)
         {
             __re_ -= __c.real();
             __im_ -= __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(const complex<_Xp>& __c)
         {
             *this = *this * complex(__c.real(), __c.imag());
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(const complex<_Xp>& __c)
         {
             *this = *this / complex(__c.real(), __c.imag());
             return *this;
 @@ -392,40 +392,40 @@ public:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double real() const {return __re_;}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double imag() const {return __im_;}
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void imag(value_type __im) {__im_ = __im;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (double __re)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (double __re)
         {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(double __re) {__re_ += __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(double __re) {__re_ -= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(double __re) {__re_ *= __re; __im_ *= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(double __re) {__re_ /= __re; __im_ /= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (const complex<_Xp>& __c)
         {
             __re_ = __c.real();
             __im_ = __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(const complex<_Xp>& __c)
         {
             __re_ += __c.real();
             __im_ += __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(const complex<_Xp>& __c)
         {
             __re_ -= __c.real();
             __im_ -= __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(const complex<_Xp>& __c)
         {
             *this = *this * complex(__c.real(), __c.imag());
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(const complex<_Xp>& __c)
         {
             *this = *this / complex(__c.real(), __c.imag());
             return *this;
 @@ -450,40 +450,40 @@ public:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double real() const {return __re_;}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double imag() const {return __im_;}
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 void imag(value_type __im) {__im_ = __im;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (long double __re)
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (long double __re)
         {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(long double __re) {__re_ += __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(long double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(long double __re) {__re_ -= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(long double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(long double __re) {__re_ *= __re; __im_ *= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(long double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(long double __re) {__re_ /= __re; __im_ /= __re; return *this;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(long double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator= (const complex<_Xp>& __c)
         {
             __re_ = __c.real();
             __im_ = __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator+=(const complex<_Xp>& __c)
         {
             __re_ += __c.real();
             __im_ += __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator-=(const complex<_Xp>& __c)
         {
             __re_ -= __c.real();
             __im_ -= __c.imag();
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator*=(const complex<_Xp>& __c)
         {
             *this = *this * complex(__c.real(), __c.imag());
             return *this;
         }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
+    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 complex& operator/=(const complex<_Xp>& __c)
         {
             *this = *this / complex(__c.real(), __c.imag());
             return *this;
 @@ -523,7 +523,7 @@ complex<long double>::complex(const complex<double>& __c)
 // 26.3.6 operators:
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
 {
 @@ -533,7 +533,7 @@ operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator+(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -543,7 +543,7 @@ operator+(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator+(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -553,7 +553,7 @@ operator+(const _Tp& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
 {
 @@ -563,7 +563,7 @@ operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator-(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -573,7 +573,7 @@ operator-(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator-(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -583,53 +583,86 @@ operator-(const _Tp& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 complex<_Tp>
 operator*(const complex<_Tp>& __z, const complex<_Tp>& __w)
 {
     _Tp __a = __z.real();
     _Tp __b = __z.imag();
     _Tp __c = __w.real();
     _Tp __d = __w.imag();
+    // Avoid floating point operations that are invalid during constant evaluation
+    if (__libcpp_is_constant_evaluated()) {
+        bool __z_zero = __a == _Tp(0) && __b == _Tp(0);
+        bool __w_zero = __c == _Tp(0) && __d == _Tp(0);
+        bool __z_inf = std::__constexpr_isinf(__a) || std::__constexpr_isinf(__b);
+        bool __w_inf = std::__constexpr_isinf(__c) || std::__constexpr_isinf(__d);
+        bool __z_nan = !__z_inf && (
+            (std::__constexpr_isnan(__a) && std::__constexpr_isnan(__b))
+            || (std::__constexpr_isnan(__a) && __b == _Tp(0))
+            || (__a == _Tp(0) && std::__constexpr_isnan(__b))
+        );
+        bool __w_nan = !__w_inf && (
+            (std::__constexpr_isnan(__c) && std::__constexpr_isnan(__d))
+            || (std::__constexpr_isnan(__c) && __d == _Tp(0))
+            || (__c == _Tp(0) && std::__constexpr_isnan(__d))
+        );
+        if (__z_nan || __w_nan) {
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+        }
+        if (__z_inf || __w_inf) {
+            if (__z_zero || __w_zero) {
+                return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+            }
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::infinity()), _Tp(numeric_limits<_Tp>::infinity()));
+        }
+        bool __z_nonzero_nan = !__z_inf && !__z_nan && (std::__constexpr_isnan(__a) || std::__constexpr_isnan(__b));
+        bool __w_nonzero_nan = !__w_inf && !__w_nan && (std::__constexpr_isnan(__c) || std::__constexpr_isnan(__d));
+        if (__z_nonzero_nan || __w_nonzero_nan) {
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+        }
+    }
     _Tp __ac = __a * __c;
     _Tp __bd = __b * __d;
     _Tp __ad = __a * __d;
     _Tp __bc = __b * __c;
     _Tp __x = __ac - __bd;
     _Tp __y = __ad + __bc;
-    if (__libcpp_isnan_or_builtin(__x) && __libcpp_isnan_or_builtin(__y))
+    if (std::__constexpr_isnan(__x) && std::__constexpr_isnan(__y))
     {
         bool __recalc = false;
-        if (__libcpp_isinf_or_builtin(__a) || __libcpp_isinf_or_builtin(__b))
+        if (std::__constexpr_isinf(__a) || std::__constexpr_isinf(__b))
         {
-            __a = copysign(__libcpp_isinf_or_builtin(__a) ? _Tp(1) : _Tp(0), __a);
+            __a = std::__constexpr_copysign(std::__constexpr_isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __b = copysign(__libcpp_isinf_or_builtin(__b) ? _Tp(1) : _Tp(0), __b);
+            __b = std::__constexpr_copysign(std::__constexpr_isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            if (__libcpp_isnan_or_builtin(__c))
+            if (std::__constexpr_isnan(__c))
-                __c = copysign(_Tp(0), __c);
+                __c = std::__constexpr_copysign(_Tp(0), __c);
-            if (__libcpp_isnan_or_builtin(__d))
+            if (std::__constexpr_isnan(__d))
-                __d = copysign(_Tp(0), __d);
+                __d = std::__constexpr_copysign(_Tp(0), __d);
             __recalc = true;
         }
-        if (__libcpp_isinf_or_builtin(__c) || __libcpp_isinf_or_builtin(__d))
+        if (std::__constexpr_isinf(__c) || std::__constexpr_isinf(__d))
         {
-            __c = copysign(__libcpp_isinf_or_builtin(__c) ? _Tp(1) : _Tp(0), __c);
+            __c = std::__constexpr_copysign(std::__constexpr_isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __d = copysign(__libcpp_isinf_or_builtin(__d) ? _Tp(1) : _Tp(0), __d);
+            __d = std::__constexpr_copysign(std::__constexpr_isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            if (__libcpp_isnan_or_builtin(__a))
+            if (std::__constexpr_isnan(__a))
-                __a = copysign(_Tp(0), __a);
+                __a = std::__constexpr_copysign(_Tp(0), __a);
-            if (__libcpp_isnan_or_builtin(__b))
+            if (std::__constexpr_isnan(__b))
-                __b = copysign(_Tp(0), __b);
+                __b = std::__constexpr_copysign(_Tp(0), __b);
             __recalc = true;
         }
-        if (!__recalc && (__libcpp_isinf_or_builtin(__ac) || __libcpp_isinf_or_builtin(__bd) ||
+        if (!__recalc && (std::__constexpr_isinf(__ac) || std::__constexpr_isinf(__bd) ||
-                          __libcpp_isinf_or_builtin(__ad) || __libcpp_isinf_or_builtin(__bc)))
+                          std::__constexpr_isinf(__ad) || std::__constexpr_isinf(__bc)))
         {
-            if (__libcpp_isnan_or_builtin(__a))
+            if (std::__constexpr_isnan(__a))
-                __a = copysign(_Tp(0), __a);
+                __a = std::__constexpr_copysign(_Tp(0), __a);
-            if (__libcpp_isnan_or_builtin(__b))
+            if (std::__constexpr_isnan(__b))
-                __b = copysign(_Tp(0), __b);
+                __b = std::__constexpr_copysign(_Tp(0), __b);
-            if (__libcpp_isnan_or_builtin(__c))
+            if (std::__constexpr_isnan(__c))
-                __c = copysign(_Tp(0), __c);
+                __c = std::__constexpr_copysign(_Tp(0), __c);
-            if (__libcpp_isnan_or_builtin(__d))
+            if (std::__constexpr_isnan(__d))
-                __d = copysign(_Tp(0), __d);
+                __d = std::__constexpr_copysign(_Tp(0), __d);
             __recalc = true;
         }
         if (__recalc)
 @@ -642,7 +675,7 @@ operator*(const complex<_Tp>& __z, const complex<_Tp>& __w)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator*(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -652,7 +685,7 @@ operator*(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator*(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -662,7 +695,7 @@ operator*(const _Tp& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 complex<_Tp>
 operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
 {
     int __ilogbw = 0;
 @@ -670,34 +703,74 @@ operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
     _Tp __b = __z.imag();
     _Tp __c = __w.real();
     _Tp __d = __w.imag();
-    _Tp __logbw = logb(fmax(fabs(__c), fabs(__d)));
+    _Tp __logbw = std::__constexpr_logb(std::__constexpr_fmax(std::__constexpr_fabs(__c), std::__constexpr_fabs(__d)));
-    if (__libcpp_isfinite_or_builtin(__logbw))
+    if (std::__constexpr_isfinite(__logbw))
     {
         __ilogbw = static_cast<int>(__logbw);
-        __c = scalbn(__c, -__ilogbw);
+        __c = std::__constexpr_scalbn(__c, -__ilogbw);
-        __d = scalbn(__d, -__ilogbw);
+        __d = std::__constexpr_scalbn(__d, -__ilogbw);
+    }
+    // Avoid floating point operations that are invalid during constant evaluation
+    if (__libcpp_is_constant_evaluated()) {
+        bool __z_zero = __a == _Tp(0) && __b == _Tp(0);
+        bool __w_zero = __c == _Tp(0) && __d == _Tp(0);
+        bool __z_inf = std::__constexpr_isinf(__a) || std::__constexpr_isinf(__b);
+        bool __w_inf = std::__constexpr_isinf(__c) || std::__constexpr_isinf(__d);
+        bool __z_nan = !__z_inf && (
+            (std::__constexpr_isnan(__a) && std::__constexpr_isnan(__b))
+            || (std::__constexpr_isnan(__a) && __b == _Tp(0))
+            || (__a == _Tp(0) && std::__constexpr_isnan(__b))
+        );
+        bool __w_nan = !__w_inf && (
+            (std::__constexpr_isnan(__c) && std::__constexpr_isnan(__d))
+            || (std::__constexpr_isnan(__c) && __d == _Tp(0))
+            || (__c == _Tp(0) && std::__constexpr_isnan(__d))
+        );
+        if ((__z_nan || __w_nan) || (__z_inf && __w_inf)) {
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+        }
+        bool __z_nonzero_nan = !__z_inf && !__z_nan && (std::__constexpr_isnan(__a) || std::__constexpr_isnan(__b));
+        bool __w_nonzero_nan = !__w_inf && !__w_nan && (std::__constexpr_isnan(__c) || std::__constexpr_isnan(__d));
+        if (__z_nonzero_nan || __w_nonzero_nan) {
+            if (__w_zero) {
+                return complex<_Tp>(_Tp(numeric_limits<_Tp>::infinity()), _Tp(numeric_limits<_Tp>::infinity()));
+            }
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+        }
+        if (__w_inf) {
+            return complex<_Tp>(_Tp(0), _Tp(0));
+        }
+        if (__z_inf) {
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::infinity()), _Tp(numeric_limits<_Tp>::infinity()));
+        }
+        if (__w_zero) {
+            if (__z_zero) {
+                return complex<_Tp>(_Tp(numeric_limits<_Tp>::quiet_NaN()), _Tp(0));
+            }
+            return complex<_Tp>(_Tp(numeric_limits<_Tp>::infinity()), _Tp(numeric_limits<_Tp>::infinity()));
+        }
     }
     _Tp __denom = __c * __c + __d * __d;
-    _Tp __x = scalbn((__a * __c + __b * __d) / __denom, -__ilogbw);
+    _Tp __x = std::__constexpr_scalbn((__a * __c + __b * __d) / __denom, -__ilogbw);
-    _Tp __y = scalbn((__b * __c - __a * __d) / __denom, -__ilogbw);
+    _Tp __y = std::__constexpr_scalbn((__b * __c - __a * __d) / __denom, -__ilogbw);
-    if (__libcpp_isnan_or_builtin(__x) && __libcpp_isnan_or_builtin(__y))
+    if (std::__constexpr_isnan(__x) && std::__constexpr_isnan(__y))
     {
-        if ((__denom == _Tp(0)) && (!__libcpp_isnan_or_builtin(__a) || !__libcpp_isnan_or_builtin(__b)))
+        if ((__denom == _Tp(0)) && (!std::__constexpr_isnan(__a) || !std::__constexpr_isnan(__b)))
         {
-            __x = copysign(_Tp(INFINITY), __c) * __a;
+            __x = std::__constexpr_copysign(_Tp(INFINITY), __c) * __a;
-            __y = copysign(_Tp(INFINITY), __c) * __b;
+            __y = std::__constexpr_copysign(_Tp(INFINITY), __c) * __b;
-        }
+        } else if ((std::__constexpr_isinf(__a) || std::__constexpr_isinf(__b)) && std::__constexpr_isfinite(__c) &&
-        else if ((__libcpp_isinf_or_builtin(__a) || __libcpp_isinf_or_builtin(__b)) && __libcpp_isfinite_or_builtin(__c) && __libcpp_isfinite_or_builtin(__d))
+                   std::__constexpr_isfinite(__d)) {
-        {
+            __a = std::__constexpr_copysign(std::__constexpr_isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __a = copysign(__libcpp_isinf_or_builtin(__a) ? _Tp(1) : _Tp(0), __a);
+            __b = std::__constexpr_copysign(std::__constexpr_isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            __b = copysign(__libcpp_isinf_or_builtin(__b) ? _Tp(1) : _Tp(0), __b);
             __x = _Tp(INFINITY) * (__a * __c + __b * __d);
             __y = _Tp(INFINITY) * (__b * __c - __a * __d);
-        }
+        } else if (std::__constexpr_isinf(__logbw) && __logbw > _Tp(0) && std::__constexpr_isfinite(__a) &&
-        else if (__libcpp_isinf_or_builtin(__logbw) && __logbw > _Tp(0) && __libcpp_isfinite_or_builtin(__a) && __libcpp_isfinite_or_builtin(__b))
+                   std::__constexpr_isfinite(__b)) {
-        {
+            __c = std::__constexpr_copysign(std::__constexpr_isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __c = copysign(__libcpp_isinf_or_builtin(__c) ? _Tp(1) : _Tp(0), __c);
+            __d = std::__constexpr_copysign(std::__constexpr_isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            __d = copysign(__libcpp_isinf_or_builtin(__d) ? _Tp(1) : _Tp(0), __d);
             __x = _Tp(0) * (__a * __c + __b * __d);
             __y = _Tp(0) * (__b * __c - __a * __d);
         }
 @@ -706,7 +779,7 @@ operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator/(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -714,7 +787,7 @@ operator/(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator/(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -724,7 +797,7 @@ operator/(const _Tp& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator+(const complex<_Tp>& __x)
 {
 @@ -732,7 +805,7 @@ operator+(const complex<_Tp>& __x)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 operator-(const complex<_Tp>& __x)
 {
 @@ -740,7 +813,7 @@ operator-(const complex<_Tp>& __x)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
 {
 @@ -748,7 +821,7 @@ operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator==(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -756,7 +829,7 @@ operator==(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator==(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -764,7 +837,7 @@ operator==(const _Tp& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
 {
 @@ -772,7 +845,7 @@ operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator!=(const complex<_Tp>& __x, const _Tp& __y)
 {
 @@ -780,7 +853,7 @@ operator!=(const complex<_Tp>& __x, const _Tp& __y)
 }
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 bool
 operator!=(const _Tp& __x, const complex<_Tp>& __y)
 {
 @@ -813,7 +886,7 @@ struct __libcpp_complex_overload_traits<_Tp, false, true>
 // real
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 real(const complex<_Tp>& __c)
 {
 @@ -821,7 +894,7 @@ real(const complex<_Tp>& __c)
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 typename __libcpp_complex_overload_traits<_Tp>::_ValueType
 real(_Tp __re)
 {
 @@ -831,7 +904,7 @@ real(_Tp __re)
 // imag
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 _Tp
 imag(const complex<_Tp>& __c)
 {
 @@ -839,7 +912,7 @@ imag(const complex<_Tp>& __c)
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
 typename __libcpp_complex_overload_traits<_Tp>::_ValueType
 imag(_Tp)
 {
 @@ -853,7 +926,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 _Tp
 abs(const complex<_Tp>& __c)
 {
-    return hypot(__c.real(), __c.imag());
+    return std::hypot(__c.real(), __c.imag());
 }
 // arg
 @@ -863,7 +936,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 _Tp
 arg(const complex<_Tp>& __c)
 {
-    return atan2(__c.imag(), __c.real());
+    return std::atan2(__c.imag(), __c.real());
 }
 template <class _Tp>
 @@ -874,7 +947,7 @@ typename enable_if<
 >::type
 arg(_Tp __re)
 {
-    return atan2l(0.L, __re);
+    return std::atan2l(0.L, __re);
 }
 template<class _Tp>
 @@ -886,7 +959,7 @@ typename enable_if
 >::type
 arg(_Tp __re)
 {
-    return atan2(0., __re);
+    return std::atan2(0., __re);
 }
 template <class _Tp>
 @@ -897,25 +970,25 @@ typename enable_if<
 >::type
 arg(_Tp __re)
 {
-    return atan2f(0.F, __re);
+    return std::atan2f(0.F, __re);
 }
 // norm
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 _Tp
 norm(const complex<_Tp>& __c)
 {
-    if (__libcpp_isinf_or_builtin(__c.real()))
+    if (std::__constexpr_isinf(__c.real()))
-        return abs(__c.real());
+        return std::abs(__c.real());
-    if (__libcpp_isinf_or_builtin(__c.imag()))
+    if (std::__constexpr_isinf(__c.imag()))
-        return abs(__c.imag());
+        return std::abs(__c.imag());
     return __c.real() * __c.real() + __c.imag() * __c.imag();
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 typename __libcpp_complex_overload_traits<_Tp>::_ValueType
 norm(_Tp __re)
 {
 @@ -926,7 +999,7 @@ norm(_Tp __re)
 // conj
 template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 complex<_Tp>
 conj(const complex<_Tp>& __c)
 {
 @@ -934,7 +1007,7 @@ conj(const complex<_Tp>& __c)
 }
 template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
 typename __libcpp_complex_overload_traits<_Tp>::_ComplexType
 conj(_Tp __re)
 {
 @@ -952,8 +1025,8 @@ complex<_Tp>
 proj(const complex<_Tp>& __c)
 {
     complex<_Tp> __r = __c;
-    if (__libcpp_isinf_or_builtin(__c.real()) || __libcpp_isinf_or_builtin(__c.imag()))
+    if (std::__constexpr_isinf(__c.real()) || std::__constexpr_isinf(__c.imag()))
-        __r = complex<_Tp>(INFINITY, copysign(_Tp(0), __c.imag()));
+        __r = complex<_Tp>(INFINITY, std::copysign(_Tp(0), __c.imag()));
     return __r;
 }
 @@ -966,8 +1039,8 @@ typename enable_if
 >::type
 proj(_Tp __re)
 {
-    if (__libcpp_isinf_or_builtin(__re))
+    if (std::__constexpr_isinf(__re))
-        __re = abs(__re);
+        __re = std::abs(__re);
     return complex<_Tp>(__re);
 }
 @@ -987,28 +1060,28 @@ proj(_Tp __re)
 // polar
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 polar(const _Tp& __rho, const _Tp& __theta = _Tp())
 {
-    if (__libcpp_isnan_or_builtin(__rho) || signbit(__rho))
+    if (std::__constexpr_isnan(__rho) || std::signbit(__rho))
         return complex<_Tp>(_Tp(NAN), _Tp(NAN));
-    if (__libcpp_isnan_or_builtin(__theta))
+    if (std::__constexpr_isnan(__theta))
     {
-        if (__libcpp_isinf_or_builtin(__rho))
+        if (std::__constexpr_isinf(__rho))
             return complex<_Tp>(__rho, __theta);
         return complex<_Tp>(__theta, __theta);
     }
-    if (__libcpp_isinf_or_builtin(__theta))
+    if (std::__constexpr_isinf(__theta))
     {
-        if (__libcpp_isinf_or_builtin(__rho))
+        if (std::__constexpr_isinf(__rho))
             return complex<_Tp>(__rho, _Tp(NAN));
         return complex<_Tp>(_Tp(NAN), _Tp(NAN));
     }
-    _Tp __x = __rho * cos(__theta);
+    _Tp __x = __rho * std::cos(__theta);
-    if (__libcpp_isnan_or_builtin(__x))
+    if (std::__constexpr_isnan(__x))
         __x = 0;
-    _Tp __y = __rho * sin(__theta);
+    _Tp __y = __rho * std::sin(__theta);
-    if (__libcpp_isnan_or_builtin(__y))
+    if (std::__constexpr_isnan(__y))
         __y = 0;
     return complex<_Tp>(__x, __y);
 }
 @@ -1020,7 +1093,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 complex<_Tp>
 log(const complex<_Tp>& __x)
 {
-    return complex<_Tp>(log(abs(__x)), arg(__x));
+    return complex<_Tp>(std::log(std::abs(__x)), std::arg(__x));
 }
 // log10
 @@ -1030,52 +1103,52 @@ inline _LIBCPP_INLINE_VISIBILITY
 complex<_Tp>
 log10(const complex<_Tp>& __x)
 {
-    return log(__x) / log(_Tp(10));
+    return std::log(__x) / std::log(_Tp(10));
 }
 // sqrt
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 sqrt(const complex<_Tp>& __x)
 {
-    if (__libcpp_isinf_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.imag()))
         return complex<_Tp>(_Tp(INFINITY), __x.imag());
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
         if (__x.real() > _Tp(0))
-            return complex<_Tp>(__x.real(), __libcpp_isnan_or_builtin(__x.imag()) ? __x.imag() : copysign(_Tp(0), __x.imag()));
+            return complex<_Tp>(__x.real(), std::__constexpr_isnan(__x.imag()) ? __x.imag() : std::copysign(_Tp(0), __x.imag()));
-        return complex<_Tp>(__libcpp_isnan_or_builtin(__x.imag()) ? __x.imag() : _Tp(0), copysign(__x.real(), __x.imag()));
+        return complex<_Tp>(std::__constexpr_isnan(__x.imag()) ? __x.imag() : _Tp(0), std::copysign(__x.real(), __x.imag()));
     }
-    return polar(sqrt(abs(__x)), arg(__x) / _Tp(2));
+    return std::polar(std::sqrt(std::abs(__x)), std::arg(__x) / _Tp(2));
 }
 // exp
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 exp(const complex<_Tp>& __x)
 {
     _Tp __i = __x.imag();
     if (__i == 0) {
-        return complex<_Tp>(exp(__x.real()), copysign(_Tp(0), __x.imag()));
+        return complex<_Tp>(std::exp(__x.real()), std::copysign(_Tp(0), __x.imag()));
     }
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
         if (__x.real() < _Tp(0))
         {
-            if (!__libcpp_isfinite_or_builtin(__i))
+            if (!std::__constexpr_isfinite(__i))
                 __i = _Tp(1);
         }
-        else if (__i == 0 || !__libcpp_isfinite_or_builtin(__i))
+        else if (__i == 0 || !std::__constexpr_isfinite(__i))
         {
-            if (__libcpp_isinf_or_builtin(__i))
+            if (std::__constexpr_isinf(__i))
                 __i = _Tp(NAN);
             return complex<_Tp>(__x.real(), __i);
         }
     }
-    _Tp __e = exp(__x.real());
+    _Tp __e = std::exp(__x.real());
-    return complex<_Tp>(__e * cos(__i), __e * sin(__i));
+    return complex<_Tp>(__e * std::cos(__i), __e * std::sin(__i));
 }
 // pow
 @@ -1085,7 +1158,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 complex<_Tp>
 pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
 {
-    return exp(__y * log(__x));
+    return std::exp(__y * std::log(__x));
 }
 template<class _Tp, class _Up>
 @@ -1137,219 +1210,219 @@ __sqr(const complex<_Tp>& __x)
 // asinh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 asinh(const complex<_Tp>& __x)
 {
     const _Tp __pi(atan2(+0., -0.));
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
-        if (__libcpp_isnan_or_builtin(__x.imag()))
+        if (std::__constexpr_isnan(__x.imag()))
             return __x;
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
-            return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
+            return complex<_Tp>(__x.real(), std::copysign(__pi * _Tp(0.25), __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
+        return complex<_Tp>(__x.real(), std::copysign(_Tp(0), __x.imag()));
     }
-    if (__libcpp_isnan_or_builtin(__x.real()))
+    if (std::__constexpr_isnan(__x.real()))
     {
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
             return complex<_Tp>(__x.imag(), __x.real());
         if (__x.imag() == 0)
             return __x;
         return complex<_Tp>(__x.real(), __x.real());
     }
-    if (__libcpp_isinf_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.imag()))
-        return complex<_Tp>(copysign(__x.imag(), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
+        return complex<_Tp>(std::copysign(__x.imag(), __x.real()), std::copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(__sqr(__x) + _Tp(1)));
+    complex<_Tp> __z = std::log(__x + std::sqrt(std::__sqr(__x) + _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
+    return complex<_Tp>(std::copysign(__z.real(), __x.real()), std::copysign(__z.imag(), __x.imag()));
 }
 // acosh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 acosh(const complex<_Tp>& __x)
 {
     const _Tp __pi(atan2(+0., -0.));
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
-        if (__libcpp_isnan_or_builtin(__x.imag()))
+        if (std::__constexpr_isnan(__x.imag()))
-            return complex<_Tp>(abs(__x.real()), __x.imag());
+            return complex<_Tp>(std::abs(__x.real()), __x.imag());
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
         {
             if (__x.real() > 0)
-                return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
+                return complex<_Tp>(__x.real(), std::copysign(__pi * _Tp(0.25), __x.imag()));
             else
-                return complex<_Tp>(-__x.real(), copysign(__pi * _Tp(0.75), __x.imag()));
+                return complex<_Tp>(-__x.real(), std::copysign(__pi * _Tp(0.75), __x.imag()));
         }
         if (__x.real() < 0)
-            return complex<_Tp>(-__x.real(), copysign(__pi, __x.imag()));
+            return complex<_Tp>(-__x.real(), std::copysign(__pi, __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
+        return complex<_Tp>(__x.real(), std::copysign(_Tp(0), __x.imag()));
     }
-    if (__libcpp_isnan_or_builtin(__x.real()))
+    if (std::__constexpr_isnan(__x.real()))
     {
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
-            return complex<_Tp>(abs(__x.imag()), __x.real());
+            return complex<_Tp>(std::abs(__x.imag()), __x.real());
         return complex<_Tp>(__x.real(), __x.real());
     }
-    if (__libcpp_isinf_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.imag()))
-        return complex<_Tp>(abs(__x.imag()), copysign(__pi/_Tp(2), __x.imag()));
+        return complex<_Tp>(std::abs(__x.imag()), std::copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(__sqr(__x) - _Tp(1)));
+    complex<_Tp> __z = std::log(__x + std::sqrt(std::__sqr(__x) - _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), _Tp(0)), copysign(__z.imag(), __x.imag()));
+    return complex<_Tp>(std::copysign(__z.real(), _Tp(0)), std::copysign(__z.imag(), __x.imag()));
 }
 // atanh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 atanh(const complex<_Tp>& __x)
 {
     const _Tp __pi(atan2(+0., -0.));
-    if (__libcpp_isinf_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.imag()))
     {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
+        return complex<_Tp>(std::copysign(_Tp(0), __x.real()), std::copysign(__pi/_Tp(2), __x.imag()));
     }
-    if (__libcpp_isnan_or_builtin(__x.imag()))
+    if (std::__constexpr_isnan(__x.imag()))
     {
-        if (__libcpp_isinf_or_builtin(__x.real()) || __x.real() == 0)
+        if (std::__constexpr_isinf(__x.real()) || __x.real() == 0)
-            return complex<_Tp>(copysign(_Tp(0), __x.real()), __x.imag());
+            return complex<_Tp>(std::copysign(_Tp(0), __x.real()), __x.imag());
         return complex<_Tp>(__x.imag(), __x.imag());
     }
-    if (__libcpp_isnan_or_builtin(__x.real()))
+    if (std::__constexpr_isnan(__x.real()))
     {
         return complex<_Tp>(__x.real(), __x.real());
     }
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
+        return complex<_Tp>(std::copysign(_Tp(0), __x.real()), std::copysign(__pi/_Tp(2), __x.imag()));
     }
-    if (abs(__x.real()) == _Tp(1) && __x.imag() == _Tp(0))
+    if (std::abs(__x.real()) == _Tp(1) && __x.imag() == _Tp(0))
     {
-        return complex<_Tp>(copysign(_Tp(INFINITY), __x.real()), copysign(_Tp(0), __x.imag()));
+        return complex<_Tp>(std::copysign(_Tp(INFINITY), __x.real()), std::copysign(_Tp(0), __x.imag()));
     }
-    complex<_Tp> __z = log((_Tp(1) + __x) / (_Tp(1) - __x)) / _Tp(2);
+    complex<_Tp> __z = std::log((_Tp(1) + __x) / (_Tp(1) - __x)) / _Tp(2);
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
+    return complex<_Tp>(std::copysign(__z.real(), __x.real()), std::copysign(__z.imag(), __x.imag()));
 }
 // sinh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 sinh(const complex<_Tp>& __x)
 {
-    if (__libcpp_isinf_or_builtin(__x.real()) && !__libcpp_isfinite_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.real()) && !std::__constexpr_isfinite(__x.imag()))
         return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.real() == 0 && !__libcpp_isfinite_or_builtin(__x.imag()))
+    if (__x.real() == 0 && !std::__constexpr_isfinite(__x.imag()))
         return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.imag() == 0 && !__libcpp_isfinite_or_builtin(__x.real()))
+    if (__x.imag() == 0 && !std::__constexpr_isfinite(__x.real()))
         return __x;
-    return complex<_Tp>(sinh(__x.real()) * cos(__x.imag()), cosh(__x.real()) * sin(__x.imag()));
+    return complex<_Tp>(std::sinh(__x.real()) * std::cos(__x.imag()), std::cosh(__x.real()) * std::sin(__x.imag()));
 }
 // cosh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 cosh(const complex<_Tp>& __x)
 {
-    if (__libcpp_isinf_or_builtin(__x.real()) && !__libcpp_isfinite_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.real()) && !std::__constexpr_isfinite(__x.imag()))
-        return complex<_Tp>(abs(__x.real()), _Tp(NAN));
+        return complex<_Tp>(std::abs(__x.real()), _Tp(NAN));
-    if (__x.real() == 0 && !__libcpp_isfinite_or_builtin(__x.imag()))
+    if (__x.real() == 0 && !std::__constexpr_isfinite(__x.imag()))
         return complex<_Tp>(_Tp(NAN), __x.real());
     if (__x.real() == 0 && __x.imag() == 0)
         return complex<_Tp>(_Tp(1), __x.imag());
-    if (__x.imag() == 0 && !__libcpp_isfinite_or_builtin(__x.real()))
+    if (__x.imag() == 0 && !std::__constexpr_isfinite(__x.real()))
-        return complex<_Tp>(abs(__x.real()), __x.imag());
+        return complex<_Tp>(std::abs(__x.real()), __x.imag());
-    return complex<_Tp>(cosh(__x.real()) * cos(__x.imag()), sinh(__x.real()) * sin(__x.imag()));
+    return complex<_Tp>(std::cosh(__x.real()) * std::cos(__x.imag()), std::sinh(__x.real()) * std::sin(__x.imag()));
 }
 // tanh
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 tanh(const complex<_Tp>& __x)
 {
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
-        if (!__libcpp_isfinite_or_builtin(__x.imag()))
+        if (!std::__constexpr_isfinite(__x.imag()))
-            return complex<_Tp>(copysign(_Tp(1), __x.real()), _Tp(0));
+            return complex<_Tp>(std::copysign(_Tp(1), __x.real()), _Tp(0));
-        return complex<_Tp>(copysign(_Tp(1), __x.real()), copysign(_Tp(0), sin(_Tp(2) * __x.imag())));
+        return complex<_Tp>(std::copysign(_Tp(1), __x.real()), std::copysign(_Tp(0), std::sin(_Tp(2) * __x.imag())));
     }
-    if (__libcpp_isnan_or_builtin(__x.real()) && __x.imag() == 0)
+    if (std::__constexpr_isnan(__x.real()) && __x.imag() == 0)
         return __x;
     _Tp __2r(_Tp(2) * __x.real());
     _Tp __2i(_Tp(2) * __x.imag());
-    _Tp __d(cosh(__2r) + cos(__2i));
+    _Tp __d(std::cosh(__2r) + std::cos(__2i));
-    _Tp __2rsh(sinh(__2r));
+    _Tp __2rsh(std::sinh(__2r));
-    if (__libcpp_isinf_or_builtin(__2rsh) && __libcpp_isinf_or_builtin(__d))
+    if (std::__constexpr_isinf(__2rsh) && std::__constexpr_isinf(__d))
         return complex<_Tp>(__2rsh > _Tp(0) ? _Tp(1) : _Tp(-1),
                             __2i > _Tp(0) ? _Tp(0) : _Tp(-0.));
-    return  complex<_Tp>(__2rsh/__d, sin(__2i)/__d);
+    return  complex<_Tp>(__2rsh/__d, std::sin(__2i)/__d);
 }
 // asin
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 asin(const complex<_Tp>& __x)
 {
-    complex<_Tp> __z = asinh(complex<_Tp>(-__x.imag(), __x.real()));
+    complex<_Tp> __z = std::asinh(complex<_Tp>(-__x.imag(), __x.real()));
     return complex<_Tp>(__z.imag(), -__z.real());
 }
 // acos
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 acos(const complex<_Tp>& __x)
 {
     const _Tp __pi(atan2(+0., -0.));
-    if (__libcpp_isinf_or_builtin(__x.real()))
+    if (std::__constexpr_isinf(__x.real()))
     {
-        if (__libcpp_isnan_or_builtin(__x.imag()))
+        if (std::__constexpr_isnan(__x.imag()))
             return complex<_Tp>(__x.imag(), __x.real());
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
         {
             if (__x.real() < _Tp(0))
                 return complex<_Tp>(_Tp(0.75) * __pi, -__x.imag());
             return complex<_Tp>(_Tp(0.25) * __pi, -__x.imag());
         }
         if (__x.real() < _Tp(0))
-            return complex<_Tp>(__pi, signbit(__x.imag()) ? -__x.real() : __x.real());
+            return complex<_Tp>(__pi, std::signbit(__x.imag()) ? -__x.real() : __x.real());
-        return complex<_Tp>(_Tp(0), signbit(__x.imag()) ? __x.real() : -__x.real());
+        return complex<_Tp>(_Tp(0), std::signbit(__x.imag()) ? __x.real() : -__x.real());
     }
-    if (__libcpp_isnan_or_builtin(__x.real()))
+    if (std::__constexpr_isnan(__x.real()))
     {
-        if (__libcpp_isinf_or_builtin(__x.imag()))
+        if (std::__constexpr_isinf(__x.imag()))
             return complex<_Tp>(__x.real(), -__x.imag());
         return complex<_Tp>(__x.real(), __x.real());
     }
-    if (__libcpp_isinf_or_builtin(__x.imag()))
+    if (std::__constexpr_isinf(__x.imag()))
         return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    if (__x.real() == 0 && (__x.imag() == 0 || isnan(__x.imag())))
+    if (__x.real() == 0 && (__x.imag() == 0 || std::isnan(__x.imag())))
         return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    complex<_Tp> __z = log(__x + sqrt(__sqr(__x) - _Tp(1)));
+    complex<_Tp> __z = std::log(__x + std::sqrt(std::__sqr(__x) - _Tp(1)));
-    if (signbit(__x.imag()))
+    if (std::signbit(__x.imag()))
-        return complex<_Tp>(abs(__z.imag()), abs(__z.real()));
+        return complex<_Tp>(std::abs(__z.imag()), std::abs(__z.real()));
-    return complex<_Tp>(abs(__z.imag()), -abs(__z.real()));
+    return complex<_Tp>(std::abs(__z.imag()), -std::abs(__z.real()));
 }
 // atan
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 atan(const complex<_Tp>& __x)
 {
-    complex<_Tp> __z = atanh(complex<_Tp>(-__x.imag(), __x.real()));
+    complex<_Tp> __z = std::atanh(complex<_Tp>(-__x.imag(), __x.real()));
     return complex<_Tp>(__z.imag(), -__z.real());
 }
 // sin
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 sin(const complex<_Tp>& __x)
 {
-    complex<_Tp> __z = sinh(complex<_Tp>(-__x.imag(), __x.real()));
+    complex<_Tp> __z = std::sinh(complex<_Tp>(-__x.imag(), __x.real()));
     return complex<_Tp>(__z.imag(), -__z.real());
 }
 @@ -1360,26 +1433,27 @@ inline _LIBCPP_INLINE_VISIBILITY
 complex<_Tp>
 cos(const complex<_Tp>& __x)
 {
-    return cosh(complex<_Tp>(-__x.imag(), __x.real()));
+    return std::cosh(complex<_Tp>(-__x.imag(), __x.real()));
 }
 // tan
 template<class _Tp>
-complex<_Tp>
+_LIBCPP_HIDE_FROM_ABI complex<_Tp>
 tan(const complex<_Tp>& __x)
 {
-    complex<_Tp> __z = tanh(complex<_Tp>(-__x.imag(), __x.real()));
+    complex<_Tp> __z = std::tanh(complex<_Tp>(-__x.imag(), __x.real()));
     return complex<_Tp>(__z.imag(), -__z.real());
 }
+#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
 template<class _Tp, class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
 {
     if (__is.good())
     {
-        ws(__is);
+        std::ws(__is);
         if (__is.peek() == _CharT('('))
         {
             __is.get();
 @@ -1387,7 +1461,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
             __is >> __r;
             if (!__is.fail())
             {
-                ws(__is);
+                std::ws(__is);
                 _CharT __c = __is.peek();
                 if (__c == _CharT(','))
                 {
 @@ -1396,7 +1470,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
                     __is >> __i;
                     if (!__is.fail())
                     {
-                        ws(__is);
+                        std::ws(__is);
                         __c = __is.peek();
                         if (__c == _CharT(')'))
                         {
 @@ -1435,9 +1509,8 @@ operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
     return __is;
 }
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
 template<class _Tp, class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
 {
     basic_ostringstream<_CharT, _Traits> __s;
 @@ -1455,34 +1528,34 @@ inline namespace literals
 {
   inline namespace complex_literals
   {
-    constexpr complex<long double> operator""il(long double __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<long double> operator""il(long double __im)
     {
         return { 0.0l, __im };
     }
-    constexpr complex<long double> operator""il(unsigned long long __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<long double> operator""il(unsigned long long __im)
     {
         return { 0.0l, static_cast<long double>(__im) };
     }
-    constexpr complex<double> operator""i(long double __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<double> operator""i(long double __im)
     {
         return { 0.0, static_cast<double>(__im) };
     }
-    constexpr complex<double> operator""i(unsigned long long __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<double> operator""i(unsigned long long __im)
     {
         return { 0.0, static_cast<double>(__im) };
     }
-    constexpr complex<float> operator""if(long double __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<float> operator""if(long double __im)
     {
         return { 0.0f, static_cast<float>(__im) };
     }
-    constexpr complex<float> operator""if(unsigned long long __im)
+    _LIBCPP_HIDE_FROM_ABI constexpr complex<float> operator""if(unsigned long long __im)
     {
         return { 0.0f, static_cast<float>(__im) };
     }

lib/libcxx/include/complex.h+4-8

...	@@ -24,13 +24,9 @@	...	@@ -24,13 +24,9 @@
24	#endif	24	#endif
25		25
26	#ifdef __cplusplus	26	#ifdef __cplusplus
27		27	# include <ccomplex>
28	#include <ccomplex>	28	#elif __has_include_next(<complex.h>)
29		29	# include_next <complex.h>
30	#else // __cplusplus	30	#endif
31
32	#include_next <complex.h>
33
34	#endif // __cplusplus
35		31
36	#endif // _LIBCPP_COMPLEX_H	32	#endif // _LIBCPP_COMPLEX_H

lib/libcxx/include/concepts+4

 @@ -155,6 +155,10 @@ namespace std {
 #include <__config>
 #include <version>
+#if _LIBCPP_STD_VER <= 20 && !defined(_LIPCPP_REMOVE_TRANSITIVE_INCLUDES)
+#  include <type_traits>
+#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif

lib/libcxx/include/condition_variable+7-1

 @@ -108,8 +108,9 @@ public:
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
+#include <__memory/shared_ptr.h>
+#include <__memory/unique_ptr.h>
 #include <__mutex_base>
-#include <memory>
 #include <version>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -267,4 +268,9 @@ _LIBCPP_END_NAMESPACE_STD
 #endif // !_LIBCPP_HAS_NO_THREADS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_CONDITION_VARIABLE

lib/libcxx/include/coroutine+7-4

 @@ -46,15 +46,18 @@ struct suspend_always;
 #include <__coroutine/trivial_awaitables.h>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iosfwd>
-#endif
 // standard-mandated includes
+// [coroutine.syn]
 #include <compare>
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <iosfwd>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_COROUTINE

lib/libcxx/include/csetjmp+9

...	@@ -32,8 +32,17 @@ void longjmp(jmp_buf env, int val);	...	@@ -32,8 +32,17 @@ void longjmp(jmp_buf env, int val);
32		32
33	#include <__assert> // all public C++ headers provide the assertion handler	33	#include <__assert> // all public C++ headers provide the assertion handler
34	#include <__config>	34	#include <__config>
		35
35	#include <setjmp.h>	36	#include <setjmp.h>
36		37
		38	#ifndef _LIBCPP_SETJMP_H
		39	# error <csetjmp> tried including <setjmp.h> but didn't find libc++'s <setjmp.h> header. \
		40	This usually means that your header search paths are not configured properly. \
		41	The header search paths should contain the C++ Standard Library headers before \
		42	any C Standard Library, and you are probably using compiler flags that make that \
		43	not be the case.
		44	#endif
		45
37	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	46	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
38	# pragma GCC system_header	47	# pragma GCC system_header
39	#endif	48	#endif

lib/libcxx/include/csignal+5-1

 @@ -42,8 +42,12 @@ int raise(int sig);
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
+// <signal.h> is not provided by libc++
 #if __has_include(<signal.h>)
-# include <signal.h>
+#  include <signal.h>
+#  ifdef _LIBCPP_SIGNAL_H
+#    error "If libc++ starts defining <signal.h>, the __has_include check should move to libc++'s <signal.h>"
+#  endif
 #endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

lib/libcxx/include/cstdarg+8-1

...	@@ -33,7 +33,14 @@ Types:	...	@@ -33,7 +33,14 @@ Types:
33		33
34	#include <__assert> // all public C++ headers provide the assertion handler	34	#include <__assert> // all public C++ headers provide the assertion handler
35	#include <__config>	35	#include <__config>
36	#include <stdarg.h>	36
		37	// <stdarg.h> is not provided by libc++
		38	#if __has_include(<stdarg.h>)
		39	# include <stdarg.h>
		40	# ifdef _LIBCPP_STDARG_H
		41	# error "If libc++ starts defining <stdarg.h>, the __has_include check should move to libc++'s <stdarg.h>"
		42	# endif
		43	#endif
37		44
38	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	45	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
39	# pragma GCC system_header	46	# pragma GCC system_header

lib/libcxx/include/cstddef+22-13

 @@ -38,9 +38,18 @@ Types:
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/is_integral.h>
-#include <stddef.h>
 #include <version>
+#include <stddef.h>
+#ifndef _LIBCPP_STDDEF_H
+#   error <cstddef> tried including <stddef.h> but didn't find libc++'s <stddef.h> header. \
+          This usually means that your header search paths are not configured properly. \
+          The header search paths should contain the C++ Standard Library headers before \
+          any C Standard Library, and you are probably using compiler flags that make that \
+          not be the case.
+#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -62,7 +71,7 @@ namespace std  // purposefully not versioned
 {
 enum class byte : unsigned char {};
-constexpr byte  operator| (byte  __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte  operator| (byte  __lhs, byte __rhs) noexcept
 {
     return static_cast<byte>(
       static_cast<unsigned char>(
 @@ -70,10 +79,10 @@ constexpr byte  operator| (byte  __lhs, byte __rhs) noexcept
     ));
 }
-constexpr byte& operator|=(byte& __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte& operator|=(byte& __lhs, byte __rhs) noexcept
 { return __lhs = __lhs | __rhs; }
-constexpr byte  operator& (byte  __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte  operator& (byte  __lhs, byte __rhs) noexcept
 {
     return static_cast<byte>(
       static_cast<unsigned char>(
 @@ -81,10 +90,10 @@ constexpr byte  operator& (byte  __lhs, byte __rhs) noexcept
     ));
 }
-constexpr byte& operator&=(byte& __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte& operator&=(byte& __lhs, byte __rhs) noexcept
 { return __lhs = __lhs & __rhs; }
-constexpr byte  operator^ (byte  __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte  operator^ (byte  __lhs, byte __rhs) noexcept
 {
     return static_cast<byte>(
       static_cast<unsigned char>(
 @@ -92,10 +101,10 @@ constexpr byte  operator^ (byte  __lhs, byte __rhs) noexcept
     ));
 }
-constexpr byte& operator^=(byte& __lhs, byte __rhs) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte& operator^=(byte& __lhs, byte __rhs) noexcept
 { return __lhs = __lhs ^ __rhs; }
-constexpr byte  operator~ (byte __b) noexcept
+_LIBCPP_HIDE_FROM_ABI constexpr byte  operator~ (byte __b) noexcept
 {
     return static_cast<byte>(
       static_cast<unsigned char>(
 @@ -107,27 +116,27 @@ template <class _Tp>
 using _EnableByteOverload = __enable_if_t<is_integral<_Tp>::value, byte>;
 template <class _Integer>
-  constexpr _EnableByteOverload<_Integer> &
+_LIBCPP_HIDE_FROM_ABI constexpr _EnableByteOverload<_Integer> &
   operator<<=(byte& __lhs, _Integer __shift) noexcept
   { return __lhs = __lhs << __shift; }
 template <class _Integer>
-  constexpr _EnableByteOverload<_Integer>
+_LIBCPP_HIDE_FROM_ABI constexpr _EnableByteOverload<_Integer>
   operator<< (byte  __lhs, _Integer __shift) noexcept
   { return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) << __shift)); }
 template <class _Integer>
-  constexpr _EnableByteOverload<_Integer> &
+_LIBCPP_HIDE_FROM_ABI constexpr _EnableByteOverload<_Integer> &
   operator>>=(byte& __lhs, _Integer __shift) noexcept
   { return __lhs = __lhs >> __shift; }
 template <class _Integer>
-  constexpr _EnableByteOverload<_Integer>
+_LIBCPP_HIDE_FROM_ABI constexpr _EnableByteOverload<_Integer>
   operator>> (byte  __lhs, _Integer __shift) noexcept
   { return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) >> __shift)); }
 template <class _Integer, class = _EnableByteOverload<_Integer> >
-  _LIBCPP_NODISCARD_EXT constexpr _Integer
+_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr _Integer
   to_integer(byte __b) noexcept { return static_cast<_Integer>(__b); }
 } // namespace std

lib/libcxx/include/cstdint+9

...	@@ -142,8 +142,17 @@ Types:	...	@@ -142,8 +142,17 @@ Types:
142		142
143	#include <__assert> // all public C++ headers provide the assertion handler	143	#include <__assert> // all public C++ headers provide the assertion handler
144	#include <__config>	144	#include <__config>
		145
145	#include <stdint.h>	146	#include <stdint.h>
146		147
		148	#ifndef _LIBCPP_STDINT_H
		149	# error <cstdint> tried including <stdint.h> but didn't find libc++'s <stdint.h> header. \
		150	This usually means that your header search paths are not configured properly. \
		151	The header search paths should contain the C++ Standard Library headers before \
		152	any C Standard Library, and you are probably using compiler flags that make that \
		153	not be the case.
		154	#endif
		155
147	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	156	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
148	# pragma GCC system_header	157	# pragma GCC system_header
149	#endif	158	#endif

lib/libcxx/include/cstdio+9

...	@@ -97,8 +97,17 @@ void perror(const char* s);	...	@@ -97,8 +97,17 @@ void perror(const char* s);
97		97
98	#include <__assert> // all public C++ headers provide the assertion handler	98	#include <__assert> // all public C++ headers provide the assertion handler
99	#include <__config>	99	#include <__config>
		100
100	#include <stdio.h>	101	#include <stdio.h>
101		102
		103	#ifndef _LIBCPP_STDIO_H
		104	# error <cstdio> tried including <stdio.h> but didn't find libc++'s <stdio.h> header. \
		105	This usually means that your header search paths are not configured properly. \
		106	The header search paths should contain the C++ Standard Library headers before \
		107	any C Standard Library, and you are probably using compiler flags that make that \
		108	not be the case.
		109	#endif
		110
102	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	111	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
103	# pragma GCC system_header	112	# pragma GCC system_header
104	#endif	113	#endif

lib/libcxx/include/cstdlib+9

...	@@ -83,8 +83,17 @@ void *aligned_alloc(size_t alignment, size_t size); // C11	...	@@ -83,8 +83,17 @@ void *aligned_alloc(size_t alignment, size_t size); // C11
83		83
84	#include <__assert> // all public C++ headers provide the assertion handler	84	#include <__assert> // all public C++ headers provide the assertion handler
85	#include <__config>	85	#include <__config>
		86
86	#include <stdlib.h>	87	#include <stdlib.h>
87		88
		89	#ifndef _LIBCPP_STDLIB_H
		90	# error <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. \
		91	This usually means that your header search paths are not configured properly. \
		92	The header search paths should contain the C++ Standard Library headers before \
		93	any C Standard Library, and you are probably using compiler flags that make that \
		94	not be the case.
		95	#endif
		96
88	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	97	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
89	# pragma GCC system_header	98	# pragma GCC system_header
90	#endif	99	#endif

lib/libcxx/include/cstring+57

...	@@ -58,8 +58,18 @@ size_t strlen(const char* s);	...	@@ -58,8 +58,18 @@ size_t strlen(const char* s);
58		58
59	#include <__assert> // all public C++ headers provide the assertion handler	59	#include <__assert> // all public C++ headers provide the assertion handler
60	#include <__config>	60	#include <__config>
		61	#include <__type_traits/is_constant_evaluated.h>
		62
61	#include <string.h>	63	#include <string.h>
62		64
		65	#ifndef _LIBCPP_STRING_H
		66	# error <cstring> tried including <string.h> but didn't find libc++'s <string.h> header. \
		67	This usually means that your header search paths are not configured properly. \
		68	The header search paths should contain the C++ Standard Library headers before \
		69	any C Standard Library, and you are probably using compiler flags that make that \
		70	not be the case.
		71	#endif
		72
63	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	73	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
64	# pragma GCC system_header	74	# pragma GCC system_header
65	#endif	75	#endif
...	@@ -90,6 +100,53 @@ using ::memset _LIBCPP_USING_IF_EXISTS;	...	@@ -90,6 +100,53 @@ using ::memset _LIBCPP_USING_IF_EXISTS;
90	using ::strerror _LIBCPP_USING_IF_EXISTS;	100	using ::strerror _LIBCPP_USING_IF_EXISTS;
91	using ::strlen _LIBCPP_USING_IF_EXISTS;	101	using ::strlen _LIBCPP_USING_IF_EXISTS;
92		102
		103	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 size_t __constexpr_strlen(const char* __str) {
		104	// GCC currently doesn't support __builtin_strlen for heap-allocated memory during constant evaluation.
		105	// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70816
		106	#ifdef _LIBCPP_COMPILER_GCC
		107	if (__libcpp_is_constant_evaluated()) {
		108	size_t __i = 0;
		109	for (; __str[__i] != '\0'; ++__i)
		110	;
		111	return __i;
		112	}
		113	#endif
		114	return __builtin_strlen(__str);
		115	}
		116
		117	template <class _Tp>
		118	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int
		119	__constexpr_memcmp(const _Tp* __lhs, const _Tp* __rhs, size_t __count) {
		120	#ifdef _LIBCPP_COMPILER_GCC
		121	if (__libcpp_is_constant_evaluated()) {
		122	for (; __count; --__count, ++__lhs, ++__rhs) {
		123	if (__lhs < __rhs)
		124	return -1;
		125	if (__rhs < __lhs)
		126	return 1;
		127	}
		128	return 0;
		129	}
		130	#endif
		131	return __builtin_memcmp(__lhs, __rhs, __count);
		132	}
		133
		134	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const char*
		135	__constexpr_char_memchr(const char* __str, int __char, size_t __count) {
		136	#if __has_builtin(__builtin_char_memchr)
		137	return __builtin_char_memchr(__str, __char, __count);
		138	#else
		139	if (!__libcpp_is_constant_evaluated())
		140	return static_cast<const char*>(std::memchr(__str, __char, __count));
		141	for (; __count; --__count) {
		142	if (*__str == __char)
		143	return __str;
		144	++__str;
		145	}
		146	return nullptr;
		147	#endif
		148	}
		149
93	_LIBCPP_END_NAMESPACE_STD	150	_LIBCPP_END_NAMESPACE_STD
94		151
95	#endif // _LIBCPP_CSTRING	152	#endif // _LIBCPP_CSTRING

lib/libcxx/include/ctime+8-1

...	@@ -47,7 +47,14 @@ int timespec_get( struct timespec *ts, int base); // C++17	...	@@ -47,7 +47,14 @@ int timespec_get( struct timespec *ts, int base); // C++17
47		47
48	#include <__assert> // all public C++ headers provide the assertion handler	48	#include <__assert> // all public C++ headers provide the assertion handler
49	#include <__config>	49	#include <__config>
50	#include <time.h>	50
		51	// <time.h> is not provided by libc++
		52	#if __has_include(<time.h>)
		53	# include <time.h>
		54	# ifdef _LIBCPP_TIME_H
		55	# error "If libc++ starts defining <time.h>, the __has_include check should move to libc++'s <time.h>"
		56	# endif
		57	#endif
51		58
52	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	59	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
53	# pragma GCC system_header	60	# pragma GCC system_header

lib/libcxx/include/ctype.h+3-1

...	@@ -35,7 +35,9 @@ int toupper(int c);	...	@@ -35,7 +35,9 @@ int toupper(int c);
35	# pragma GCC system_header	35	# pragma GCC system_header
36	#endif	36	#endif
37		37
38	#include_next <ctype.h>	38	#if __has_include_next(<ctype.h>)
		39	# include_next <ctype.h>
		40	#endif
39		41
40	#ifdef __cplusplus	42	#ifdef __cplusplus
41		43

lib/libcxx/include/cuchar+15

 @@ -25,6 +25,8 @@ Types:
   mbstate_t
   size_t
+size_t mbrtoc8(char8_t* pc8, const char* s, size_t n, mbstate_t* ps);   // since C++20
+size_t c8rtomb(char* s, char8_t c8, mbstate_t* ps);                     // since C++20
 size_t mbrtoc16(char16_t* pc16, const char* s, size_t n, mbstate_t* ps);
 size_t c16rtomb(char* s, char16_t c16, mbstate_t* ps);
 size_t mbrtoc32(char32_t* pc32, const char* s, size_t n, mbstate_t* ps);
 @@ -36,8 +38,17 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <uchar.h>
+#ifndef _LIBCPP_UCHAR_H
+#   error <cuchar> tried including <uchar.h> but didn't find libc++'s <uchar.h> header. \
+          This usually means that your header search paths are not configured properly. \
+          The header search paths should contain the C++ Standard Library headers before \
+          any C Standard Library, and you are probably using compiler flags that make that \
+          not be the case.
+#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -49,6 +60,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
 using ::size_t _LIBCPP_USING_IF_EXISTS;
+#  if !defined(_LIBCPP_HAS_NO_C8RTOMB_MBRTOC8)
+using ::mbrtoc8 _LIBCPP_USING_IF_EXISTS;
+using ::c8rtomb _LIBCPP_USING_IF_EXISTS;
+#  endif
 using ::mbrtoc16 _LIBCPP_USING_IF_EXISTS;
 using ::c16rtomb _LIBCPP_USING_IF_EXISTS;
 using ::mbrtoc32 _LIBCPP_USING_IF_EXISTS;

lib/libcxx/include/cwchar+59

...	@@ -104,9 +104,19 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,	...	@@ -104,9 +104,19 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
104		104
105	#include <__assert> // all public C++ headers provide the assertion handler	105	#include <__assert> // all public C++ headers provide the assertion handler
106	#include <__config>	106	#include <__config>
		107	#include <__type_traits/is_constant_evaluated.h>
107	#include <cwctype>	108	#include <cwctype>
		109
108	#include <wchar.h>	110	#include <wchar.h>
109		111
		112	#ifndef _LIBCPP_WCHAR_H
		113	# error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \
		114	This usually means that your header search paths are not configured properly. \
		115	The header search paths should contain the C++ Standard Library headers before \
		116	any C Standard Library, and you are probably using compiler flags that make that \
		117	not be the case.
		118	#endif
		119
110	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	120	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
111	# pragma GCC system_header	121	# pragma GCC system_header
112	#endif	122	#endif
...	@@ -180,6 +190,55 @@ using ::putwchar _LIBCPP_USING_IF_EXISTS;	...	@@ -180,6 +190,55 @@ using ::putwchar _LIBCPP_USING_IF_EXISTS;
180	using ::vwprintf _LIBCPP_USING_IF_EXISTS;	190	using ::vwprintf _LIBCPP_USING_IF_EXISTS;
181	using ::wprintf _LIBCPP_USING_IF_EXISTS;	191	using ::wprintf _LIBCPP_USING_IF_EXISTS;
182		192
		193	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 size_t __constexpr_wcslen(const wchar_t* __str) {
		194	#if __has_builtin(__builtin_wcslen)
		195	return __builtin_wcslen(__str);
		196	#else
		197	if (!__libcpp_is_constant_evaluated())
		198	return std::wcslen(__str);
		199
		200	size_t __len = 0;
		201	for (; *__str != L'\0'; ++__str)
		202	++__len;
		203	return __len;
		204	#endif
		205	}
		206
		207	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int
		208	__constexpr_wmemcmp(const wchar_t* __lhs, const wchar_t* __rhs, size_t __count) {
		209	#if __has_builtin(__builtin_wmemcmp)
		210	return __builtin_wmemcmp(__lhs, __rhs, __count);
		211	#else
		212	if (!__libcpp_is_constant_evaluated())
		213	return std::wmemcmp(__lhs, __rhs, __count);
		214
		215	for (; __count; --__count, ++__lhs, ++__rhs) {
		216	if (__lhs < __rhs)
		217	return -1;
		218	if (__rhs < __lhs)
		219	return 1;
		220	}
		221	return 0;
		222	#endif
		223	}
		224
		225	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const wchar_t*
		226	__constexpr_wmemchr(const wchar_t* __str, wchar_t __char, size_t __count) {
		227	#if __has_feature(cxx_constexpr_string_builtins)
		228	return __builtin_wmemchr(__str, __char, __count);
		229	#else
		230	if (!__libcpp_is_constant_evaluated())
		231	return std::wmemchr(__str, __char, __count);
		232
		233	for (; __count; --__count) {
		234	if (*__str == __char)
		235	return __str;
		236	++__str;
		237	}
		238	return nullptr;
		239	#endif
		240	}
		241
183	_LIBCPP_END_NAMESPACE_STD	242	_LIBCPP_END_NAMESPACE_STD
184		243
185	#endif // _LIBCPP_CWCHAR	244	#endif // _LIBCPP_CWCHAR

lib/libcxx/include/cwctype+9

...	@@ -52,8 +52,17 @@ wctrans_t wctrans(const char* property);	...	@@ -52,8 +52,17 @@ wctrans_t wctrans(const char* property);
52	#include <__assert> // all public C++ headers provide the assertion handler	52	#include <__assert> // all public C++ headers provide the assertion handler
53	#include <__config>	53	#include <__config>
54	#include <cctype>	54	#include <cctype>
		55
55	#include <wctype.h>	56	#include <wctype.h>
56		57
		58	#ifndef _LIBCPP_WCTYPE_H
		59	# error <cwctype> tried including <wctype.h> but didn't find libc++'s <wctype.h> header. \
		60	This usually means that your header search paths are not configured properly. \
		61	The header search paths should contain the C++ Standard Library headers before \
		62	any C Standard Library, and you are probably using compiler flags that make that \
		63	not be the case.
		64	#endif
		65
57	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	66	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
58	# pragma GCC system_header	67	# pragma GCC system_header
59	#endif	68	#endif

lib/libcxx/include/deque+757-1374

...	@@ -176,7 +176,14 @@ template <class T, class Allocator, class Predicate>	...	@@ -176,7 +176,14 @@ template <class T, class Allocator, class Predicate>
176	#include <__iterator/next.h>	176	#include <__iterator/next.h>
177	#include <__iterator/prev.h>	177	#include <__iterator/prev.h>
178	#include <__iterator/reverse_iterator.h>	178	#include <__iterator/reverse_iterator.h>
		179	#include <__iterator/segmented_iterator.h>
		180	#include <__memory/allocator_destructor.h>
		181	#include <__memory/pointer_traits.h>
		182	#include <__memory/temp_value.h>
		183	#include <__memory/unique_ptr.h>
		184	#include <__memory_resource/polymorphic_allocator.h>
179	#include <__split_buffer>	185	#include <__split_buffer>
		186	#include <__type_traits/is_allocator.h>
180	#include <__utility/forward.h>	187	#include <__utility/forward.h>
181	#include <__utility/move.h>	188	#include <__utility/move.h>
182	#include <__utility/swap.h>	189	#include <__utility/swap.h>
...	@@ -185,12 +192,6 @@ template <class T, class Allocator, class Predicate>	...	@@ -185,12 +192,6 @@ template <class T, class Allocator, class Predicate>
185	#include <type_traits>	192	#include <type_traits>
186	#include <version>	193	#include <version>
187		194
188	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
189	# include <algorithm>
190	# include <functional>
191	# include <iterator>
192	#endif
193
194	// standard-mandated includes	195	// standard-mandated includes
195		196
196	// [iterator.range]	197	// [iterator.range]
...	@@ -214,101 +215,8 @@ _LIBCPP_PUSH_MACROS	...	@@ -214,101 +215,8 @@ _LIBCPP_PUSH_MACROS
214		215
215	_LIBCPP_BEGIN_NAMESPACE_STD	216	_LIBCPP_BEGIN_NAMESPACE_STD
216		217
217	template <class _Tp, class _Allocator> class __deque_base;
218	template <class _Tp, class _Allocator = allocator<_Tp> > class _LIBCPP_TEMPLATE_VIS deque;	218	template <class _Tp, class _Allocator = allocator<_Tp> > class _LIBCPP_TEMPLATE_VIS deque;
219		219
220	template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
221	class _DiffType, _DiffType _BlockSize>
222	class _LIBCPP_TEMPLATE_VIS __deque_iterator;
223
224	template <class _RAIter,
225	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
226	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
227	copy(_RAIter __f,
228	_RAIter __l,
229	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
230	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);
231
232	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
233	class _OutputIterator>
234	_OutputIterator
235	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
236	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
237	_OutputIterator __r);
238
239	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
240	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
241	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
242	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
243	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
244	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
245
246	template <class _RAIter,
247	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
248	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
249	copy_backward(_RAIter __f,
250	_RAIter __l,
251	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
252	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);
253
254	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
255	class _OutputIterator>
256	_OutputIterator
257	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
258	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
259	_OutputIterator __r);
260
261	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
262	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
263	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
264	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
265	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
266	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
267
268	template <class _RAIter,
269	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
270	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
271	move(_RAIter __f,
272	_RAIter __l,
273	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
274	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);
275
276	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
277	class _OutputIterator>
278	_OutputIterator
279	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
280	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
281	_OutputIterator __r);
282
283	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
284	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
285	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
286	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
287	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
288	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
289
290	template <class _RAIter,
291	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
292	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
293	move_backward(_RAIter __f,
294	_RAIter __l,
295	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
296	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);
297
298	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
299	class _OutputIterator>
300	_OutputIterator
301	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
302	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
303	_OutputIterator __r);
304
305	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
306	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
307	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
308	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
309	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
310	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
311
312	template <class _ValueType, class _DiffType>	220	template <class _ValueType, class _DiffType>
313	struct __deque_block_size {	221	struct __deque_block_size {
314	static const _DiffType value = sizeof(_ValueType) < 256 ? 4096 / sizeof(_ValueType) : 16;	222	static const _DiffType value = sizeof(_ValueType) < 256 ? 4096 / sizeof(_ValueType) : 16;
...	@@ -340,22 +248,22 @@ public:	...	@@ -340,22 +248,22 @@ public:
340	typedef random_access_iterator_tag iterator_category;	248	typedef random_access_iterator_tag iterator_category;
341	typedef _Reference reference;	249	typedef _Reference reference;
342		250
343	_LIBCPP_INLINE_VISIBILITY __deque_iterator() _NOEXCEPT	251	_LIBCPP_HIDE_FROM_ABI __deque_iterator() _NOEXCEPT
344	#if _LIBCPP_STD_VER > 11	252	#if _LIBCPP_STD_VER > 11
345	: __m_iter_(nullptr), __ptr_(nullptr)	253	: __m_iter_(nullptr), __ptr_(nullptr)
346	#endif	254	#endif
347	{}	255	{}
348		256
349	template <class _Pp, class _Rp, class _MP>	257	template <class _Pp, class _Rp, class _MP>
350	_LIBCPP_INLINE_VISIBILITY	258	_LIBCPP_HIDE_FROM_ABI
351	__deque_iterator(const __deque_iterator<value_type, _Pp, _Rp, _MP, difference_type, _BS>& __it,	259	__deque_iterator(const __deque_iterator<value_type, _Pp, _Rp, _MP, difference_type, _BS>& __it,
352	typename enable_if<is_convertible<_Pp, pointer>::value>::type* = 0) _NOEXCEPT	260	typename enable_if<is_convertible<_Pp, pointer>::value>::type* = 0) _NOEXCEPT
353	: __m_iter_(__it.__m_iter_), __ptr_(__it.__ptr_) {}	261	: __m_iter_(__it.__m_iter_), __ptr_(__it.__ptr_) {}
354		262
355	_LIBCPP_INLINE_VISIBILITY reference operator() const {return __ptr_;}	263	_LIBCPP_HIDE_FROM_ABI reference operator() const {return __ptr_;}
356	_LIBCPP_INLINE_VISIBILITY pointer operator->() const {return __ptr_;}	264	_LIBCPP_HIDE_FROM_ABI pointer operator->() const {return __ptr_;}
357		265
358	_LIBCPP_INLINE_VISIBILITY __deque_iterator& operator++()	266	_LIBCPP_HIDE_FROM_ABI __deque_iterator& operator++()
359	{	267	{
360	if (++__ptr_ - *__m_iter_ == __block_size)	268	if (++__ptr_ - *__m_iter_ == __block_size)
361	{	269	{
...	@@ -365,14 +273,14 @@ public:	...	@@ -365,14 +273,14 @@ public:
365	return *this;	273	return *this;
366	}	274	}
367		275
368	_LIBCPP_INLINE_VISIBILITY __deque_iterator operator++(int)	276	_LIBCPP_HIDE_FROM_ABI __deque_iterator operator++(int)
369	{	277	{
370	__deque_iterator __tmp = *this;	278	__deque_iterator __tmp = *this;
371	++(*this);	279	++(*this);
372	return __tmp;	280	return __tmp;
373	}	281	}
374		282
375	_LIBCPP_INLINE_VISIBILITY __deque_iterator& operator--()	283	_LIBCPP_HIDE_FROM_ABI __deque_iterator& operator--()
376	{	284	{
377	if (__ptr_ == *__m_iter_)	285	if (__ptr_ == *__m_iter_)
378	{	286	{
...	@@ -383,14 +291,14 @@ public:	...	@@ -383,14 +291,14 @@ public:
383	return *this;	291	return *this;
384	}	292	}
385		293
386	_LIBCPP_INLINE_VISIBILITY __deque_iterator operator--(int)	294	_LIBCPP_HIDE_FROM_ABI __deque_iterator operator--(int)
387	{	295	{
388	__deque_iterator __tmp = *this;	296	__deque_iterator __tmp = *this;
389	--(*this);	297	--(*this);
390	return __tmp;	298	return __tmp;
391	}	299	}
392		300
393	_LIBCPP_INLINE_VISIBILITY __deque_iterator& operator+=(difference_type __n)	301	_LIBCPP_HIDE_FROM_ABI __deque_iterator& operator+=(difference_type __n)
394	{	302	{
395	if (__n != 0)	303	if (__n != 0)
396	{	304	{
...	@@ -410,30 +318,30 @@ public:	...	@@ -410,30 +318,30 @@ public:
410	return *this;	318	return *this;
411	}	319	}
412		320
413	_LIBCPP_INLINE_VISIBILITY __deque_iterator& operator-=(difference_type __n)	321	_LIBCPP_HIDE_FROM_ABI __deque_iterator& operator-=(difference_type __n)
414	{	322	{
415	return *this += -__n;	323	return *this += -__n;
416	}	324	}
417		325
418	_LIBCPP_INLINE_VISIBILITY __deque_iterator operator+(difference_type __n) const	326	_LIBCPP_HIDE_FROM_ABI __deque_iterator operator+(difference_type __n) const
419	{	327	{
420	__deque_iterator __t(*this);	328	__deque_iterator __t(*this);
421	__t += __n;	329	__t += __n;
422	return __t;	330	return __t;
423	}	331	}
424		332
425	_LIBCPP_INLINE_VISIBILITY __deque_iterator operator-(difference_type __n) const	333	_LIBCPP_HIDE_FROM_ABI __deque_iterator operator-(difference_type __n) const
426	{	334	{
427	__deque_iterator __t(*this);	335	__deque_iterator __t(*this);
428	__t -= __n;	336	__t -= __n;
429	return __t;	337	return __t;
430	}	338	}
431		339
432	_LIBCPP_INLINE_VISIBILITY	340	_LIBCPP_HIDE_FROM_ABI
433	friend __deque_iterator operator+(difference_type __n, const __deque_iterator& __it)	341	friend __deque_iterator operator+(difference_type __n, const __deque_iterator& __it)
434	{return __it + __n;}	342	{return __it + __n;}
435		343
436	_LIBCPP_INLINE_VISIBILITY	344	_LIBCPP_HIDE_FROM_ABI
437	friend difference_type operator-(const __deque_iterator& __x, const __deque_iterator& __y)	345	friend difference_type operator-(const __deque_iterator& __x, const __deque_iterator& __y)
438	{	346	{
439	if (__x != __y)	347	if (__x != __y)
...	@@ -443,142 +351,72 @@ public:	...	@@ -443,142 +351,72 @@ public:
443	return 0;	351	return 0;
444	}	352	}
445		353
446	_LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const	354	_LIBCPP_HIDE_FROM_ABI reference operator[](difference_type __n) const
447	{return (this + __n);}	355	{return (this + __n);}
448		356
449	_LIBCPP_INLINE_VISIBILITY friend	357	_LIBCPP_HIDE_FROM_ABI friend
450	bool operator==(const __deque_iterator& __x, const __deque_iterator& __y)	358	bool operator==(const __deque_iterator& __x, const __deque_iterator& __y)
451	{return __x.__ptr_ == __y.__ptr_;}	359	{return __x.__ptr_ == __y.__ptr_;}
452		360
453	_LIBCPP_INLINE_VISIBILITY friend	361	_LIBCPP_HIDE_FROM_ABI friend
454	bool operator!=(const __deque_iterator& __x, const __deque_iterator& __y)	362	bool operator!=(const __deque_iterator& __x, const __deque_iterator& __y)
455	{return !(__x == __y);}	363	{return !(__x == __y);}
456		364
457	_LIBCPP_INLINE_VISIBILITY friend	365	_LIBCPP_HIDE_FROM_ABI friend
458	bool operator<(const __deque_iterator& __x, const __deque_iterator& __y)	366	bool operator<(const __deque_iterator& __x, const __deque_iterator& __y)
459	{return __x.__m_iter_ < __y.__m_iter_ \|\|	367	{return __x.__m_iter_ < __y.__m_iter_ \|\|
460	(__x.__m_iter_ == __y.__m_iter_ && __x.__ptr_ < __y.__ptr_);}	368	(__x.__m_iter_ == __y.__m_iter_ && __x.__ptr_ < __y.__ptr_);}
461		369
462	_LIBCPP_INLINE_VISIBILITY friend	370	_LIBCPP_HIDE_FROM_ABI friend
463	bool operator>(const __deque_iterator& __x, const __deque_iterator& __y)	371	bool operator>(const __deque_iterator& __x, const __deque_iterator& __y)
464	{return __y < __x;}	372	{return __y < __x;}
465		373
466	_LIBCPP_INLINE_VISIBILITY friend	374	_LIBCPP_HIDE_FROM_ABI friend
467	bool operator<=(const __deque_iterator& __x, const __deque_iterator& __y)	375	bool operator<=(const __deque_iterator& __x, const __deque_iterator& __y)
468	{return !(__y < __x);}	376	{return !(__y < __x);}
469		377
470	_LIBCPP_INLINE_VISIBILITY friend	378	_LIBCPP_HIDE_FROM_ABI friend
471	bool operator>=(const __deque_iterator& __x, const __deque_iterator& __y)	379	bool operator>=(const __deque_iterator& __x, const __deque_iterator& __y)
472	{return !(__x < __y);}	380	{return !(__x < __y);}
473		381
474	private:	382	private:
475	_LIBCPP_INLINE_VISIBILITY explicit __deque_iterator(__map_iterator __m, pointer __p) _NOEXCEPT	383	_LIBCPP_HIDE_FROM_ABI explicit __deque_iterator(__map_iterator __m, pointer __p) _NOEXCEPT
476	: __m_iter_(__m), __ptr_(__p) {}	384	: __m_iter_(__m), __ptr_(__p) {}
477		385
478	template <class _Tp, class _Ap> friend class __deque_base;
479	template <class _Tp, class _Ap> friend class _LIBCPP_TEMPLATE_VIS deque;	386	template <class _Tp, class _Ap> friend class _LIBCPP_TEMPLATE_VIS deque;
480	template <class _Vp, class _Pp, class _Rp, class _MP, class _Dp, _Dp>	387	template <class _Vp, class _Pp, class _Rp, class _MP, class _Dp, _Dp>
481	friend class _LIBCPP_TEMPLATE_VIS __deque_iterator;	388	friend class _LIBCPP_TEMPLATE_VIS __deque_iterator;
482		389
483	template <class _RAIter,	390	template <class>
484	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	391	friend struct __segmented_iterator_traits;
485	friend	392	};
486	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	393
487	copy(_RAIter __f,	394	template <class _ValueType, class _Pointer, class _Reference, class _MapPointer, class _DiffType, _DiffType _BlockSize>
488	_RAIter __l,	395	struct __segmented_iterator_traits<
489	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,	396	__deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize> > {
490	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*);	397	private:
491		398	using _Iterator = __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize>;
492	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	399
493	class _OutputIterator>	400	public:
494	friend	401	using __is_segmented_iterator = true_type;
495	_OutputIterator	402	using __segment_iterator = _MapPointer;
496	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,	403	using __local_iterator = _Pointer;
497	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,	404
498	_OutputIterator __r);	405	static _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_Iterator __iter) { return __iter.__m_iter_; }
499		406	static _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_Iterator __iter) { return __iter.__ptr_; }
500	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	407	static _LIBCPP_HIDE_FROM_ABI __local_iterator __begin(__segment_iterator __iter) { return *__iter; }
501	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	408
502	friend	409	static _LIBCPP_HIDE_FROM_ABI __local_iterator __end(__segment_iterator __iter) {
503	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	410	return *__iter + _Iterator::__block_size;
504	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,	411	}
505	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,	412
506	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);	413	static _LIBCPP_HIDE_FROM_ABI _Iterator __compose(__segment_iterator __segment, __local_iterator __local) {
507		414	if (__local == __end(__segment)) {
508	template <class _RAIter,	415	++__segment;
509	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	416	return _Iterator(__segment, *__segment);
510	friend	417	}
511	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	418	return _Iterator(__segment, __local);
512	copy_backward(_RAIter __f,	419	}
513	_RAIter __l,
514	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
515	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*);
516
517	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
518	class _OutputIterator>
519	friend
520	_OutputIterator
521	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
522	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
523	_OutputIterator __r);
524
525	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
526	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
527	friend
528	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
529	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
530	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
531	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
532
533	template <class _RAIter,
534	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
535	friend
536	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
537	move(_RAIter __f,
538	_RAIter __l,
539	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
540	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*);
541
542	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
543	class _OutputIterator>
544	friend
545	_OutputIterator
546	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
547	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
548	_OutputIterator __r);
549
550	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
551	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
552	friend
553	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
554	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
555	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
556	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
557
558	template <class _RAIter,
559	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
560	friend
561	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
562	move_backward(_RAIter __f,
563	_RAIter __l,
564	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
565	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*);
566
567	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
568	class _OutputIterator>
569	friend
570	_OutputIterator
571	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
572	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
573	_OutputIterator __r);
574
575	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
576	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
577	friend
578	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
579	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
580	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
581	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
582	};	420	};
583		421
584	template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,	422	template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
...	@@ -587,897 +425,329 @@ const _DiffType __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer,	...	@@ -587,897 +425,329 @@ const _DiffType __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer,
587	_DiffType, _BlockSize>::__block_size =	425	_DiffType, _BlockSize>::__block_size =
588	__deque_block_size<_ValueType, _DiffType>::value;	426	__deque_block_size<_ValueType, _DiffType>::value;
589		427
590	// copy	428	template <class _Tp, class _Allocator /= allocator<_Tp>/>
591		429	class _LIBCPP_TEMPLATE_VIS deque
592	template <class _RAIter,
593	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
594	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
595	copy(_RAIter __f,
596	_RAIter __l,
597	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
598	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)
599	{	430	{
600	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;	431	public:
601	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;	432	// types:
602	const difference_type __block_size = __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::__block_size;
603	while (__f != __l)
604	{
605	pointer __rb = __r.__ptr_;
606	pointer __re = *__r.__m_iter_ + __block_size;
607	difference_type __bs = __re - __rb;
608	difference_type __n = __l - __f;
609	_RAIter __m = __l;
610	if (__n > __bs)
611	{
612	__n = __bs;
613	__m = __f + __n;
614	}
615	_VSTD::copy(__f, __m, __rb);
616	__f = __m;
617	__r += __n;
618	}
619	return __r;
620	}
621		433
622	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	434	using value_type = _Tp;
623	class _OutputIterator>
624	_OutputIterator
625	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
626	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
627	_OutputIterator __r)
628	{
629	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
630	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
631	const difference_type __block_size = __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::__block_size;
632	difference_type __n = __l - __f;
633	while (__n > 0)
634	{
635	pointer __fb = __f.__ptr_;
636	pointer __fe = *__f.__m_iter_ + __block_size;
637	difference_type __bs = __fe - __fb;
638	if (__bs > __n)
639	{
640	__bs = __n;
641	__fe = __fb + __bs;
642	}
643	__r = _VSTD::copy(__fb, __fe, __r);
644	__n -= __bs;
645	__f += __bs;
646	}
647	return __r;
648	}
649		435
650	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	436	static_assert((is_same<typename _Allocator::value_type, value_type>::value),
651	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	437	"Allocator::value_type must be same type as value_type");
652	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
653	copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
654	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
655	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
656	{
657	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
658	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
659	const difference_type __block_size = __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::__block_size;
660	difference_type __n = __l - __f;
661	while (__n > 0)
662	{
663	pointer __fb = __f.__ptr_;
664	pointer __fe = *__f.__m_iter_ + __block_size;
665	difference_type __bs = __fe - __fb;
666	if (__bs > __n)
667	{
668	__bs = __n;
669	__fe = __fb + __bs;
670	}
671	__r = _VSTD::copy(__fb, __fe, __r);
672	__n -= __bs;
673	__f += __bs;
674	}
675	return __r;
676	}
677		438
678	// copy_backward	439	using allocator_type = _Allocator;
		440	using __alloc_traits = allocator_traits<allocator_type>;
679		441
680	template <class _RAIter,	442	using size_type = typename __alloc_traits::size_type;
681	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	443	using difference_type = typename __alloc_traits::difference_type;
682	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
683	copy_backward(_RAIter __f,
684	_RAIter __l,
685	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
686	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)
687	{
688	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
689	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
690	while (__f != __l)
691	{
692	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
693	pointer __rb = *__rp.__m_iter_;
694	pointer __re = __rp.__ptr_ + 1;
695	difference_type __bs = __re - __rb;
696	difference_type __n = __l - __f;
697	_RAIter __m = __f;
698	if (__n > __bs)
699	{
700	__n = __bs;
701	__m = __l - __n;
702	}
703	_VSTD::copy_backward(__m, __l, __re);
704	__l = __m;
705	__r -= __n;
706	}
707	return __r;
708	}
709		444
710	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	445	using pointer = typename __alloc_traits::pointer;
711	class _OutputIterator>	446	using const_pointer = typename __alloc_traits::const_pointer;
712	_OutputIterator
713	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
714	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
715	_OutputIterator __r)
716	{
717	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
718	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
719	difference_type __n = __l - __f;
720	while (__n > 0)
721	{
722	--__l;
723	pointer __lb = *__l.__m_iter_;
724	pointer __le = __l.__ptr_ + 1;
725	difference_type __bs = __le - __lb;
726	if (__bs > __n)
727	{
728	__bs = __n;
729	__lb = __le - __bs;
730	}
731	__r = _VSTD::copy_backward(__lb, __le, __r);
732	__n -= __bs;
733	__l -= __bs - 1;
734	}
735	return __r;
736	}
737		447
738	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	448	using __pointer_allocator = __rebind_alloc<__alloc_traits, pointer>;
739	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	449	using __const_pointer_allocator = __rebind_alloc<__alloc_traits, const_pointer>;
740	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	450	using __map = __split_buffer<pointer, __pointer_allocator>;
741	copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,	451	using __map_alloc_traits = allocator_traits<__pointer_allocator>;
742	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,	452	using __map_pointer = typename __map_alloc_traits::pointer;
743	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)	453	using __map_const_pointer = typename allocator_traits<__const_pointer_allocator>::const_pointer;
744	{
745	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
746	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
747	difference_type __n = __l - __f;
748	while (__n > 0)
749	{
750	--__l;
751	pointer __lb = *__l.__m_iter_;
752	pointer __le = __l.__ptr_ + 1;
753	difference_type __bs = __le - __lb;
754	if (__bs > __n)
755	{
756	__bs = __n;
757	__lb = __le - __bs;
758	}
759	__r = _VSTD::copy_backward(__lb, __le, __r);
760	__n -= __bs;
761	__l -= __bs - 1;
762	}
763	return __r;
764	}
765		454
766	// move	455	using reference = value_type&;
		456	using const_reference = const value_type&;
767		457
768	template <class _RAIter,	458	using iterator = __deque_iterator<value_type, pointer, reference, __map_pointer, difference_type>;
769	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	459	using const_iterator =
770	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	460	__deque_iterator<value_type, const_pointer, const_reference, __map_const_pointer, difference_type>;
771	move(_RAIter __f,	461	using reverse_iterator = std::reverse_iterator<iterator>;
772	_RAIter __l,	462	using const_reverse_iterator = std::reverse_iterator<const_iterator>;
773	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
774	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)
775	{
776	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
777	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
778	const difference_type __block_size = __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::__block_size;
779	while (__f != __l)
780	{
781	pointer __rb = __r.__ptr_;
782	pointer __re = *__r.__m_iter_ + __block_size;
783	difference_type __bs = __re - __rb;
784	difference_type __n = __l - __f;
785	_RAIter __m = __l;
786	if (__n > __bs)
787	{
788	__n = __bs;
789	__m = __f + __n;
790	}
791	_VSTD::move(__f, __m, __rb);
792	__f = __m;
793	__r += __n;
794	}
795	return __r;
796	}
797		463
798	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	464	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
799	class _OutputIterator>	465	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
800	_OutputIterator	466	"original allocator");
801	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,	467	static_assert(is_nothrow_default_constructible<allocator_type>::value ==
802	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,	468	is_nothrow_default_constructible<__pointer_allocator>::value,
803	_OutputIterator __r)	469	"rebinding an allocator should not change excpetion guarantees");
804	{	470	static_assert(is_nothrow_move_constructible<allocator_type>::value ==
805	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;	471	is_nothrow_move_constructible<typename __map::allocator_type>::value,
806	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;	472	"rebinding an allocator should not change excpetion guarantees");
807	const difference_type __block_size = __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::__block_size;
808	difference_type __n = __l - __f;
809	while (__n > 0)
810	{
811	pointer __fb = __f.__ptr_;
812	pointer __fe = *__f.__m_iter_ + __block_size;
813	difference_type __bs = __fe - __fb;
814	if (__bs > __n)
815	{
816	__bs = __n;
817	__fe = __fb + __bs;
818	}
819	__r = _VSTD::move(__fb, __fe, __r);
820	__n -= __bs;
821	__f += __bs;
822	}
823	return __r;
824	}
825		473
826	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	474	private:
827	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	475	struct __deque_block_range {
828	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>	476	explicit _LIBCPP_HIDE_FROM_ABI
829	move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,	477	__deque_block_range(pointer __b, pointer __e) _NOEXCEPT : __begin_(__b), __end_(__e) {}
830	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,	478	const pointer __begin_;
831	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)	479	const pointer __end_;
832	{	480	};
833	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
834	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
835	const difference_type __block_size = __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::__block_size;
836	difference_type __n = __l - __f;
837	while (__n > 0)
838	{
839	pointer __fb = __f.__ptr_;
840	pointer __fe = *__f.__m_iter_ + __block_size;
841	difference_type __bs = __fe - __fb;
842	if (__bs > __n)
843	{
844	__bs = __n;
845	__fe = __fb + __bs;
846	}
847	__r = _VSTD::move(__fb, __fe, __r);
848	__n -= __bs;
849	__f += __bs;
850	}
851	return __r;
852	}
853		481
854	// move_backward	482	struct __deque_range {
		483	iterator __pos_;
		484	const iterator __end_;
855		485
856	template <class _RAIter,	486	_LIBCPP_HIDE_FROM_ABI __deque_range(iterator __pos, iterator __e) _NOEXCEPT
857	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	487	: __pos_(__pos), __end_(__e) {}
858	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
859	move_backward(_RAIter __f,
860	_RAIter __l,
861	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
862	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)
863	{
864	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
865	typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
866	while (__f != __l)
867	{
868	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
869	pointer __rb = *__rp.__m_iter_;
870	pointer __re = __rp.__ptr_ + 1;
871	difference_type __bs = __re - __rb;
872	difference_type __n = __l - __f;
873	_RAIter __m = __f;
874	if (__n > __bs)
875	{
876	__n = __bs;
877	__m = __l - __n;
878	}
879	_VSTD::move_backward(__m, __l, __re);
880	__l = __m;
881	__r -= __n;
882	}
883	return __r;
884	}
885		488
886	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	489	explicit _LIBCPP_HIDE_FROM_ABI operator bool() const _NOEXCEPT {
887	class _OutputIterator>	490	return __pos_ != __end_;
888	_OutputIterator
889	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
890	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
891	_OutputIterator __r)
892	{
893	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
894	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
895	difference_type __n = __l - __f;
896	while (__n > 0)
897	{
898	--__l;
899	pointer __lb = *__l.__m_iter_;
900	pointer __le = __l.__ptr_ + 1;
901	difference_type __bs = __le - __lb;
902	if (__bs > __n)
903	{
904	__bs = __n;
905	__lb = __le - __bs;
906	}
907	__r = _VSTD::move_backward(__lb, __le, __r);
908	__n -= __bs;
909	__l -= __bs - 1;
910	}	491	}
911	return __r;
912	}
913		492
914	template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,	493	_LIBCPP_HIDE_FROM_ABI __deque_range begin() const {
915	class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>	494	return *this;
916	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
917	move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
918	__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
919	__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
920	{
921	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
922	typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
923	difference_type __n = __l - __f;
924	while (__n > 0)
925	{
926	--__l;
927	pointer __lb = *__l.__m_iter_;
928	pointer __le = __l.__ptr_ + 1;
929	difference_type __bs = __le - __lb;
930	if (__bs > __n)
931	{
932	__bs = __n;
933	__lb = __le - __bs;
934	}
935	__r = _VSTD::move_backward(__lb, __le, __r);
936	__n -= __bs;
937	__l -= __bs - 1;
938	}	495	}
939	return __r;
940	}
941
942	template <class _Tp, class _Allocator>
943	class __deque_base
944	{
945	__deque_base(const __deque_base& __c);
946	__deque_base& operator=(const __deque_base& __c);
947	public:
948	typedef _Allocator allocator_type;
949	typedef allocator_traits<allocator_type> __alloc_traits;
950	typedef typename __alloc_traits::size_type size_type;
951		496
952	typedef _Tp value_type;	497	_LIBCPP_HIDE_FROM_ABI __deque_range end() const {
953	typedef value_type& reference;	498	return __deque_range(__end_, __end_);
954	typedef const value_type& const_reference;	499	}
955	typedef typename __alloc_traits::difference_type difference_type;	500	_LIBCPP_HIDE_FROM_ABI __deque_block_range operator*() const _NOEXCEPT {
956	typedef typename __alloc_traits::pointer pointer;
957	typedef typename __alloc_traits::const_pointer const_pointer;
958
959	static const difference_type __block_size;
960
961	typedef typename __rebind_alloc_helper<__alloc_traits, pointer>::type __pointer_allocator;
962	typedef allocator_traits<__pointer_allocator> __map_traits;
963	typedef typename __map_traits::pointer __map_pointer;
964	typedef typename __rebind_alloc_helper<__alloc_traits, const_pointer>::type __const_pointer_allocator;
965	typedef typename allocator_traits<__const_pointer_allocator>::const_pointer __map_const_pointer;
966	typedef __split_buffer<pointer, __pointer_allocator> __map;
967
968	typedef __deque_iterator<value_type, pointer, reference, __map_pointer,
969	difference_type> iterator;
970	typedef __deque_iterator<value_type, const_pointer, const_reference, __map_const_pointer,
971	difference_type> const_iterator;
972
973	struct __deque_block_range {
974	explicit __deque_block_range(pointer __b, pointer __e) _NOEXCEPT : __begin_(__b), __end_(__e) {}
975	const pointer __begin_;
976	const pointer __end_;
977	};
978
979	struct __deque_range {
980	iterator __pos_;
981	const iterator __end_;
982
983	__deque_range(iterator __pos, iterator __e) _NOEXCEPT
984	: __pos_(__pos), __end_(__e) {}
985
986	explicit operator bool() const _NOEXCEPT {
987	return __pos_ != __end_;
988	}
989
990	__deque_range begin() const {
991	return *this;
992	}
993
994	__deque_range end() const {
995	return __deque_range(__end_, __end_);
996	}
997	__deque_block_range operator*() const _NOEXCEPT {
998	if (__pos_.__m_iter_ == __end_.__m_iter_) {
999	return __deque_block_range(__pos_.__ptr_, __end_.__ptr_);
1000	}
1001	return __deque_block_range(__pos_.__ptr_, *__pos_.__m_iter_ + __block_size);
1002	}
1003
1004	__deque_range& operator++() _NOEXCEPT {
1005	if (__pos_.__m_iter_ == __end_.__m_iter_) {	501	if (__pos_.__m_iter_ == __end_.__m_iter_) {
1006	__pos_ = __end_;	502	return __deque_block_range(__pos_.__ptr_, __end_.__ptr_);
1007	} else {
1008	++__pos_.__m_iter_;
1009	__pos_.__ptr_ = *__pos_.__m_iter_;
1010	}
1011	return *this;
1012	}
1013
1014
1015	friend bool operator==(__deque_range const& __lhs, __deque_range const& __rhs) {
1016	return __lhs.__pos_ == __rhs.__pos_;
1017	}	503	}
1018	friend bool operator!=(__deque_range const& __lhs, __deque_range const& __rhs) {	504	return __deque_block_range(__pos_.__ptr_, *__pos_.__m_iter_ + __block_size);
1019	return !(__lhs == __rhs);	505	}
1020	}
1021	};
1022
1023
1024
1025	struct _ConstructTransaction {
1026	_ConstructTransaction(__deque_base* __db, __deque_block_range& __r)
1027	: __pos_(__r.__begin_), __end_(__r.__end_), __begin_(__r.__begin_), __base_(__db) {}
1028
1029		506
1030	~_ConstructTransaction() {	507	_LIBCPP_HIDE_FROM_ABI __deque_range& operator++() _NOEXCEPT {
1031	__base_->size() += (__pos_ - __begin_);	508	if (__pos_.__m_iter_ == __end_.__m_iter_) {
		509	__pos_ = __end_;
		510	} else {
		511	++__pos_.__m_iter_;
		512	__pos_.__ptr_ = *__pos_.__m_iter_;
1032	}	513	}
1033		514	return *this;
1034	pointer __pos_;
1035	const pointer __end_;
1036	private:
1037	const pointer __begin_;
1038	__deque_base * const __base_;
1039	};
1040
1041	protected:
1042	__map __map_;
1043	size_type __start_;
1044	__compressed_pair<size_type, allocator_type> __size_;
1045
1046	iterator begin() _NOEXCEPT;
1047	const_iterator begin() const _NOEXCEPT;
1048	iterator end() _NOEXCEPT;
1049	const_iterator end() const _NOEXCEPT;
1050
1051	_LIBCPP_INLINE_VISIBILITY size_type& size() {return __size_.first();}
1052	_LIBCPP_INLINE_VISIBILITY
1053	const size_type& size() const _NOEXCEPT {return __size_.first();}
1054	_LIBCPP_INLINE_VISIBILITY allocator_type& __alloc() {return __size_.second();}
1055	_LIBCPP_INLINE_VISIBILITY
1056	const allocator_type& __alloc() const _NOEXCEPT {return __size_.second();}
1057
1058	_LIBCPP_INLINE_VISIBILITY
1059	__deque_base()
1060	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
1061	_LIBCPP_INLINE_VISIBILITY
1062	explicit __deque_base(const allocator_type& __a);
1063	public:
1064	~__deque_base();
1065
1066	#ifndef _LIBCPP_CXX03_LANG
1067	__deque_base(__deque_base&& __c)
1068	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
1069	__deque_base(__deque_base&& __c, const allocator_type& __a);
1070	#endif // _LIBCPP_CXX03_LANG
1071
1072	void swap(__deque_base& __c)
1073	#if _LIBCPP_STD_VER >= 14
1074	_NOEXCEPT;
1075	#else
1076	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
1077	__is_nothrow_swappable<allocator_type>::value);
1078	#endif
1079	protected:
1080	void clear() _NOEXCEPT;
1081
1082	bool __invariants() const;
1083
1084	_LIBCPP_INLINE_VISIBILITY
1085	void __move_assign(__deque_base& __c)
1086	_NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
1087	is_nothrow_move_assignable<allocator_type>::value)
1088	{
1089	__map_ = _VSTD::move(__c.__map_);
1090	__start_ = __c.__start_;
1091	size() = __c.size();
1092	__move_assign_alloc(__c);
1093	__c.__start_ = __c.size() = 0;
1094	}	515	}
1095		516
1096	_LIBCPP_INLINE_VISIBILITY
1097	void __move_assign_alloc(__deque_base& __c)
1098	_NOEXCEPT_(!__alloc_traits::propagate_on_container_move_assignment::value \|\|
1099	is_nothrow_move_assignable<allocator_type>::value)
1100	{__move_assign_alloc(__c, integral_constant<bool,
1101	__alloc_traits::propagate_on_container_move_assignment::value>());}
1102		517
1103	private:	518	_LIBCPP_HIDE_FROM_ABI friend bool operator==(__deque_range const& __lhs, __deque_range const& __rhs) {
1104	_LIBCPP_INLINE_VISIBILITY	519	return __lhs.__pos_ == __rhs.__pos_;
1105	void __move_assign_alloc(__deque_base& __c, true_type)
1106	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
1107	{
1108	__alloc() = _VSTD::move(__c.__alloc());
1109	}
1110
1111	_LIBCPP_INLINE_VISIBILITY
1112	void __move_assign_alloc(__deque_base&, false_type) _NOEXCEPT
1113	{}
1114	};
1115
1116	template <class _Tp, class _Allocator>
1117	const typename __deque_base<_Tp, _Allocator>::difference_type
1118	__deque_base<_Tp, _Allocator>::__block_size =
1119	__deque_block_size<value_type, difference_type>::value;
1120
1121	template <class _Tp, class _Allocator>
1122	bool
1123	__deque_base<_Tp, _Allocator>::__invariants() const
1124	{
1125	if (!__map_.__invariants())
1126	return false;
1127	if (__map_.size() >= size_type(-1) / __block_size)
1128	return false;
1129	for (typename __map::const_iterator __i = __map_.begin(), __e = __map_.end();
1130	__i != __e; ++__i)
1131	if (*__i == nullptr)
1132	return false;
1133	if (__map_.size() != 0)
1134	{
1135	if (size() >= __map_.size() * __block_size)
1136	return false;
1137	if (__start_ >= __map_.size() * __block_size - size())
1138	return false;
1139	}	520	}
1140	else	521	_LIBCPP_HIDE_FROM_ABI friend bool operator!=(__deque_range const& __lhs, __deque_range const& __rhs) {
1141	{	522	return !(__lhs == __rhs);
1142	if (size() != 0)
1143	return false;
1144	if (__start_ != 0)
1145	return false;
1146	}	523	}
1147	return true;	524	};
1148	}
1149
1150	template <class _Tp, class _Allocator>
1151	typename __deque_base<_Tp, _Allocator>::iterator
1152	__deque_base<_Tp, _Allocator>::begin() _NOEXCEPT
1153	{
1154	__map_pointer __mp = __map_.begin() + __start_ / __block_size;
1155	return iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
1156	}
1157
1158	template <class _Tp, class _Allocator>
1159	typename __deque_base<_Tp, _Allocator>::const_iterator
1160	__deque_base<_Tp, _Allocator>::begin() const _NOEXCEPT
1161	{
1162	__map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __start_ / __block_size);
1163	return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
1164	}
1165
1166	template <class _Tp, class _Allocator>
1167	typename __deque_base<_Tp, _Allocator>::iterator
1168	__deque_base<_Tp, _Allocator>::end() _NOEXCEPT
1169	{
1170	size_type __p = size() + __start_;
1171	__map_pointer __mp = __map_.begin() + __p / __block_size;
1172	return iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
1173	}
1174
1175	template <class _Tp, class _Allocator>
1176	typename __deque_base<_Tp, _Allocator>::const_iterator
1177	__deque_base<_Tp, _Allocator>::end() const _NOEXCEPT
1178	{
1179	size_type __p = size() + __start_;
1180	__map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __p / __block_size);
1181	return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
1182	}
1183
1184	template <class _Tp, class _Allocator>
1185	inline
1186	__deque_base<_Tp, _Allocator>::__deque_base()
1187	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
1188	: __start_(0), __size_(0, __default_init_tag()) {}
1189
1190	template <class _Tp, class _Allocator>
1191	inline
1192	__deque_base<_Tp, _Allocator>::__deque_base(const allocator_type& __a)
1193	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a) {}
1194		525
1195	template <class _Tp, class _Allocator>	526	struct _ConstructTransaction {
1196	__deque_base<_Tp, _Allocator>::~__deque_base()	527	_LIBCPP_HIDE_FROM_ABI _ConstructTransaction(deque* __db, __deque_block_range& __r)
1197	{	528	: __pos_(__r.__begin_), __end_(__r.__end_), __begin_(__r.__begin_), __base_(__db) {}
1198	clear();
1199	typename __map::iterator __i = __map_.begin();
1200	typename __map::iterator __e = __map_.end();
1201	for (; __i != __e; ++__i)
1202	__alloc_traits::deallocate(__alloc(), *__i, __block_size);
1203	}
1204		529
1205	#ifndef _LIBCPP_CXX03_LANG
1206		530
1207	template <class _Tp, class _Allocator>	531	_LIBCPP_HIDE_FROM_ABI ~_ConstructTransaction() {
1208	__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c)	532	__base_->__size() += (__pos_ - __begin_);
1209	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
1210	: __map_(_VSTD::move(__c.__map_)),
1211	__start_(_VSTD::move(__c.__start_)),
1212	__size_(_VSTD::move(__c.__size_))
1213	{
1214	__c.__start_ = 0;
1215	__c.size() = 0;
1216	}
1217
1218	template <class _Tp, class _Allocator>
1219	__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c, const allocator_type& __a)
1220	: __map_(_VSTD::move(__c.__map_), __pointer_allocator(__a)),
1221	__start_(_VSTD::move(__c.__start_)),
1222	__size_(_VSTD::move(__c.size()), __a)
1223	{
1224	if (__a == __c.__alloc())
1225	{
1226	__c.__start_ = 0;
1227	__c.size() = 0;
1228	}	533	}
1229	else
1230	{
1231	__map_.clear();
1232	__start_ = 0;
1233	size() = 0;
1234	}
1235	}
1236		534
1237	#endif // _LIBCPP_CXX03_LANG	535	pointer __pos_;
		536	const pointer __end_;
		537	private:
		538	const pointer __begin_;
		539	deque* const __base_;
		540	};
1238		541
1239	template <class _Tp, class _Allocator>	542	static const difference_type __block_size;
1240	void
1241	__deque_base<_Tp, _Allocator>::swap(__deque_base& __c)
1242	#if _LIBCPP_STD_VER >= 14
1243	_NOEXCEPT
1244	#else
1245	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
1246	__is_nothrow_swappable<allocator_type>::value)
1247	#endif
1248	{
1249	__map_.swap(__c.__map_);
1250	_VSTD::swap(__start_, __c.__start_);
1251	_VSTD::swap(size(), __c.size());
1252	_VSTD::__swap_allocator(__alloc(), __c.__alloc());
1253	}
1254		543
1255	template <class _Tp, class _Allocator>	544	__map __map_;
1256	void	545	size_type __start_;
1257	__deque_base<_Tp, _Allocator>::clear() _NOEXCEPT	546	__compressed_pair<size_type, allocator_type> __size_;
1258	{
1259	allocator_type& __a = __alloc();
1260	for (iterator __i = begin(), __e = end(); __i != __e; ++__i)
1261	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));
1262	size() = 0;
1263	while (__map_.size() > 2)
1264	{
1265	__alloc_traits::deallocate(__a, __map_.front(), __block_size);
1266	__map_.pop_front();
1267	}
1268	switch (__map_.size())
1269	{
1270	case 1:
1271	__start_ = __block_size / 2;
1272	break;
1273	case 2:
1274	__start_ = __block_size;
1275	break;
1276	}
1277	}
1278		547
1279	template <class _Tp, class _Allocator /= allocator<_Tp>/>
1280	class _LIBCPP_TEMPLATE_VIS deque
1281	: private __deque_base<_Tp, _Allocator>
1282	{
1283	public:	548	public:
1284	// types:
1285
1286	typedef _Tp value_type;
1287	typedef _Allocator allocator_type;
1288		549
1289	static_assert((is_same<typename allocator_type::value_type, value_type>::value),	550	// construct/copy/destroy:
1290	"Allocator::value_type must be same type as value_type");	551	_LIBCPP_HIDE_FROM_ABI
1291		552	deque() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
1292	typedef __deque_base<value_type, allocator_type> __base;	553	: __start_(0), __size_(0, __default_init_tag()) {}
1293
1294	typedef typename __base::__alloc_traits __alloc_traits;
1295	typedef typename __base::reference reference;
1296	typedef typename __base::const_reference const_reference;
1297	typedef typename __base::iterator iterator;
1298	typedef typename __base::const_iterator const_iterator;
1299	typedef typename __base::size_type size_type;
1300	typedef typename __base::difference_type difference_type;
1301		554
1302	typedef typename __base::pointer pointer;	555	_LIBCPP_HIDE_FROM_ABI ~deque() {
1303	typedef typename __base::const_pointer const_pointer;	556	clear();
1304	typedef _VSTD::reverse_iterator<iterator> reverse_iterator;	557	typename __map::iterator __i = __map_.begin();
1305	typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;	558	typename __map::iterator __e = __map_.end();
		559	for (; __i != __e; ++__i)
		560	__alloc_traits::deallocate(__alloc(), *__i, __block_size);
		561	}
1306		562
1307	using typename __base::__deque_range;	563	_LIBCPP_HIDE_FROM_ABI explicit deque(const allocator_type& __a)
1308	using typename __base::__deque_block_range;	564	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a) {}
1309	using typename __base::_ConstructTransaction;
1310		565
1311	// construct/copy/destroy:	566	explicit _LIBCPP_HIDE_FROM_ABI deque(size_type __n);
1312	_LIBCPP_INLINE_VISIBILITY
1313	deque()
1314	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
1315	{}
1316	_LIBCPP_INLINE_VISIBILITY explicit deque(const allocator_type& __a) : __base(__a) {}
1317	explicit deque(size_type __n);
1318	#if _LIBCPP_STD_VER > 11	567	#if _LIBCPP_STD_VER > 11
1319	explicit deque(size_type __n, const _Allocator& __a);	568	explicit _LIBCPP_HIDE_FROM_ABI deque(size_type __n, const _Allocator& __a);
1320	#endif	569	#endif
1321	deque(size_type __n, const value_type& __v);	570	_LIBCPP_HIDE_FROM_ABI deque(size_type __n, const value_type& __v);
1322		571
1323	template <class = __enable_if_t<__is_allocator<_Allocator>::value> >	572	template <class = __enable_if_t<__is_allocator<_Allocator>::value> >
1324	deque(size_type __n, const value_type& __v, const allocator_type& __a) : __base(__a)	573	_LIBCPP_HIDE_FROM_ABI deque(size_type __n, const value_type& __v, const allocator_type& __a)
		574	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a)
1325	{	575	{
1326	if (__n > 0)	576	if (__n > 0)
1327	__append(__n, __v);	577	__append(__n, __v);
1328	}	578	}
1329		579
1330	template <class _InputIter>	580	template <class _InputIter>
1331	deque(_InputIter __f, _InputIter __l,	581	_LIBCPP_HIDE_FROM_ABI deque(_InputIter __f, _InputIter __l,
1332	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type* = 0);	582	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type* = 0);
1333	template <class _InputIter>	583	template <class _InputIter>
1334	deque(_InputIter __f, _InputIter __l, const allocator_type& __a,	584	_LIBCPP_HIDE_FROM_ABI deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
1335	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type* = 0);	585	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type* = 0);
1336	deque(const deque& __c);	586	_LIBCPP_HIDE_FROM_ABI deque(const deque& __c);
1337	deque(const deque& __c, const __type_identity_t<allocator_type>& __a);	587	_LIBCPP_HIDE_FROM_ABI deque(const deque& __c, const __type_identity_t<allocator_type>& __a);
1338		588
1339	deque& operator=(const deque& __c);	589	_LIBCPP_HIDE_FROM_ABI deque& operator=(const deque& __c);
1340		590
1341	#ifndef _LIBCPP_CXX03_LANG	591	#ifndef _LIBCPP_CXX03_LANG
1342	deque(initializer_list<value_type> __il);	592	_LIBCPP_HIDE_FROM_ABI deque(initializer_list<value_type> __il);
1343	deque(initializer_list<value_type> __il, const allocator_type& __a);	593	_LIBCPP_HIDE_FROM_ABI deque(initializer_list<value_type> __il, const allocator_type& __a);
1344		594
1345	_LIBCPP_INLINE_VISIBILITY	595	_LIBCPP_HIDE_FROM_ABI
1346	deque& operator=(initializer_list<value_type> __il) {assign(__il); return *this;}	596	deque& operator=(initializer_list<value_type> __il) {assign(__il); return *this;}
1347		597
1348	_LIBCPP_INLINE_VISIBILITY	598	_LIBCPP_HIDE_FROM_ABI
1349	deque(deque&& __c) _NOEXCEPT_(is_nothrow_move_constructible<__base>::value);	599	deque(deque&& __c) _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
1350	_LIBCPP_INLINE_VISIBILITY	600	_LIBCPP_HIDE_FROM_ABI
1351	deque(deque&& __c, const __type_identity_t<allocator_type>& __a);	601	deque(deque&& __c, const __type_identity_t<allocator_type>& __a);
1352	_LIBCPP_INLINE_VISIBILITY	602	_LIBCPP_HIDE_FROM_ABI
1353	deque& operator=(deque&& __c)	603	deque& operator=(deque&& __c)
1354	_NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&	604	_NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
1355	is_nothrow_move_assignable<allocator_type>::value);	605	is_nothrow_move_assignable<allocator_type>::value);
1356		606
1357	_LIBCPP_INLINE_VISIBILITY	607	_LIBCPP_HIDE_FROM_ABI
1358	void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());}	608	void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());}
1359	#endif // _LIBCPP_CXX03_LANG	609	#endif // _LIBCPP_CXX03_LANG
1360		610
1361	template <class _InputIter>	611	template <class _InputIter>
1362	void assign(_InputIter __f, _InputIter __l,	612	_LIBCPP_HIDE_FROM_ABI void assign(_InputIter __f, _InputIter __l,
1363	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value &&	613	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value &&
1364	!__is_cpp17_random_access_iterator<_InputIter>::value>::type* = 0);	614	!__is_cpp17_random_access_iterator<_InputIter>::value>::type* = 0);
1365	template <class _RAIter>	615	template <class _RAIter>
1366	void assign(_RAIter __f, _RAIter __l,	616	_LIBCPP_HIDE_FROM_ABI void assign(_RAIter __f, _RAIter __l,
1367	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);	617	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type* = 0);
1368	void assign(size_type __n, const value_type& __v);	618	_LIBCPP_HIDE_FROM_ABI void assign(size_type __n, const value_type& __v);
1369		619
1370	_LIBCPP_INLINE_VISIBILITY	620	_LIBCPP_HIDE_FROM_ABI
1371	allocator_type get_allocator() const _NOEXCEPT;	621	allocator_type get_allocator() const _NOEXCEPT;
1372		622	_LIBCPP_HIDE_FROM_ABI allocator_type& __alloc() _NOEXCEPT { return __size_.second(); }
1373	// iterators:	623	_LIBCPP_HIDE_FROM_ABI const allocator_type& __alloc() const _NOEXCEPT { return __size_.second(); }
1374		624
1375	_LIBCPP_INLINE_VISIBILITY	625	// iterators:
1376	iterator begin() _NOEXCEPT {return __base::begin();}	626
1377	_LIBCPP_INLINE_VISIBILITY	627	_LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT {
1378	const_iterator begin() const _NOEXCEPT {return __base::begin();}	628	__map_pointer __mp = __map_.begin() + __start_ / __block_size;
1379	_LIBCPP_INLINE_VISIBILITY	629	return iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
1380	iterator end() _NOEXCEPT {return __base::end();}	630	}
1381	_LIBCPP_INLINE_VISIBILITY	631
1382	const_iterator end() const _NOEXCEPT {return __base::end();}	632	_LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT {
1383		633	__map_const_pointer __mp =
1384	_LIBCPP_INLINE_VISIBILITY	634	static_cast<__map_const_pointer>(__map_.begin() + __start_ / __block_size);
		635	return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
		636	}
		637
		638	_LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT {
		639	size_type __p = size() + __start_;
		640	__map_pointer __mp = __map_.begin() + __p / __block_size;
		641	return iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
		642	}
		643
		644	_LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT {
		645	size_type __p = size() + __start_;
		646	__map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __p / __block_size);
		647	return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
		648	}
		649
		650	_LIBCPP_HIDE_FROM_ABI
1385	reverse_iterator rbegin() _NOEXCEPT	651	reverse_iterator rbegin() _NOEXCEPT
1386	{return reverse_iterator(__base::end());}	652	{return reverse_iterator(end());}
1387	_LIBCPP_INLINE_VISIBILITY	653	_LIBCPP_HIDE_FROM_ABI
1388	const_reverse_iterator rbegin() const _NOEXCEPT	654	const_reverse_iterator rbegin() const _NOEXCEPT
1389	{return const_reverse_iterator(__base::end());}	655	{return const_reverse_iterator(end());}
1390	_LIBCPP_INLINE_VISIBILITY	656	_LIBCPP_HIDE_FROM_ABI
1391	reverse_iterator rend() _NOEXCEPT	657	reverse_iterator rend() _NOEXCEPT
1392	{return reverse_iterator(__base::begin());}	658	{return reverse_iterator(begin());}
1393	_LIBCPP_INLINE_VISIBILITY	659	_LIBCPP_HIDE_FROM_ABI
1394	const_reverse_iterator rend() const _NOEXCEPT	660	const_reverse_iterator rend() const _NOEXCEPT
1395	{return const_reverse_iterator(__base::begin());}	661	{return const_reverse_iterator(begin());}
1396		662
1397	_LIBCPP_INLINE_VISIBILITY	663	_LIBCPP_HIDE_FROM_ABI
1398	const_iterator cbegin() const _NOEXCEPT	664	const_iterator cbegin() const _NOEXCEPT
1399	{return __base::begin();}	665	{return begin();}
1400	_LIBCPP_INLINE_VISIBILITY	666	_LIBCPP_HIDE_FROM_ABI
1401	const_iterator cend() const _NOEXCEPT	667	const_iterator cend() const _NOEXCEPT
1402	{return __base::end();}	668	{return end();}
1403	_LIBCPP_INLINE_VISIBILITY	669	_LIBCPP_HIDE_FROM_ABI
1404	const_reverse_iterator crbegin() const _NOEXCEPT	670	const_reverse_iterator crbegin() const _NOEXCEPT
1405	{return const_reverse_iterator(__base::end());}	671	{return const_reverse_iterator(end());}
1406	_LIBCPP_INLINE_VISIBILITY	672	_LIBCPP_HIDE_FROM_ABI
1407	const_reverse_iterator crend() const _NOEXCEPT	673	const_reverse_iterator crend() const _NOEXCEPT
1408	{return const_reverse_iterator(__base::begin());}	674	{return const_reverse_iterator(begin());}
1409		675
1410	// capacity:	676	// capacity:
1411	_LIBCPP_INLINE_VISIBILITY	677	_LIBCPP_HIDE_FROM_ABI
1412	size_type size() const _NOEXCEPT {return __base::size();}	678	size_type size() const _NOEXCEPT {return __size();}
1413	_LIBCPP_INLINE_VISIBILITY	679
		680	_LIBCPP_HIDE_FROM_ABI size_type& __size() _NOEXCEPT { return __size_.first(); }
		681	_LIBCPP_HIDE_FROM_ABI const size_type& __size() const _NOEXCEPT { return __size_.first(); }
		682
		683	_LIBCPP_HIDE_FROM_ABI
1414	size_type max_size() const _NOEXCEPT	684	size_type max_size() const _NOEXCEPT
1415	{return _VSTD::min<size_type>(	685	{return _VSTD::min<size_type>(
1416	__alloc_traits::max_size(__base::__alloc()),	686	__alloc_traits::max_size(__alloc()),
1417	numeric_limits<difference_type>::max());}	687	numeric_limits<difference_type>::max());}
1418	void resize(size_type __n);	688	_LIBCPP_HIDE_FROM_ABI void resize(size_type __n);
1419	void resize(size_type __n, const value_type& __v);	689	_LIBCPP_HIDE_FROM_ABI void resize(size_type __n, const value_type& __v);
1420	void shrink_to_fit() _NOEXCEPT;	690	_LIBCPP_HIDE_FROM_ABI void shrink_to_fit() _NOEXCEPT;
1421	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	691	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI
1422	bool empty() const _NOEXCEPT {return __base::size() == 0;}	692	bool empty() const _NOEXCEPT {return size() == 0;}
1423		693
1424	// element access:	694	// element access:
1425	_LIBCPP_INLINE_VISIBILITY	695	_LIBCPP_HIDE_FROM_ABI
1426	reference operator[](size_type __i) _NOEXCEPT;	696	reference operator[](size_type __i) _NOEXCEPT;
1427	_LIBCPP_INLINE_VISIBILITY	697	_LIBCPP_HIDE_FROM_ABI
1428	const_reference operator[](size_type __i) const _NOEXCEPT;	698	const_reference operator[](size_type __i) const _NOEXCEPT;
1429	_LIBCPP_INLINE_VISIBILITY	699	_LIBCPP_HIDE_FROM_ABI
1430	reference at(size_type __i);	700	reference at(size_type __i);
1431	_LIBCPP_INLINE_VISIBILITY	701	_LIBCPP_HIDE_FROM_ABI
1432	const_reference at(size_type __i) const;	702	const_reference at(size_type __i) const;
1433	_LIBCPP_INLINE_VISIBILITY	703	_LIBCPP_HIDE_FROM_ABI
1434	reference front() _NOEXCEPT;	704	reference front() _NOEXCEPT;
1435	_LIBCPP_INLINE_VISIBILITY	705	_LIBCPP_HIDE_FROM_ABI
1436	const_reference front() const _NOEXCEPT;	706	const_reference front() const _NOEXCEPT;
1437	_LIBCPP_INLINE_VISIBILITY	707	_LIBCPP_HIDE_FROM_ABI
1438	reference back() _NOEXCEPT;	708	reference back() _NOEXCEPT;
1439	_LIBCPP_INLINE_VISIBILITY	709	_LIBCPP_HIDE_FROM_ABI
1440	const_reference back() const _NOEXCEPT;	710	const_reference back() const _NOEXCEPT;
1441		711
1442	// 23.2.2.3 modifiers:	712	// 23.2.2.3 modifiers:
1443	void push_front(const value_type& __v);	713	_LIBCPP_HIDE_FROM_ABI void push_front(const value_type& __v);
1444	void push_back(const value_type& __v);	714	_LIBCPP_HIDE_FROM_ABI void push_back(const value_type& __v);
1445	#ifndef _LIBCPP_CXX03_LANG	715	#ifndef _LIBCPP_CXX03_LANG
1446	#if _LIBCPP_STD_VER > 14	716	#if _LIBCPP_STD_VER > 14
1447	template <class... _Args> reference emplace_front(_Args&&... __args);	717	template <class... _Args> _LIBCPP_HIDE_FROM_ABI reference emplace_front(_Args&&... __args);
1448	template <class... _Args> reference emplace_back (_Args&&... __args);	718	template <class... _Args> _LIBCPP_HIDE_FROM_ABI reference emplace_back (_Args&&... __args);
1449	#else	719	#else
1450	template <class... _Args> void emplace_front(_Args&&... __args);	720	template <class... _Args> _LIBCPP_HIDE_FROM_ABI void emplace_front(_Args&&... __args);
1451	template <class... _Args> void emplace_back (_Args&&... __args);	721	template <class... _Args> _LIBCPP_HIDE_FROM_ABI void emplace_back (_Args&&... __args);
1452	#endif	722	#endif
1453	template <class... _Args> iterator emplace(const_iterator __p, _Args&&... __args);	723	template <class... _Args> _LIBCPP_HIDE_FROM_ABI iterator emplace(const_iterator __p, _Args&&... __args);
1454		724
1455	void push_front(value_type&& __v);	725	_LIBCPP_HIDE_FROM_ABI void push_front(value_type&& __v);
1456	void push_back(value_type&& __v);	726	_LIBCPP_HIDE_FROM_ABI void push_back(value_type&& __v);
1457	iterator insert(const_iterator __p, value_type&& __v);	727	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v);
1458		728
1459	_LIBCPP_INLINE_VISIBILITY	729	_LIBCPP_HIDE_FROM_ABI
1460	iterator insert(const_iterator __p, initializer_list<value_type> __il)	730	iterator insert(const_iterator __p, initializer_list<value_type> __il)
1461	{return insert(__p, __il.begin(), __il.end());}	731	{return insert(__p, __il.begin(), __il.end());}
1462	#endif // _LIBCPP_CXX03_LANG	732	#endif // _LIBCPP_CXX03_LANG
1463	iterator insert(const_iterator __p, const value_type& __v);	733	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v);
1464	iterator insert(const_iterator __p, size_type __n, const value_type& __v);	734	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, size_type __n, const value_type& __v);
1465	template <class _InputIter>	735	template <class _InputIter>
1466	iterator insert(const_iterator __p, _InputIter __f, _InputIter __l,	736	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, _InputIter __f, _InputIter __l,
1467	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIter>::value>::type* = 0);	737	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIter>::value>::type* = 0);
1468	template <class _ForwardIterator>	738	template <class _ForwardIterator>
1469	iterator insert(const_iterator __p, _ForwardIterator __f, _ForwardIterator __l,	739	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, _ForwardIterator __f, _ForwardIterator __l,
1470	typename enable_if<__is_exactly_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);	740	typename enable_if<__is_exactly_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);
1471	template <class _BiIter>	741	template <class _BiIter>
1472	iterator insert(const_iterator __p, _BiIter __f, _BiIter __l,	742	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, _BiIter __f, _BiIter __l,
1473	typename enable_if<__is_cpp17_bidirectional_iterator<_BiIter>::value>::type* = 0);	743	typename enable_if<__is_cpp17_bidirectional_iterator<_BiIter>::value>::type* = 0);
1474		744
1475	void pop_front();	745	_LIBCPP_HIDE_FROM_ABI void pop_front();
1476	void pop_back();	746	_LIBCPP_HIDE_FROM_ABI void pop_back();
1477	iterator erase(const_iterator __p);	747	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p);
1478	iterator erase(const_iterator __f, const_iterator __l);	748	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l);
1479		749
1480	_LIBCPP_INLINE_VISIBILITY	750	_LIBCPP_HIDE_FROM_ABI
1481	void swap(deque& __c)	751	void swap(deque& __c)
1482	#if _LIBCPP_STD_VER >= 14	752	#if _LIBCPP_STD_VER >= 14
1483	_NOEXCEPT;	753	_NOEXCEPT;
...	@@ -1485,121 +755,177 @@ public:	...	@@ -1485,121 +755,177 @@ public:
1485	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|	755	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
1486	__is_nothrow_swappable<allocator_type>::value);	756	__is_nothrow_swappable<allocator_type>::value);
1487	#endif	757	#endif
1488	_LIBCPP_INLINE_VISIBILITY	758	_LIBCPP_HIDE_FROM_ABI
1489	void clear() _NOEXCEPT;	759	void clear() _NOEXCEPT;
1490		760
1491	_LIBCPP_INLINE_VISIBILITY	761	_LIBCPP_HIDE_FROM_ABI
1492	bool __invariants() const {return __base::__invariants();}	762	bool __invariants() const {
		763	if (!__map_.__invariants())
		764	return false;
		765	if (__map_.size() >= size_type(-1) / __block_size)
		766	return false;
		767	for (typename __map::const_iterator __i = __map_.begin(), __e = __map_.end();
		768	__i != __e; ++__i)
		769	if (*__i == nullptr)
		770	return false;
		771	if (__map_.size() != 0)
		772	{
		773	if (size() >= __map_.size() * __block_size)
		774	return false;
		775	if (__start_ >= __map_.size() * __block_size - size())
		776	return false;
		777	}
		778	else
		779	{
		780	if (size() != 0)
		781	return false;
		782	if (__start_ != 0)
		783	return false;
		784	}
		785	return true;
		786	}
1493		787
1494	typedef typename __base::__map_const_pointer __map_const_pointer;	788	_LIBCPP_HIDE_FROM_ABI
		789	void __move_assign_alloc(deque& __c)
		790	_NOEXCEPT_(!__alloc_traits::propagate_on_container_move_assignment::value \|\|
		791	is_nothrow_move_assignable<allocator_type>::value)
		792	{__move_assign_alloc(__c, integral_constant<bool,
		793	__alloc_traits::propagate_on_container_move_assignment::value>());}
		794
		795	_LIBCPP_HIDE_FROM_ABI
		796	void __move_assign_alloc(deque& __c, true_type)
		797	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
		798	{
		799	__alloc() = _VSTD::move(__c.__alloc());
		800	}
		801
		802	_LIBCPP_HIDE_FROM_ABI
		803	void __move_assign_alloc(deque&, false_type) _NOEXCEPT
		804	{}
		805
		806	_LIBCPP_HIDE_FROM_ABI
		807	void __move_assign(deque& __c)
		808	_NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
		809	is_nothrow_move_assignable<allocator_type>::value)
		810	{
		811	__map_ = _VSTD::move(__c.__map_);
		812	__start_ = __c.__start_;
		813	__size() = __c.size();
		814	__move_assign_alloc(__c);
		815	__c.__start_ = __c.__size() = 0;
		816	}
1495		817
1496	_LIBCPP_INLINE_VISIBILITY	818	_LIBCPP_HIDE_FROM_ABI
1497	static size_type __recommend_blocks(size_type __n)	819	static size_type __recommend_blocks(size_type __n)
1498	{	820	{
1499	return __n / __base::__block_size + (__n % __base::__block_size != 0);	821	return __n / __block_size + (__n % __block_size != 0);
1500	}	822	}
1501	_LIBCPP_INLINE_VISIBILITY	823	_LIBCPP_HIDE_FROM_ABI
1502	size_type __capacity() const	824	size_type __capacity() const
1503	{	825	{
1504	return __base::__map_.size() == 0 ? 0 : __base::__map_.size() * __base::__block_size - 1;	826	return __map_.size() == 0 ? 0 : __map_.size() * __block_size - 1;
1505	}	827	}
1506	_LIBCPP_INLINE_VISIBILITY	828	_LIBCPP_HIDE_FROM_ABI
1507	size_type __block_count() const	829	size_type __block_count() const
1508	{	830	{
1509	return __base::__map_.size();	831	return __map_.size();
1510	}	832	}
1511		833
1512	_LIBCPP_INLINE_VISIBILITY	834	_LIBCPP_HIDE_FROM_ABI
1513	size_type __front_spare() const	835	size_type __front_spare() const
1514	{	836	{
1515	return __base::__start_;	837	return __start_;
1516	}	838	}
1517	_LIBCPP_INLINE_VISIBILITY	839	_LIBCPP_HIDE_FROM_ABI
1518	size_type __front_spare_blocks() const {	840	size_type __front_spare_blocks() const {
1519	return __front_spare() / __base::__block_size;	841	return __front_spare() / __block_size;
1520	}	842	}
1521	_LIBCPP_INLINE_VISIBILITY	843	_LIBCPP_HIDE_FROM_ABI
1522	size_type __back_spare() const	844	size_type __back_spare() const
1523	{	845	{
1524	return __capacity() - (__base::__start_ + __base::size());	846	return __capacity() - (__start_ + size());
1525	}	847	}
1526	_LIBCPP_INLINE_VISIBILITY	848	_LIBCPP_HIDE_FROM_ABI
1527	size_type __back_spare_blocks() const {	849	size_type __back_spare_blocks() const {
1528	return __back_spare() / __base::__block_size;	850	return __back_spare() / __block_size;
1529	}	851	}
1530		852
1531	private:	853	private:
1532	_LIBCPP_INLINE_VISIBILITY	854	_LIBCPP_HIDE_FROM_ABI
1533	bool __maybe_remove_front_spare(bool __keep_one = true) {	855	bool __maybe_remove_front_spare(bool __keep_one = true) {
1534	if (__front_spare_blocks() >= 2 \|\| (!__keep_one && __front_spare_blocks())) {	856	if (__front_spare_blocks() >= 2 \|\| (!__keep_one && __front_spare_blocks())) {
1535	__alloc_traits::deallocate(__base::__alloc(), __base::__map_.front(),	857	__alloc_traits::deallocate(__alloc(), __map_.front(),
1536	__base::__block_size);	858	__block_size);
1537	__base::__map_.pop_front();	859	__map_.pop_front();
1538	__base::__start_ -= __base::__block_size;	860	__start_ -= __block_size;
1539	return true;	861	return true;
1540	}	862	}
1541	return false;	863	return false;
1542	}	864	}
1543		865
1544	_LIBCPP_INLINE_VISIBILITY	866	_LIBCPP_HIDE_FROM_ABI
1545	bool __maybe_remove_back_spare(bool __keep_one = true) {	867	bool __maybe_remove_back_spare(bool __keep_one = true) {
1546	if (__back_spare_blocks() >= 2 \|\| (!__keep_one && __back_spare_blocks())) {	868	if (__back_spare_blocks() >= 2 \|\| (!__keep_one && __back_spare_blocks())) {
1547	__alloc_traits::deallocate(__base::__alloc(), __base::__map_.back(),	869	__alloc_traits::deallocate(__alloc(), __map_.back(),
1548	__base::__block_size);	870	__block_size);
1549	__base::__map_.pop_back();	871	__map_.pop_back();
1550	return true;	872	return true;
1551	}	873	}
1552	return false;	874	return false;
1553	}	875	}
1554		876
1555	template <class _InpIter>	877	template <class _InpIter>
1556	void __append(_InpIter __f, _InpIter __l,	878	_LIBCPP_HIDE_FROM_ABI void __append(_InpIter __f, _InpIter __l,
1557	typename enable_if<__is_exactly_cpp17_input_iterator<_InpIter>::value>::type* = 0);	879	typename enable_if<__is_exactly_cpp17_input_iterator<_InpIter>::value>::type* = 0);
1558	template <class _ForIter>	880	template <class _ForIter>
1559	void __append(_ForIter __f, _ForIter __l,	881	_LIBCPP_HIDE_FROM_ABI void __append(_ForIter __f, _ForIter __l,
1560	typename enable_if<__is_cpp17_forward_iterator<_ForIter>::value>::type* = 0);	882	typename enable_if<__is_cpp17_forward_iterator<_ForIter>::value>::type* = 0);
1561	void __append(size_type __n);	883	_LIBCPP_HIDE_FROM_ABI void __append(size_type __n);
1562	void __append(size_type __n, const value_type& __v);	884	_LIBCPP_HIDE_FROM_ABI void __append(size_type __n, const value_type& __v);
1563	void __erase_to_end(const_iterator __f);	885	_LIBCPP_HIDE_FROM_ABI void __erase_to_end(const_iterator __f);
1564	void __add_front_capacity();	886	_LIBCPP_HIDE_FROM_ABI void __add_front_capacity();
1565	void __add_front_capacity(size_type __n);	887	_LIBCPP_HIDE_FROM_ABI void __add_front_capacity(size_type __n);
1566	void __add_back_capacity();	888	_LIBCPP_HIDE_FROM_ABI void __add_back_capacity();
1567	void __add_back_capacity(size_type __n);	889	_LIBCPP_HIDE_FROM_ABI void __add_back_capacity(size_type __n);
1568	iterator __move_and_check(iterator __f, iterator __l, iterator __r,	890	_LIBCPP_HIDE_FROM_ABI iterator __move_and_check(iterator __f, iterator __l, iterator __r,
1569	const_pointer& __vt);	891	const_pointer& __vt);
1570	iterator __move_backward_and_check(iterator __f, iterator __l, iterator __r,	892	_LIBCPP_HIDE_FROM_ABI iterator __move_backward_and_check(iterator __f, iterator __l, iterator __r,
1571	const_pointer& __vt);	893	const_pointer& __vt);
1572	void __move_construct_and_check(iterator __f, iterator __l,	894	_LIBCPP_HIDE_FROM_ABI void __move_construct_and_check(iterator __f, iterator __l,
1573	iterator __r, const_pointer& __vt);	895	iterator __r, const_pointer& __vt);
1574	void __move_construct_backward_and_check(iterator __f, iterator __l,	896	_LIBCPP_HIDE_FROM_ABI void __move_construct_backward_and_check(iterator __f, iterator __l,
1575	iterator __r, const_pointer& __vt);	897	iterator __r, const_pointer& __vt);
1576		898
1577	_LIBCPP_INLINE_VISIBILITY	899	_LIBCPP_HIDE_FROM_ABI
1578	void __copy_assign_alloc(const deque& __c)	900	void __copy_assign_alloc(const deque& __c)
1579	{__copy_assign_alloc(__c, integral_constant<bool,	901	{__copy_assign_alloc(__c, integral_constant<bool,
1580	__alloc_traits::propagate_on_container_copy_assignment::value>());}	902	__alloc_traits::propagate_on_container_copy_assignment::value>());}
1581		903
1582	_LIBCPP_INLINE_VISIBILITY	904	_LIBCPP_HIDE_FROM_ABI
1583	void __copy_assign_alloc(const deque& __c, true_type)	905	void __copy_assign_alloc(const deque& __c, true_type)
1584	{	906	{
1585	if (__base::__alloc() != __c.__alloc())	907	if (__alloc() != __c.__alloc())
1586	{	908	{
1587	clear();	909	clear();
1588	shrink_to_fit();	910	shrink_to_fit();
1589	}	911	}
1590	__base::__alloc() = __c.__alloc();	912	__alloc() = __c.__alloc();
1591	__base::__map_.__alloc() = __c.__map_.__alloc();	913	__map_.__alloc() = __c.__map_.__alloc();
1592	}	914	}
1593		915
1594	_LIBCPP_INLINE_VISIBILITY	916	_LIBCPP_HIDE_FROM_ABI
1595	void __copy_assign_alloc(const deque&, false_type)	917	void __copy_assign_alloc(const deque&, false_type)
1596	{}	918	{}
1597		919
1598	void __move_assign(deque& __c, true_type)	920	_LIBCPP_HIDE_FROM_ABI void __move_assign(deque& __c, true_type)
1599	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);	921	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
1600	void __move_assign(deque& __c, false_type);	922	_LIBCPP_HIDE_FROM_ABI void __move_assign(deque& __c, false_type);
1601	};	923	};
1602		924
		925	template <class _Tp, class _Alloc>
		926	_LIBCPP_CONSTEXPR const typename allocator_traits<_Alloc>::difference_type deque<_Tp, _Alloc>::__block_size =
		927	__deque_block_size<value_type, difference_type>::value;
		928
1603	#if _LIBCPP_STD_VER >= 17	929	#if _LIBCPP_STD_VER >= 17
1604	template<class _InputIterator,	930	template<class _InputIterator,
1605	class _Alloc = allocator<__iter_value_type<_InputIterator>>,	931	class _Alloc = allocator<__iter_value_type<_InputIterator>>,
...	@@ -1620,6 +946,7 @@ deque(_InputIterator, _InputIterator, _Alloc)	...	@@ -1620,6 +946,7 @@ deque(_InputIterator, _InputIterator, _Alloc)
1620		946
1621	template <class _Tp, class _Allocator>	947	template <class _Tp, class _Allocator>
1622	deque<_Tp, _Allocator>::deque(size_type __n)	948	deque<_Tp, _Allocator>::deque(size_type __n)
		949	: __start_(0), __size_(0, __default_init_tag())
1623	{	950	{
1624	if (__n > 0)	951	if (__n > 0)
1625	__append(__n);	952	__append(__n);
...	@@ -1628,7 +955,7 @@ deque<_Tp, _Allocator>::deque(size_type __n)	...	@@ -1628,7 +955,7 @@ deque<_Tp, _Allocator>::deque(size_type __n)
1628	#if _LIBCPP_STD_VER > 11	955	#if _LIBCPP_STD_VER > 11
1629	template <class _Tp, class _Allocator>	956	template <class _Tp, class _Allocator>
1630	deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)	957	deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
1631	: __base(__a)	958	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a)
1632	{	959	{
1633	if (__n > 0)	960	if (__n > 0)
1634	__append(__n);	961	__append(__n);
...	@@ -1637,6 +964,7 @@ deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)	...	@@ -1637,6 +964,7 @@ deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
1637		964
1638	template <class _Tp, class _Allocator>	965	template <class _Tp, class _Allocator>
1639	deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v)	966	deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v)
		967	: __start_(0), __size_(0, __default_init_tag())
1640	{	968	{
1641	if (__n > 0)	969	if (__n > 0)
1642	__append(__n, __v);	970	__append(__n, __v);
...	@@ -1646,6 +974,7 @@ template <class _Tp, class _Allocator>	...	@@ -1646,6 +974,7 @@ template <class _Tp, class _Allocator>
1646	template <class _InputIter>	974	template <class _InputIter>
1647	deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l,	975	deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l,
1648	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type*)	976	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type*)
		977	: __start_(0), __size_(0, __default_init_tag())
1649	{	978	{
1650	__append(__f, __l);	979	__append(__f, __l);
1651	}	980	}
...	@@ -1654,21 +983,23 @@ template <class _Tp, class _Allocator>	...	@@ -1654,21 +983,23 @@ template <class _Tp, class _Allocator>
1654	template <class _InputIter>	983	template <class _InputIter>
1655	deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l, const allocator_type& __a,	984	deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
1656	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type*)	985	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value>::type*)
1657	: __base(__a)	986	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a)
1658	{	987	{
1659	__append(__f, __l);	988	__append(__f, __l);
1660	}	989	}
1661		990
1662	template <class _Tp, class _Allocator>	991	template <class _Tp, class _Allocator>
1663	deque<_Tp, _Allocator>::deque(const deque& __c)	992	deque<_Tp, _Allocator>::deque(const deque& __c)
1664	: __base(__alloc_traits::select_on_container_copy_construction(__c.__alloc()))	993	: __map_(__pointer_allocator(__alloc_traits::select_on_container_copy_construction(__c.__alloc()))),
		994	__start_(0),
		995	__size_(0, __map_.__alloc())
1665	{	996	{
1666	__append(__c.begin(), __c.end());	997	__append(__c.begin(), __c.end());
1667	}	998	}
1668		999
1669	template <class _Tp, class _Allocator>	1000	template <class _Tp, class _Allocator>
1670	deque<_Tp, _Allocator>::deque(const deque& __c, const __type_identity_t<allocator_type>& __a)	1001	deque<_Tp, _Allocator>::deque(const deque& __c, const __type_identity_t<allocator_type>& __a)
1671	: __base(__a)	1002	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a)
1672	{	1003	{
1673	__append(__c.begin(), __c.end());	1004	__append(__c.begin(), __c.end());
1674	}	1005	}
...	@@ -1689,13 +1020,14 @@ deque<_Tp, _Allocator>::operator=(const deque& __c)	...	@@ -1689,13 +1020,14 @@ deque<_Tp, _Allocator>::operator=(const deque& __c)
1689		1020
1690	template <class _Tp, class _Allocator>	1021	template <class _Tp, class _Allocator>
1691	deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il)	1022	deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il)
		1023	: __start_(0), __size_(0, __default_init_tag())
1692	{	1024	{
1693	__append(__il.begin(), __il.end());	1025	__append(__il.begin(), __il.end());
1694	}	1026	}
1695		1027
1696	template <class _Tp, class _Allocator>	1028	template <class _Tp, class _Allocator>
1697	deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator_type& __a)	1029	deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator_type& __a)
1698	: __base(__a)	1030	: __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a)
1699	{	1031	{
1700	__append(__il.begin(), __il.end());	1032	__append(__il.begin(), __il.end());
1701	}	1033	}
...	@@ -1703,18 +1035,30 @@ deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator	...	@@ -1703,18 +1035,30 @@ deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator
1703	template <class _Tp, class _Allocator>	1035	template <class _Tp, class _Allocator>
1704	inline	1036	inline
1705	deque<_Tp, _Allocator>::deque(deque&& __c)	1037	deque<_Tp, _Allocator>::deque(deque&& __c)
1706	_NOEXCEPT_(is_nothrow_move_constructible<__base>::value)	1038	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
1707	: __base(_VSTD::move(__c))	1039	: __map_(std::move(__c.__map_)), __start_(std::move(__c.__start_)), __size_(std::move(__c.__size_))
1708	{	1040	{
		1041	__c.__start_ = 0;
		1042	__c.__size() = 0;
1709	}	1043	}
1710		1044
1711	template <class _Tp, class _Allocator>	1045	template <class _Tp, class _Allocator>
1712	inline	1046	inline
1713	deque<_Tp, _Allocator>::deque(deque&& __c, const __type_identity_t<allocator_type>& __a)	1047	deque<_Tp, _Allocator>::deque(deque&& __c, const __type_identity_t<allocator_type>& __a)
1714	: __base(_VSTD::move(__c), __a)	1048	: __map_(std::move(__c.__map_), __pointer_allocator(__a)),
		1049	__start_(std::move(__c.__start_)),
		1050	__size_(std::move(__c.__size()), __a)
1715	{	1051	{
1716	if (__a != __c.__alloc())	1052	if (__a == __c.__alloc())
1717	{	1053	{
		1054	__c.__start_ = 0;
		1055	__c.__size() = 0;
		1056	}
		1057	else
		1058	{
		1059	__map_.clear();
		1060	__start_ = 0;
		1061	__size() = 0;
1718	typedef move_iterator<iterator> _Ip;	1062	typedef move_iterator<iterator> _Ip;
1719	assign(_Ip(__c.begin()), _Ip(__c.end()));	1063	assign(_Ip(__c.begin()), _Ip(__c.end()));
1720	}	1064	}
...	@@ -1736,7 +1080,7 @@ template <class _Tp, class _Allocator>	...	@@ -1736,7 +1080,7 @@ template <class _Tp, class _Allocator>
1736	void	1080	void
1737	deque<_Tp, _Allocator>::__move_assign(deque& __c, false_type)	1081	deque<_Tp, _Allocator>::__move_assign(deque& __c, false_type)
1738	{	1082	{
1739	if (__base::__alloc() != __c.__alloc())	1083	if (__alloc() != __c.__alloc())
1740	{	1084	{
1741	typedef move_iterator<iterator> _Ip;	1085	typedef move_iterator<iterator> _Ip;
1742	assign(_Ip(__c.begin()), _Ip(__c.end()));	1086	assign(_Ip(__c.begin()), _Ip(__c.end()));
...	@@ -1752,7 +1096,7 @@ deque<_Tp, _Allocator>::__move_assign(deque& __c, true_type)	...	@@ -1752,7 +1096,7 @@ deque<_Tp, _Allocator>::__move_assign(deque& __c, true_type)
1752	{	1096	{
1753	clear();	1097	clear();
1754	shrink_to_fit();	1098	shrink_to_fit();
1755	__base::__move_assign(__c);	1099	__move_assign(__c);
1756	}	1100	}
1757		1101
1758	#endif // _LIBCPP_CXX03_LANG	1102	#endif // _LIBCPP_CXX03_LANG
...	@@ -1764,8 +1108,8 @@ deque<_Tp, _Allocator>::assign(_InputIter __f, _InputIter __l,	...	@@ -1764,8 +1108,8 @@ deque<_Tp, _Allocator>::assign(_InputIter __f, _InputIter __l,
1764	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value &&	1108	typename enable_if<__is_cpp17_input_iterator<_InputIter>::value &&
1765	!__is_cpp17_random_access_iterator<_InputIter>::value>::type*)	1109	!__is_cpp17_random_access_iterator<_InputIter>::value>::type*)
1766	{	1110	{
1767	iterator __i = __base::begin();	1111	iterator __i = begin();
1768	iterator __e = __base::end();	1112	iterator __e = end();
1769	for (; __f != __l && __i != __e; ++__f, (void) ++__i)	1113	for (; __f != __l && __i != __e; ++__f, (void) ++__i)
1770	__i = __f;	1114	__i = __f;
1771	if (__f != __l)	1115	if (__f != __l)
...	@@ -1780,28 +1124,28 @@ void	...	@@ -1780,28 +1124,28 @@ void
1780	deque<_Tp, _Allocator>::assign(_RAIter __f, _RAIter __l,	1124	deque<_Tp, _Allocator>::assign(_RAIter __f, _RAIter __l,
1781	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)	1125	typename enable_if<__is_cpp17_random_access_iterator<_RAIter>::value>::type*)
1782	{	1126	{
1783	if (static_cast<size_type>(__l - __f) > __base::size())	1127	if (static_cast<size_type>(__l - __f) > size())
1784	{	1128	{
1785	_RAIter __m = __f + __base::size();	1129	_RAIter __m = __f + size();
1786	_VSTD::copy(__f, __m, __base::begin());	1130	_VSTD::copy(__f, __m, begin());
1787	__append(__m, __l);	1131	__append(__m, __l);
1788	}	1132	}
1789	else	1133	else
1790	__erase_to_end(_VSTD::copy(__f, __l, __base::begin()));	1134	__erase_to_end(_VSTD::copy(__f, __l, begin()));
1791	}	1135	}
1792		1136
1793	template <class _Tp, class _Allocator>	1137	template <class _Tp, class _Allocator>
1794	void	1138	void
1795	deque<_Tp, _Allocator>::assign(size_type __n, const value_type& __v)	1139	deque<_Tp, _Allocator>::assign(size_type __n, const value_type& __v)
1796	{	1140	{
1797	if (__n > __base::size())	1141	if (__n > size())
1798	{	1142	{
1799	_VSTD::fill_n(__base::begin(), __base::size(), __v);	1143	_VSTD::fill_n(begin(), size(), __v);
1800	__n -= __base::size();	1144	__n -= size();
1801	__append(__n, __v);	1145	__append(__n, __v);
1802	}	1146	}
1803	else	1147	else
1804	__erase_to_end(_VSTD::fill_n(__base::begin(), __n, __v));	1148	__erase_to_end(_VSTD::fill_n(begin(), __n, __v));
1805	}	1149	}
1806		1150
1807	template <class _Tp, class _Allocator>	1151	template <class _Tp, class _Allocator>
...	@@ -1809,49 +1153,49 @@ inline	...	@@ -1809,49 +1153,49 @@ inline
1809	_Allocator	1153	_Allocator
1810	deque<_Tp, _Allocator>::get_allocator() const _NOEXCEPT	1154	deque<_Tp, _Allocator>::get_allocator() const _NOEXCEPT
1811	{	1155	{
1812	return __base::__alloc();	1156	return __alloc();
1813	}	1157	}
1814		1158
1815	template <class _Tp, class _Allocator>	1159	template <class _Tp, class _Allocator>
1816	void	1160	void
1817	deque<_Tp, _Allocator>::resize(size_type __n)	1161	deque<_Tp, _Allocator>::resize(size_type __n)
1818	{	1162	{
1819	if (__n > __base::size())	1163	if (__n > size())
1820	__append(__n - __base::size());	1164	__append(__n - size());
1821	else if (__n < __base::size())	1165	else if (__n < size())
1822	__erase_to_end(__base::begin() + __n);	1166	__erase_to_end(begin() + __n);
1823	}	1167	}
1824		1168
1825	template <class _Tp, class _Allocator>	1169	template <class _Tp, class _Allocator>
1826	void	1170	void
1827	deque<_Tp, _Allocator>::resize(size_type __n, const value_type& __v)	1171	deque<_Tp, _Allocator>::resize(size_type __n, const value_type& __v)
1828	{	1172	{
1829	if (__n > __base::size())	1173	if (__n > size())
1830	__append(__n - __base::size(), __v);	1174	__append(__n - size(), __v);
1831	else if (__n < __base::size())	1175	else if (__n < size())
1832	__erase_to_end(__base::begin() + __n);	1176	__erase_to_end(begin() + __n);
1833	}	1177	}
1834		1178
1835	template <class _Tp, class _Allocator>	1179	template <class _Tp, class _Allocator>
1836	void	1180	void
1837	deque<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT	1181	deque<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
1838	{	1182	{
1839	allocator_type& __a = __base::__alloc();	1183	allocator_type& __a = __alloc();
1840	if (empty())	1184	if (empty())
1841	{	1185	{
1842	while (__base::__map_.size() > 0)	1186	while (__map_.size() > 0)
1843	{	1187	{
1844	__alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);	1188	__alloc_traits::deallocate(__a, __map_.back(), __block_size);
1845	__base::__map_.pop_back();	1189	__map_.pop_back();
1846	}	1190	}
1847	__base::__start_ = 0;	1191	__start_ = 0;
1848	}	1192	}
1849	else	1193	else
1850	{	1194	{
1851	__maybe_remove_front_spare(/__keep_one=/false);	1195	__maybe_remove_front_spare(/__keep_one=/false);
1852	__maybe_remove_back_spare(/__keep_one=/false);	1196	__maybe_remove_back_spare(/__keep_one=/false);
1853	}	1197	}
1854	__base::__map_.shrink_to_fit();	1198	__map_.shrink_to_fit();
1855	}	1199	}
1856		1200
1857	template <class _Tp, class _Allocator>	1201	template <class _Tp, class _Allocator>
...	@@ -1859,8 +1203,8 @@ inline	...	@@ -1859,8 +1203,8 @@ inline
1859	typename deque<_Tp, _Allocator>::reference	1203	typename deque<_Tp, _Allocator>::reference
1860	deque<_Tp, _Allocator>::operator[](size_type __i) _NOEXCEPT	1204	deque<_Tp, _Allocator>::operator[](size_type __i) _NOEXCEPT
1861	{	1205	{
1862	size_type __p = __base::__start_ + __i;	1206	size_type __p = __start_ + __i;
1863	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1207	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1864	}	1208	}
1865		1209
1866	template <class _Tp, class _Allocator>	1210	template <class _Tp, class _Allocator>
...	@@ -1868,8 +1212,8 @@ inline	...	@@ -1868,8 +1212,8 @@ inline
1868	typename deque<_Tp, _Allocator>::const_reference	1212	typename deque<_Tp, _Allocator>::const_reference
1869	deque<_Tp, _Allocator>::operator[](size_type __i) const _NOEXCEPT	1213	deque<_Tp, _Allocator>::operator[](size_type __i) const _NOEXCEPT
1870	{	1214	{
1871	size_type __p = __base::__start_ + __i;	1215	size_type __p = __start_ + __i;
1872	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1216	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1873	}	1217	}
1874		1218
1875	template <class _Tp, class _Allocator>	1219	template <class _Tp, class _Allocator>
...	@@ -1877,10 +1221,10 @@ inline	...	@@ -1877,10 +1221,10 @@ inline
1877	typename deque<_Tp, _Allocator>::reference	1221	typename deque<_Tp, _Allocator>::reference
1878	deque<_Tp, _Allocator>::at(size_type __i)	1222	deque<_Tp, _Allocator>::at(size_type __i)
1879	{	1223	{
1880	if (__i >= __base::size())	1224	if (__i >= size())
1881	_VSTD::__throw_out_of_range("deque");	1225	_VSTD::__throw_out_of_range("deque");
1882	size_type __p = __base::__start_ + __i;	1226	size_type __p = __start_ + __i;
1883	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1227	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1884	}	1228	}
1885		1229
1886	template <class _Tp, class _Allocator>	1230	template <class _Tp, class _Allocator>
...	@@ -1888,10 +1232,10 @@ inline	...	@@ -1888,10 +1232,10 @@ inline
1888	typename deque<_Tp, _Allocator>::const_reference	1232	typename deque<_Tp, _Allocator>::const_reference
1889	deque<_Tp, _Allocator>::at(size_type __i) const	1233	deque<_Tp, _Allocator>::at(size_type __i) const
1890	{	1234	{
1891	if (__i >= __base::size())	1235	if (__i >= size())
1892	_VSTD::__throw_out_of_range("deque");	1236	_VSTD::__throw_out_of_range("deque");
1893	size_type __p = __base::__start_ + __i;	1237	size_type __p = __start_ + __i;
1894	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1238	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1895	}	1239	}
1896		1240
1897	template <class _Tp, class _Allocator>	1241	template <class _Tp, class _Allocator>
...	@@ -1899,8 +1243,8 @@ inline	...	@@ -1899,8 +1243,8 @@ inline
1899	typename deque<_Tp, _Allocator>::reference	1243	typename deque<_Tp, _Allocator>::reference
1900	deque<_Tp, _Allocator>::front() _NOEXCEPT	1244	deque<_Tp, _Allocator>::front() _NOEXCEPT
1901	{	1245	{
1902	return ((__base::__map_.begin() + __base::__start_ / __base::__block_size)	1246	return ((__map_.begin() + __start_ / __block_size)
1903	+ __base::__start_ % __base::__block_size);	1247	+ __start_ % __block_size);
1904	}	1248	}
1905		1249
1906	template <class _Tp, class _Allocator>	1250	template <class _Tp, class _Allocator>
...	@@ -1908,8 +1252,8 @@ inline	...	@@ -1908,8 +1252,8 @@ inline
1908	typename deque<_Tp, _Allocator>::const_reference	1252	typename deque<_Tp, _Allocator>::const_reference
1909	deque<_Tp, _Allocator>::front() const _NOEXCEPT	1253	deque<_Tp, _Allocator>::front() const _NOEXCEPT
1910	{	1254	{
1911	return ((__base::__map_.begin() + __base::__start_ / __base::__block_size)	1255	return ((__map_.begin() + __start_ / __block_size)
1912	+ __base::__start_ % __base::__block_size);	1256	+ __start_ % __block_size);
1913	}	1257	}
1914		1258
1915	template <class _Tp, class _Allocator>	1259	template <class _Tp, class _Allocator>
...	@@ -1917,8 +1261,8 @@ inline	...	@@ -1917,8 +1261,8 @@ inline
1917	typename deque<_Tp, _Allocator>::reference	1261	typename deque<_Tp, _Allocator>::reference
1918	deque<_Tp, _Allocator>::back() _NOEXCEPT	1262	deque<_Tp, _Allocator>::back() _NOEXCEPT
1919	{	1263	{
1920	size_type __p = __base::size() + __base::__start_ - 1;	1264	size_type __p = size() + __start_ - 1;
1921	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1265	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1922	}	1266	}
1923		1267
1924	template <class _Tp, class _Allocator>	1268	template <class _Tp, class _Allocator>
...	@@ -1926,33 +1270,33 @@ inline	...	@@ -1926,33 +1270,33 @@ inline
1926	typename deque<_Tp, _Allocator>::const_reference	1270	typename deque<_Tp, _Allocator>::const_reference
1927	deque<_Tp, _Allocator>::back() const _NOEXCEPT	1271	deque<_Tp, _Allocator>::back() const _NOEXCEPT
1928	{	1272	{
1929	size_type __p = __base::size() + __base::__start_ - 1;	1273	size_type __p = size() + __start_ - 1;
1930	return ((__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);	1274	return ((__map_.begin() + __p / __block_size) + __p % __block_size);
1931	}	1275	}
1932		1276
1933	template <class _Tp, class _Allocator>	1277	template <class _Tp, class _Allocator>
1934	void	1278	void
1935	deque<_Tp, _Allocator>::push_back(const value_type& __v)	1279	deque<_Tp, _Allocator>::push_back(const value_type& __v)
1936	{	1280	{
1937	allocator_type& __a = __base::__alloc();	1281	allocator_type& __a = __alloc();
1938	if (__back_spare() == 0)	1282	if (__back_spare() == 0)
1939	__add_back_capacity();	1283	__add_back_capacity();
1940	// __back_spare() >= 1	1284	// __back_spare() >= 1
1941	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);	1285	__alloc_traits::construct(__a, _VSTD::addressof(*end()), __v);
1942	++__base::size();	1286	++__size();
1943	}	1287	}
1944		1288
1945	template <class _Tp, class _Allocator>	1289	template <class _Tp, class _Allocator>
1946	void	1290	void
1947	deque<_Tp, _Allocator>::push_front(const value_type& __v)	1291	deque<_Tp, _Allocator>::push_front(const value_type& __v)
1948	{	1292	{
1949	allocator_type& __a = __base::__alloc();	1293	allocator_type& __a = __alloc();
1950	if (__front_spare() == 0)	1294	if (__front_spare() == 0)
1951	__add_front_capacity();	1295	__add_front_capacity();
1952	// __front_spare() >= 1	1296	// __front_spare() >= 1
1953	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);	1297	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), __v);
1954	--__base::__start_;	1298	--__start_;
1955	++__base::size();	1299	++__size();
1956	}	1300	}
1957		1301
1958	#ifndef _LIBCPP_CXX03_LANG	1302	#ifndef _LIBCPP_CXX03_LANG
...	@@ -1960,12 +1304,12 @@ template <class _Tp, class _Allocator>	...	@@ -1960,12 +1304,12 @@ template <class _Tp, class _Allocator>
1960	void	1304	void
1961	deque<_Tp, _Allocator>::push_back(value_type&& __v)	1305	deque<_Tp, _Allocator>::push_back(value_type&& __v)
1962	{	1306	{
1963	allocator_type& __a = __base::__alloc();	1307	allocator_type& __a = __alloc();
1964	if (__back_spare() == 0)	1308	if (__back_spare() == 0)
1965	__add_back_capacity();	1309	__add_back_capacity();
1966	// __back_spare() >= 1	1310	// __back_spare() >= 1
1967	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));	1311	__alloc_traits::construct(__a, _VSTD::addressof(*end()), _VSTD::move(__v));
1968	++__base::size();	1312	++__size();
1969	}	1313	}
1970		1314
1971	template <class _Tp, class _Allocator>	1315	template <class _Tp, class _Allocator>
...	@@ -1977,15 +1321,15 @@ void	...	@@ -1977,15 +1321,15 @@ void
1977	#endif	1321	#endif
1978	deque<_Tp, _Allocator>::emplace_back(_Args&&... __args)	1322	deque<_Tp, _Allocator>::emplace_back(_Args&&... __args)
1979	{	1323	{
1980	allocator_type& __a = __base::__alloc();	1324	allocator_type& __a = __alloc();
1981	if (__back_spare() == 0)	1325	if (__back_spare() == 0)
1982	__add_back_capacity();	1326	__add_back_capacity();
1983	// __back_spare() >= 1	1327	// __back_spare() >= 1
1984	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()),	1328	__alloc_traits::construct(__a, _VSTD::addressof(*end()),
1985	_VSTD::forward<_Args>(__args)...);	1329	_VSTD::forward<_Args>(__args)...);
1986	++__base::size();	1330	++__size();
1987	#if _LIBCPP_STD_VER > 14	1331	#if _LIBCPP_STD_VER > 14
1988	return *--__base::end();	1332	return *--end();
1989	#endif	1333	#endif
1990	}	1334	}
1991		1335
...	@@ -1993,13 +1337,13 @@ template <class _Tp, class _Allocator>	...	@@ -1993,13 +1337,13 @@ template <class _Tp, class _Allocator>
1993	void	1337	void
1994	deque<_Tp, _Allocator>::push_front(value_type&& __v)	1338	deque<_Tp, _Allocator>::push_front(value_type&& __v)
1995	{	1339	{
1996	allocator_type& __a = __base::__alloc();	1340	allocator_type& __a = __alloc();
1997	if (__front_spare() == 0)	1341	if (__front_spare() == 0)
1998	__add_front_capacity();	1342	__add_front_capacity();
1999	// __front_spare() >= 1	1343	// __front_spare() >= 1
2000	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));	1344	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), _VSTD::move(__v));
2001	--__base::__start_;	1345	--__start_;
2002	++__base::size();	1346	++__size();
2003	}	1347	}
2004		1348
2005		1349
...	@@ -2012,15 +1356,15 @@ void	...	@@ -2012,15 +1356,15 @@ void
2012	#endif	1356	#endif
2013	deque<_Tp, _Allocator>::emplace_front(_Args&&... __args)	1357	deque<_Tp, _Allocator>::emplace_front(_Args&&... __args)
2014	{	1358	{
2015	allocator_type& __a = __base::__alloc();	1359	allocator_type& __a = __alloc();
2016	if (__front_spare() == 0)	1360	if (__front_spare() == 0)
2017	__add_front_capacity();	1361	__add_front_capacity();
2018	// __front_spare() >= 1	1362	// __front_spare() >= 1
2019	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);	1363	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), _VSTD::forward<_Args>(__args)...);
2020	--__base::__start_;	1364	--__start_;
2021	++__base::size();	1365	++__size();
2022	#if _LIBCPP_STD_VER > 14	1366	#if _LIBCPP_STD_VER > 14
2023	return *__base::begin();	1367	return *begin();
2024	#endif	1368	#endif
2025	}	1369	}
2026		1370
...	@@ -2028,9 +1372,9 @@ template <class _Tp, class _Allocator>	...	@@ -2028,9 +1372,9 @@ template <class _Tp, class _Allocator>
2028	typename deque<_Tp, _Allocator>::iterator	1372	typename deque<_Tp, _Allocator>::iterator
2029	deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)	1373	deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)
2030	{	1374	{
2031	size_type __pos = __p - __base::begin();	1375	size_type __pos = __p - begin();
2032	size_type __to_end = __base::size() - __pos;	1376	size_type __to_end = size() - __pos;
2033	allocator_type& __a = __base::__alloc();	1377	allocator_type& __a = __alloc();
2034	if (__pos < __to_end)	1378	if (__pos < __to_end)
2035	{ // insert by shifting things backward	1379	{ // insert by shifting things backward
2036	if (__front_spare() == 0)	1380	if (__front_spare() == 0)
...	@@ -2038,17 +1382,17 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)	...	@@ -2038,17 +1382,17 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)
2038	// __front_spare() >= 1	1382	// __front_spare() >= 1
2039	if (__pos == 0)	1383	if (__pos == 0)
2040	{	1384	{
2041	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));	1385	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), _VSTD::move(__v));
2042	--__base::__start_;	1386	--__start_;
2043	++__base::size();	1387	++__size();
2044	}	1388	}
2045	else	1389	else
2046	{	1390	{
2047	iterator __b = __base::begin();	1391	iterator __b = begin();
2048	iterator __bm1 = _VSTD::prev(__b);	1392	iterator __bm1 = _VSTD::prev(__b);
2049	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));	1393	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));
2050	--__base::__start_;	1394	--__start_;
2051	++__base::size();	1395	++__size();
2052	if (__pos > 1)	1396	if (__pos > 1)
2053	__b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);	1397	__b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
2054	*__b = _VSTD::move(__v);	1398	*__b = _VSTD::move(__v);
...	@@ -2059,24 +1403,24 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)	...	@@ -2059,24 +1403,24 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)
2059	if (__back_spare() == 0)	1403	if (__back_spare() == 0)
2060	__add_back_capacity();	1404	__add_back_capacity();
2061	// __back_capacity >= 1	1405	// __back_capacity >= 1
2062	size_type __de = __base::size() - __pos;	1406	size_type __de = size() - __pos;
2063	if (__de == 0)	1407	if (__de == 0)
2064	{	1408	{
2065	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));	1409	__alloc_traits::construct(__a, _VSTD::addressof(*end()), _VSTD::move(__v));
2066	++__base::size();	1410	++__size();
2067	}	1411	}
2068	else	1412	else
2069	{	1413	{
2070	iterator __e = __base::end();	1414	iterator __e = end();
2071	iterator __em1 = _VSTD::prev(__e);	1415	iterator __em1 = _VSTD::prev(__e);
2072	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));	1416	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));
2073	++__base::size();	1417	++__size();
2074	if (__de > 1)	1418	if (__de > 1)
2075	__e = _VSTD::move_backward(__e - __de, __em1, __e);	1419	__e = _VSTD::move_backward(__e - __de, __em1, __e);
2076	*--__e = _VSTD::move(__v);	1420	*--__e = _VSTD::move(__v);
2077	}	1421	}
2078	}	1422	}
2079	return __base::begin() + __pos;	1423	return begin() + __pos;
2080	}	1424	}
2081		1425
2082	template <class _Tp, class _Allocator>	1426	template <class _Tp, class _Allocator>
...	@@ -2084,9 +1428,9 @@ template <class... _Args>	...	@@ -2084,9 +1428,9 @@ template <class... _Args>
2084	typename deque<_Tp, _Allocator>::iterator	1428	typename deque<_Tp, _Allocator>::iterator
2085	deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)	1429	deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)
2086	{	1430	{
2087	size_type __pos = __p - __base::begin();	1431	size_type __pos = __p - begin();
2088	size_type __to_end = __base::size() - __pos;	1432	size_type __to_end = size() - __pos;
2089	allocator_type& __a = __base::__alloc();	1433	allocator_type& __a = __alloc();
2090	if (__pos < __to_end)	1434	if (__pos < __to_end)
2091	{ // insert by shifting things backward	1435	{ // insert by shifting things backward
2092	if (__front_spare() == 0)	1436	if (__front_spare() == 0)
...	@@ -2094,18 +1438,18 @@ deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)	...	@@ -2094,18 +1438,18 @@ deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)
2094	// __front_spare() >= 1	1438	// __front_spare() >= 1
2095	if (__pos == 0)	1439	if (__pos == 0)
2096	{	1440	{
2097	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);	1441	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), _VSTD::forward<_Args>(__args)...);
2098	--__base::__start_;	1442	--__start_;
2099	++__base::size();	1443	++__size();
2100	}	1444	}
2101	else	1445	else
2102	{	1446	{
2103	__temp_value<value_type, _Allocator> __tmp(this->__alloc(), _VSTD::forward<_Args>(__args)...);	1447	__temp_value<value_type, _Allocator> __tmp(__alloc(), _VSTD::forward<_Args>(__args)...);
2104	iterator __b = __base::begin();	1448	iterator __b = begin();
2105	iterator __bm1 = _VSTD::prev(__b);	1449	iterator __bm1 = _VSTD::prev(__b);
2106	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));	1450	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));
2107	--__base::__start_;	1451	--__start_;
2108	++__base::size();	1452	++__size();
2109	if (__pos > 1)	1453	if (__pos > 1)
2110	__b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);	1454	__b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
2111	*__b = _VSTD::move(__tmp.get());	1455	*__b = _VSTD::move(__tmp.get());
...	@@ -2116,25 +1460,25 @@ deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)	...	@@ -2116,25 +1460,25 @@ deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)
2116	if (__back_spare() == 0)	1460	if (__back_spare() == 0)
2117	__add_back_capacity();	1461	__add_back_capacity();
2118	// __back_capacity >= 1	1462	// __back_capacity >= 1
2119	size_type __de = __base::size() - __pos;	1463	size_type __de = size() - __pos;
2120	if (__de == 0)	1464	if (__de == 0)
2121	{	1465	{
2122	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::forward<_Args>(__args)...);	1466	__alloc_traits::construct(__a, _VSTD::addressof(*end()), _VSTD::forward<_Args>(__args)...);
2123	++__base::size();	1467	++__size();
2124	}	1468	}
2125	else	1469	else
2126	{	1470	{
2127	__temp_value<value_type, _Allocator> __tmp(this->__alloc(), _VSTD::forward<_Args>(__args)...);	1471	__temp_value<value_type, _Allocator> __tmp(__alloc(), _VSTD::forward<_Args>(__args)...);
2128	iterator __e = __base::end();	1472	iterator __e = end();
2129	iterator __em1 = _VSTD::prev(__e);	1473	iterator __em1 = _VSTD::prev(__e);
2130	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));	1474	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));
2131	++__base::size();	1475	++__size();
2132	if (__de > 1)	1476	if (__de > 1)
2133	__e = _VSTD::move_backward(__e - __de, __em1, __e);	1477	__e = _VSTD::move_backward(__e - __de, __em1, __e);
2134	*--__e = _VSTD::move(__tmp.get());	1478	*--__e = _VSTD::move(__tmp.get());
2135	}	1479	}
2136	}	1480	}
2137	return __base::begin() + __pos;	1481	return begin() + __pos;
2138	}	1482	}
2139		1483
2140	#endif // _LIBCPP_CXX03_LANG	1484	#endif // _LIBCPP_CXX03_LANG
...	@@ -2144,9 +1488,9 @@ template <class _Tp, class _Allocator>	...	@@ -2144,9 +1488,9 @@ template <class _Tp, class _Allocator>
2144	typename deque<_Tp, _Allocator>::iterator	1488	typename deque<_Tp, _Allocator>::iterator
2145	deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)	1489	deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)
2146	{	1490	{
2147	size_type __pos = __p - __base::begin();	1491	size_type __pos = __p - begin();
2148	size_type __to_end = __base::size() - __pos;	1492	size_type __to_end = size() - __pos;
2149	allocator_type& __a = __base::__alloc();	1493	allocator_type& __a = __alloc();
2150	if (__pos < __to_end)	1494	if (__pos < __to_end)
2151	{ // insert by shifting things backward	1495	{ // insert by shifting things backward
2152	if (__front_spare() == 0)	1496	if (__front_spare() == 0)
...	@@ -2154,20 +1498,20 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)	...	@@ -2154,20 +1498,20 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)
2154	// __front_spare() >= 1	1498	// __front_spare() >= 1
2155	if (__pos == 0)	1499	if (__pos == 0)
2156	{	1500	{
2157	__alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);	1501	__alloc_traits::construct(__a, _VSTD::addressof(*--begin()), __v);
2158	--__base::__start_;	1502	--__start_;
2159	++__base::size();	1503	++__size();
2160	}	1504	}
2161	else	1505	else
2162	{	1506	{
2163	const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);	1507	const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
2164	iterator __b = __base::begin();	1508	iterator __b = begin();
2165	iterator __bm1 = _VSTD::prev(__b);	1509	iterator __bm1 = _VSTD::prev(__b);
2166	if (__vt == pointer_traits<const_pointer>::pointer_to(*__b))	1510	if (__vt == pointer_traits<const_pointer>::pointer_to(*__b))
2167	__vt = pointer_traits<const_pointer>::pointer_to(*__bm1);	1511	__vt = pointer_traits<const_pointer>::pointer_to(*__bm1);
2168	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));	1512	__alloc_traits::construct(__a, _VSTD::addressof(__bm1), _VSTD::move(__b));
2169	--__base::__start_;	1513	--__start_;
2170	++__base::size();	1514	++__size();
2171	if (__pos > 1)	1515	if (__pos > 1)
2172	__b = __move_and_check(_VSTD::next(__b), __b + __pos, __b, __vt);	1516	__b = __move_and_check(_VSTD::next(__b), __b + __pos, __b, __vt);
2173	__b = __vt;	1517	__b = __vt;
...	@@ -2178,46 +1522,46 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)	...	@@ -2178,46 +1522,46 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)
2178	if (__back_spare() == 0)	1522	if (__back_spare() == 0)
2179	__add_back_capacity();	1523	__add_back_capacity();
2180	// __back_capacity >= 1	1524	// __back_capacity >= 1
2181	size_type __de = __base::size() - __pos;	1525	size_type __de = size() - __pos;
2182	if (__de == 0)	1526	if (__de == 0)
2183	{	1527	{
2184	__alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);	1528	__alloc_traits::construct(__a, _VSTD::addressof(*end()), __v);
2185	++__base::size();	1529	++__size();
2186	}	1530	}
2187	else	1531	else
2188	{	1532	{
2189	const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);	1533	const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
2190	iterator __e = __base::end();	1534	iterator __e = end();
2191	iterator __em1 = _VSTD::prev(__e);	1535	iterator __em1 = _VSTD::prev(__e);
2192	if (__vt == pointer_traits<const_pointer>::pointer_to(*__em1))	1536	if (__vt == pointer_traits<const_pointer>::pointer_to(*__em1))
2193	__vt = pointer_traits<const_pointer>::pointer_to(*__e);	1537	__vt = pointer_traits<const_pointer>::pointer_to(*__e);
2194	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));	1538	__alloc_traits::construct(__a, _VSTD::addressof(__e), _VSTD::move(__em1));
2195	++__base::size();	1539	++__size();
2196	if (__de > 1)	1540	if (__de > 1)
2197	__e = __move_backward_and_check(__e - __de, __em1, __e, __vt);	1541	__e = __move_backward_and_check(__e - __de, __em1, __e, __vt);
2198	--__e = __vt;	1542	--__e = __vt;
2199	}	1543	}
2200	}	1544	}
2201	return __base::begin() + __pos;	1545	return begin() + __pos;
2202	}	1546	}
2203		1547
2204	template <class _Tp, class _Allocator>	1548	template <class _Tp, class _Allocator>
2205	typename deque<_Tp, _Allocator>::iterator	1549	typename deque<_Tp, _Allocator>::iterator
2206	deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_type& __v)	1550	deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_type& __v)
2207	{	1551	{
2208	size_type __pos = __p - __base::begin();	1552	size_type __pos = __p - begin();
2209	size_type __to_end = __base::size() - __pos;	1553	size_type __to_end = __size() - __pos;
2210	allocator_type& __a = __base::__alloc();	1554	allocator_type& __a = __alloc();
2211	if (__pos < __to_end)	1555	if (__pos < __to_end)
2212	{ // insert by shifting things backward	1556	{ // insert by shifting things backward
2213	if (__n > __front_spare())	1557	if (__n > __front_spare())
2214	__add_front_capacity(__n - __front_spare());	1558	__add_front_capacity(__n - __front_spare());
2215	// __n <= __front_spare()	1559	// __n <= __front_spare()
2216	iterator __old_begin = __base::begin();	1560	iterator __old_begin = begin();
2217	iterator __i = __old_begin;	1561	iterator __i = __old_begin;
2218	if (__n > __pos)	1562	if (__n > __pos)
2219	{	1563	{
2220	for (size_type __m = __n - __pos; __m; --__m, --__base::__start_, ++__base::size())	1564	for (size_type __m = __n - __pos; __m; --__m, --__start_, ++__size())
2221	__alloc_traits::construct(__a, _VSTD::addressof(*--__i), __v);	1565	__alloc_traits::construct(__a, _VSTD::addressof(*--__i), __v);
2222	__n = __pos;	1566	__n = __pos;
2223	}	1567	}
...	@@ -2237,12 +1581,12 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_ty	...	@@ -2237,12 +1581,12 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_ty
2237	if (__n > __back_capacity)	1581	if (__n > __back_capacity)
2238	__add_back_capacity(__n - __back_capacity);	1582	__add_back_capacity(__n - __back_capacity);
2239	// __n <= __back_capacity	1583	// __n <= __back_capacity
2240	iterator __old_end = __base::end();	1584	iterator __old_end = end();
2241	iterator __i = __old_end;	1585	iterator __i = __old_end;
2242	size_type __de = __base::size() - __pos;	1586	size_type __de = size() - __pos;
2243	if (__n > __de)	1587	if (__n > __de)
2244	{	1588	{
2245	for (size_type __m = __n - __de; __m; --__m, (void) ++__i, ++__base::size())	1589	for (size_type __m = __n - __de; __m; --__m, (void) ++__i, ++__size())
2246	__alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);	1590	__alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);
2247	__n = __de;	1591	__n = __de;
2248	}	1592	}
...	@@ -2256,7 +1600,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_ty	...	@@ -2256,7 +1600,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_ty
2256	_VSTD::fill_n(__old_end - __n, __n, *__vt);	1600	_VSTD::fill_n(__old_end - __n, __n, *__vt);
2257	}	1601	}
2258	}	1602	}
2259	return __base::begin() + __pos;	1603	return begin() + __pos;
2260	}	1604	}
2261		1605
2262	template <class _Tp, class _Allocator>	1606	template <class _Tp, class _Allocator>
...	@@ -2265,7 +1609,7 @@ typename deque<_Tp, _Allocator>::iterator	...	@@ -2265,7 +1609,7 @@ typename deque<_Tp, _Allocator>::iterator
2265	deque<_Tp, _Allocator>::insert(const_iterator __p, _InputIter __f, _InputIter __l,	1609	deque<_Tp, _Allocator>::insert(const_iterator __p, _InputIter __f, _InputIter __l,
2266	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIter>::value>::type*)	1610	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIter>::value>::type*)
2267	{	1611	{
2268	__split_buffer<value_type, allocator_type&> __buf(__base::__alloc());	1612	__split_buffer<value_type, allocator_type&> __buf(__alloc());
2269	__buf.__construct_at_end(__f, __l);	1613	__buf.__construct_at_end(__f, __l);
2270	typedef typename __split_buffer<value_type, allocator_type&>::iterator __bi;	1614	typedef typename __split_buffer<value_type, allocator_type&>::iterator __bi;
2271	return insert(__p, move_iterator<__bi>(__buf.begin()), move_iterator<__bi>(__buf.end()));	1615	return insert(__p, move_iterator<__bi>(__buf.begin()), move_iterator<__bi>(__buf.end()));
...	@@ -2278,7 +1622,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _ForwardIterator __f, _Forwar	...	@@ -2278,7 +1622,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _ForwardIterator __f, _Forwar
2278	typename enable_if<__is_exactly_cpp17_forward_iterator<_ForwardIterator>::value>::type*)	1622	typename enable_if<__is_exactly_cpp17_forward_iterator<_ForwardIterator>::value>::type*)
2279	{	1623	{
2280	size_type __n = _VSTD::distance(__f, __l);	1624	size_type __n = _VSTD::distance(__f, __l);
2281	__split_buffer<value_type, allocator_type&> __buf(__n, 0, __base::__alloc());	1625	__split_buffer<value_type, allocator_type&> __buf(__n, 0, __alloc());
2282	__buf.__construct_at_end(__f, __l);	1626	__buf.__construct_at_end(__f, __l);
2283	typedef typename __split_buffer<value_type, allocator_type&>::iterator __fwd;	1627	typedef typename __split_buffer<value_type, allocator_type&>::iterator __fwd;
2284	return insert(__p, move_iterator<__fwd>(__buf.begin()), move_iterator<__fwd>(__buf.end()));	1628	return insert(__p, move_iterator<__fwd>(__buf.begin()), move_iterator<__fwd>(__buf.end()));
...	@@ -2291,21 +1635,21 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,	...	@@ -2291,21 +1635,21 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,
2291	typename enable_if<__is_cpp17_bidirectional_iterator<_BiIter>::value>::type*)	1635	typename enable_if<__is_cpp17_bidirectional_iterator<_BiIter>::value>::type*)
2292	{	1636	{
2293	size_type __n = _VSTD::distance(__f, __l);	1637	size_type __n = _VSTD::distance(__f, __l);
2294	size_type __pos = __p - __base::begin();	1638	size_type __pos = __p - begin();
2295	size_type __to_end = __base::size() - __pos;	1639	size_type __to_end = size() - __pos;
2296	allocator_type& __a = __base::__alloc();	1640	allocator_type& __a = __alloc();
2297	if (__pos < __to_end)	1641	if (__pos < __to_end)
2298	{ // insert by shifting things backward	1642	{ // insert by shifting things backward
2299	if (__n > __front_spare())	1643	if (__n > __front_spare())
2300	__add_front_capacity(__n - __front_spare());	1644	__add_front_capacity(__n - __front_spare());
2301	// __n <= __front_spare()	1645	// __n <= __front_spare()
2302	iterator __old_begin = __base::begin();	1646	iterator __old_begin = begin();
2303	iterator __i = __old_begin;	1647	iterator __i = __old_begin;
2304	_BiIter __m = __f;	1648	_BiIter __m = __f;
2305	if (__n > __pos)	1649	if (__n > __pos)
2306	{	1650	{
2307	__m = __pos < __n / 2 ? _VSTD::prev(__l, __pos) : _VSTD::next(__f, __n - __pos);	1651	__m = __pos < __n / 2 ? _VSTD::prev(__l, __pos) : _VSTD::next(__f, __n - __pos);
2308	for (_BiIter __j = __m; __j != __f; --__base::__start_, ++__base::size())	1652	for (_BiIter __j = __m; __j != __f; --__start_, ++__size())
2309	__alloc_traits::construct(__a, _VSTD::addressof(--__i), --__j);	1653	__alloc_traits::construct(__a, _VSTD::addressof(--__i), --__j);
2310	__n = __pos;	1654	__n = __pos;
2311	}	1655	}
...	@@ -2315,8 +1659,8 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,	...	@@ -2315,8 +1659,8 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,
2315	for (iterator __j = __obn; __j != __old_begin;)	1659	for (iterator __j = __obn; __j != __old_begin;)
2316	{	1660	{
2317	__alloc_traits::construct(__a, _VSTD::addressof(--__i), _VSTD::move(--__j));	1661	__alloc_traits::construct(__a, _VSTD::addressof(--__i), _VSTD::move(--__j));
2318	--__base::__start_;	1662	--__start_;
2319	++__base::size();	1663	++__size();
2320	}	1664	}
2321	if (__n < __pos)	1665	if (__n < __pos)
2322	__old_begin = _VSTD::move(__obn, __old_begin + __pos, __old_begin);	1666	__old_begin = _VSTD::move(__obn, __old_begin + __pos, __old_begin);
...	@@ -2329,28 +1673,28 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,	...	@@ -2329,28 +1673,28 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,
2329	if (__n > __back_capacity)	1673	if (__n > __back_capacity)
2330	__add_back_capacity(__n - __back_capacity);	1674	__add_back_capacity(__n - __back_capacity);
2331	// __n <= __back_capacity	1675	// __n <= __back_capacity
2332	iterator __old_end = __base::end();	1676	iterator __old_end = end();
2333	iterator __i = __old_end;	1677	iterator __i = __old_end;
2334	_BiIter __m = __l;	1678	_BiIter __m = __l;
2335	size_type __de = __base::size() - __pos;	1679	size_type __de = size() - __pos;
2336	if (__n > __de)	1680	if (__n > __de)
2337	{	1681	{
2338	__m = __de < __n / 2 ? _VSTD::next(__f, __de) : _VSTD::prev(__l, __n - __de);	1682	__m = __de < __n / 2 ? _VSTD::next(__f, __de) : _VSTD::prev(__l, __n - __de);
2339	for (_BiIter __j = __m; __j != __l; ++__i, (void) ++__j, ++__base::size())	1683	for (_BiIter __j = __m; __j != __l; ++__i, (void) ++__j, ++__size())
2340	__alloc_traits::construct(__a, _VSTD::addressof(__i), __j);	1684	__alloc_traits::construct(__a, _VSTD::addressof(__i), __j);
2341	__n = __de;	1685	__n = __de;
2342	}	1686	}
2343	if (__n > 0)	1687	if (__n > 0)
2344	{	1688	{
2345	iterator __oen = __old_end - __n;	1689	iterator __oen = __old_end - __n;
2346	for (iterator __j = __oen; __j != __old_end; ++__i, (void) ++__j, ++__base::size())	1690	for (iterator __j = __oen; __j != __old_end; ++__i, (void) ++__j, ++__size())
2347	__alloc_traits::construct(__a, _VSTD::addressof(__i), _VSTD::move(__j));	1691	__alloc_traits::construct(__a, _VSTD::addressof(__i), _VSTD::move(__j));
2348	if (__n < __de)	1692	if (__n < __de)
2349	__old_end = _VSTD::move_backward(__old_end - __de, __oen, __old_end);	1693	__old_end = _VSTD::move_backward(__old_end - __de, __oen, __old_end);
2350	_VSTD::copy_backward(__f, __m, __old_end);	1694	_VSTD::copy_backward(__f, __m, __old_end);
2351	}	1695	}
2352	}	1696	}
2353	return __base::begin() + __pos;	1697	return begin() + __pos;
2354	}	1698	}
2355		1699
2356	template <class _Tp, class _Allocator>	1700	template <class _Tp, class _Allocator>
...	@@ -2374,12 +1718,12 @@ deque<_Tp, _Allocator>::__append(_ForIter __f, _ForIter __l,	...	@@ -2374,12 +1718,12 @@ deque<_Tp, _Allocator>::__append(_ForIter __f, _ForIter __l,
2374	typename enable_if<__is_cpp17_forward_iterator<_ForIter>::value>::type*)	1718	typename enable_if<__is_cpp17_forward_iterator<_ForIter>::value>::type*)
2375	{	1719	{
2376	size_type __n = _VSTD::distance(__f, __l);	1720	size_type __n = _VSTD::distance(__f, __l);
2377	allocator_type& __a = __base::__alloc();	1721	allocator_type& __a = __alloc();
2378	size_type __back_capacity = __back_spare();	1722	size_type __back_capacity = __back_spare();
2379	if (__n > __back_capacity)	1723	if (__n > __back_capacity)
2380	__add_back_capacity(__n - __back_capacity);	1724	__add_back_capacity(__n - __back_capacity);
2381	// __n <= __back_capacity	1725	// __n <= __back_capacity
2382	for (__deque_block_range __br : __deque_range(__base::end(), __base::end() + __n)) {	1726	for (__deque_block_range __br : __deque_range(end(), end() + __n)) {
2383	_ConstructTransaction __tx(this, __br);	1727	_ConstructTransaction __tx(this, __br);
2384	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_, (void)++__f) {	1728	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_, (void)++__f) {
2385	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_), *__f);	1729	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_), *__f);
...	@@ -2391,12 +1735,12 @@ template <class _Tp, class _Allocator>	...	@@ -2391,12 +1735,12 @@ template <class _Tp, class _Allocator>
2391	void	1735	void
2392	deque<_Tp, _Allocator>::__append(size_type __n)	1736	deque<_Tp, _Allocator>::__append(size_type __n)
2393	{	1737	{
2394	allocator_type& __a = __base::__alloc();	1738	allocator_type& __a = __alloc();
2395	size_type __back_capacity = __back_spare();	1739	size_type __back_capacity = __back_spare();
2396	if (__n > __back_capacity)	1740	if (__n > __back_capacity)
2397	__add_back_capacity(__n - __back_capacity);	1741	__add_back_capacity(__n - __back_capacity);
2398	// __n <= __back_capacity	1742	// __n <= __back_capacity
2399	for (__deque_block_range __br : __deque_range(__base::end(), __base::end() + __n)) {	1743	for (__deque_block_range __br : __deque_range(end(), end() + __n)) {
2400	_ConstructTransaction __tx(this, __br);	1744	_ConstructTransaction __tx(this, __br);
2401	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) {	1745	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) {
2402	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_));	1746	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_));
...	@@ -2408,12 +1752,12 @@ template <class _Tp, class _Allocator>	...	@@ -2408,12 +1752,12 @@ template <class _Tp, class _Allocator>
2408	void	1752	void
2409	deque<_Tp, _Allocator>::__append(size_type __n, const value_type& __v)	1753	deque<_Tp, _Allocator>::__append(size_type __n, const value_type& __v)
2410	{	1754	{
2411	allocator_type& __a = __base::__alloc();	1755	allocator_type& __a = __alloc();
2412	size_type __back_capacity = __back_spare();	1756	size_type __back_capacity = __back_spare();
2413	if (__n > __back_capacity)	1757	if (__n > __back_capacity)
2414	__add_back_capacity(__n - __back_capacity);	1758	__add_back_capacity(__n - __back_capacity);
2415	// __n <= __back_capacity	1759	// __n <= __back_capacity
2416	for (__deque_block_range __br : __deque_range(__base::end(), __base::end() + __n)) {	1760	for (__deque_block_range __br : __deque_range(end(), end() + __n)) {
2417	_ConstructTransaction __tx(this, __br);	1761	_ConstructTransaction __tx(this, __br);
2418	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) {	1762	for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) {
2419	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_), __v);	1763	__alloc_traits::construct(__a, _VSTD::__to_address(__tx.__pos_), __v);
...	@@ -2428,57 +1772,57 @@ template <class _Tp, class _Allocator>	...	@@ -2428,57 +1772,57 @@ template <class _Tp, class _Allocator>
2428	void	1772	void
2429	deque<_Tp, _Allocator>::__add_front_capacity()	1773	deque<_Tp, _Allocator>::__add_front_capacity()
2430	{	1774	{
2431	allocator_type& __a = __base::__alloc();	1775	allocator_type& __a = __alloc();
2432	if (__back_spare() >= __base::__block_size)	1776	if (__back_spare() >= __block_size)
2433	{	1777	{
2434	__base::__start_ += __base::__block_size;	1778	__start_ += __block_size;
2435	pointer __pt = __base::__map_.back();	1779	pointer __pt = __map_.back();
2436	__base::__map_.pop_back();	1780	__map_.pop_back();
2437	__base::__map_.push_front(__pt);	1781	__map_.push_front(__pt);
2438	}	1782	}
2439	// Else if __base::__map_.size() < __base::__map_.capacity() then we need to allocate 1 buffer	1783	// Else if __map_.size() < __map_.capacity() then we need to allocate 1 buffer
2440	else if (__base::__map_.size() < __base::__map_.capacity())	1784	else if (__map_.size() < __map_.capacity())
2441	{ // we can put the new buffer into the map, but don't shift things around	1785	{ // we can put the new buffer into the map, but don't shift things around
2442	// until all buffers are allocated. If we throw, we don't need to fix	1786	// until all buffers are allocated. If we throw, we don't need to fix
2443	// anything up (any added buffers are undetectible)	1787	// anything up (any added buffers are undetectible)
2444	if (__base::__map_.__front_spare() > 0)	1788	if (__map_.__front_spare() > 0)
2445	__base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));	1789	__map_.push_front(__alloc_traits::allocate(__a, __block_size));
2446	else	1790	else
2447	{	1791	{
2448	__base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));	1792	__map_.push_back(__alloc_traits::allocate(__a, __block_size));
2449	// Done allocating, reorder capacity	1793	// Done allocating, reorder capacity
2450	pointer __pt = __base::__map_.back();	1794	pointer __pt = __map_.back();
2451	__base::__map_.pop_back();	1795	__map_.pop_back();
2452	__base::__map_.push_front(__pt);	1796	__map_.push_front(__pt);
2453	}	1797	}
2454	__base::__start_ = __base::__map_.size() == 1 ?	1798	__start_ = __map_.size() == 1 ?
2455	__base::__block_size / 2 :	1799	__block_size / 2 :
2456	__base::__start_ + __base::__block_size;	1800	__start_ + __block_size;
2457	}	1801	}
2458	// Else need to allocate 1 buffer, and we need to reallocate __map_.	1802	// Else need to allocate 1 buffer, and we need to reallocate __map_.
2459	else	1803	else
2460	{	1804	{
2461	__split_buffer<pointer, typename __base::__pointer_allocator&>	1805	__split_buffer<pointer, __pointer_allocator&>
2462	__buf(max<size_type>(2 * __base::__map_.capacity(), 1),	1806	__buf(std::max<size_type>(2 * __map_.capacity(), 1),
2463	0, __base::__map_.__alloc());	1807	0, __map_.__alloc());
2464		1808
2465	typedef __allocator_destructor<_Allocator> _Dp;	1809	typedef __allocator_destructor<_Allocator> _Dp;
2466	unique_ptr<pointer, _Dp> __hold(	1810	unique_ptr<pointer, _Dp> __hold(
2467	__alloc_traits::allocate(__a, __base::__block_size),	1811	__alloc_traits::allocate(__a, __block_size),
2468	_Dp(__a, __base::__block_size));	1812	_Dp(__a, __block_size));
2469	__buf.push_back(__hold.get());	1813	__buf.push_back(__hold.get());
2470	__hold.release();	1814	__hold.release();
2471		1815
2472	for (typename __base::__map_pointer __i = __base::__map_.begin();	1816	for (__map_pointer __i = __map_.begin();
2473	__i != __base::__map_.end(); ++__i)	1817	__i != __map_.end(); ++__i)
2474	__buf.push_back(*__i);	1818	__buf.push_back(*__i);
2475	_VSTD::swap(__base::__map_.__first_, __buf.__first_);	1819	_VSTD::swap(__map_.__first_, __buf.__first_);
2476	_VSTD::swap(__base::__map_.__begin_, __buf.__begin_);	1820	_VSTD::swap(__map_.__begin_, __buf.__begin_);
2477	_VSTD::swap(__base::__map_.__end_, __buf.__end_);	1821	_VSTD::swap(__map_.__end_, __buf.__end_);
2478	_VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());	1822	_VSTD::swap(__map_.__end_cap(), __buf.__end_cap());
2479	__base::__start_ = __base::__map_.size() == 1 ?	1823	__start_ = __map_.size() == 1 ?
2480	__base::__block_size / 2 :	1824	__block_size / 2 :
2481	__base::__start_ + __base::__block_size;	1825	__start_ + __block_size;
2482	}	1826	}
2483	}	1827	}
2484		1828
...	@@ -2488,82 +1832,82 @@ template <class _Tp, class _Allocator>	...	@@ -2488,82 +1832,82 @@ template <class _Tp, class _Allocator>
2488	void	1832	void
2489	deque<_Tp, _Allocator>::__add_front_capacity(size_type __n)	1833	deque<_Tp, _Allocator>::__add_front_capacity(size_type __n)
2490	{	1834	{
2491	allocator_type& __a = __base::__alloc();	1835	allocator_type& __a = __alloc();
2492	size_type __nb = __recommend_blocks(__n + __base::__map_.empty());	1836	size_type __nb = __recommend_blocks(__n + __map_.empty());
2493	// Number of unused blocks at back:	1837	// Number of unused blocks at back:
2494	size_type __back_capacity = __back_spare() / __base::__block_size;	1838	size_type __back_capacity = __back_spare() / __block_size;
2495	__back_capacity = _VSTD::min(__back_capacity, __nb); // don't take more than you need	1839	__back_capacity = _VSTD::min(__back_capacity, __nb); // don't take more than you need
2496	__nb -= __back_capacity; // number of blocks need to allocate	1840	__nb -= __back_capacity; // number of blocks need to allocate
2497	// If __nb == 0, then we have sufficient capacity.	1841	// If __nb == 0, then we have sufficient capacity.
2498	if (__nb == 0)	1842	if (__nb == 0)
2499	{	1843	{
2500	__base::__start_ += __base::__block_size * __back_capacity;	1844	__start_ += __block_size * __back_capacity;
2501	for (; __back_capacity > 0; --__back_capacity)	1845	for (; __back_capacity > 0; --__back_capacity)
2502	{	1846	{
2503	pointer __pt = __base::__map_.back();	1847	pointer __pt = __map_.back();
2504	__base::__map_.pop_back();	1848	__map_.pop_back();
2505	__base::__map_.push_front(__pt);	1849	__map_.push_front(__pt);
2506	}	1850	}
2507	}	1851	}
2508	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers	1852	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
2509	else if (__nb <= __base::__map_.capacity() - __base::__map_.size())	1853	else if (__nb <= __map_.capacity() - __map_.size())
2510	{ // we can put the new buffers into the map, but don't shift things around	1854	{ // we can put the new buffers into the map, but don't shift things around
2511	// until all buffers are allocated. If we throw, we don't need to fix	1855	// until all buffers are allocated. If we throw, we don't need to fix
2512	// anything up (any added buffers are undetectible)	1856	// anything up (any added buffers are undetectible)
2513	for (; __nb > 0; --__nb, __base::__start_ += __base::__block_size - (__base::__map_.size() == 1))	1857	for (; __nb > 0; --__nb, __start_ += __block_size - (__map_.size() == 1))
2514	{	1858	{
2515	if (__base::__map_.__front_spare() == 0)	1859	if (__map_.__front_spare() == 0)
2516	break;	1860	break;
2517	__base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));	1861	__map_.push_front(__alloc_traits::allocate(__a, __block_size));
2518	}	1862	}
2519	for (; __nb > 0; --__nb, ++__back_capacity)	1863	for (; __nb > 0; --__nb, ++__back_capacity)
2520	__base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));	1864	__map_.push_back(__alloc_traits::allocate(__a, __block_size));
2521	// Done allocating, reorder capacity	1865	// Done allocating, reorder capacity
2522	__base::__start_ += __back_capacity * __base::__block_size;	1866	__start_ += __back_capacity * __block_size;
2523	for (; __back_capacity > 0; --__back_capacity)	1867	for (; __back_capacity > 0; --__back_capacity)
2524	{	1868	{
2525	pointer __pt = __base::__map_.back();	1869	pointer __pt = __map_.back();
2526	__base::__map_.pop_back();	1870	__map_.pop_back();
2527	__base::__map_.push_front(__pt);	1871	__map_.push_front(__pt);
2528	}	1872	}
2529	}	1873	}
2530	// Else need to allocate __nb buffers, and we need to reallocate __map_.	1874	// Else need to allocate __nb buffers, and we need to reallocate __map_.
2531	else	1875	else
2532	{	1876	{
2533	size_type __ds = (__nb + __back_capacity) * __base::__block_size - __base::__map_.empty();	1877	size_type __ds = (__nb + __back_capacity) * __block_size - __map_.empty();
2534	__split_buffer<pointer, typename __base::__pointer_allocator&>	1878	__split_buffer<pointer, __pointer_allocator&>
2535	__buf(max<size_type>(2* __base::__map_.capacity(),	1879	__buf(std::max<size_type>(2* __map_.capacity(),
2536	__nb + __base::__map_.size()),	1880	__nb + __map_.size()),
2537	0, __base::__map_.__alloc());	1881	0, __map_.__alloc());
2538	#ifndef _LIBCPP_NO_EXCEPTIONS	1882	#ifndef _LIBCPP_NO_EXCEPTIONS
2539	try	1883	try
2540	{	1884	{
2541	#endif // _LIBCPP_NO_EXCEPTIONS	1885	#endif // _LIBCPP_NO_EXCEPTIONS
2542	for (; __nb > 0; --__nb)	1886	for (; __nb > 0; --__nb)
2543	__buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));	1887	__buf.push_back(__alloc_traits::allocate(__a, __block_size));
2544	#ifndef _LIBCPP_NO_EXCEPTIONS	1888	#ifndef _LIBCPP_NO_EXCEPTIONS
2545	}	1889	}
2546	catch (...)	1890	catch (...)
2547	{	1891	{
2548	for (typename __base::__map_pointer __i = __buf.begin();	1892	for (__map_pointer __i = __buf.begin();
2549	__i != __buf.end(); ++__i)	1893	__i != __buf.end(); ++__i)
2550	__alloc_traits::deallocate(__a, *__i, __base::__block_size);	1894	__alloc_traits::deallocate(__a, *__i, __block_size);
2551	throw;	1895	throw;
2552	}	1896	}
2553	#endif // _LIBCPP_NO_EXCEPTIONS	1897	#endif // _LIBCPP_NO_EXCEPTIONS
2554	for (; __back_capacity > 0; --__back_capacity)	1898	for (; __back_capacity > 0; --__back_capacity)
2555	{	1899	{
2556	__buf.push_back(__base::__map_.back());	1900	__buf.push_back(__map_.back());
2557	__base::__map_.pop_back();	1901	__map_.pop_back();
2558	}	1902	}
2559	for (typename __base::__map_pointer __i = __base::__map_.begin();	1903	for (__map_pointer __i = __map_.begin();
2560	__i != __base::__map_.end(); ++__i)	1904	__i != __map_.end(); ++__i)
2561	__buf.push_back(*__i);	1905	__buf.push_back(*__i);
2562	_VSTD::swap(__base::__map_.__first_, __buf.__first_);	1906	_VSTD::swap(__map_.__first_, __buf.__first_);
2563	_VSTD::swap(__base::__map_.__begin_, __buf.__begin_);	1907	_VSTD::swap(__map_.__begin_, __buf.__begin_);
2564	_VSTD::swap(__base::__map_.__end_, __buf.__end_);	1908	_VSTD::swap(__map_.__end_, __buf.__end_);
2565	_VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());	1909	_VSTD::swap(__map_.__end_cap(), __buf.__end_cap());
2566	__base::__start_ += __ds;	1910	__start_ += __ds;
2567	}	1911	}
2568	}	1912	}
2569		1913
...	@@ -2573,52 +1917,52 @@ template <class _Tp, class _Allocator>	...	@@ -2573,52 +1917,52 @@ template <class _Tp, class _Allocator>
2573	void	1917	void
2574	deque<_Tp, _Allocator>::__add_back_capacity()	1918	deque<_Tp, _Allocator>::__add_back_capacity()
2575	{	1919	{
2576	allocator_type& __a = __base::__alloc();	1920	allocator_type& __a = __alloc();
2577	if (__front_spare() >= __base::__block_size)	1921	if (__front_spare() >= __block_size)
2578	{	1922	{
2579	__base::__start_ -= __base::__block_size;	1923	__start_ -= __block_size;
2580	pointer __pt = __base::__map_.front();	1924	pointer __pt = __map_.front();
2581	__base::__map_.pop_front();	1925	__map_.pop_front();
2582	__base::__map_.push_back(__pt);	1926	__map_.push_back(__pt);
2583	}	1927	}
2584	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers	1928	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
2585	else if (__base::__map_.size() < __base::__map_.capacity())	1929	else if (__map_.size() < __map_.capacity())
2586	{ // we can put the new buffer into the map, but don't shift things around	1930	{ // we can put the new buffer into the map, but don't shift things around
2587	// until it is allocated. If we throw, we don't need to fix	1931	// until it is allocated. If we throw, we don't need to fix
2588	// anything up (any added buffers are undetectible)	1932	// anything up (any added buffers are undetectible)
2589	if (__base::__map_.__back_spare() != 0)	1933	if (__map_.__back_spare() != 0)
2590	__base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));	1934	__map_.push_back(__alloc_traits::allocate(__a, __block_size));
2591	else	1935	else
2592	{	1936	{
2593	__base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));	1937	__map_.push_front(__alloc_traits::allocate(__a, __block_size));
2594	// Done allocating, reorder capacity	1938	// Done allocating, reorder capacity
2595	pointer __pt = __base::__map_.front();	1939	pointer __pt = __map_.front();
2596	__base::__map_.pop_front();	1940	__map_.pop_front();
2597	__base::__map_.push_back(__pt);	1941	__map_.push_back(__pt);
2598	}	1942	}
2599	}	1943	}
2600	// Else need to allocate 1 buffer, and we need to reallocate __map_.	1944	// Else need to allocate 1 buffer, and we need to reallocate __map_.
2601	else	1945	else
2602	{	1946	{
2603	__split_buffer<pointer, typename __base::__pointer_allocator&>	1947	__split_buffer<pointer, __pointer_allocator&>
2604	__buf(max<size_type>(2* __base::__map_.capacity(), 1),	1948	__buf(std::max<size_type>(2* __map_.capacity(), 1),
2605	__base::__map_.size(),	1949	__map_.size(),
2606	__base::__map_.__alloc());	1950	__map_.__alloc());
2607		1951
2608	typedef __allocator_destructor<_Allocator> _Dp;	1952	typedef __allocator_destructor<_Allocator> _Dp;
2609	unique_ptr<pointer, _Dp> __hold(	1953	unique_ptr<pointer, _Dp> __hold(
2610	__alloc_traits::allocate(__a, __base::__block_size),	1954	__alloc_traits::allocate(__a, __block_size),
2611	_Dp(__a, __base::__block_size));	1955	_Dp(__a, __block_size));
2612	__buf.push_back(__hold.get());	1956	__buf.push_back(__hold.get());
2613	__hold.release();	1957	__hold.release();
2614		1958
2615	for (typename __base::__map_pointer __i = __base::__map_.end();	1959	for (__map_pointer __i = __map_.end();
2616	__i != __base::__map_.begin();)	1960	__i != __map_.begin();)
2617	__buf.push_front(*--__i);	1961	__buf.push_front(*--__i);
2618	_VSTD::swap(__base::__map_.__first_, __buf.__first_);	1962	_VSTD::swap(__map_.__first_, __buf.__first_);
2619	_VSTD::swap(__base::__map_.__begin_, __buf.__begin_);	1963	_VSTD::swap(__map_.__begin_, __buf.__begin_);
2620	_VSTD::swap(__base::__map_.__end_, __buf.__end_);	1964	_VSTD::swap(__map_.__end_, __buf.__end_);
2621	_VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());	1965	_VSTD::swap(__map_.__end_cap(), __buf.__end_cap());
2622	}	1966	}
2623	}	1967	}
2624		1968
...	@@ -2628,84 +1972,84 @@ template <class _Tp, class _Allocator>	...	@@ -2628,84 +1972,84 @@ template <class _Tp, class _Allocator>
2628	void	1972	void
2629	deque<_Tp, _Allocator>::__add_back_capacity(size_type __n)	1973	deque<_Tp, _Allocator>::__add_back_capacity(size_type __n)
2630	{	1974	{
2631	allocator_type& __a = __base::__alloc();	1975	allocator_type& __a = __alloc();
2632	size_type __nb = __recommend_blocks(__n + __base::__map_.empty());	1976	size_type __nb = __recommend_blocks(__n + __map_.empty());
2633	// Number of unused blocks at front:	1977	// Number of unused blocks at front:
2634	size_type __front_capacity = __front_spare() / __base::__block_size;	1978	size_type __front_capacity = __front_spare() / __block_size;
2635	__front_capacity = _VSTD::min(__front_capacity, __nb); // don't take more than you need	1979	__front_capacity = _VSTD::min(__front_capacity, __nb); // don't take more than you need
2636	__nb -= __front_capacity; // number of blocks need to allocate	1980	__nb -= __front_capacity; // number of blocks need to allocate
2637	// If __nb == 0, then we have sufficient capacity.	1981	// If __nb == 0, then we have sufficient capacity.
2638	if (__nb == 0)	1982	if (__nb == 0)
2639	{	1983	{
2640	__base::__start_ -= __base::__block_size * __front_capacity;	1984	__start_ -= __block_size * __front_capacity;
2641	for (; __front_capacity > 0; --__front_capacity)	1985	for (; __front_capacity > 0; --__front_capacity)
2642	{	1986	{
2643	pointer __pt = __base::__map_.front();	1987	pointer __pt = __map_.front();
2644	__base::__map_.pop_front();	1988	__map_.pop_front();
2645	__base::__map_.push_back(__pt);	1989	__map_.push_back(__pt);
2646	}	1990	}
2647	}	1991	}
2648	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers	1992	// Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
2649	else if (__nb <= __base::__map_.capacity() - __base::__map_.size())	1993	else if (__nb <= __map_.capacity() - __map_.size())
2650	{ // we can put the new buffers into the map, but don't shift things around	1994	{ // we can put the new buffers into the map, but don't shift things around
2651	// until all buffers are allocated. If we throw, we don't need to fix	1995	// until all buffers are allocated. If we throw, we don't need to fix
2652	// anything up (any added buffers are undetectible)	1996	// anything up (any added buffers are undetectible)
2653	for (; __nb > 0; --__nb)	1997	for (; __nb > 0; --__nb)
2654	{	1998	{
2655	if (__base::__map_.__back_spare() == 0)	1999	if (__map_.__back_spare() == 0)
2656	break;	2000	break;
2657	__base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));	2001	__map_.push_back(__alloc_traits::allocate(__a, __block_size));
2658	}	2002	}
2659	for (; __nb > 0; --__nb, ++__front_capacity, __base::__start_ +=	2003	for (; __nb > 0; --__nb, ++__front_capacity, __start_ +=
2660	__base::__block_size - (__base::__map_.size() == 1))	2004	__block_size - (__map_.size() == 1))
2661	__base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));	2005	__map_.push_front(__alloc_traits::allocate(__a, __block_size));
2662	// Done allocating, reorder capacity	2006	// Done allocating, reorder capacity
2663	__base::__start_ -= __base::__block_size * __front_capacity;	2007	__start_ -= __block_size * __front_capacity;
2664	for (; __front_capacity > 0; --__front_capacity)	2008	for (; __front_capacity > 0; --__front_capacity)
2665	{	2009	{
2666	pointer __pt = __base::__map_.front();	2010	pointer __pt = __map_.front();
2667	__base::__map_.pop_front();	2011	__map_.pop_front();
2668	__base::__map_.push_back(__pt);	2012	__map_.push_back(__pt);
2669	}	2013	}
2670	}	2014	}
2671	// Else need to allocate __nb buffers, and we need to reallocate __map_.	2015	// Else need to allocate __nb buffers, and we need to reallocate __map_.
2672	else	2016	else
2673	{	2017	{
2674	size_type __ds = __front_capacity * __base::__block_size;	2018	size_type __ds = __front_capacity * __block_size;
2675	__split_buffer<pointer, typename __base::__pointer_allocator&>	2019	__split_buffer<pointer, __pointer_allocator&>
2676	__buf(max<size_type>(2* __base::__map_.capacity(),	2020	__buf(std::max<size_type>(2* __map_.capacity(),
2677	__nb + __base::__map_.size()),	2021	__nb + __map_.size()),
2678	__base::__map_.size() - __front_capacity,	2022	__map_.size() - __front_capacity,
2679	__base::__map_.__alloc());	2023	__map_.__alloc());
2680	#ifndef _LIBCPP_NO_EXCEPTIONS	2024	#ifndef _LIBCPP_NO_EXCEPTIONS
2681	try	2025	try
2682	{	2026	{
2683	#endif // _LIBCPP_NO_EXCEPTIONS	2027	#endif // _LIBCPP_NO_EXCEPTIONS
2684	for (; __nb > 0; --__nb)	2028	for (; __nb > 0; --__nb)
2685	__buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));	2029	__buf.push_back(__alloc_traits::allocate(__a, __block_size));
2686	#ifndef _LIBCPP_NO_EXCEPTIONS	2030	#ifndef _LIBCPP_NO_EXCEPTIONS
2687	}	2031	}
2688	catch (...)	2032	catch (...)
2689	{	2033	{
2690	for (typename __base::__map_pointer __i = __buf.begin();	2034	for (__map_pointer __i = __buf.begin();
2691	__i != __buf.end(); ++__i)	2035	__i != __buf.end(); ++__i)
2692	__alloc_traits::deallocate(__a, *__i, __base::__block_size);	2036	__alloc_traits::deallocate(__a, *__i, __block_size);
2693	throw;	2037	throw;
2694	}	2038	}
2695	#endif // _LIBCPP_NO_EXCEPTIONS	2039	#endif // _LIBCPP_NO_EXCEPTIONS
2696	for (; __front_capacity > 0; --__front_capacity)	2040	for (; __front_capacity > 0; --__front_capacity)
2697	{	2041	{
2698	__buf.push_back(__base::__map_.front());	2042	__buf.push_back(__map_.front());
2699	__base::__map_.pop_front();	2043	__map_.pop_front();
2700	}	2044	}
2701	for (typename __base::__map_pointer __i = __base::__map_.end();	2045	for (__map_pointer __i = __map_.end();
2702	__i != __base::__map_.begin();)	2046	__i != __map_.begin();)
2703	__buf.push_front(*--__i);	2047	__buf.push_front(*--__i);
2704	_VSTD::swap(__base::__map_.__first_, __buf.__first_);	2048	_VSTD::swap(__map_.__first_, __buf.__first_);
2705	_VSTD::swap(__base::__map_.__begin_, __buf.__begin_);	2049	_VSTD::swap(__map_.__begin_, __buf.__begin_);
2706	_VSTD::swap(__base::__map_.__end_, __buf.__end_);	2050	_VSTD::swap(__map_.__end_, __buf.__end_);
2707	_VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());	2051	_VSTD::swap(__map_.__end_cap(), __buf.__end_cap());
2708	__base::__start_ -= __ds;	2052	__start_ -= __ds;
2709	}	2053	}
2710	}	2054	}
2711		2055
...	@@ -2713,12 +2057,12 @@ template <class _Tp, class _Allocator>	...	@@ -2713,12 +2057,12 @@ template <class _Tp, class _Allocator>
2713	void	2057	void
2714	deque<_Tp, _Allocator>::pop_front()	2058	deque<_Tp, _Allocator>::pop_front()
2715	{	2059	{
2716	allocator_type& __a = __base::__alloc();	2060	allocator_type& __a = __alloc();
2717	__alloc_traits::destroy(__a, _VSTD::__to_address(*(__base::__map_.begin() +	2061	__alloc_traits::destroy(__a, _VSTD::__to_address(*(__map_.begin() +
2718	__base::__start_ / __base::__block_size) +	2062	__start_ / __block_size) +
2719	__base::__start_ % __base::__block_size));	2063	__start_ % __block_size));
2720	--__base::size();	2064	--__size();
2721	++__base::__start_;	2065	++__start_;
2722	__maybe_remove_front_spare();	2066	__maybe_remove_front_spare();
2723	}	2067	}
2724		2068
...	@@ -2727,12 +2071,12 @@ void	...	@@ -2727,12 +2071,12 @@ void
2727	deque<_Tp, _Allocator>::pop_back()	2071	deque<_Tp, _Allocator>::pop_back()
2728	{	2072	{
2729	_LIBCPP_ASSERT(!empty(), "deque::pop_back called on an empty deque");	2073	_LIBCPP_ASSERT(!empty(), "deque::pop_back called on an empty deque");
2730	allocator_type& __a = __base::__alloc();	2074	allocator_type& __a = __alloc();
2731	size_type __p = __base::size() + __base::__start_ - 1;	2075	size_type __p = size() + __start_ - 1;
2732	__alloc_traits::destroy(__a, _VSTD::__to_address(*(__base::__map_.begin() +	2076	__alloc_traits::destroy(__a, _VSTD::__to_address(*(__map_.begin() +
2733	__p / __base::__block_size) +	2077	__p / __block_size) +
2734	__p % __base::__block_size));	2078	__p % __block_size));
2735	--__base::size();	2079	--__size();
2736	__maybe_remove_back_spare();	2080	__maybe_remove_back_spare();
2737	}	2081	}
2738		2082
...	@@ -2750,7 +2094,7 @@ deque<_Tp, _Allocator>::__move_and_check(iterator __f, iterator __l, iterator __	...	@@ -2750,7 +2094,7 @@ deque<_Tp, _Allocator>::__move_and_check(iterator __f, iterator __l, iterator __
2750	while (__n > 0)	2094	while (__n > 0)
2751	{	2095	{
2752	pointer __fb = __f.__ptr_;	2096	pointer __fb = __f.__ptr_;
2753	pointer __fe = *__f.__m_iter_ + __base::__block_size;	2097	pointer __fe = *__f.__m_iter_ + __block_size;
2754	difference_type __bs = __fe - __fb;	2098	difference_type __bs = __fe - __fb;
2755	if (__bs > __n)	2099	if (__bs > __n)
2756	{	2100	{
...	@@ -2804,15 +2148,15 @@ void	...	@@ -2804,15 +2148,15 @@ void
2804	deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,	2148	deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,
2805	iterator __r, const_pointer& __vt)	2149	iterator __r, const_pointer& __vt)
2806	{	2150	{
2807	allocator_type& __a = __base::__alloc();	2151	allocator_type& __a = __alloc();
2808	// as if	2152	// as if
2809	// for (; __f != __l; ++__r, ++__f, ++__base::size())	2153	// for (; __f != __l; ++__r, ++__f, ++__size())
2810	// __alloc_traits::construct(__a, _VSTD::addressof(__r), _VSTD::move(__f));	2154	// __alloc_traits::construct(__a, _VSTD::addressof(__r), _VSTD::move(__f));
2811	difference_type __n = __l - __f;	2155	difference_type __n = __l - __f;
2812	while (__n > 0)	2156	while (__n > 0)
2813	{	2157	{
2814	pointer __fb = __f.__ptr_;	2158	pointer __fb = __f.__ptr_;
2815	pointer __fe = *__f.__m_iter_ + __base::__block_size;	2159	pointer __fe = *__f.__m_iter_ + __block_size;
2816	difference_type __bs = __fe - __fb;	2160	difference_type __bs = __fe - __fb;
2817	if (__bs > __n)	2161	if (__bs > __n)
2818	{	2162	{
...	@@ -2821,7 +2165,7 @@ deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,	...	@@ -2821,7 +2165,7 @@ deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,
2821	}	2165	}
2822	if (__fb <= __vt && __vt < __fe)	2166	if (__fb <= __vt && __vt < __fe)
2823	__vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) += __r - __f).__ptr_;	2167	__vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) += __r - __f).__ptr_;
2824	for (; __fb != __fe; ++__fb, ++__r, ++__base::size())	2168	for (; __fb != __fe; ++__fb, ++__r, ++__size())
2825	__alloc_traits::construct(__a, _VSTD::addressof(__r), _VSTD::move(__fb));	2169	__alloc_traits::construct(__a, _VSTD::addressof(__r), _VSTD::move(__fb));
2826	__n -= __bs;	2170	__n -= __bs;
2827	__f += __bs;	2171	__f += __bs;
...	@@ -2835,13 +2179,13 @@ void	...	@@ -2835,13 +2179,13 @@ void
2835	deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterator __l,	2179	deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterator __l,
2836	iterator __r, const_pointer& __vt)	2180	iterator __r, const_pointer& __vt)
2837	{	2181	{
2838	allocator_type& __a = __base::__alloc();	2182	allocator_type& __a = __alloc();
2839	// as if	2183	// as if
2840	// for (iterator __j = __l; __j != __f;)	2184	// for (iterator __j = __l; __j != __f;)
2841	// {	2185	// {
2842	// __alloc_traitsconstruct(__a, _VSTD::addressof(--__r), _VSTD::move(--__j));	2186	// __alloc_traitsconstruct(__a, _VSTD::addressof(--__r), _VSTD::move(--__j));
2843	// --__base::__start_;	2187	// --__start_;
2844	// ++__base::size();	2188	// ++__size();
2845	// }	2189	// }
2846	difference_type __n = __l - __f;	2190	difference_type __n = __l - __f;
2847	while (__n > 0)	2191	while (__n > 0)
...	@@ -2860,8 +2204,8 @@ deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterat	...	@@ -2860,8 +2204,8 @@ deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterat
2860	while (__le != __lb)	2204	while (__le != __lb)
2861	{	2205	{
2862	__alloc_traits::construct(__a, _VSTD::addressof(--__r), _VSTD::move(--__le));	2206	__alloc_traits::construct(__a, _VSTD::addressof(--__r), _VSTD::move(--__le));
2863	--__base::__start_;	2207	--__start_;
2864	++__base::size();	2208	++__size();
2865	}	2209	}
2866	__n -= __bs;	2210	__n -= __bs;
2867	__l -= __bs - 1;	2211	__l -= __bs - 1;
...	@@ -2872,26 +2216,26 @@ template <class _Tp, class _Allocator>	...	@@ -2872,26 +2216,26 @@ template <class _Tp, class _Allocator>
2872	typename deque<_Tp, _Allocator>::iterator	2216	typename deque<_Tp, _Allocator>::iterator
2873	deque<_Tp, _Allocator>::erase(const_iterator __f)	2217	deque<_Tp, _Allocator>::erase(const_iterator __f)
2874	{	2218	{
2875	iterator __b = __base::begin();	2219	iterator __b = begin();
2876	difference_type __pos = __f - __b;	2220	difference_type __pos = __f - __b;
2877	iterator __p = __b + __pos;	2221	iterator __p = __b + __pos;
2878	allocator_type& __a = __base::__alloc();	2222	allocator_type& __a = __alloc();
2879	if (static_cast<size_t>(__pos) <= (__base::size() - 1) / 2)	2223	if (static_cast<size_t>(__pos) <= (size() - 1) / 2)
2880	{ // erase from front	2224	{ // erase from front
2881	_VSTD::move_backward(__b, __p, _VSTD::next(__p));	2225	_VSTD::move_backward(__b, __p, _VSTD::next(__p));
2882	__alloc_traits::destroy(__a, _VSTD::addressof(*__b));	2226	__alloc_traits::destroy(__a, _VSTD::addressof(*__b));
2883	--__base::size();	2227	--__size();
2884	++__base::__start_;	2228	++__start_;
2885	__maybe_remove_front_spare();	2229	__maybe_remove_front_spare();
2886	}	2230	}
2887	else	2231	else
2888	{ // erase from back	2232	{ // erase from back
2889	iterator __i = _VSTD::move(_VSTD::next(__p), __base::end(), __p);	2233	iterator __i = _VSTD::move(_VSTD::next(__p), end(), __p);
2890	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));	2234	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));
2891	--__base::size();	2235	--__size();
2892	__maybe_remove_back_spare();	2236	__maybe_remove_back_spare();
2893	}	2237	}
2894	return __base::begin() + __pos;	2238	return begin() + __pos;
2895	}	2239	}
2896		2240
2897	template <class _Tp, class _Allocator>	2241	template <class _Tp, class _Allocator>
...	@@ -2899,49 +2243,49 @@ typename deque<_Tp, _Allocator>::iterator	...	@@ -2899,49 +2243,49 @@ typename deque<_Tp, _Allocator>::iterator
2899	deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l)	2243	deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l)
2900	{	2244	{
2901	difference_type __n = __l - __f;	2245	difference_type __n = __l - __f;
2902	iterator __b = __base::begin();	2246	iterator __b = begin();
2903	difference_type __pos = __f - __b;	2247	difference_type __pos = __f - __b;
2904	iterator __p = __b + __pos;	2248	iterator __p = __b + __pos;
2905	if (__n > 0)	2249	if (__n > 0)
2906	{	2250	{
2907	allocator_type& __a = __base::__alloc();	2251	allocator_type& __a = __alloc();
2908	if (static_cast<size_t>(__pos) <= (__base::size() - __n) / 2)	2252	if (static_cast<size_t>(__pos) <= (size() - __n) / 2)
2909	{ // erase from front	2253	{ // erase from front
2910	iterator __i = _VSTD::move_backward(__b, __p, __p + __n);	2254	iterator __i = _VSTD::move_backward(__b, __p, __p + __n);
2911	for (; __b != __i; ++__b)	2255	for (; __b != __i; ++__b)
2912	__alloc_traits::destroy(__a, _VSTD::addressof(*__b));	2256	__alloc_traits::destroy(__a, _VSTD::addressof(*__b));
2913	__base::size() -= __n;	2257	__size() -= __n;
2914	__base::__start_ += __n;	2258	__start_ += __n;
2915	while (__maybe_remove_front_spare()) {	2259	while (__maybe_remove_front_spare()) {
2916	}	2260	}
2917	}	2261	}
2918	else	2262	else
2919	{ // erase from back	2263	{ // erase from back
2920	iterator __i = _VSTD::move(__p + __n, __base::end(), __p);	2264	iterator __i = _VSTD::move(__p + __n, end(), __p);
2921	for (iterator __e = __base::end(); __i != __e; ++__i)	2265	for (iterator __e = end(); __i != __e; ++__i)
2922	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));	2266	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));
2923	__base::size() -= __n;	2267	__size() -= __n;
2924	while (__maybe_remove_back_spare()) {	2268	while (__maybe_remove_back_spare()) {
2925	}	2269	}
2926	}	2270	}
2927	}	2271	}
2928	return __base::begin() + __pos;	2272	return begin() + __pos;
2929	}	2273	}
2930		2274
2931	template <class _Tp, class _Allocator>	2275	template <class _Tp, class _Allocator>
2932	void	2276	void
2933	deque<_Tp, _Allocator>::__erase_to_end(const_iterator __f)	2277	deque<_Tp, _Allocator>::__erase_to_end(const_iterator __f)
2934	{	2278	{
2935	iterator __e = __base::end();	2279	iterator __e = end();
2936	difference_type __n = __e - __f;	2280	difference_type __n = __e - __f;
2937	if (__n > 0)	2281	if (__n > 0)
2938	{	2282	{
2939	allocator_type& __a = __base::__alloc();	2283	allocator_type& __a = __alloc();
2940	iterator __b = __base::begin();	2284	iterator __b = begin();
2941	difference_type __pos = __f - __b;	2285	difference_type __pos = __f - __b;
2942	for (iterator __p = __b + __pos; __p != __e; ++__p)	2286	for (iterator __p = __b + __pos; __p != __e; ++__p)
2943	__alloc_traits::destroy(__a, _VSTD::addressof(*__p));	2287	__alloc_traits::destroy(__a, _VSTD::addressof(*__p));
2944	__base::size() -= __n;	2288	__size() -= __n;
2945	while (__maybe_remove_back_spare()) {	2289	while (__maybe_remove_back_spare()) {
2946	}	2290	}
2947	}	2291	}
...	@@ -2958,7 +2302,10 @@ deque<_Tp, _Allocator>::swap(deque& __c)	...	@@ -2958,7 +2302,10 @@ deque<_Tp, _Allocator>::swap(deque& __c)
2958	__is_nothrow_swappable<allocator_type>::value)	2302	__is_nothrow_swappable<allocator_type>::value)
2959	#endif	2303	#endif
2960	{	2304	{
2961	__base::swap(__c);	2305	__map_.swap(__c.__map_);
		2306	_VSTD::swap(__start_, __c.__start_);
		2307	_VSTD::swap(__size(), __c.__size());
		2308	_VSTD::__swap_allocator(__alloc(), __c.__alloc());
2962	}	2309	}
2963		2310
2964	template <class _Tp, class _Allocator>	2311	template <class _Tp, class _Allocator>
...	@@ -2966,11 +2313,28 @@ inline	...	@@ -2966,11 +2313,28 @@ inline
2966	void	2313	void
2967	deque<_Tp, _Allocator>::clear() _NOEXCEPT	2314	deque<_Tp, _Allocator>::clear() _NOEXCEPT
2968	{	2315	{
2969	__base::clear();	2316	allocator_type& __a = __alloc();
		2317	for (iterator __i = begin(), __e = end(); __i != __e; ++__i)
		2318	__alloc_traits::destroy(__a, _VSTD::addressof(*__i));
		2319	__size() = 0;
		2320	while (__map_.size() > 2)
		2321	{
		2322	__alloc_traits::deallocate(__a, __map_.front(), __block_size);
		2323	__map_.pop_front();
		2324	}
		2325	switch (__map_.size())
		2326	{
		2327	case 1:
		2328	__start_ = __block_size / 2;
		2329	break;
		2330	case 2:
		2331	__start_ = __block_size;
		2332	break;
		2333	}
2970	}	2334	}
2971		2335
2972	template <class _Tp, class _Allocator>	2336	template <class _Tp, class _Allocator>
2973	inline _LIBCPP_INLINE_VISIBILITY	2337	inline _LIBCPP_HIDE_FROM_ABI
2974	bool	2338	bool
2975	operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2339	operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2976	{	2340	{
...	@@ -2979,7 +2343,7 @@ operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -2979,7 +2343,7 @@ operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2979	}	2343	}
2980		2344
2981	template <class _Tp, class _Allocator>	2345	template <class _Tp, class _Allocator>
2982	inline _LIBCPP_INLINE_VISIBILITY	2346	inline _LIBCPP_HIDE_FROM_ABI
2983	bool	2347	bool
2984	operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2348	operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2985	{	2349	{
...	@@ -2987,7 +2351,7 @@ operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -2987,7 +2351,7 @@ operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2987	}	2351	}
2988		2352
2989	template <class _Tp, class _Allocator>	2353	template <class _Tp, class _Allocator>
2990	inline _LIBCPP_INLINE_VISIBILITY	2354	inline _LIBCPP_HIDE_FROM_ABI
2991	bool	2355	bool
2992	operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2356	operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2993	{	2357	{
...	@@ -2995,7 +2359,7 @@ operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -2995,7 +2359,7 @@ operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
2995	}	2359	}
2996		2360
2997	template <class _Tp, class _Allocator>	2361	template <class _Tp, class _Allocator>
2998	inline _LIBCPP_INLINE_VISIBILITY	2362	inline _LIBCPP_HIDE_FROM_ABI
2999	bool	2363	bool
3000	operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2364	operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3001	{	2365	{
...	@@ -3003,7 +2367,7 @@ operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -3003,7 +2367,7 @@ operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3003	}	2367	}
3004		2368
3005	template <class _Tp, class _Allocator>	2369	template <class _Tp, class _Allocator>
3006	inline _LIBCPP_INLINE_VISIBILITY	2370	inline _LIBCPP_HIDE_FROM_ABI
3007	bool	2371	bool
3008	operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2372	operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3009	{	2373	{
...	@@ -3011,7 +2375,7 @@ operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -3011,7 +2375,7 @@ operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3011	}	2375	}
3012		2376
3013	template <class _Tp, class _Allocator>	2377	template <class _Tp, class _Allocator>
3014	inline _LIBCPP_INLINE_VISIBILITY	2378	inline _LIBCPP_HIDE_FROM_ABI
3015	bool	2379	bool
3016	operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	2380	operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3017	{	2381	{
...	@@ -3019,7 +2383,7 @@ operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)	...	@@ -3019,7 +2383,7 @@ operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
3019	}	2383	}
3020		2384
3021	template <class _Tp, class _Allocator>	2385	template <class _Tp, class _Allocator>
3022	inline _LIBCPP_INLINE_VISIBILITY	2386	inline _LIBCPP_HIDE_FROM_ABI
3023	void	2387	void
3024	swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)	2388	swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)
3025	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))	2389	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
...	@@ -3029,7 +2393,7 @@ swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)	...	@@ -3029,7 +2393,7 @@ swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)
3029		2393
3030	#if _LIBCPP_STD_VER > 17	2394	#if _LIBCPP_STD_VER > 17
3031	template <class _Tp, class _Allocator, class _Up>	2395	template <class _Tp, class _Allocator, class _Up>
3032	inline _LIBCPP_INLINE_VISIBILITY typename deque<_Tp, _Allocator>::size_type	2396	inline _LIBCPP_HIDE_FROM_ABI typename deque<_Tp, _Allocator>::size_type
3033	erase(deque<_Tp, _Allocator>& __c, const _Up& __v) {	2397	erase(deque<_Tp, _Allocator>& __c, const _Up& __v) {
3034	auto __old_size = __c.size();	2398	auto __old_size = __c.size();
3035	__c.erase(_VSTD::remove(__c.begin(), __c.end(), __v), __c.end());	2399	__c.erase(_VSTD::remove(__c.begin(), __c.end(), __v), __c.end());
...	@@ -3037,7 +2401,7 @@ erase(deque<_Tp, _Allocator>& __c, const _Up& __v) {	...	@@ -3037,7 +2401,7 @@ erase(deque<_Tp, _Allocator>& __c, const _Up& __v) {
3037	}	2401	}
3038		2402
3039	template <class _Tp, class _Allocator, class _Predicate>	2403	template <class _Tp, class _Allocator, class _Predicate>
3040	inline _LIBCPP_INLINE_VISIBILITY typename deque<_Tp, _Allocator>::size_type	2404	inline _LIBCPP_HIDE_FROM_ABI typename deque<_Tp, _Allocator>::size_type
3041	erase_if(deque<_Tp, _Allocator>& __c, _Predicate __pred) {	2405	erase_if(deque<_Tp, _Allocator>& __c, _Predicate __pred) {
3042	auto __old_size = __c.size();	2406	auto __old_size = __c.size();
3043	__c.erase(_VSTD::remove_if(__c.begin(), __c.end(), __pred), __c.end());	2407	__c.erase(_VSTD::remove_if(__c.begin(), __c.end(), __pred), __c.end());
...	@@ -3055,6 +2419,25 @@ inline constexpr bool __format::__enable_insertable<std::deque<wchar_t>> = true;	...	@@ -3055,6 +2419,25 @@ inline constexpr bool __format::__enable_insertable<std::deque<wchar_t>> = true;
3055		2419
3056	_LIBCPP_END_NAMESPACE_STD	2420	_LIBCPP_END_NAMESPACE_STD
3057		2421
		2422	#if _LIBCPP_STD_VER > 14
		2423	_LIBCPP_BEGIN_NAMESPACE_STD
		2424	namespace pmr {
		2425	template <class _ValueT>
		2426	using deque = std::deque<_ValueT, polymorphic_allocator<_ValueT>>;
		2427	} // namespace pmr
		2428	_LIBCPP_END_NAMESPACE_STD
		2429	#endif
		2430
3058	_LIBCPP_POP_MACROS	2431	_LIBCPP_POP_MACROS
3059		2432
		2433	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		2434	# include <algorithm>
		2435	# include <atomic>
		2436	# include <concepts>
		2437	# include <functional>
		2438	# include <iosfwd>
		2439	# include <iterator>
		2440	# include <typeinfo>
		2441	#endif
		2442
3060	#endif // _LIBCPP_DEQUE	2443	#endif // _LIBCPP_DEQUE

lib/libcxx/include/errno.h+3-1

...	@@ -28,7 +28,9 @@ Macros:	...	@@ -28,7 +28,9 @@ Macros:
28	# pragma GCC system_header	28	# pragma GCC system_header
29	#endif	29	#endif
30		30
31	#include_next <errno.h>	31	#if __has_include_next(<errno.h>)
		32	# include_next <errno.h>
		33	#endif
32		34
33	#ifdef __cplusplus	35	#ifdef __cplusplus
34		36

lib/libcxx/include/exception+70-16

...	@@ -80,13 +80,21 @@ template <class E> void rethrow_if_nested(const E& e);	...	@@ -80,13 +80,21 @@ template <class E> void rethrow_if_nested(const E& e);
80	#include <__availability>	80	#include <__availability>
81	#include <__config>	81	#include <__config>
82	#include <__memory/addressof.h>	82	#include <__memory/addressof.h>
		83	#include <__type_traits/decay.h>
		84	#include <__type_traits/is_base_of.h>
		85	#include <__type_traits/is_class.h>
		86	#include <__type_traits/is_convertible.h>
		87	#include <__type_traits/is_copy_constructible.h>
		88	#include <__type_traits/is_final.h>
		89	#include <__type_traits/is_polymorphic.h>
83	#include <cstddef>	90	#include <cstddef>
84	#include <cstdlib>	91	#include <cstdlib>
85	#include <type_traits>
86	#include <version>	92	#include <version>
87		93
		94	// <vcruntime_exception.h> defines its own std::exception and std::bad_exception types,
		95	// which we use in order to be ABI-compatible with other STLs on Windows.
88	#if defined(_LIBCPP_ABI_VCRUNTIME)	96	#if defined(_LIBCPP_ABI_VCRUNTIME)
89	#include <vcruntime_exception.h>	97	# include <vcruntime_exception.h>
90	#endif	98	#endif
91		99
92	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	100	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -96,24 +104,66 @@ template <class E> void rethrow_if_nested(const E& e);	...	@@ -96,24 +104,66 @@ template <class E> void rethrow_if_nested(const E& e);
96	namespace std // purposefully not using versioning namespace	104	namespace std // purposefully not using versioning namespace
97	{	105	{
98		106
99	#if !defined(_LIBCPP_ABI_VCRUNTIME)	107	#if defined(_LIBCPP_ABI_VCRUNTIME) && (!defined(_HAS_EXCEPTIONS) \|\| _HAS_EXCEPTIONS != 0)
100	class _LIBCPP_EXCEPTION_ABI exception	108	// The std::exception class was already included above, but we're explicit about this condition here for clarity.
101	{	109
		110	#elif defined(_LIBCPP_ABI_VCRUNTIME) && _HAS_EXCEPTIONS == 0
		111	// However, <vcruntime_exception.h> does not define std::exception and std::bad_exception
		112	// when _HAS_EXCEPTIONS == 0.
		113	//
		114	// Since libc++ still wants to provide the std::exception hierarchy even when _HAS_EXCEPTIONS == 0
		115	// (after all those are simply types like any other), we define an ABI-compatible version
		116	// of the VCRuntime std::exception and std::bad_exception types in that mode.
		117
		118	struct __std_exception_data {
		119	char const* _What;
		120	bool _DoFree;
		121	};
		122
		123	class exception { // base of all library exceptions
102	public:	124	public:
103	_LIBCPP_INLINE_VISIBILITY exception() _NOEXCEPT {}	125	exception() _NOEXCEPT : __data_() {}
104	_LIBCPP_INLINE_VISIBILITY exception(const exception&) _NOEXCEPT = default;
105		126
106	virtual ~exception() _NOEXCEPT;	127	explicit exception(char const* __message) _NOEXCEPT : __data_() {
107	virtual const char* what() const _NOEXCEPT;	128	__data_._What = __message;
		129	__data_._DoFree = true;
		130	}
		131
		132	exception(exception const&) _NOEXCEPT {}
		133
		134	exception& operator=(exception const&) _NOEXCEPT { return *this; }
		135
		136	virtual ~exception() _NOEXCEPT {}
		137
		138	virtual char const* what() const _NOEXCEPT { return __data_._What ? __data_._What : "Unknown exception"; }
		139
		140	private:
		141	__std_exception_data __data_;
108	};	142	};
109		143
110	class _LIBCPP_EXCEPTION_ABI bad_exception	144	class bad_exception : public exception {
111	: public exception	145	public:
112	{	146	bad_exception() _NOEXCEPT : exception("bad exception") {}
		147	};
		148
		149	#else // !defined(_LIBCPP_ABI_VCRUNTIME)
		150	// On all other platforms, we define our own std::exception and std::bad_exception types
		151	// regardless of whether exceptions are turned on as a language feature.
		152
		153	class _LIBCPP_EXCEPTION_ABI exception {
113	public:	154	public:
114	_LIBCPP_INLINE_VISIBILITY bad_exception() _NOEXCEPT {}	155	_LIBCPP_INLINE_VISIBILITY exception() _NOEXCEPT {}
115	virtual ~bad_exception() _NOEXCEPT;	156	_LIBCPP_INLINE_VISIBILITY exception(const exception&) _NOEXCEPT = default;
116	virtual const char* what() const _NOEXCEPT;	157
		158	virtual ~exception() _NOEXCEPT;
		159	virtual const char* what() const _NOEXCEPT;
		160	};
		161
		162	class _LIBCPP_EXCEPTION_ABI bad_exception : public exception {
		163	public:
		164	_LIBCPP_INLINE_VISIBILITY bad_exception() _NOEXCEPT {}
		165	~bad_exception() _NOEXCEPT override;
		166	const char* what() const _NOEXCEPT override;
117	};	167	};
118	#endif // !_LIBCPP_ABI_VCRUNTIME	168	#endif // !_LIBCPP_ABI_VCRUNTIME
119		169
...	@@ -282,7 +332,7 @@ struct __throw_with_nested<_Tp, _Up, false> {	...	@@ -282,7 +332,7 @@ struct __throw_with_nested<_Tp, _Up, false> {
282	#endif	332	#endif
283		333
284	template <class _Tp>	334	template <class _Tp>
285	_LIBCPP_NORETURN	335	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI
286	void	336	void
287	throw_with_nested(_Tp&& __t)	337	throw_with_nested(_Tp&& __t)
288	{	338	{
...	@@ -327,4 +377,8 @@ rethrow_if_nested(const _Ep&,	...	@@ -327,4 +377,8 @@ rethrow_if_nested(const _Ep&,
327		377
328	} // namespace std	378	} // namespace std
329		379
		380	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		381	# include <type_traits>
		382	#endif
		383
330	#endif // _LIBCPP_EXCEPTION	384	#endif // _LIBCPP_EXCEPTION

lib/libcxx/include/expected created+54

...	@@ -0,0 +1,54 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_EXPECTED
11	#define _LIBCPP_EXPECTED
12
13	/*
14	Header <expected> synopsis
15
16	namespace std {
17	// [expected.unexpected], class template unexpected
18	template<class E> class unexpected;
19
20	// [expected.bad], class template bad_expected_access
21	template<class E> class bad_expected_access;
22
23	// [expected.bad.void], specialization for void
24	template<> class bad_expected_access<void>;
25
26	// in-place construction of unexpected values
27	struct unexpect_t {
28	explicit unexpect_t() = default;
29	};
30	inline constexpr unexpect_t unexpect{};
31
32	// [expected.expected], class template expected
33	template<class T, class E> class expected;
34
35	// [expected.void], partial specialization of expected for void types
36	template<class T, class E> requires is_void_v<T> class expected<T, E>;
37	}
38
39	*/
40
41	#include <__assert> // all public C++ headers provide the assertion handler
42	#include <__config>
43	#include <__expected/bad_expected_access.h>
44	#include <__expected/expected.h>
45	#include <__expected/unexpect.h>
46	#include <__expected/unexpected.h>
47	#include <version>
48
49	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
50	# pragma GCC system_header
51	#endif
52
53	#endif // _LIBCPP_EXPECTED
54

lib/libcxx/include/experimental/__memory+2-2

...	@@ -56,11 +56,11 @@ struct __lfts_uses_alloc_ctor_imp<true, _Tp, _Alloc, _Args...>	...	@@ -56,11 +56,11 @@ struct __lfts_uses_alloc_ctor_imp<true, _Tp, _Alloc, _Args...>
56	= is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;	56	= is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;
57		57
58	static const bool __ic_second =	58	static const bool __ic_second =
59	conditional<	59	__conditional_t<
60	__ic_first,	60	__ic_first,
61	false_type,	61	false_type,
62	is_constructible<_Tp, _Args..., _Alloc>	62	is_constructible<_Tp, _Args..., _Alloc>
63	>::type::value;	63	>::value;
64		64
65	static_assert(__ic_first \|\| __ic_second,	65	static_assert(__ic_first \|\| __ic_second,
66	"Request for uses allocator construction is ill-formed");	66	"Request for uses allocator construction is ill-formed");

lib/libcxx/include/experimental/coroutine+24-7

 @@ -50,10 +50,28 @@ template <class P> struct hash<coroutine_handle<P>>;
 #include <__functional/operations.h>
 #include <cstddef>
 #include <experimental/__config>
-#include <memory> // for hash<T*>
 #include <new>
 #include <type_traits>
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <climits>
+#  include <cmath>
+#  include <compare>
+#  include <concepts>
+#  include <ctime>
+#  include <initializer_list>
+#  include <iosfwd>
+#  include <iterator>
+#  include <memory>
+#  include <ratio>
+#  include <stdexcept>
+#  include <tuple>
+#  include <typeinfo>
+#  include <utility>
+#  include <variant>
+#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -66,8 +84,7 @@ template <class _Tp, class = void>
 struct __coroutine_traits_sfinae {};
 template <class _Tp>
-struct __coroutine_traits_sfinae<
+struct __coroutine_traits_sfinae<_Tp, __void_t<typename _Tp::promise_type> >
-    _Tp, typename __void_t<typename _Tp::promise_type>::type>
 {
   using promise_type = typename _Tp::promise_type;
 };
 @@ -241,7 +258,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     static coroutine_handle from_promise(_Promise& __promise) _NOEXCEPT {
-        typedef typename remove_cv<_Promise>::type _RawPromise;
+        typedef __remove_cv_t<_Promise> _RawPromise;
         coroutine_handle __tmp;
         __tmp.__handle_ = __builtin_coro_promise(
             _VSTD::addressof(const_cast<_RawPromise&>(__promise)),
 @@ -269,9 +286,9 @@ public:
   _LIBCPP_CONSTEXPR explicit operator bool() const _NOEXCEPT { return true; }
   _LIBCPP_CONSTEXPR bool done() const _NOEXCEPT { return false; }
-  _LIBCPP_CONSTEXPR_AFTER_CXX17 void operator()() const _NOEXCEPT {}
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 void operator()() const _NOEXCEPT {}
-  _LIBCPP_CONSTEXPR_AFTER_CXX17 void resume() const _NOEXCEPT {}
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 void resume() const _NOEXCEPT {}
-  _LIBCPP_CONSTEXPR_AFTER_CXX17 void destroy() const _NOEXCEPT {}
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 void destroy() const _NOEXCEPT {}
 private:
   _LIBCPP_INLINE_VISIBILITY

lib/libcxx/include/experimental/deque+4

 @@ -40,9 +40,13 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _ValueT>
 using deque = _VSTD::deque<_ValueT, polymorphic_allocator<_ValueT>>;
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_DEQUE */

lib/libcxx/include/experimental/forward_list+4

 @@ -40,9 +40,13 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _ValueT>
 using forward_list = _VSTD::forward_list<_ValueT, polymorphic_allocator<_ValueT>>;
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_FORWARD_LIST */

lib/libcxx/include/experimental/functional+25-25

...	@@ -85,9 +85,9 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS	...	@@ -85,9 +85,9 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
85	# define _LIBCPP_DEPRECATED_BOYER_MOORE_SEARCHER	85	# define _LIBCPP_DEPRECATED_BOYER_MOORE_SEARCHER
86	# define _LIBCPP_DEPRECATED_BOYER_MOORE_HORSPOOL_SEARCHER	86	# define _LIBCPP_DEPRECATED_BOYER_MOORE_HORSPOOL_SEARCHER
87	#else	87	#else
88	# define _LIBCPP_DEPRECATED_DEFAULT_SEARCHER _LIBCPP_DEPRECATED_("std::exprerimental::default_searcher will be removed in LLVM 17. Use std::default_searcher instead")	88	# define _LIBCPP_DEPRECATED_DEFAULT_SEARCHER _LIBCPP_DEPRECATED_("std::experimental::default_searcher will be removed in LLVM 17. Use std::default_searcher instead")
89	# define _LIBCPP_DEPRECATED_BOYER_MOORE_SEARCHER _LIBCPP_DEPRECATED_("std::exprerimental::boyer_moore_searcher will be removed in LLVM 17. Use std::boyer_moore_searcher instead")	89	# define _LIBCPP_DEPRECATED_BOYER_MOORE_SEARCHER _LIBCPP_DEPRECATED_("std::experimental::boyer_moore_searcher will be removed in LLVM 17. Use std::boyer_moore_searcher instead")
90	# define _LIBCPP_DEPRECATED_BOYER_MOORE_HORSPOOL_SEARCHER _LIBCPP_DEPRECATED_("std::exprerimental::boyer_moore_horspool_searcher will be removed in LLVM 17. Use std::boyer_moore_horspool_searcher instead")	90	# define _LIBCPP_DEPRECATED_BOYER_MOORE_HORSPOOL_SEARCHER _LIBCPP_DEPRECATED_("std::experimental::boyer_moore_horspool_searcher will be removed in LLVM 17. Use std::boyer_moore_horspool_searcher instead")
91	#endif	91	#endif
92		92
93	#if _LIBCPP_STD_VER > 11	93	#if _LIBCPP_STD_VER > 11
...	@@ -132,24 +132,24 @@ class _BMSkipTable<_Key, _Value, _Hash, _BinaryPredicate, false> {	...	@@ -132,24 +132,24 @@ class _BMSkipTable<_Key, _Value, _Hash, _BinaryPredicate, false> {
132	typedef _Key key_type;	132	typedef _Key key_type;
133		133
134	const _Value __default_value_;	134	const _Value __default_value_;
135	std::unordered_map<_Key, _Value, _Hash, _BinaryPredicate> __table;	135	std::unordered_map<_Key, _Value, _Hash, _BinaryPredicate> __table_;
136		136
137	public:	137	public:
138	_LIBCPP_INLINE_VISIBILITY	138	_LIBCPP_INLINE_VISIBILITY
139	_BMSkipTable(size_t __sz, _Value __default, _Hash __hf, _BinaryPredicate __pred)	139	_BMSkipTable(size_t __sz, _Value __default, _Hash __hf, _BinaryPredicate __pred)
140	: __default_value_(__default), __table(__sz, __hf, __pred) {}	140	: __default_value_(__default), __table_(__sz, __hf, __pred) {}
141		141
142	_LIBCPP_INLINE_VISIBILITY	142	_LIBCPP_INLINE_VISIBILITY
143	void insert(const key_type &__key, value_type __val)	143	void insert(const key_type &__key, value_type __val)
144	{	144	{
145	__table [__key] = __val; // Would skip_.insert (val) be better here?	145	__table_ [__key] = __val; // Would skip_.insert (val) be better here?
146	}	146	}
147		147
148	_LIBCPP_INLINE_VISIBILITY	148	_LIBCPP_INLINE_VISIBILITY
149	value_type operator [](const key_type & __key) const	149	value_type operator [](const key_type & __key) const
150	{	150	{
151	auto __it = __table.find (__key);	151	auto __it = __table_.find (__key);
152	return __it == __table.end() ? __default_value_ : __it->second;	152	return __it == __table_.end() ? __default_value_ : __it->second;
153	}	153	}
154	};	154	};
155		155
...	@@ -161,27 +161,27 @@ private:	...	@@ -161,27 +161,27 @@ private:
161	typedef _Value value_type;	161	typedef _Value value_type;
162	typedef _Key key_type;	162	typedef _Key key_type;
163		163
164	typedef typename make_unsigned<key_type>::type unsigned_key_type;	164	typedef __make_unsigned_t<key_type> unsigned_key_type;
165	typedef std::array<value_type, 256> skip_map;	165	typedef std::array<value_type, 256> skip_map;
166	skip_map __table;	166	skip_map __table_;
167		167
168	public:	168	public:
169	_LIBCPP_INLINE_VISIBILITY	169	_LIBCPP_INLINE_VISIBILITY
170	_BMSkipTable(size_t /__sz/, _Value __default, _Hash /__hf/, _BinaryPredicate /__pred/)	170	_BMSkipTable(size_t /__sz/, _Value __default, _Hash /__hf/, _BinaryPredicate /__pred/)
171	{	171	{
172	std::fill_n(__table.begin(), __table.size(), __default);	172	std::fill_n(__table_.begin(), __table_.size(), __default);
173	}	173	}
174		174
175	_LIBCPP_INLINE_VISIBILITY	175	_LIBCPP_INLINE_VISIBILITY
176	void insert(key_type __key, value_type __val)	176	void insert(key_type __key, value_type __val)
177	{	177	{
178	__table[static_cast<unsigned_key_type>(__key)] = __val;	178	__table_[static_cast<unsigned_key_type>(__key)] = __val;
179	}	179	}
180		180
181	_LIBCPP_INLINE_VISIBILITY	181	_LIBCPP_INLINE_VISIBILITY
182	value_type operator [](key_type __key) const	182	value_type operator [](key_type __key) const
183	{	183	{
184	return __table[static_cast<unsigned_key_type>(__key)];	184	return __table_[static_cast<unsigned_key_type>(__key)];
185	}	185	}
186	};	186	};
187		187
...	@@ -205,8 +205,8 @@ public:	...	@@ -205,8 +205,8 @@ public:
205	_Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate())	205	_Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate())
206	: __first_(__f), __last_(__l), __pred_(__pred),	206	: __first_(__f), __last_(__l), __pred_(__pred),
207	__pattern_length_(_VSTD::distance(__first_, __last_)),	207	__pattern_length_(_VSTD::distance(__first_, __last_)),
208	__skip_{make_shared<skip_table_type>(__pattern_length_, -1, __hf, __pred_)},	208	__skip_{std::make_shared<skip_table_type>(__pattern_length_, -1, __hf, __pred_)},
209	__suffix_{make_shared<vector<difference_type>>(__pattern_length_ + 1)}	209	__suffix_{std::make_shared<vector<difference_type>>(__pattern_length_ + 1)}
210	{	210	{
211	// build the skip table	211	// build the skip table
212	for ( difference_type __i = 0; __f != __l; ++__f, (void) ++__i )	212	for ( difference_type __i = 0; __f != __l; ++__f, (void) ++__i )
...	@@ -223,12 +223,12 @@ public:	...	@@ -223,12 +223,12 @@ public:
223	typename iterator_traits<_RandomAccessIterator2>::value_type>::value,	223	typename iterator_traits<_RandomAccessIterator2>::value_type>::value,
224	"Corpus and Pattern iterators must point to the same type");	224	"Corpus and Pattern iterators must point to the same type");
225		225
226	if (__f == __l ) return make_pair(__l, __l); // empty corpus	226	if (__f == __l ) return std::make_pair(__l, __l); // empty corpus
227	if (__first_ == __last_) return make_pair(__f, __f); // empty pattern	227	if (__first_ == __last_) return std::make_pair(__f, __f); // empty pattern
228		228
229	// If the pattern is larger than the corpus, we can't find it!	229	// If the pattern is larger than the corpus, we can't find it!
230	if ( __pattern_length_ > _VSTD::distance(__f, __l))	230	if ( __pattern_length_ > _VSTD::distance(__f, __l))
231	return make_pair(__l, __l);	231	return std::make_pair(__l, __l);
232		232
233	// Do the search	233	// Do the search
234	return this->__search(__f, __l);	234	return this->__search(__f, __l);
...	@@ -260,7 +260,7 @@ private:	...	@@ -260,7 +260,7 @@ private:
260	__j--;	260	__j--;
261	// We matched - we're done!	261	// We matched - we're done!
262	if ( __j == 0 )	262	if ( __j == 0 )
263	return make_pair(__cur, __cur + __pattern_length_);	263	return std::make_pair(__cur, __cur + __pattern_length_);
264	}	264	}
265		265
266	// Since we didn't match, figure out how far to skip forward	266	// Since we didn't match, figure out how far to skip forward
...	@@ -272,7 +272,7 @@ private:	...	@@ -272,7 +272,7 @@ private:
272	__cur += __suffix[ __j ];	272	__cur += __suffix[ __j ];
273	}	273	}
274		274
275	return make_pair(__l, __l); // We didn't find anything	275	return std::make_pair(__l, __l); // We didn't find anything
276	}	276	}
277		277
278		278
...	@@ -373,12 +373,12 @@ public:	...	@@ -373,12 +373,12 @@ public:
373	typename std::iterator_traits<_RandomAccessIterator2>::value_type>::value,	373	typename std::iterator_traits<_RandomAccessIterator2>::value_type>::value,
374	"Corpus and Pattern iterators must point to the same type");	374	"Corpus and Pattern iterators must point to the same type");
375		375
376	if (__f == __l ) return make_pair(__l, __l); // empty corpus	376	if (__f == __l ) return std::make_pair(__l, __l); // empty corpus
377	if (__first_ == __last_) return make_pair(__f, __f); // empty pattern	377	if (__first_ == __last_) return std::make_pair(__f, __f); // empty pattern
378		378
379	// If the pattern is larger than the corpus, we can't find it!	379	// If the pattern is larger than the corpus, we can't find it!
380	if ( __pattern_length_ > _VSTD::distance(__f, __l))	380	if ( __pattern_length_ > _VSTD::distance(__f, __l))
381	return make_pair(__l, __l);	381	return std::make_pair(__l, __l);
382		382
383	// Do the search	383	// Do the search
384	return this->__search(__f, __l);	384	return this->__search(__f, __l);
...	@@ -407,12 +407,12 @@ private:	...	@@ -407,12 +407,12 @@ private:
407	__j--;	407	__j--;
408	// We matched - we're done!	408	// We matched - we're done!
409	if ( __j == 0 )	409	if ( __j == 0 )
410	return make_pair(__cur, __cur + __pattern_length_);	410	return std::make_pair(__cur, __cur + __pattern_length_);
411	}	411	}
412	__cur += __skip[__cur[__pattern_length_-1]];	412	__cur += __skip[__cur[__pattern_length_-1]];
413	}	413	}
414		414
415	return make_pair(__l, __l);	415	return std::make_pair(__l, __l);
416	}	416	}
417	};	417	};
418		418

lib/libcxx/include/experimental/iterator+15-10

 @@ -54,6 +54,7 @@ namespace std {
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__memory/addressof.h>
+#include <__type_traits/decay.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <experimental/__config>
 @@ -82,19 +83,19 @@ public:
     typedef void                                 reference;
     ostream_joiner(ostream_type& __os, _Delim&& __d)
-        : __output_iter(_VSTD::addressof(__os)), __delim(_VSTD::move(__d)), __first(true) {}
+        : __output_iter_(_VSTD::addressof(__os)), __delim_(_VSTD::move(__d)), __first_(true) {}
     ostream_joiner(ostream_type& __os, const _Delim& __d)
-        : __output_iter(_VSTD::addressof(__os)), __delim(__d), __first(true) {}
+        : __output_iter_(_VSTD::addressof(__os)), __delim_(__d), __first_(true) {}
     template<typename _Tp>
     ostream_joiner& operator=(const _Tp& __v)
     {
-        if (!__first)
+        if (!__first_)
-            *__output_iter << __delim;
+            *__output_iter_ << __delim_;
-        __first = false;
+        __first_ = false;
-        *__output_iter << __v;
+        *__output_iter_ << __v;
         return *this;
     }
 @@ -103,14 +104,14 @@ public:
     ostream_joiner& operator++(int) _NOEXCEPT { return *this; }
 private:
-    ostream_type*   __output_iter;
+    ostream_type*   __output_iter_;
-    _Delim          __delim;
+    _Delim          __delim_;
-    bool            __first;
+    bool            __first_;
 };
 template <class _CharT, class _Traits, class _Delim>
-ostream_joiner<typename decay<_Delim>::type, _CharT, _Traits>
+_LIBCPP_HIDE_FROM_ABI ostream_joiner<typename decay<_Delim>::type, _CharT, _Traits>
 make_ostream_joiner(basic_ostream<_CharT, _Traits>& __os, _Delim && __d)
 { return ostream_joiner<typename decay<_Delim>::type, _CharT, _Traits>(__os, _VSTD::forward<_Delim>(__d)); }
 @@ -118,4 +119,8 @@ _LIBCPP_END_NAMESPACE_LFTS
 #endif // _LIBCPP_STD_VER > 11
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_EXPERIMENTAL_ITERATOR

lib/libcxx/include/experimental/list+4

 @@ -40,9 +40,13 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _ValueT>
 using list = _VSTD::list<_ValueT, polymorphic_allocator<_ValueT>>;
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_LIST */

lib/libcxx/include/experimental/map+4

...	@@ -45,6 +45,8 @@ namespace pmr {	...	@@ -45,6 +45,8 @@ namespace pmr {
45		45
46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR	46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
47		47
		48	#ifndef _LIBCPP_CXX03_LANG
		49
48	template <class _Key, class _Value, class _Compare = less<_Key>>	50	template <class _Key, class _Value, class _Compare = less<_Key>>
49	using map = _VSTD::map<_Key, _Value, _Compare,	51	using map = _VSTD::map<_Key, _Value, _Compare,
50	polymorphic_allocator<pair<const _Key, _Value>>>;	52	polymorphic_allocator<pair<const _Key, _Value>>>;
...	@@ -53,6 +55,8 @@ template <class _Key, class _Value, class _Compare = less<_Key>>	...	@@ -53,6 +55,8 @@ template <class _Key, class _Value, class _Compare = less<_Key>>
53	using multimap = _VSTD::multimap<_Key, _Value, _Compare,	55	using multimap = _VSTD::multimap<_Key, _Value, _Compare,
54	polymorphic_allocator<pair<const _Key, _Value>>>;	56	polymorphic_allocator<pair<const _Key, _Value>>>;
55		57
		58	#endif // _LIBCPP_CXX03_LANG
		59
56	_LIBCPP_END_NAMESPACE_LFTS_PMR	60	_LIBCPP_END_NAMESPACE_LFTS_PMR
57		61
58	#endif /* _LIBCPP_EXPERIMENTAL_MAP */	62	#endif /* _LIBCPP_EXPERIMENTAL_MAP */

lib/libcxx/include/experimental/memory_resource+37-13

 @@ -65,16 +65,16 @@ namespace pmr {
  */
 #include <__assert> // all public C++ headers provide the assertion handler
-#include <__tuple>
+#include <__memory/allocator_traits.h>
 #include <__utility/move.h>
 #include <cstddef>
 #include <cstdlib>
 #include <experimental/__config>
 #include <experimental/__memory>
 #include <limits>
-#include <memory>
 #include <new>
 #include <stdexcept>
+#include <tuple>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -86,6 +86,12 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#define _LIBCPP_DEPCREATED_MEMORY_RESOURCE(name)                                                                       \
+  _LIBCPP_DEPRECATED_("'std::experimental::pmr::" name                                                                 \
+                      "' is deprecated and will be removed in LLVM 18. Use 'std::pmr::" name "' instead.")
+#ifndef _LIBCPP_CXX03_LANG
 // Round __s up to next multiple of __a.
 inline _LIBCPP_INLINE_VISIBILITY
 size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT
 @@ -95,7 +101,7 @@ size_t __aligned_allocation_size(size_t __s, size_t __a) _NOEXCEPT
 }
 // 8.5, memory.resource
-class _LIBCPP_TYPE_VIS memory_resource
+class _LIBCPP_DEPCREATED_MEMORY_RESOURCE("memory_resource") _LIBCPP_TYPE_VIS memory_resource
 {
     static const size_t __max_align = _LIBCPP_ALIGNOF(max_align_t);
 @@ -123,37 +129,37 @@ private:
 };
 // 8.5.4, memory.resource.eq
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("operator==(memory_resource, memory_resource)") inline _LIBCPP_INLINE_VISIBILITY
 bool operator==(memory_resource const & __lhs,
                 memory_resource const & __rhs) _NOEXCEPT
 {
     return &__lhs == &__rhs || __lhs.is_equal(__rhs);
 }
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("operator!=(memory_resource, memory_resource)") inline _LIBCPP_INLINE_VISIBILITY
 bool operator!=(memory_resource const & __lhs,
                 memory_resource const & __rhs) _NOEXCEPT
 {
     return !(__lhs == __rhs);
 }
-_LIBCPP_FUNC_VIS
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("new_delete_resource()") _LIBCPP_FUNC_VIS
 memory_resource * new_delete_resource() _NOEXCEPT;
-_LIBCPP_FUNC_VIS
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("null_memory_resource()") _LIBCPP_FUNC_VIS
 memory_resource * null_memory_resource() _NOEXCEPT;
-_LIBCPP_FUNC_VIS
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("get_default_resource()") _LIBCPP_FUNC_VIS
 memory_resource * get_default_resource() _NOEXCEPT;
-_LIBCPP_FUNC_VIS
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("set_default_resource()") _LIBCPP_FUNC_VIS
 memory_resource * set_default_resource(memory_resource * __new_res) _NOEXCEPT;
 // 8.6, memory.polymorphic.allocator.class
 // 8.6.1, memory.polymorphic.allocator.overview
 template <class _ValueType>
-class _LIBCPP_TEMPLATE_VIS polymorphic_allocator
+class _LIBCPP_DEPCREATED_MEMORY_RESOURCE("polymorphic_allocator") _LIBCPP_TEMPLATE_VIS polymorphic_allocator
 {
 public:
     typedef _ValueType value_type;
 @@ -314,6 +320,7 @@ private:
 // 8.6.4, memory.polymorphic.allocator.eq
 template <class _Tp, class _Up>
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("operator==(const polymorphic_allocator&, const polymorphic_allocator&)")
 inline _LIBCPP_INLINE_VISIBILITY
 bool operator==(polymorphic_allocator<_Tp> const & __lhs,
                 polymorphic_allocator<_Up> const & __rhs) _NOEXCEPT
 @@ -322,6 +329,7 @@ bool operator==(polymorphic_allocator<_Tp> const & __lhs,
 }
 template <class _Tp, class _Up>
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("operator!=(const polymorphic_allocator&, const polymorphic_allocator&)")
 inline _LIBCPP_INLINE_VISIBILITY
 bool operator!=(polymorphic_allocator<_Tp> const & __lhs,
                 polymorphic_allocator<_Up> const & __rhs) _NOEXCEPT
 @@ -331,6 +339,7 @@ bool operator!=(polymorphic_allocator<_Tp> const & __lhs,
 // 8.7, memory.resource.adaptor
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
 // 8.7.1, memory.resource.adaptor.overview
 template <class _CharAlloc>
 class _LIBCPP_TEMPLATE_VIS __resource_adaptor_imp
 @@ -379,7 +388,7 @@ public:
 // 8.7.3, memory.resource.adaptor.mem
 private:
-    virtual void * do_allocate(size_t __bytes, size_t)
+    void * do_allocate(size_t __bytes, size_t) override
     {
         if (__bytes > __max_size())
             __throw_bad_array_new_length();
 @@ -387,7 +396,7 @@ private:
         return __alloc_.allocate(__s);
     }
-    virtual void do_deallocate(void * __p, size_t __bytes, size_t)
+    void do_deallocate(void * __p, size_t __bytes, size_t) override
     {
         _LIBCPP_ASSERT(__bytes <= __max_size(),
             "do_deallocate called for size which exceeds the maximum allocation size");
 @@ -395,7 +404,7 @@ private:
         __alloc_.deallocate((_ValueType*)__p, __s);
     }
-    virtual bool do_is_equal(memory_resource const & __other) const _NOEXCEPT {
+    bool do_is_equal(memory_resource const & __other) const _NOEXCEPT override {
         __resource_adaptor_imp const * __p
           = dynamic_cast<__resource_adaptor_imp const *>(&__other);
         return __p  ? __alloc_ == __p->__alloc_ : false;
 @@ -411,9 +420,24 @@ template <class _Alloc>
 using resource_adaptor = __resource_adaptor_imp<
     typename allocator_traits<_Alloc>::template rebind_alloc<char>
   >;
+_LIBCPP_SUPPRESS_DEPRECATED_POP
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <climits>
+#  include <concepts>
+#  include <cstring>
+#  include <ctime>
+#  include <iterator>
+#  include <memory>
+#  include <ratio>
+#  include <variant>
+#endif
 #endif /* _LIBCPP_EXPERIMENTAL_MEMORY_RESOURCE */

lib/libcxx/include/experimental/propagate_const+4-3

 @@ -109,6 +109,7 @@
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__functional/operations.h>
+#include <__fwd/hash.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/swap.h>
 @@ -138,15 +139,15 @@ template <class _Tp>
 class propagate_const
 {
 public:
-  typedef remove_reference_t<decltype(*declval<_Tp&>())> element_type;
+  typedef remove_reference_t<decltype(*std::declval<_Tp&>())> element_type;
   static_assert(!is_array<_Tp>::value,
       "Instantiation of propagate_const with an array type is ill-formed.");
   static_assert(!is_reference<_Tp>::value,
       "Instantiation of propagate_const with a reference type is ill-formed.");
-  static_assert(!(is_pointer<_Tp>::value && is_function<typename remove_pointer<_Tp>::type>::value),
+  static_assert(!(is_pointer<_Tp>::value && is_function<__remove_pointer_t<_Tp> >::value),
       "Instantiation of propagate_const with a function-pointer type is ill-formed.");
-  static_assert(!(is_pointer<_Tp>::value && is_same<typename remove_cv<typename remove_pointer<_Tp>::type>::type, void>::value),
+  static_assert(!(is_pointer<_Tp>::value && is_same<__remove_cv_t<__remove_pointer_t<_Tp> >, void>::value),
       "Instantiation of propagate_const with a pointer to (possibly cv-qualified) void is ill-formed.");
 private:

lib/libcxx/include/experimental/regex+8-4

 @@ -48,18 +48,22 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _BiDirIter>
 using match_results =
     _VSTD::match_results<_BiDirIter,
         polymorphic_allocator<_VSTD::sub_match<_BiDirIter>>>;
-typedef match_results<const char*> cmatch;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("cmatch") typedef match_results<const char*> cmatch;
-typedef match_results<_VSTD_LFTS_PMR::string::const_iterator> smatch;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("smatch") typedef match_results<_VSTD_LFTS_PMR::string::const_iterator> smatch;
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
-typedef match_results<const wchar_t*> wcmatch;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("wcmatch") typedef match_results<const wchar_t*> wcmatch;
-typedef match_results<_VSTD_LFTS_PMR::wstring::const_iterator> wsmatch;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("wsmatch") typedef match_results<_VSTD_LFTS_PMR::wstring::const_iterator> wsmatch;
 #endif
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_REGEX */

lib/libcxx/include/experimental/set+4

...	@@ -45,6 +45,8 @@ namespace pmr {	...	@@ -45,6 +45,8 @@ namespace pmr {
45		45
46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR	46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
47		47
		48	#ifndef _LIBCPP_CXX03_LANG
		49
48	template <class _Value, class _Compare = less<_Value>>	50	template <class _Value, class _Compare = less<_Value>>
49	using set = _VSTD::set<_Value, _Compare,	51	using set = _VSTD::set<_Value, _Compare,
50	polymorphic_allocator<_Value>>;	52	polymorphic_allocator<_Value>>;
...	@@ -53,6 +55,8 @@ template <class _Value, class _Compare = less<_Value>>	...	@@ -53,6 +55,8 @@ template <class _Value, class _Compare = less<_Value>>
53	using multiset = _VSTD::multiset<_Value, _Compare,	55	using multiset = _VSTD::multiset<_Value, _Compare,
54	polymorphic_allocator<_Value>>;	56	polymorphic_allocator<_Value>>;
55		57
		58	#endif // _LIBCPP_CXX03_LANG
		59
56	_LIBCPP_END_NAMESPACE_LFTS_PMR	60	_LIBCPP_END_NAMESPACE_LFTS_PMR
57		61
58	#endif /* _LIBCPP_EXPERIMENTAL_SET */	62	#endif /* _LIBCPP_EXPERIMENTAL_SET */

lib/libcxx/include/experimental/simd+26-23

 @@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP_EXPERIMENTAL_SIMD
 #define _LIBCPP_EXPERIMENTAL_SIMD
 @@ -656,11 +657,6 @@ public:
 #include <experimental/__config>
 #include <tuple>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <functional>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -720,12 +716,12 @@ public:
 #ifndef _LIBCPP_HAS_NO_VECTOR_EXTENSION
-constexpr size_t __floor_pow_of_2(size_t __val) {
+_LIBCPP_HIDE_FROM_ABI constexpr size_t __floor_pow_of_2(size_t __val) {
   return ((__val - 1) & __val) == 0 ? __val
                                     : __floor_pow_of_2((__val - 1) & __val);
 }
-constexpr size_t __ceil_pow_of_2(size_t __val) {
+_LIBCPP_HIDE_FROM_ABI constexpr size_t __ceil_pow_of_2(size_t __val) {
   return __val == 1 ? 1 : __floor_pow_of_2(__val - 1) << 1;
 }
 @@ -913,25 +909,27 @@ public:
 };
 template <class _To, class _From>
-constexpr decltype(_To{std::declval<_From>()}, true)
+_LIBCPP_HIDE_FROM_ABI constexpr decltype(_To{std::declval<_From>()}, true)
 __is_non_narrowing_convertible_impl(_From) {
   return true;
 }
 template <class _To>
-constexpr bool __is_non_narrowing_convertible_impl(...) {
+_LIBCPP_HIDE_FROM_ABI constexpr bool __is_non_narrowing_convertible_impl(...) {
   return false;
 }
 template <class _From, class _To>
+_LIBCPP_HIDE_FROM_ABI
 constexpr typename std::enable_if<std::is_arithmetic<_To>::value &&
                                       std::is_arithmetic<_From>::value,
                                   bool>::type
 __is_non_narrowing_arithmetic_convertible() {
-  return __is_non_narrowing_convertible_impl<_To>(_From{});
+  return experimental::__is_non_narrowing_convertible_impl<_To>(_From{});
 }
 template <class _From, class _To>
+_LIBCPP_HIDE_FROM_ABI
 constexpr typename std::enable_if<!(std::is_arithmetic<_To>::value &&
                                     std::is_arithmetic<_From>::value),
                                   bool>::type
 @@ -940,13 +938,13 @@ __is_non_narrowing_arithmetic_convertible() {
 }
 template <class _Tp>
-constexpr _Tp __variadic_sum() {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __variadic_sum() {
   return _Tp{};
 }
 template <class _Tp, class _Up, class... _Args>
-constexpr _Tp __variadic_sum(_Up __first, _Args... __rest) {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __variadic_sum(_Up __first, _Args... __rest) {
-  return static_cast<_Tp>(__first) + __variadic_sum<_Tp>(__rest...);
+  return static_cast<_Tp>(__first) + experimental::__variadic_sum<_Tp>(__rest...);
 }
 template <class _Tp>
 @@ -955,7 +953,7 @@ struct __nodeduce {
 };
 template <class _Tp>
-constexpr bool __vectorizable() {
+_LIBCPP_HIDE_FROM_ABI constexpr bool __vectorizable() {
   return std::is_arithmetic<_Tp>::value && !std::is_const<_Tp>::value &&
          !std::is_volatile<_Tp>::value && !std::is_same<_Tp, bool>::value;
 }
 @@ -1060,7 +1058,7 @@ struct simd_size<_Tp, __simd_abi<__kind, _Np>>
     : std::integral_constant<size_t, _Np> {
   static_assert(
       std::is_arithmetic<_Tp>::value &&
-          !std::is_same<typename std::remove_const<_Tp>::type, bool>::value,
+          !std::is_same<__remove_const_t<_Tp>, bool>::value,
       "Element type should be vectorizable");
 };
 @@ -1123,13 +1121,13 @@ struct __simd_cast_traits<simd<_Tp, _NewAbi>> {
 };
 template <class _Tp, class _Up, class _Abi>
-auto simd_cast(const simd<_Up, _Abi>& __v)
+_LIBCPP_HIDE_FROM_ABI auto simd_cast(const simd<_Up, _Abi>& __v)
     -> decltype(__simd_cast_traits<_Tp>::__apply(__v)) {
   return __simd_cast_traits<_Tp>::__apply(__v);
 }
 template <class _Tp, class _Up, class _Abi>
-auto static_simd_cast(const simd<_Up, _Abi>& __v)
+_LIBCPP_HIDE_FROM_ABI auto static_simd_cast(const simd<_Up, _Abi>& __v)
     -> decltype(__static_simd_cast_traits<_Tp>::__apply(__v)) {
   return __static_simd_cast_traits<_Tp>::__apply(__v);
 }
 @@ -1172,12 +1170,12 @@ array<_SimdType, simd_size<typename _SimdType::value_type, _Abi>::value /
 split(const simd_mask<typename _SimdType::value_type, _Abi>&);
 template <class _Tp, class... _Abis>
-simd<_Tp, abi_for_size_t<_Tp, __variadic_sum(simd_size<_Tp, _Abis>::value...)>>
+simd<_Tp, abi_for_size_t<_Tp, experimental::__variadic_sum(simd_size<_Tp, _Abis>::value...)>>
 concat(const simd<_Tp, _Abis>&...);
 template <class _Tp, class... _Abis>
 simd_mask<_Tp,
-          abi_for_size_t<_Tp, __variadic_sum(simd_size<_Tp, _Abis>::value...)>>
+          abi_for_size_t<_Tp, experimental::__variadic_sum(simd_size<_Tp, _Abis>::value...)>>
 concat(const simd_mask<_Tp, _Abis>&...);
 // reductions [simd.mask.reductions]
 @@ -1302,7 +1300,7 @@ class const_where_expression {
 public:
   const_where_expression(const const_where_expression&) = delete;
   const_where_expression& operator=(const const_where_expression&) = delete;
-  typename remove_const<_Tp>::type operator-() const&&;
+  __remove_const_t<_Tp> operator-() const&&;
   template <class _Up, class _Flags>
   void copy_to(_Up*, _Flags) const&&;
 };
 @@ -1369,8 +1367,8 @@ private:
             __is_non_narrowing_arithmetic_convertible<_Up, _Tp>()) ||
            (!std::is_arithmetic<_Up>::value &&
             std::is_convertible<_Up, _Tp>::value) ||
-           std::is_same<typename std::remove_const<_Up>::type, int>::value ||
+           std::is_same<__remove_const_t<_Up>, int>::value ||
-           (std::is_same<typename std::remove_const<_Up>::type,
+           (std::is_same<__remove_const_t<_Up>,
                          unsigned int>::value &&
             std::is_unsigned<_Tp>::value);
   }
 @@ -1381,7 +1379,7 @@ private:
           std::integral_constant<size_t, __indicies>())...),
       bool())
   __can_generate(std::index_sequence<__indicies...>) {
-    return !__variadic_sum<bool>(
+    return !experimental::__variadic_sum<bool>(
         !__can_broadcast<decltype(std::declval<_Generator>()(
             std::integral_constant<size_t, __indicies>()))>()...);
   }
 @@ -1579,4 +1577,9 @@ _LIBCPP_END_NAMESPACE_EXPERIMENTAL_SIMD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <functional>
+#endif
 #endif /* _LIBCPP_EXPERIMENTAL_SIMD */

lib/libcxx/include/experimental/string+12-4

 @@ -49,17 +49,25 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
 template <class _CharT, class _Traits = char_traits<_CharT>>
 using basic_string =
     _VSTD::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>;
-typedef basic_string<char> string;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("string") typedef basic_string<char> string;
-typedef basic_string<char16_t> u16string;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("u16string") typedef basic_string<char16_t> u16string;
-typedef basic_string<char32_t> u32string;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("u32string") typedef basic_string<char32_t> u32string;
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
-typedef basic_string<wchar_t> wstring;
+_LIBCPP_DEPCREATED_MEMORY_RESOURCE("wstring") typedef basic_string<wchar_t> wstring;
 #endif
+_LIBCPP_SUPPRESS_DEPRECATED_POP
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_STRING */

lib/libcxx/include/experimental/unordered_map+12-8

 @@ -45,20 +45,14 @@ namespace pmr {
 #include <experimental/memory_resource>
 #include <unordered_map>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <array>
-#  include <bit>
-#  include <functional>
-#  include <vector>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Key, class _Value,
           class _Hash = hash<_Key>, class _Pred = equal_to<_Key>>
 using unordered_map = _VSTD::unordered_map<_Key, _Value, _Hash, _Pred,
 @@ -69,6 +63,16 @@ template <class _Key, class _Value,
 using unordered_multimap = _VSTD::unordered_multimap<_Key, _Value, _Hash, _Pred,
                         polymorphic_allocator<pair<const _Key, _Value>>>;
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <array>
+#  include <bit>
+#  include <functional>
+#  include <vector>
+#endif
 #endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_MAP */

lib/libcxx/include/experimental/unordered_set+4

...	@@ -45,6 +45,8 @@ namespace pmr {	...	@@ -45,6 +45,8 @@ namespace pmr {
45		45
46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR	46	_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
47		47
		48	#ifndef _LIBCPP_CXX03_LANG
		49
48	template <class _Value,	50	template <class _Value,
49	class _Hash = hash<_Value>, class _Pred = equal_to<_Value>>	51	class _Hash = hash<_Value>, class _Pred = equal_to<_Value>>
50	using unordered_set = _VSTD::unordered_set<_Value, _Hash, _Pred,	52	using unordered_set = _VSTD::unordered_set<_Value, _Hash, _Pred,
...	@@ -55,6 +57,8 @@ template <class _Value,	...	@@ -55,6 +57,8 @@ template <class _Value,
55	using unordered_multiset = _VSTD::unordered_multiset<_Value, _Hash, _Pred,	57	using unordered_multiset = _VSTD::unordered_multiset<_Value, _Hash, _Pred,
56	polymorphic_allocator<_Value>>;	58	polymorphic_allocator<_Value>>;
57		59
		60	#endif // _LIBCPP_CXX03_LANG
		61
58	_LIBCPP_END_NAMESPACE_LFTS_PMR	62	_LIBCPP_END_NAMESPACE_LFTS_PMR
59		63
60	#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_SET */	64	#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_SET */

lib/libcxx/include/experimental/vector+4

 @@ -40,9 +40,13 @@ namespace pmr {
 _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
+#ifndef _LIBCPP_CXX03_LANG
 template <class _ValueT>
 using vector = _VSTD::vector<_ValueT, polymorphic_allocator<_ValueT>>;
+#endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_LFTS_PMR
 #endif /* _LIBCPP_EXPERIMENTAL_VECTOR */

lib/libcxx/include/ext/__hash+1

...	@@ -14,6 +14,7 @@	...	@@ -14,6 +14,7 @@
14		14
15	#include <__config>	15	#include <__config>
16	#include <cstring>	16	#include <cstring>
		17	#include <stddef.h>
17	#include <string>	18	#include <string>
18		19
19	namespace __gnu_cxx {	20	namespace __gnu_cxx {

lib/libcxx/include/ext/hash_map+11-11

lib/libcxx/include/ext/hash_set+7-6

...	@@ -199,10 +199,6 @@ template <class Value, class Hash, class Pred, class Alloc>	...	@@ -199,10 +199,6 @@ template <class Value, class Hash, class Pred, class Alloc>
199	#include <ext/__hash>	199	#include <ext/__hash>
200	#include <functional>	200	#include <functional>
201		201
202	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
203	# include <iterator>
204	#endif
205
206	#if defined(__DEPRECATED) && __DEPRECATED	202	#if defined(__DEPRECATED) && __DEPRECATED
207	#if defined(_LIBCPP_WARNING)	203	#if defined(_LIBCPP_WARNING)
208	_LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>")	204	_LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>")
...	@@ -412,7 +408,7 @@ swap(hash_set<_Value, _Hash, _Pred, _Alloc>& __x,	...	@@ -412,7 +408,7 @@ swap(hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
412	}	408	}
413		409
414	template <class _Value, class _Hash, class _Pred, class _Alloc>	410	template <class _Value, class _Hash, class _Pred, class _Alloc>
415	bool	411	_LIBCPP_HIDE_FROM_ABI bool
416	operator==(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,	412	operator==(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
417	const hash_set<_Value, _Hash, _Pred, _Alloc>& __y)	413	const hash_set<_Value, _Hash, _Pred, _Alloc>& __y)
418	{	414	{
...	@@ -633,7 +629,7 @@ swap(hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,	...	@@ -633,7 +629,7 @@ swap(hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
633	}	629	}
634		630
635	template <class _Value, class _Hash, class _Pred, class _Alloc>	631	template <class _Value, class _Hash, class _Pred, class _Alloc>
636	bool	632	_LIBCPP_HIDE_FROM_ABI bool
637	operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,	633	operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
638	const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __y)	634	const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
639	{	635	{
...	@@ -666,4 +662,9 @@ operator!=(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,	...	@@ -666,4 +662,9 @@ operator!=(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
666		662
667	} // namespace __gnu_cxx	663	} // namespace __gnu_cxx
668		664
		665	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		666	# include <concepts>
		667	# include <iterator>
		668	#endif
		669
669	#endif // _LIBCPP_HASH_SET	670	#endif // _LIBCPP_HASH_SET

lib/libcxx/include/fenv.h+3-1

...	@@ -56,7 +56,9 @@ int feupdateenv(const fenv_t* envp);	...	@@ -56,7 +56,9 @@ int feupdateenv(const fenv_t* envp);
56	# pragma GCC system_header	56	# pragma GCC system_header
57	#endif	57	#endif
58		58
59	#include_next <fenv.h>	59	#if __has_include_next(<fenv.h>)
		60	# include_next <fenv.h>
		61	#endif
60		62
61	#ifdef __cplusplus	63	#ifdef __cplusplus
62		64

lib/libcxx/include/filesystem+216-20

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP_FILESYSTEM	10	#ifndef _LIBCPP_FILESYSTEM
10	#define _LIBCPP_FILESYSTEM	11	#define _LIBCPP_FILESYSTEM
11		12
...	@@ -14,36 +15,223 @@	...	@@ -14,36 +15,223 @@
14		15
15	namespace std::filesystem {	16	namespace std::filesystem {
16		17
17	class path;	18	// `class path` from http://eel.is/c++draft/fs.class.path.general#6
		19	class path {
		20	public:
		21	using value_type = see below;
		22	using string_type = basic_string<value_type>;
		23	static constexpr value_type preferred_separator = see below;
		24
		25	enum format;
		26
		27	path() noexcept;
		28	path(const path& p);
		29	path(path&& p) noexcept;
		30	path(string_type&& source, format fmt = auto_format);
		31	template<class Source>
		32	path(const Source& source, format fmt = auto_format);
		33	template<class InputIterator>
		34	path(InputIterator first, InputIterator last, format fmt = auto_format);
		35	template<class Source>
		36	path(const Source& source, const locale& loc, format fmt = auto_format);
		37	template<class InputIterator>
		38	path(InputIterator first, InputIterator last, const locale& loc, format fmt = auto_format);
		39	~path();
		40
		41	path& operator=(const path& p);
		42	path& operator=(path&& p) noexcept;
		43	path& operator=(string_type&& source);
		44	path& assign(string_type&& source);
		45	template<class Source>
		46	path& operator=(const Source& source);
		47	template<class Source>
		48	path& assign(const Source& source);
		49	template<class InputIterator>
		50	path& assign(InputIterator first, InputIterator last);
		51
		52	path& operator/=(const path& p);
		53	template<class Source>
		54	path& operator/=(const Source& source);
		55	template<class Source>
		56	path& append(const Source& source);
		57	template<class InputIterator>
		58	path& append(InputIterator first, InputIterator last);
		59
		60	path& operator+=(const path& x);
		61	path& operator+=(const string_type& x);
		62	path& operator+=(basic_string_view<value_type> x);
		63	path& operator+=(const value_type* x);
		64	path& operator+=(value_type x);
		65	template<class Source>
		66	path& operator+=(const Source& x);
		67	template<class EcharT>
		68	path& operator+=(EcharT x);
		69	template<class Source>
		70	path& concat(const Source& x);
		71	template<class InputIterator>
		72	path& concat(InputIterator first, InputIterator last);
		73
		74	void clear() noexcept;
		75	path& make_preferred();
		76	path& remove_filename();
		77	path& replace_filename(const path& replacement);
		78	path& replace_extension(const path& replacement = path());
		79	void swap(path& rhs) noexcept;
		80
		81	friend bool operator==(const path& lhs, const path& rhs) noexcept;
		82	friend bool operator!=(const path& lhs, const path& rhs) noexcept; // removed in C++20
		83	friend bool operator< (const path& lhs, const path& rhs) noexcept; // removed in C++20
		84	friend bool operator<=(const path& lhs, const path& rhs) noexcept; // removed in C++20
		85	friend bool operator> (const path& lhs, const path& rhs) noexcept; // removed in C++20
		86	friend bool operator>=(const path& lhs, const path& rhs) noexcept; // removed in C++20
		87	friend strong_ordering operator<=>(const path& lhs, const path& rhs) noexcept; // C++20
		88
		89	friend path operator/(const path& lhs, const path& rhs);
		90
		91	const string_type& native() const noexcept;
		92	const value_type* c_str() const noexcept;
		93	operator string_type() const;
		94
		95	template<class EcharT, class traits = char_traits<EcharT>,
		96	class Allocator = allocator<EcharT>>
		97	basic_string<EcharT, traits, Allocator>
		98	string(const Allocator& a = Allocator()) const;
		99	std::string string() const;
		100	std::wstring wstring() const;
		101	std::u8string u8string() const;
		102	std::u16string u16string() const;
		103	std::u32string u32string() const;
		104
		105	template<class EcharT, class traits = char_traits<EcharT>,
		106	class Allocator = allocator<EcharT>>
		107	basic_string<EcharT, traits, Allocator>
		108	generic_string(const Allocator& a = Allocator()) const;
		109	std::string generic_string() const;
		110	std::wstring generic_wstring() const;
		111	std::u8string generic_u8string() const;
		112	std::u16string generic_u16string() const;
		113	std::u32string generic_u32string() const;
		114
		115	int compare(const path& p) const noexcept;
		116	int compare(const string_type& s) const;
		117	int compare(basic_string_view<value_type> s) const;
		118	int compare(const value_type* s) const;
		119
		120	path root_name() const;
		121	path root_directory() const;
		122	path root_path() const;
		123	path relative_path() const;
		124	path parent_path() const;
		125	path filename() const;
		126	path stem() const;
		127	path extension() const;
		128
		129	[[nodiscard]] bool empty() const noexcept;
		130	bool has_root_name() const;
		131	bool has_root_directory() const;
		132	bool has_root_path() const;
		133	bool has_relative_path() const;
		134	bool has_parent_path() const;
		135	bool has_filename() const;
		136	bool has_stem() const;
		137	bool has_extension() const;
		138	bool is_absolute() const;
		139	bool is_relative() const;
		140
		141	path lexically_normal() const;
		142	path lexically_relative(const path& base) const;
		143	path lexically_proximate(const path& base) const;
		144
		145	class iterator;
		146	using const_iterator = iterator;
		147
		148	iterator begin() const;
		149	iterator end() const;
		150
		151	template<class charT, class traits>
		152	friend basic_ostream<charT, traits>&
		153	operator<<(basic_ostream<charT, traits>& os, const path& p);
		154	template<class charT, class traits>
		155	friend basic_istream<charT, traits>&
		156	operator>>(basic_istream<charT, traits>& is, path& p);
		157	};
18		158
19	void swap(path& lhs, path& rhs) noexcept;	159	void swap(path& lhs, path& rhs) noexcept;
20	size_t hash_value(const path& p) noexcept;	160	size_t hash_value(const path& p) noexcept;
21		161
22	bool operator==(const path& lhs, const path& rhs) noexcept;
23	bool operator!=(const path& lhs, const path& rhs) noexcept;
24	bool operator< (const path& lhs, const path& rhs) noexcept;
25	bool operator<=(const path& lhs, const path& rhs) noexcept;
26	bool operator> (const path& lhs, const path& rhs) noexcept;
27	bool operator>=(const path& lhs, const path& rhs) noexcept;
28
29	path operator/ (const path& lhs, const path& rhs);
30
31	// fs.path.io operators are friends of path.
32	template <class charT, class traits>
33	friend basic_ostream<charT, traits>&
34	operator<<(basic_ostream<charT, traits>& os, const path& p);
35
36	template <class charT, class traits>
37	friend basic_istream<charT, traits>&
38	operator>>(basic_istream<charT, traits>& is, path& p);
39
40	template <class Source>	162	template <class Source>
41	path u8path(const Source& source);	163	path u8path(const Source& source);
42	template <class InputIterator>	164	template <class InputIterator>
43	path u8path(InputIterator first, InputIterator last);	165	path u8path(InputIterator first, InputIterator last);
44		166
45	class filesystem_error;	167	class filesystem_error;
46	class directory_entry;	168
		169	class directory_entry {
		170	public:
		171	directory_entry() noexcept = default;
		172	directory_entry(const directory_entry&) = default;
		173	directory_entry(directory_entry&&) noexcept = default;
		174	explicit directory_entry(const filesystem::path& p);
		175	directory_entry(const filesystem::path& p, error_code& ec);
		176	~directory_entry();
		177
		178	directory_entry& operator=(const directory_entry&) = default;
		179	directory_entry& operator=(directory_entry&&) noexcept = default;
		180
		181	void assign(const filesystem::path& p);
		182	void assign(const filesystem::path& p, error_code& ec);
		183	void replace_filename(const filesystem::path& p);
		184	void replace_filename(const filesystem::path& p, error_code& ec);
		185	void refresh();
		186	void refresh(error_code& ec) noexcept;
		187
		188	const filesystem::path& path() const noexcept;
		189	operator const filesystem::path&() const noexcept;
		190	bool exists() const;
		191	bool exists(error_code& ec) const noexcept;
		192	bool is_block_file() const;
		193	bool is_block_file(error_code& ec) const noexcept;
		194	bool is_character_file() const;
		195	bool is_character_file(error_code& ec) const noexcept;
		196	bool is_directory() const;
		197	bool is_directory(error_code& ec) const noexcept;
		198	bool is_fifo() const;
		199	bool is_fifo(error_code& ec) const noexcept;
		200	bool is_other() const;
		201	bool is_other(error_code& ec) const noexcept;
		202	bool is_regular_file() const;
		203	bool is_regular_file(error_code& ec) const noexcept;
		204	bool is_socket() const;
		205	bool is_socket(error_code& ec) const noexcept;
		206	bool is_symlink() const;
		207	bool is_symlink(error_code& ec) const noexcept;
		208	uintmax_t file_size() const;
		209	uintmax_t file_size(error_code& ec) const noexcept;
		210	uintmax_t hard_link_count() const;
		211	uintmax_t hard_link_count(error_code& ec) const noexcept;
		212	file_time_type last_write_time() const;
		213	file_time_type last_write_time(error_code& ec) const noexcept;
		214	file_status status() const;
		215	file_status status(error_code& ec) const noexcept;
		216	file_status symlink_status() const;
		217	file_status symlink_status(error_code& ec) const noexcept;
		218
		219	bool operator==(const directory_entry& rhs) const noexcept;
		220	bool operator!=(const directory_entry& rhs) const noexcept; // removed in C++20
		221	bool operator< (const directory_entry& rhs) const noexcept; // removed in C++20
		222	bool operator<=(const directory_entry& rhs) const noexcept; // removed in C++20
		223	bool operator> (const directory_entry& rhs) const noexcept; // removed in C++20
		224	bool operator>=(const directory_entry& rhs) const noexcept; // removed in C++20
		225	strong_ordering operator<=>(const directory_entry& rhs) const noexcept; // since C++20
		226
		227	template<class charT, class traits>
		228	friend basic_ostream<charT, traits>&
		229	operator<<(basic_ostream<charT, traits>& os, const directory_entry& d);
		230
		231	private:
		232	filesystem::path pathobject; // exposition only
		233	friend class directory_iterator; // exposition only
		234	};
47		235
48	class directory_iterator;	236	class directory_iterator;
49		237
...	@@ -64,6 +252,8 @@	...	@@ -64,6 +252,8 @@
64	uintmax_t capacity;	252	uintmax_t capacity;
65	uintmax_t free;	253	uintmax_t free;
66	uintmax_t available;	254	uintmax_t available;
		255
		256	friend bool operator==(const space_info&, const space_info&) = default; // C++20
67	};	257	};
68		258
69	enum class file_type;	259	enum class file_type;
...	@@ -260,6 +450,8 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct	...	@@ -260,6 +450,8 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
260	#include <version>	450	#include <version>
261		451
262	// standard-mandated includes	452	// standard-mandated includes
		453
		454	// [fs.filesystem.syn]
263	#include <compare>	455	#include <compare>
264		456
265	#if defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)	457	#if defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
...	@@ -270,4 +462,8 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct	...	@@ -270,4 +462,8 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
270	# pragma GCC system_header	462	# pragma GCC system_header
271	#endif	463	#endif
272		464
		465	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		466	# include <concepts>
		467	#endif
		468
273	#endif // _LIBCPP_FILESYSTEM	469	#endif // _LIBCPP_FILESYSTEM

lib/libcxx/include/float.h+3-1

...	@@ -76,7 +76,9 @@ Macros:	...	@@ -76,7 +76,9 @@ Macros:
76	# pragma GCC system_header	76	# pragma GCC system_header
77	#endif	77	#endif
78		78
79	#include_next <float.h>	79	#if __has_include_next(<float.h>)
		80	# include_next <float.h>
		81	#endif
80		82
81	#ifdef __cplusplus	83	#ifdef __cplusplus
82		84

lib/libcxx/include/format+39-636

...	@@ -112,6 +112,40 @@ namespace std {	...	@@ -112,6 +112,40 @@ namespace std {
112	using format_parse_context = basic_format_parse_context<char>;	112	using format_parse_context = basic_format_parse_context<char>;
113	using wformat_parse_context = basic_format_parse_context<wchar_t>;	113	using wformat_parse_context = basic_format_parse_context<wchar_t>;
114		114
		115	// [format.range], formatting of ranges
		116	// [format.range.fmtkind], variable template format_kind
		117	enum class range_format { // since C++23
		118	disabled,
		119	map,
		120	set,
		121	sequence,
		122	string,
		123	debug_string
		124	};
		125
		126	template<class R>
		127	constexpr unspecified format_kind = unspecified; // since C++23
		128
		129	template<ranges::input_range R>
		130	requires same_as<R, remove_cvref_t<R>>
		131	constexpr range_format format_kind<R> = see below; // since C++23
		132
		133	// [format.range.formatter], class template range_formatter
		134	template<class T, class charT = char>
		135	requires same_as<remove_cvref_t<T>, T> && formattable<T, charT>
		136	class range_formatter; // since C++23
		137
		138	// [format.range.fmtdef], class template range-default-formatter
		139	template<range_format K, ranges::input_range R, class charT>
		140	struct range-default-formatter; // exposition only, since C++23
		141
		142	// [format.range.fmtmap], [format.range.fmtset], [format.range.fmtstr],
		143	// specializations for maps, sets, and strings
		144	template<ranges::input_range R, class charT>
		145	requires (format_kind<R> != range_format::disabled) &&
		146	formattable<ranges::range_reference_t<R>, charT>
		147	struct formatter<R, charT> : range-default-formatter<format_kind<R>, R, charT> { }; // since C++23
		148
115	// [format.arguments], arguments	149	// [format.arguments], arguments
116	// [format.arg], class template basic_format_arg	150	// [format.arg], class template basic_format_arg
117	template<class Context> class basic_format_arg;	151	template<class Context> class basic_format_arg;
...	@@ -141,17 +175,17 @@ namespace std {	...	@@ -141,17 +175,17 @@ namespace std {
141	// Enable the contents of the header only when libc++ was built with experimental features enabled.	175	// Enable the contents of the header only when libc++ was built with experimental features enabled.
142	#if !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)	176	#if !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
143		177
144	#include <__algorithm/clamp.h>
145	#include <__config>	178	#include <__config>
146	#include <__debug>
147	#include <__format/buffer.h>	179	#include <__format/buffer.h>
148	#include <__format/concepts.h>	180	#include <__format/concepts.h>
		181	#include <__format/container_adaptor.h>
149	#include <__format/enable_insertable.h>	182	#include <__format/enable_insertable.h>
150	#include <__format/format_arg.h>	183	#include <__format/format_arg.h>
151	#include <__format/format_arg_store.h>	184	#include <__format/format_arg_store.h>
152	#include <__format/format_args.h>	185	#include <__format/format_args.h>
153	#include <__format/format_context.h>	186	#include <__format/format_context.h>
154	#include <__format/format_error.h>	187	#include <__format/format_error.h>
		188	#include <__format/format_functions.h>
155	#include <__format/format_fwd.h>	189	#include <__format/format_fwd.h>
156	#include <__format/format_parse_context.h>	190	#include <__format/format_parse_context.h>
157	#include <__format/format_string.h>	191	#include <__format/format_string.h>
...	@@ -163,647 +197,16 @@ namespace std {	...	@@ -163,647 +197,16 @@ namespace std {
163	#include <__format/formatter_integer.h>	197	#include <__format/formatter_integer.h>
164	#include <__format/formatter_pointer.h>	198	#include <__format/formatter_pointer.h>
165	#include <__format/formatter_string.h>	199	#include <__format/formatter_string.h>
		200	#include <__format/formatter_tuple.h>
166	#include <__format/parser_std_format_spec.h>	201	#include <__format/parser_std_format_spec.h>
		202	#include <__format/range_default_formatter.h>
		203	#include <__format/range_formatter.h>
167	#include <__format/unicode.h>	204	#include <__format/unicode.h>
168	#include <__iterator/back_insert_iterator.h>
169	#include <__iterator/incrementable_traits.h>
170	#include <__variant/monostate.h>
171	#include <array>
172	#include <concepts>
173	#include <string>
174	#include <string_view>
175	#include <type_traits>
176
177	#ifndef _LIBCPP_HAS_NO_LOCALIZATION
178	#include <locale>
179	#endif
180		205
181	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	206	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
182	# pragma GCC system_header	207	# pragma GCC system_header
183	#endif	208	#endif
184		209
185	_LIBCPP_BEGIN_NAMESPACE_STD
186
187	#if _LIBCPP_STD_VER > 17
188
189	// TODO FMT Move the implementation in this file to its own granular headers.
190
191	// TODO FMT Evaluate which templates should be external templates. This
192	// improves the efficiency of the header. However since the header is still
193	// under heavy development and not all classes are stable it makes no sense
194	// to do this optimization now.
195
196	using format_args = basic_format_args<format_context>;
197	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
198	using wformat_args = basic_format_args<wformat_context>;
199	#endif
200
201	template <class _Context = format_context, class... _Args>
202	_LIBCPP_HIDE_FROM_ABI __format_arg_store<_Context, _Args...> make_format_args(_Args&&... __args) {
203	return _VSTD::__format_arg_store<_Context, _Args...>(__args...);
204	}
205
206	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
207	template <class... _Args>
208	_LIBCPP_HIDE_FROM_ABI __format_arg_store<wformat_context, _Args...> make_wformat_args(_Args&&... __args) {
209	return _VSTD::__format_arg_store<wformat_context, _Args...>(__args...);
210	}
211	#endif
212
213	namespace __format {
214
215	/// Helper class parse and handle argument.
216	///
217	/// When parsing a handle which is not enabled the code is ill-formed.
218	/// This helper uses the parser of the appropriate formatter for the stored type.
219	template <class _CharT>
220	class _LIBCPP_TEMPLATE_VIS __compile_time_handle {
221	public:
222	_LIBCPP_HIDE_FROM_ABI
223	constexpr void __parse(basic_format_parse_context<_CharT>& __parse_ctx) const { __parse_(__parse_ctx); }
224
225	template <class _Tp>
226	_LIBCPP_HIDE_FROM_ABI constexpr void __enable() {
227	__parse_ = [](basic_format_parse_context<_CharT>& __parse_ctx) {
228	formatter<_Tp, _CharT> __f;
229	__parse_ctx.advance_to(__f.parse(__parse_ctx));
230	};
231	}
232
233	// Before calling __parse the proper handler needs to be set with __enable.
234	// The default handler isn't a core constant expression.
235	_LIBCPP_HIDE_FROM_ABI constexpr __compile_time_handle()
236	: __parse_([](basic_format_parse_context<_CharT>&) { __throw_format_error("Not a handle"); }) {}
237
238	private:
239	void (*__parse_)(basic_format_parse_context<_CharT>&);
240	};
241
242	// Dummy format_context only providing the parts used during constant
243	// validation of the basic_format_string.
244	template <class _CharT>
245	struct _LIBCPP_TEMPLATE_VIS __compile_time_basic_format_context {
246	public:
247	using char_type = _CharT;
248
249	_LIBCPP_HIDE_FROM_ABI constexpr explicit __compile_time_basic_format_context(
250	const __arg_t* __args, const __compile_time_handle<_CharT>* __handles, size_t __size)
251	: __args_(__args), __handles_(__handles), __size_(__size) {}
252
253	// During the compile-time validation nothing needs to be written.
254	// Therefore all operations of this iterator are a NOP.
255	struct iterator {
256	_LIBCPP_HIDE_FROM_ABI constexpr iterator& operator=(_CharT) { return *this; }
257	_LIBCPP_HIDE_FROM_ABI constexpr iterator& operator() { return this; }
258	_LIBCPP_HIDE_FROM_ABI constexpr iterator operator++(int) { return *this; }
259	};
260
261	_LIBCPP_HIDE_FROM_ABI constexpr __arg_t arg(size_t __id) const {
262	if (__id >= __size_)
263	__throw_format_error("Argument index out of bounds");
264	return __args_[__id];
265	}
266
267	_LIBCPP_HIDE_FROM_ABI constexpr const __compile_time_handle<_CharT>& __handle(size_t __id) const {
268	if (__id >= __size_)
269	__throw_format_error("Argument index out of bounds");
270	return __handles_[__id];
271	}
272
273	_LIBCPP_HIDE_FROM_ABI constexpr iterator out() { return {}; }
274	_LIBCPP_HIDE_FROM_ABI constexpr void advance_to(iterator) {}
275
276	private:
277	const __arg_t* __args_;
278	const __compile_time_handle<_CharT>* __handles_;
279	size_t __size_;
280	};
281
282	_LIBCPP_HIDE_FROM_ABI
283	constexpr void __compile_time_validate_integral(__arg_t __type) {
284	switch (__type) {
285	case __arg_t::__int:
286	case __arg_t::__long_long:
287	case __arg_t::__i128:
288	case __arg_t::__unsigned:
289	case __arg_t::__unsigned_long_long:
290	case __arg_t::__u128:
291	return;
292
293	default:
294	__throw_format_error("Argument isn't an integral type");
295	}
296	}
297
298	// _HasPrecision does the formatter have a precision?
299	template <class _CharT, class _Tp, bool _HasPrecision = false>
300	_LIBCPP_HIDE_FROM_ABI constexpr void
301	__compile_time_validate_argument(basic_format_parse_context<_CharT>& __parse_ctx,
302	__compile_time_basic_format_context<_CharT>& __ctx) {
303	formatter<_Tp, _CharT> __formatter;
304	__parse_ctx.advance_to(__formatter.parse(__parse_ctx));
305	// [format.string.std]/7
306	// ... If the corresponding formatting argument is not of integral type, or
307	// its value is negative for precision or non-positive for width, an
308	// exception of type format_error is thrown.
309	//
310	// Validate whether the arguments are integrals.
311	if constexpr (requires(formatter<_Tp, _CharT> __f) { __f.__width_needs_substitution(); }) {
312	// TODO FMT Remove this when parser v1 has been phased out.
313	if (__formatter.__width_needs_substitution())
314	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__width));
315
316	if constexpr (_HasPrecision)
317	if (__formatter.__precision_needs_substitution())
318	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__precision));
319	} else {
320	if (__formatter.__parser_.__width_as_arg_)
321	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__parser_.__width_));
322
323	if constexpr (_HasPrecision)
324	if (__formatter.__parser_.__precision_as_arg_)
325	__format::__compile_time_validate_integral(__ctx.arg(__formatter.__parser_.__precision_));
326	}
327	}
328
329	template <class _CharT>
330	_LIBCPP_HIDE_FROM_ABI constexpr void __compile_time_visit_format_arg(basic_format_parse_context<_CharT>& __parse_ctx,
331	__compile_time_basic_format_context<_CharT>& __ctx,
332	__arg_t __type) {
333	switch (__type) {
334	case __arg_t::__none:
335	__throw_format_error("Invalid argument");
336	case __arg_t::__boolean:
337	return __format::__compile_time_validate_argument<_CharT, bool>(__parse_ctx, __ctx);
338	case __arg_t::__char_type:
339	return __format::__compile_time_validate_argument<_CharT, _CharT>(__parse_ctx, __ctx);
340	case __arg_t::__int:
341	return __format::__compile_time_validate_argument<_CharT, int>(__parse_ctx, __ctx);
342	case __arg_t::__long_long:
343	return __format::__compile_time_validate_argument<_CharT, long long>(__parse_ctx, __ctx);
344	case __arg_t::__i128:
345	# ifndef _LIBCPP_HAS_NO_INT128
346	return __format::__compile_time_validate_argument<_CharT, __int128_t>(__parse_ctx, __ctx);
347	# else
348	__throw_format_error("Invalid argument");
349	# endif
350	return;
351	case __arg_t::__unsigned:
352	return __format::__compile_time_validate_argument<_CharT, unsigned>(__parse_ctx, __ctx);
353	case __arg_t::__unsigned_long_long:
354	return __format::__compile_time_validate_argument<_CharT, unsigned long long>(__parse_ctx, __ctx);
355	case __arg_t::__u128:
356	# ifndef _LIBCPP_HAS_NO_INT128
357	return __format::__compile_time_validate_argument<_CharT, __uint128_t>(__parse_ctx, __ctx);
358	# else
359	__throw_format_error("Invalid argument");
360	# endif
361	return;
362	case __arg_t::__float:
363	return __format::__compile_time_validate_argument<_CharT, float, true>(__parse_ctx, __ctx);
364	case __arg_t::__double:
365	return __format::__compile_time_validate_argument<_CharT, double, true>(__parse_ctx, __ctx);
366	case __arg_t::__long_double:
367	return __format::__compile_time_validate_argument<_CharT, long double, true>(__parse_ctx, __ctx);
368	case __arg_t::__const_char_type_ptr:
369	return __format::__compile_time_validate_argument<_CharT, const _CharT*, true>(__parse_ctx, __ctx);
370	case __arg_t::__string_view:
371	return __format::__compile_time_validate_argument<_CharT, basic_string_view<_CharT>, true>(__parse_ctx, __ctx);
372	case __arg_t::__ptr:
373	return __format::__compile_time_validate_argument<_CharT, const void*>(__parse_ctx, __ctx);
374	case __arg_t::__handle:
375	__throw_format_error("Handle should use __compile_time_validate_handle_argument");
376	}
377	__throw_format_error("Invalid argument");
378	}
379
380	template <class _CharT, class _ParseCtx, class _Ctx>
381	_LIBCPP_HIDE_FROM_ABI constexpr const _CharT*
382	__handle_replacement_field(const _CharT* __begin, const _CharT* __end,
383	_ParseCtx& __parse_ctx, _Ctx& __ctx) {
384	__format::__parse_number_result __r =
385	__format::__parse_arg_id(__begin, __end, __parse_ctx);
386
387	bool __parse = *__r.__ptr == _CharT(':');
388	switch (*__r.__ptr) {
389	case _CharT(':'):
390	// The arg-id has a format-specifier, advance the input to the format-spec.
391	__parse_ctx.advance_to(__r.__ptr + 1);
392	break;
393	case _CharT('}'):
394	// The arg-id has no format-specifier.
395	__parse_ctx.advance_to(__r.__ptr);
396	break;
397	default:
398	__throw_format_error(
399	"The replacement field arg-id should terminate at a ':' or '}'");
400	}
401
402	if constexpr (same_as<_Ctx, __compile_time_basic_format_context<_CharT>>) {
403	__arg_t __type = __ctx.arg(__r.__value);
404	if (__type == __arg_t::__handle)
405	__ctx.__handle(__r.__value).__parse(__parse_ctx);
406	else
407	__format::__compile_time_visit_format_arg(__parse_ctx, __ctx, __type);
408	} else
409	_VSTD::visit_format_arg(
410	[&](auto __arg) {
411	if constexpr (same_as<decltype(__arg), monostate>)
412	__throw_format_error("Argument index out of bounds");
413	else if constexpr (same_as<decltype(__arg), typename basic_format_arg<_Ctx>::handle>)
414	__arg.format(__parse_ctx, __ctx);
415	else {
416	formatter<decltype(__arg), _CharT> __formatter;
417	if (__parse)
418	__parse_ctx.advance_to(__formatter.parse(__parse_ctx));
419	__ctx.advance_to(__formatter.format(__arg, __ctx));
420	}
421	},
422	__ctx.arg(__r.__value));
423
424	__begin = __parse_ctx.begin();
425	if (__begin == __end \|\| *__begin != _CharT('}'))
426	__throw_format_error("The replacement field misses a terminating '}'");
427
428	return ++__begin;
429	}
430
431	template <class _ParseCtx, class _Ctx>
432	_LIBCPP_HIDE_FROM_ABI constexpr typename _Ctx::iterator
433	__vformat_to(_ParseCtx&& __parse_ctx, _Ctx&& __ctx) {
434	using _CharT = typename _ParseCtx::char_type;
435	static_assert(same_as<typename _Ctx::char_type, _CharT>);
436
437	const _CharT* __begin = __parse_ctx.begin();
438	const _CharT* __end = __parse_ctx.end();
439	typename _Ctx::iterator __out_it = __ctx.out();
440	while (__begin != __end) {
441	switch (*__begin) {
442	case _CharT('{'):
443	++__begin;
444	if (__begin == __end)
445	__throw_format_error("The format string terminates at a '{'");
446
447	if (*__begin != _CharT('{')) [[likely]] {
448	__ctx.advance_to(_VSTD::move(__out_it));
449	__begin =
450	__handle_replacement_field(__begin, __end, __parse_ctx, __ctx);
451	__out_it = __ctx.out();
452
453	// The output is written and __begin points to the next character. So
454	// start the next iteration.
455	continue;
456	}
457	// The string is an escape character.
458	break;
459
460	case _CharT('}'):
461	++__begin;
462	if (__begin == __end \|\| *__begin != _CharT('}'))
463	__throw_format_error(
464	"The format string contains an invalid escape sequence");
465
466	break;
467	}
468
469	// Copy the character to the output verbatim.
470	__out_it++ = __begin++;
471	}
472	return __out_it;
473	}
474
475	} // namespace __format
476
477	template <class _CharT, class... _Args>
478	struct _LIBCPP_TEMPLATE_VIS basic_format_string {
479	template <class _Tp>
480	requires convertible_to<const _Tp&, basic_string_view<_CharT>>
481	consteval basic_format_string(const _Tp& __str) : __str_{__str} {
482	__format::__vformat_to(basic_format_parse_context<_CharT>{__str_, sizeof...(_Args)},
483	_Context{__types_.data(), __handles_.data(), sizeof...(_Args)});
484	}
485
486	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT constexpr basic_string_view<_CharT> get() const noexcept {
487	return __str_;
488	}
489
490	private:
491	basic_string_view<_CharT> __str_;
492
493	using _Context = __format::__compile_time_basic_format_context<_CharT>;
494
495	static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{
496	__format::__determine_arg_t<_Context, remove_cvref_t<_Args>>()...};
497
498	// TODO FMT remove this work-around when the AIX ICE has been resolved.
499	# if defined(_AIX) && defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER < 1400
500	template <class _Tp>
501	static constexpr __format::__compile_time_handle<_CharT> __get_handle() {
502	__format::__compile_time_handle<_CharT> __handle;
503	if (__format::__determine_arg_t<_Context, _Tp>() == __format::__arg_t::__handle)
504	__handle.template __enable<_Tp>();
505
506	return __handle;
507	}
508
509	static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{
510	__get_handle<_Args>()...};
511	# else
512	static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{[] {
513	using _Tp = remove_cvref_t<_Args>;
514	__format::__compile_time_handle<_CharT> __handle;
515	if (__format::__determine_arg_t<_Context, _Tp>() == __format::__arg_t::__handle)
516	__handle.template __enable<_Tp>();
517
518	return __handle;
519	}()...};
520	# endif
521	};
522
523	template <class... _Args>
524	using format_string = basic_format_string<char, type_identity_t<_Args>...>;
525
526	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
527	template <class... _Args>
528	using wformat_string = basic_format_string<wchar_t, type_identity_t<_Args>...>;
529	#endif
530
531	template <class _OutIt, class _CharT, class _FormatOutIt>
532	requires(output_iterator<_OutIt, const _CharT&>) _LIBCPP_HIDE_FROM_ABI _OutIt
533	__vformat_to(
534	_OutIt __out_it, basic_string_view<_CharT> __fmt,
535	basic_format_args<basic_format_context<_FormatOutIt, _CharT>> __args) {
536	if constexpr (same_as<_OutIt, _FormatOutIt>)
537	return _VSTD::__format::__vformat_to(
538	basic_format_parse_context{__fmt, __args.__size()},
539	_VSTD::__format_context_create(_VSTD::move(__out_it), __args));
540	else {
541	__format::__format_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it)};
542	_VSTD::__format::__vformat_to(
543	basic_format_parse_context{__fmt, __args.__size()},
544	_VSTD::__format_context_create(__buffer.make_output_iterator(),
545	__args));
546	return _VSTD::move(__buffer).out();
547	}
548	}
549
550	// The function is _LIBCPP_ALWAYS_INLINE since the compiler is bad at inlining
551	// https://reviews.llvm.org/D110499#inline-1180704
552	// TODO FMT Evaluate whether we want to file a Clang bug report regarding this.
553	template <output_iterator<const char&> _OutIt>
554	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
555	vformat_to(_OutIt __out_it, string_view __fmt, format_args __args) {
556	return _VSTD::__vformat_to(_VSTD::move(__out_it), __fmt, __args);
557	}
558
559	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
560	template <output_iterator<const wchar_t&> _OutIt>
561	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
562	vformat_to(_OutIt __out_it, wstring_view __fmt, wformat_args __args) {
563	return _VSTD::__vformat_to(_VSTD::move(__out_it), __fmt, __args);
564	}
565	#endif
566
567	template <output_iterator<const char&> _OutIt, class... _Args>
568	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
569	format_to(_OutIt __out_it, format_string<_Args...> __fmt, _Args&&... __args) {
570	return _VSTD::vformat_to(_VSTD::move(__out_it), __fmt.get(),
571	_VSTD::make_format_args(__args...));
572	}
573
574	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
575	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
576	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
577	format_to(_OutIt __out_it, wformat_string<_Args...> __fmt, _Args&&... __args) {
578	return _VSTD::vformat_to(_VSTD::move(__out_it), __fmt.get(),
579	_VSTD::make_wformat_args(__args...));
580	}
581	#endif
582
583	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string
584	vformat(string_view __fmt, format_args __args) {
585	string __res;
586	_VSTD::vformat_to(_VSTD::back_inserter(__res), __fmt, __args);
587	return __res;
588	}
589
590	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
591	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
592	vformat(wstring_view __fmt, wformat_args __args) {
593	wstring __res;
594	_VSTD::vformat_to(_VSTD::back_inserter(__res), __fmt, __args);
595	return __res;
596	}
597	#endif
598
599	template <class... _Args>
600	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string format(format_string<_Args...> __fmt,
601	_Args&&... __args) {
602	return _VSTD::vformat(__fmt.get(), _VSTD::make_format_args(__args...));
603	}
604
605	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
606	template <class... _Args>
607	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
608	format(wformat_string<_Args...> __fmt, _Args&&... __args) {
609	return _VSTD::vformat(__fmt.get(), _VSTD::make_wformat_args(__args...));
610	}
611	#endif
612
613	template <class _Context, class _OutIt, class _CharT>
614	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> __vformat_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n,
615	basic_string_view<_CharT> __fmt,
616	basic_format_args<_Context> __args) {
617	__format::__format_to_n_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it), __n};
618	_VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
619	_VSTD::__format_context_create(__buffer.make_output_iterator(), __args));
620	return _VSTD::move(__buffer).result();
621	}
622
623	template <output_iterator<const char&> _OutIt, class... _Args>
624	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
625	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, format_string<_Args...> __fmt, _Args&&... __args) {
626	return _VSTD::__vformat_to_n<format_context>(_VSTD::move(__out_it), __n, __fmt.get(), _VSTD::make_format_args(__args...));
627	}
628
629	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
630	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
631	_LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
632	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, wformat_string<_Args...> __fmt,
633	_Args&&... __args) {
634	return _VSTD::__vformat_to_n<wformat_context>(_VSTD::move(__out_it), __n, __fmt.get(), _VSTD::make_wformat_args(__args...));
635	}
636	#endif
637
638	template <class _CharT>
639	_LIBCPP_HIDE_FROM_ABI size_t __vformatted_size(basic_string_view<_CharT> __fmt, auto __args) {
640	__format::__formatted_size_buffer<_CharT> __buffer;
641	_VSTD::__format::__vformat_to(basic_format_parse_context{__fmt, __args.__size()},
642	_VSTD::__format_context_create(__buffer.make_output_iterator(), __args));
643	return _VSTD::move(__buffer).result();
644	}
645
646	template <class... _Args>
647	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
648	formatted_size(format_string<_Args...> __fmt, _Args&&... __args) {
649	return _VSTD::__vformatted_size(__fmt.get(), basic_format_args{_VSTD::make_format_args(__args...)});
650	}
651
652	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
653	template <class... _Args>
654	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
655	formatted_size(wformat_string<_Args...> __fmt, _Args&&... __args) {
656	return _VSTD::__vformatted_size(__fmt.get(), basic_format_args{_VSTD::make_wformat_args(__args...)});
657	}
658	#endif
659
660	#ifndef _LIBCPP_HAS_NO_LOCALIZATION
661
662	template <class _OutIt, class _CharT, class _FormatOutIt>
663	requires(output_iterator<_OutIt, const _CharT&>) _LIBCPP_HIDE_FROM_ABI _OutIt
664	__vformat_to(
665	_OutIt __out_it, locale __loc, basic_string_view<_CharT> __fmt,
666	basic_format_args<basic_format_context<_FormatOutIt, _CharT>> __args) {
667	if constexpr (same_as<_OutIt, _FormatOutIt>)
668	return _VSTD::__format::__vformat_to(
669	basic_format_parse_context{__fmt, __args.__size()},
670	_VSTD::__format_context_create(_VSTD::move(__out_it), __args,
671	_VSTD::move(__loc)));
672	else {
673	__format::__format_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it)};
674	_VSTD::__format::__vformat_to(
675	basic_format_parse_context{__fmt, __args.__size()},
676	_VSTD::__format_context_create(__buffer.make_output_iterator(),
677	__args, _VSTD::move(__loc)));
678	return _VSTD::move(__buffer).out();
679	}
680	}
681
682	template <output_iterator<const char&> _OutIt>
683	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt vformat_to(
684	_OutIt __out_it, locale __loc, string_view __fmt, format_args __args) {
685	return _VSTD::__vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt,
686	__args);
687	}
688
689	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
690	template <output_iterator<const wchar_t&> _OutIt>
691	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt vformat_to(
692	_OutIt __out_it, locale __loc, wstring_view __fmt, wformat_args __args) {
693	return _VSTD::__vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt,
694	__args);
695	}
696	#endif
697
698	template <output_iterator<const char&> _OutIt, class... _Args>
699	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
700	format_to(_OutIt __out_it, locale __loc, format_string<_Args...> __fmt, _Args&&... __args) {
701	return _VSTD::vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt.get(),
702	_VSTD::make_format_args(__args...));
703	}
704
705	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
706	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
707	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT _OutIt
708	format_to(_OutIt __out_it, locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
709	return _VSTD::vformat_to(_VSTD::move(__out_it), _VSTD::move(__loc), __fmt.get(),
710	_VSTD::make_wformat_args(__args...));
711	}
712	#endif
713
714	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string
715	vformat(locale __loc, string_view __fmt, format_args __args) {
716	string __res;
717	_VSTD::vformat_to(_VSTD::back_inserter(__res), _VSTD::move(__loc), __fmt,
718	__args);
719	return __res;
720	}
721
722	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
723	_LIBCPP_ALWAYS_INLINE inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
724	vformat(locale __loc, wstring_view __fmt, wformat_args __args) {
725	wstring __res;
726	_VSTD::vformat_to(_VSTD::back_inserter(__res), _VSTD::move(__loc), __fmt,
727	__args);
728	return __res;
729	}
730	#endif
731
732	template <class... _Args>
733	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT string format(locale __loc,
734	format_string<_Args...> __fmt,
735	_Args&&... __args) {
736	return _VSTD::vformat(_VSTD::move(__loc), __fmt.get(),
737	_VSTD::make_format_args(__args...));
738	}
739
740	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
741	template <class... _Args>
742	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT wstring
743	format(locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
744	return _VSTD::vformat(_VSTD::move(__loc), __fmt.get(),
745	_VSTD::make_wformat_args(__args...));
746	}
747	#endif
748
749	template <class _Context, class _OutIt, class _CharT>
750	_LIBCPP_HIDE_FROM_ABI format_to_n_result<_OutIt> __vformat_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n,
751	locale __loc, basic_string_view<_CharT> __fmt,
752	basic_format_args<_Context> __args) {
753	__format::__format_to_n_buffer<_OutIt, _CharT> __buffer{_VSTD::move(__out_it), __n};
754	_VSTD::__format::__vformat_to(
755	basic_format_parse_context{__fmt, __args.__size()},
756	_VSTD::__format_context_create(__buffer.make_output_iterator(), __args, _VSTD::move(__loc)));
757	return _VSTD::move(__buffer).result();
758	}
759
760	template <output_iterator<const char&> _OutIt, class... _Args>
761	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
762	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, locale __loc, format_string<_Args...> __fmt,
763	_Args&&... __args) {
764	return _VSTD::__vformat_to_n<format_context>(_VSTD::move(__out_it), __n, _VSTD::move(__loc), __fmt.get(),
765	_VSTD::make_format_args(__args...));
766	}
767
768	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
769	template <output_iterator<const wchar_t&> _OutIt, class... _Args>
770	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT format_to_n_result<_OutIt>
771	format_to_n(_OutIt __out_it, iter_difference_t<_OutIt> __n, locale __loc, wformat_string<_Args...> __fmt,
772	_Args&&... __args) {
773	return _VSTD::__vformat_to_n<wformat_context>(_VSTD::move(__out_it), __n, _VSTD::move(__loc), __fmt.get(),
774	_VSTD::make_wformat_args(__args...));
775	}
776	#endif
777
778	template <class _CharT>
779	_LIBCPP_HIDE_FROM_ABI size_t __vformatted_size(locale __loc, basic_string_view<_CharT> __fmt, auto __args) {
780	__format::__formatted_size_buffer<_CharT> __buffer;
781	_VSTD::__format::__vformat_to(
782	basic_format_parse_context{__fmt, __args.__size()},
783	_VSTD::__format_context_create(__buffer.make_output_iterator(), __args, _VSTD::move(__loc)));
784	return _VSTD::move(__buffer).result();
785	}
786
787	template <class... _Args>
788	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
789	formatted_size(locale __loc, format_string<_Args...> __fmt, _Args&&... __args) {
790	return _VSTD::__vformatted_size(_VSTD::move(__loc), __fmt.get(), basic_format_args{_VSTD::make_format_args(__args...)});
791	}
792
793	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
794	template <class... _Args>
795	_LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_AVAILABILITY_FORMAT size_t
796	formatted_size(locale __loc, wformat_string<_Args...> __fmt, _Args&&... __args) {
797	return _VSTD::__vformatted_size(_VSTD::move(__loc), __fmt.get(), basic_format_args{_VSTD::make_wformat_args(__args...)});
798	}
799	#endif
800
801	#endif // _LIBCPP_HAS_NO_LOCALIZATION
802
803	#endif //_LIBCPP_STD_VER > 17
804
805	_LIBCPP_END_NAMESPACE_STD
806
807	#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)	210	#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT)
808		211
809	#endif // _LIBCPP_FORMAT	212	#endif // _LIBCPP_FORMAT

lib/libcxx/include/forward_list+51-38

 @@ -188,19 +188,22 @@ template <class T, class Allocator, class Predicate>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/move_iterator.h>
 #include <__iterator/next.h>
+#include <__memory/addressof.h>
+#include <__memory/allocator.h>
+#include <__memory/allocator_destructor.h>
+#include <__memory/allocator_traits.h>
+#include <__memory/compressed_pair.h>
+#include <__memory/pointer_traits.h>
 #include <__memory/swap_allocator.h>
+#include <__memory/unique_ptr.h>
+#include <__memory_resource/polymorphic_allocator.h>
+#include <__type_traits/is_allocator.h>
 #include <__utility/forward.h>
+#include <__utility/move.h>
 #include <limits>
-#include <memory>
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <functional>
-#  include <iterator>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -239,30 +242,23 @@ struct __forward_list_node_value_type<__forward_list_node<_Tp, _VoidPtr> > {
 template <class _NodePtr>
 struct __forward_node_traits {
-  typedef typename remove_cv<
+  typedef __remove_cv_t<
-        typename pointer_traits<_NodePtr>::element_type>::type  __node;
+        typename pointer_traits<_NodePtr>::element_type>        __node;
   typedef typename __forward_list_node_value_type<__node>::type __node_value_type;
   typedef _NodePtr                                              __node_pointer;
   typedef __forward_begin_node<_NodePtr>                        __begin_node;
-  typedef typename __rebind_pointer<_NodePtr, __begin_node>::type
+  typedef __rebind_pointer_t<_NodePtr, __begin_node>            __begin_node_pointer;
-                                                                __begin_node_pointer;
+  typedef __rebind_pointer_t<_NodePtr, void>                    __void_pointer;
-  typedef typename __rebind_pointer<_NodePtr, void>::type       __void_pointer;
 #if defined(_LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB)
   typedef __begin_node_pointer __iter_node_pointer;
 #else
-  typedef typename conditional<
+  typedef __conditional_t<is_pointer<__void_pointer>::value, __begin_node_pointer, __node_pointer>
-          is_pointer<__void_pointer>::value,
+      __iter_node_pointer;
-          __begin_node_pointer,
-          __node_pointer
-    >::type __iter_node_pointer;
 #endif
-  typedef typename conditional<
+  typedef __conditional_t<is_same<__iter_node_pointer, __node_pointer>::value, __begin_node_pointer, __node_pointer>
-          is_same<__iter_node_pointer, __node_pointer>::value,
+      __non_iter_node_pointer;
-          __begin_node_pointer,
-          __node_pointer
-    >::type __non_iter_node_pointer;
   _LIBCPP_INLINE_VISIBILITY
   static __iter_node_pointer __as_iter_node(__iter_node_pointer __p) {
 @@ -278,7 +274,7 @@ template <class _NodePtr>
 struct __forward_begin_node
 {
     typedef _NodePtr pointer;
-    typedef typename __rebind_pointer<_NodePtr, __forward_begin_node>::type __begin_node_pointer;
+    typedef __rebind_pointer_t<_NodePtr, __forward_begin_node> __begin_node_pointer;
     pointer __next_;
 @@ -291,16 +287,11 @@ struct __forward_begin_node
 };
 template <class _Tp, class _VoidPtr>
-struct _LIBCPP_HIDDEN __begin_node_of
+using __begin_node_of = __forward_begin_node<__rebind_pointer_t<_VoidPtr, __forward_list_node<_Tp, _VoidPtr> > >;
-{
-    typedef __forward_begin_node<
-        typename __rebind_pointer<_VoidPtr, __forward_list_node<_Tp, _VoidPtr> >::type
-    > type;
-};
 template <class _Tp, class _VoidPtr>
 struct _LIBCPP_STANDALONE_DEBUG __forward_list_node
-    : public __begin_node_of<_Tp, _VoidPtr>::type
+    : public __begin_node_of<_Tp, _VoidPtr>
 {
     typedef _Tp value_type;
 @@ -353,7 +344,7 @@ public:
     typedef value_type&                                       reference;
     typedef typename pointer_traits<__node_pointer>::difference_type
                                                               difference_type;
-    typedef typename __rebind_pointer<__node_pointer, value_type>::type pointer;
+    typedef __rebind_pointer_t<__node_pointer, value_type> pointer;
     _LIBCPP_INLINE_VISIBILITY
     __forward_list_iterator() _NOEXCEPT : __ptr_(nullptr) {}
 @@ -434,7 +425,7 @@ public:
     typedef const value_type&                                 reference;
     typedef typename pointer_traits<__node_pointer>::difference_type
                                                               difference_type;
-    typedef typename __rebind_pointer<__node_pointer, const value_type>::type
+    typedef __rebind_pointer_t<__node_pointer, const value_type>
                                                               pointer;
     _LIBCPP_INLINE_VISIBILITY
 @@ -482,14 +473,12 @@ protected:
     typedef typename allocator_traits<allocator_type>::void_pointer  void_pointer;
     typedef __forward_list_node<value_type, void_pointer>            __node;
-    typedef typename __begin_node_of<value_type, void_pointer>::type __begin_node;
+    typedef __begin_node_of<value_type, void_pointer>                __begin_node;
-    typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>, __node>::type __node_allocator;
+    typedef __rebind_alloc<allocator_traits<allocator_type>, __node> __node_allocator;
     typedef allocator_traits<__node_allocator>        __node_traits;
     typedef typename __node_traits::pointer           __node_pointer;
-    typedef typename __rebind_alloc_helper<
+    typedef __rebind_alloc<allocator_traits<allocator_type>, __begin_node> __begin_node_allocator;
-        allocator_traits<allocator_type>, __begin_node
-    >::type                                           __begin_node_allocator;
     typedef typename allocator_traits<__begin_node_allocator>::pointer
                                                       __begin_node_pointer;
 @@ -497,6 +486,10 @@ protected:
                   "internal allocator type must differ from user-specified "
                   "type; otherwise overload resolution breaks");
+    static_assert(is_same<allocator_type, __rebind_alloc<__node_traits, value_type> >::value,
+                  "[allocator.requirements] states that rebinding an allocator to the same type should result in the "
+                  "original allocator");
     __compressed_pair<__begin_node, __node_allocator> __before_begin_;
     _LIBCPP_INLINE_VISIBILITY
 @@ -852,7 +845,7 @@ public:
     __remove_return_type remove(const value_type& __v);
     template <class _Predicate> __remove_return_type remove_if(_Predicate __pred);
     _LIBCPP_INLINE_VISIBILITY
-    __remove_return_type unique() {return unique(__equal_to<value_type>());}
+    __remove_return_type unique() { return unique(__equal_to()); }
     template <class _BinaryPredicate> __remove_return_type unique(_BinaryPredicate __binary_pred);
 #ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
 @@ -1702,6 +1695,7 @@ forward_list<_Tp, _Alloc>::reverse() _NOEXCEPT
 }
 template <class _Tp, class _Alloc>
+_LIBCPP_HIDE_FROM_ABI
 bool operator==(const forward_list<_Tp, _Alloc>& __x,
                 const forward_list<_Tp, _Alloc>& __y)
 {
 @@ -1785,6 +1779,25 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_END_NAMESPACE_STD
+#if _LIBCPP_STD_VER > 14
+_LIBCPP_BEGIN_NAMESPACE_STD
+namespace pmr {
+template <class _ValueT>
+using forward_list = std::forward_list<_ValueT, polymorphic_allocator<_ValueT>>;
+} // namespace pmr
+_LIBCPP_END_NAMESPACE_STD
+#endif
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <atomic>
+#  include <concepts>
+#  include <functional>
+#  include <iosfwd>
+#  include <iterator>
+#  include <typeinfo>
+#endif
 #endif // _LIBCPP_FORWARD_LIST

lib/libcxx/include/fstream+40-23

...	@@ -192,6 +192,7 @@ typedef basic_fstream<wchar_t> wfstream;	...	@@ -192,6 +192,7 @@ typedef basic_fstream<wchar_t> wfstream;
192	#include <cstring>	192	#include <cstring>
193	#include <istream>	193	#include <istream>
194	#include <ostream>	194	#include <ostream>
		195	#include <typeinfo>
195	#include <version>	196	#include <version>
196		197
197	#if !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)	198	#if !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
...	@@ -209,6 +210,8 @@ _LIBCPP_PUSH_MACROS	...	@@ -209,6 +210,8 @@ _LIBCPP_PUSH_MACROS
209	# define _LIBCPP_HAS_NO_OFF_T_FUNCTIONS	210	# define _LIBCPP_HAS_NO_OFF_T_FUNCTIONS
210	#endif	211	#endif
211		212
		213	#if !defined(_LIBCPP_HAS_NO_FSTREAM)
		214
212	_LIBCPP_BEGIN_NAMESPACE_STD	215	_LIBCPP_BEGIN_NAMESPACE_STD
213		216
214	template <class _CharT, class _Traits>	217	template <class _CharT, class _Traits>
...	@@ -226,7 +229,7 @@ public:	...	@@ -226,7 +229,7 @@ public:
226	// 27.9.1.2 Constructors/destructor:	229	// 27.9.1.2 Constructors/destructor:
227	basic_filebuf();	230	basic_filebuf();
228	basic_filebuf(basic_filebuf&& __rhs);	231	basic_filebuf(basic_filebuf&& __rhs);
229	virtual ~basic_filebuf();	232	~basic_filebuf() override;
230		233
231	// 27.9.1.3 Assign/swap:	234	// 27.9.1.3 Assign/swap:
232	_LIBCPP_INLINE_VISIBILITY	235	_LIBCPP_INLINE_VISIBILITY
...	@@ -259,16 +262,16 @@ public:	...	@@ -259,16 +262,16 @@ public:
259		262
260	protected:	263	protected:
261	// 27.9.1.5 Overridden virtual functions:	264	// 27.9.1.5 Overridden virtual functions:
262	virtual int_type underflow();	265	int_type underflow() override;
263	virtual int_type pbackfail(int_type __c = traits_type::eof());	266	int_type pbackfail(int_type __c = traits_type::eof()) override;
264	virtual int_type overflow (int_type __c = traits_type::eof());	267	int_type overflow (int_type __c = traits_type::eof()) override;
265	virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* __s, streamsize __n);	268	basic_streambuf<char_type, traits_type>* setbuf(char_type* __s, streamsize __n) override;
266	virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,	269	pos_type seekoff(off_type __off, ios_base::seekdir __way,
267	ios_base::openmode __wch = ios_base::in \| ios_base::out);	270	ios_base::openmode __wch = ios_base::in \| ios_base::out) override;
268	virtual pos_type seekpos(pos_type __sp,	271	pos_type seekpos(pos_type __sp,
269	ios_base::openmode __wch = ios_base::in \| ios_base::out);	272	ios_base::openmode __wch = ios_base::in \| ios_base::out) override;
270	virtual int sync();	273	int sync() override;
271	virtual void imbue(const locale& __loc);	274	void imbue(const locale& __loc) override;
272		275
273	private:	276	private:
274	char* __extbuf_;	277	char* __extbuf_;
...	@@ -310,9 +313,9 @@ basic_filebuf<_CharT, _Traits>::basic_filebuf()	...	@@ -310,9 +313,9 @@ basic_filebuf<_CharT, _Traits>::basic_filebuf()
310	__owns_ib_(false),	313	__owns_ib_(false),
311	__always_noconv_(false)	314	__always_noconv_(false)
312	{	315	{
313	if (has_facet<codecvt<char_type, char, state_type> >(this->getloc()))	316	if (std::has_facet<codecvt<char_type, char, state_type> >(this->getloc()))
314	{	317	{
315	__cv_ = &use_facet<codecvt<char_type, char, state_type> >(this->getloc());	318	__cv_ = &std::use_facet<codecvt<char_type, char, state_type> >(this->getloc());
316	__always_noconv_ = __cv_->always_noconv();	319	__always_noconv_ = __cv_->always_noconv();
317	}	320	}
318	setbuf(nullptr, 4096);	321	setbuf(nullptr, 4096);
...	@@ -731,7 +734,7 @@ basic_filebuf<_CharT, _Traits>::underflow()	...	@@ -731,7 +734,7 @@ basic_filebuf<_CharT, _Traits>::underflow()
731	char_type __1buf;	734	char_type __1buf;
732	if (this->gptr() == nullptr)	735	if (this->gptr() == nullptr)
733	this->setg(&__1buf, &__1buf+1, &__1buf+1);	736	this->setg(&__1buf, &__1buf+1, &__1buf+1);
734	const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);	737	const size_t __unget_sz = __initial ? 0 : std::min<size_t>((this->egptr() - this->eback()) / 2, 4);
735	int_type __c = traits_type::eof();	738	int_type __c = traits_type::eof();
736	if (this->gptr() == this->egptr())	739	if (this->gptr() == this->egptr())
737	{	740	{
...	@@ -739,7 +742,7 @@ basic_filebuf<_CharT, _Traits>::underflow()	...	@@ -739,7 +742,7 @@ basic_filebuf<_CharT, _Traits>::underflow()
739	if (__always_noconv_)	742	if (__always_noconv_)
740	{	743	{
741	size_t __nmemb = static_cast<size_t>(this->egptr() - this->eback() - __unget_sz);	744	size_t __nmemb = static_cast<size_t>(this->egptr() - this->eback() - __unget_sz);
742	__nmemb = fread(this->eback() + __unget_sz, 1, __nmemb, __file_);	745	__nmemb = ::fread(this->eback() + __unget_sz, 1, __nmemb, __file_);
743	if (__nmemb != 0)	746	if (__nmemb != 0)
744	{	747	{
745	this->setg(this->eback(),	748	this->setg(this->eback(),
...	@@ -750,9 +753,11 @@ basic_filebuf<_CharT, _Traits>::underflow()	...	@@ -750,9 +753,11 @@ basic_filebuf<_CharT, _Traits>::underflow()
750	}	753	}
751	else	754	else
752	{	755	{
753	_LIBCPP_ASSERT ( !(__extbufnext_ == NULL && (__extbufend_ != __extbufnext_)), "underflow moving from NULL" );	756	if (__extbufend_ != __extbufnext_) {
754	if (__extbufend_ != __extbufnext_)	757	_LIBCPP_ASSERT(__extbufnext_ != nullptr, "underflow moving from nullptr");
		758	_LIBCPP_ASSERT(__extbuf_ != nullptr, "underflow moving into nullptr");
755	_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);	759	_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
		760	}
756	__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);	761	__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
757	__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);	762	__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
758	size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz),	763	size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz),
...	@@ -835,7 +840,7 @@ basic_filebuf<_CharT, _Traits>::overflow(int_type __c)	...	@@ -835,7 +840,7 @@ basic_filebuf<_CharT, _Traits>::overflow(int_type __c)
835	if (__always_noconv_)	840	if (__always_noconv_)
836	{	841	{
837	size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());	842	size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
838	if (fwrite(this->pbase(), sizeof(char_type), __nmemb, __file_) != __nmemb)	843	if (std::fwrite(this->pbase(), sizeof(char_type), __nmemb, __file_) != __nmemb)
839	return traits_type::eof();	844	return traits_type::eof();
840	}	845	}
841	else	846	else
...	@@ -855,7 +860,7 @@ basic_filebuf<_CharT, _Traits>::overflow(int_type __c)	...	@@ -855,7 +860,7 @@ basic_filebuf<_CharT, _Traits>::overflow(int_type __c)
855	if (__r == codecvt_base::noconv)	860	if (__r == codecvt_base::noconv)
856	{	861	{
857	size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());	862	size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
858	if (fwrite(this->pbase(), 1, __nmemb, __file_) != __nmemb)	863	if (std::fwrite(this->pbase(), 1, __nmemb, __file_) != __nmemb)
859	return traits_type::eof();	864	return traits_type::eof();
860	}	865	}
861	else if (__r == codecvt_base::ok \|\| __r == codecvt_base::partial)	866	else if (__r == codecvt_base::ok \|\| __r == codecvt_base::partial)
...	@@ -963,7 +968,7 @@ basic_filebuf<_CharT, _Traits>::seekoff(off_type __off, ios_base::seekdir __way,	...	@@ -963,7 +968,7 @@ basic_filebuf<_CharT, _Traits>::seekoff(off_type __off, ios_base::seekdir __way,
963	return pos_type(off_type(-1));	968	return pos_type(off_type(-1));
964	pos_type __r = ftell(__file_);	969	pos_type __r = ftell(__file_);
965	#else	970	#else
966	if (fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))	971	if (::fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))
967	return pos_type(off_type(-1));	972	return pos_type(off_type(-1));
968	pos_type __r = ftello(__file_);	973	pos_type __r = ftello(__file_);
969	#endif	974	#endif
...	@@ -981,7 +986,7 @@ basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode)	...	@@ -981,7 +986,7 @@ basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode)
981	if (fseek(__file_, __sp, SEEK_SET))	986	if (fseek(__file_, __sp, SEEK_SET))
982	return pos_type(off_type(-1));	987	return pos_type(off_type(-1));
983	#else	988	#else
984	if (fseeko(__file_, __sp, SEEK_SET))	989	if (::fseeko(__file_, __sp, SEEK_SET))
985	return pos_type(off_type(-1));	990	return pos_type(off_type(-1));
986	#endif	991	#endif
987	__st_ = __sp.state();	992	__st_ = __sp.state();
...	@@ -1045,7 +1050,7 @@ basic_filebuf<_CharT, _Traits>::sync()	...	@@ -1045,7 +1050,7 @@ basic_filebuf<_CharT, _Traits>::sync()
1045	if (fseek(__file_, -__c, SEEK_CUR))	1050	if (fseek(__file_, -__c, SEEK_CUR))
1046	return -1;	1051	return -1;
1047	#else	1052	#else
1048	if (fseeko(__file_, -__c, SEEK_CUR))	1053	if (::fseeko(__file_, -__c, SEEK_CUR))
1049	return -1;	1054	return -1;
1050	#endif	1055	#endif
1051	if (__update_st)	1056	if (__update_st)
...	@@ -1062,7 +1067,7 @@ void	...	@@ -1062,7 +1067,7 @@ void
1062	basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc)	1067	basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc)
1063	{	1068	{
1064	sync();	1069	sync();
1065	__cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);	1070	__cv_ = &std::use_facet<codecvt<char_type, char, state_type> >(__loc);
1066	bool __old_anc = __always_noconv_;	1071	bool __old_anc = __always_noconv_;
1067	__always_noconv_ = __cv_->always_noconv();	1072	__always_noconv_ = __cv_->always_noconv();
1068	if (__old_anc != __always_noconv_)	1073	if (__old_anc != __always_noconv_)
...	@@ -1741,6 +1746,18 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_filebuf<char>;	...	@@ -1741,6 +1746,18 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_filebuf<char>;
1741		1746
1742	_LIBCPP_END_NAMESPACE_STD	1747	_LIBCPP_END_NAMESPACE_STD
1743		1748
		1749	#endif // _LIBCPP_HAS_NO_FSTREAM
		1750
1744	_LIBCPP_POP_MACROS	1751	_LIBCPP_POP_MACROS
1745		1752
		1753	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		1754	# include <atomic>
		1755	# include <concepts>
		1756	# include <iosfwd>
		1757	# include <limits>
		1758	# include <new>
		1759	# include <stdexcept>
		1760	# include <type_traits>
		1761	#endif
		1762
1746	#endif // _LIBCPP_FSTREAM	1763	#endif // _LIBCPP_FSTREAM

lib/libcxx/include/functional+7-7

 @@ -531,20 +531,20 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #include <__functional/unary_negate.h>
 #include <__functional/unwrap_ref.h>
 #include <__utility/forward.h>
-#include <concepts>
 #include <exception>
-#include <memory>
+#include <memory> // TODO: find out why removing this breaks the modules build
-#include <tuple>
 #include <type_traits>
 #include <typeinfo>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <utility>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <tuple>
+#  include <utility>
+#endif
 #endif // _LIBCPP_FUNCTIONAL

lib/libcxx/include/future+44-26

 @@ -367,21 +367,19 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
 #include <__chrono/time_point.h>
 #include <__config>
 #include <__memory/allocator_arg_t.h>
+#include <__memory/allocator_destructor.h>
 #include <__memory/uses_allocator.h>
+#include <__type_traits/strip_signature.h>
 #include <__utility/auto_cast.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <exception>
-#include <memory>
 #include <mutex>
+#include <new>
 #include <system_error>
 #include <thread>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <chrono>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -518,7 +516,7 @@ public:
     const error_code& code() const _NOEXCEPT {return __ec_;}
     future_error(const future_error&) _NOEXCEPT = default;
-    virtual ~future_error() _NOEXCEPT;
+    ~future_error() _NOEXCEPT override;
 };
 _LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
 @@ -544,7 +542,7 @@ protected:
     mutable condition_variable __cv_;
     unsigned __state_;
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
     void __sub_wait(unique_lock<mutex>& __lk);
 public:
     enum
 @@ -627,11 +625,13 @@ class _LIBCPP_AVAILABILITY_FUTURE _LIBCPP_HIDDEN __assoc_state
     : public __assoc_sub_state
 {
     typedef __assoc_sub_state base;
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
     typedef typename aligned_storage<sizeof(_Rp), alignment_of<_Rp>::value>::type _Up;
+_LIBCPP_SUPPRESS_DEPRECATED_POP
 protected:
     _Up __value_;
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
 public:
     template <class _Arg>
 @@ -641,7 +641,7 @@ public:
     void set_value_at_thread_exit(_Arg&& __arg);
     _Rp move();
-    typename add_lvalue_reference<_Rp>::type copy();
+    __add_lvalue_reference_t<_Rp> copy();
 };
 template <class _Rp>
 @@ -687,18 +687,18 @@ __assoc_state<_Rp>::move()
     unique_lock<mutex> __lk(this->__mut_);
     this->__sub_wait(__lk);
     if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
+        std::rethrow_exception(this->__exception_);
     return _VSTD::move(*reinterpret_cast<_Rp*>(&__value_));
 }
 template <class _Rp>
-typename add_lvalue_reference<_Rp>::type
+__add_lvalue_reference_t<_Rp>
 __assoc_state<_Rp>::copy()
 {
     unique_lock<mutex> __lk(this->__mut_);
     this->__sub_wait(__lk);
     if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
+        std::rethrow_exception(this->__exception_);
     return *reinterpret_cast<_Rp*>(&__value_);
 }
 @@ -711,7 +711,7 @@ class _LIBCPP_AVAILABILITY_FUTURE __assoc_state<_Rp&>
 protected:
     _Up __value_;
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
 public:
     void set_value(_Rp& __arg);
 @@ -758,7 +758,7 @@ __assoc_state<_Rp&>::copy()
     unique_lock<mutex> __lk(this->__mut_);
     this->__sub_wait(__lk);
     if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
+        std::rethrow_exception(this->__exception_);
     return *__value_;
 }
 @@ -823,7 +823,7 @@ class _LIBCPP_AVAILABILITY_FUTURE __assoc_sub_state_alloc
     typedef __assoc_sub_state base;
     _Alloc __alloc_;
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
 public:
     _LIBCPP_INLINE_VISIBILITY
     explicit __assoc_sub_state_alloc(const _Alloc& __a)
 @@ -895,7 +895,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     explicit __deferred_assoc_state(_Fp&& __f);
-    virtual void __execute();
+    void __execute() override;
 };
 template <class _Fp>
 @@ -982,12 +982,12 @@ class _LIBCPP_AVAILABILITY_FUTURE __async_assoc_state<void, _Fp>
     _Fp __func_;
-    virtual void __on_zero_shared() _NOEXCEPT;
+    void __on_zero_shared() _NOEXCEPT override;
 public:
     _LIBCPP_INLINE_VISIBILITY
     explicit __async_assoc_state(_Fp&& __f);
-    virtual void __execute();
+    void __execute() override;
 };
 template <class _Fp>
 @@ -1628,7 +1628,7 @@ class _LIBCPP_AVAILABILITY_FUTURE __packaged_task_base<_Rp(_ArgTypes...)>
 public:
     _LIBCPP_INLINE_VISIBILITY
     __packaged_task_base() {}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     virtual ~__packaged_task_base() {}
     virtual void __move_to(__packaged_task_base*) _NOEXCEPT = 0;
     virtual void destroy() = 0;
 @@ -1704,7 +1704,9 @@ class _LIBCPP_AVAILABILITY_FUTURE __packaged_task_function<_Rp(_ArgTypes...)>
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_NO_CFI
     __base* __get_buf() { return (__base*)&__buf_; }
+    _LIBCPP_SUPPRESS_DEPRECATED_PUSH
     typename aligned_storage<3*sizeof(void*)>::type __buf_;
+    _LIBCPP_SUPPRESS_DEPRECATED_POP
     __base* __f_;
 public:
 @@ -1754,7 +1756,7 @@ template <class _Fp>
 __packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(_Fp&& __f)
     : __f_(nullptr)
 {
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
+    typedef __libcpp_remove_reference_t<typename decay<_Fp>::type> _FR;
     typedef __packaged_task_func<_FR, allocator<_FR>, _Rp(_ArgTypes...)> _FF;
     if (sizeof(_FF) <= sizeof(__buf_))
     {
 @@ -1778,7 +1780,7 @@ __packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(
                                   allocator_arg_t, const _Alloc& __a0, _Fp&& __f)
     : __f_(nullptr)
 {
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
+    typedef __libcpp_remove_reference_t<typename decay<_Fp>::type> _FR;
     typedef __packaged_task_func<_FR, _Alloc, _Rp(_ArgTypes...)> _FF;
     if (sizeof(_FF) <= sizeof(__buf_))
     {
 @@ -1837,7 +1839,9 @@ __packaged_task_function<_Rp(_ArgTypes...)>::swap(__packaged_task_function& __f)
 {
     if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
     {
+        _LIBCPP_SUPPRESS_DEPRECATED_PUSH
         typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
+        _LIBCPP_SUPPRESS_DEPRECATED_POP
         __base* __t = (__base*)&__tempbuf;
         __f_->__move_to(__t);
         __f_->destroy();
 @@ -1891,11 +1895,11 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     packaged_task() _NOEXCEPT : __p_(nullptr) {}
     template <class _Fp,
-              class = __enable_if_t<!is_same<__uncvref_t<_Fp>, packaged_task>::value> >
+              class = __enable_if_t<!is_same<__remove_cvref_t<_Fp>, packaged_task>::value> >
         _LIBCPP_INLINE_VISIBILITY
         explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
     template <class _Fp, class _Allocator,
-              class = __enable_if_t<!is_same<__uncvref_t<_Fp>, packaged_task>::value> >
+              class = __enable_if_t<!is_same<__remove_cvref_t<_Fp>, packaged_task>::value> >
         _LIBCPP_INLINE_VISIBILITY
         packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
              : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
 @@ -2006,11 +2010,11 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     packaged_task() _NOEXCEPT : __p_(nullptr) {}
     template <class _Fp,
-              class = __enable_if_t<!is_same<__uncvref_t<_Fp>, packaged_task>::value> >
+              class = __enable_if_t<!is_same<__remove_cvref_t<_Fp>, packaged_task>::value> >
         _LIBCPP_INLINE_VISIBILITY
         explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
     template <class _Fp, class _Allocator,
-              class = __enable_if_t<!is_same<__uncvref_t<_Fp>, packaged_task>::value> >
+              class = __enable_if_t<!is_same<__remove_cvref_t<_Fp>, packaged_task>::value> >
         _LIBCPP_INLINE_VISIBILITY
         packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
              : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
 @@ -2053,6 +2057,16 @@ public:
     void reset();
 };
+#if _LIBCPP_STD_VER >= 17
+template <class _Rp, class... _Args>
+packaged_task(_Rp(*)(_Args...)) -> packaged_task<_Rp(_Args...)>;
+template <class _Fp, class _Stripped = typename __strip_signature<decltype(&_Fp::operator())>::type>
+packaged_task(_Fp) -> packaged_task<_Stripped>;
+#endif
 template<class ..._ArgTypes>
 void
 packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args)
 @@ -2174,7 +2188,7 @@ inline _LIBCPP_INLINE_VISIBILITY bool __does_policy_contain(launch __policy, lau
 { return (int(__policy) & int(__value)) != 0; }
 template <class _Fp, class... _Args>
-_LIBCPP_NODISCARD_AFTER_CXX17
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI
 future<typename __invoke_of<typename decay<_Fp>::type, typename decay<_Args>::type...>::type>
 async(launch __policy, _Fp&& __f, _Args&&... __args)
 {
 @@ -2436,4 +2450,8 @@ future<void>::share() _NOEXCEPT
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  include <chrono>
+#endif
 #endif // _LIBCPP_FUTURE

lib/libcxx/include/initializer_list+7-7

...	@@ -62,7 +62,7 @@ class _LIBCPP_TEMPLATE_VIS initializer_list	...	@@ -62,7 +62,7 @@ class _LIBCPP_TEMPLATE_VIS initializer_list
62	size_t __size_;	62	size_t __size_;
63		63
64	_LIBCPP_INLINE_VISIBILITY	64	_LIBCPP_INLINE_VISIBILITY
65	_LIBCPP_CONSTEXPR_AFTER_CXX11	65	_LIBCPP_CONSTEXPR_SINCE_CXX14
66	initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT	66	initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT
67	: __begin_(__b),	67	: __begin_(__b),
68	__size_(__s)	68	__size_(__s)
...	@@ -77,25 +77,25 @@ public:	...	@@ -77,25 +77,25 @@ public:
77	typedef const _Ep* const_iterator;	77	typedef const _Ep* const_iterator;
78		78
79	_LIBCPP_INLINE_VISIBILITY	79	_LIBCPP_INLINE_VISIBILITY
80	_LIBCPP_CONSTEXPR_AFTER_CXX11	80	_LIBCPP_CONSTEXPR_SINCE_CXX14
81	initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {}	81	initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {}
82		82
83	_LIBCPP_INLINE_VISIBILITY	83	_LIBCPP_INLINE_VISIBILITY
84	_LIBCPP_CONSTEXPR_AFTER_CXX11	84	_LIBCPP_CONSTEXPR_SINCE_CXX14
85	size_t size() const _NOEXCEPT {return __size_;}	85	size_t size() const _NOEXCEPT {return __size_;}
86		86
87	_LIBCPP_INLINE_VISIBILITY	87	_LIBCPP_INLINE_VISIBILITY
88	_LIBCPP_CONSTEXPR_AFTER_CXX11	88	_LIBCPP_CONSTEXPR_SINCE_CXX14
89	const _Ep* begin() const _NOEXCEPT {return __begin_;}	89	const _Ep* begin() const _NOEXCEPT {return __begin_;}
90		90
91	_LIBCPP_INLINE_VISIBILITY	91	_LIBCPP_INLINE_VISIBILITY
92	_LIBCPP_CONSTEXPR_AFTER_CXX11	92	_LIBCPP_CONSTEXPR_SINCE_CXX14
93	const _Ep* end() const _NOEXCEPT {return __begin_ + __size_;}	93	const _Ep* end() const _NOEXCEPT {return __begin_ + __size_;}
94	};	94	};
95		95
96	template<class _Ep>	96	template<class _Ep>
97	inline _LIBCPP_INLINE_VISIBILITY	97	inline _LIBCPP_INLINE_VISIBILITY
98	_LIBCPP_CONSTEXPR_AFTER_CXX11	98	_LIBCPP_CONSTEXPR_SINCE_CXX14
99	const _Ep*	99	const _Ep*
100	begin(initializer_list<_Ep> __il) _NOEXCEPT	100	begin(initializer_list<_Ep> __il) _NOEXCEPT
101	{	101	{
...	@@ -104,7 +104,7 @@ begin(initializer_list<_Ep> __il) _NOEXCEPT	...	@@ -104,7 +104,7 @@ begin(initializer_list<_Ep> __il) _NOEXCEPT
104		104
105	template<class _Ep>	105	template<class _Ep>
106	inline _LIBCPP_INLINE_VISIBILITY	106	inline _LIBCPP_INLINE_VISIBILITY
107	_LIBCPP_CONSTEXPR_AFTER_CXX11	107	_LIBCPP_CONSTEXPR_SINCE_CXX14
108	const _Ep*	108	const _Ep*
109	end(initializer_list<_Ep> __il) _NOEXCEPT	109	end(initializer_list<_Ep> __il) _NOEXCEPT
110	{	110	{

lib/libcxx/include/inttypes.h+3-1

...	@@ -248,7 +248,9 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int	...	@@ -248,7 +248,9 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
248	# define __STDC_FORMAT_MACROS	248	# define __STDC_FORMAT_MACROS
249	#endif	249	#endif
250		250
251	#include_next <inttypes.h>	251	#if __has_include_next(<inttypes.h>)
		252	# include_next <inttypes.h>
		253	#endif
252		254
253	#ifdef __cplusplus	255	#ifdef __cplusplus
254		256

lib/libcxx/include/iomanip+12-12

lib/libcxx/include/ios+43-28

...	@@ -224,6 +224,8 @@ storage-class-specifier const error_category& iostream_category() noexcept;	...	@@ -224,6 +224,8 @@ storage-class-specifier const error_category& iostream_category() noexcept;
224	#include <version>	224	#include <version>
225		225
226	// standard-mandated includes	226	// standard-mandated includes
		227
		228	// [ios.syn]
227	#include <iosfwd>	229	#include <iosfwd>
228		230
229	#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)	231	#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
...	@@ -441,7 +443,7 @@ public:	...	@@ -441,7 +443,7 @@ public:
441	explicit failure(const string& __msg, const error_code& __ec = io_errc::stream);	443	explicit failure(const string& __msg, const error_code& __ec = io_errc::stream);
442	explicit failure(const char* __msg, const error_code& __ec = io_errc::stream);	444	explicit failure(const char* __msg, const error_code& __ec = io_errc::stream);
443	failure(const failure&) _NOEXCEPT = default;	445	failure(const failure&) _NOEXCEPT = default;
444	virtual ~failure() _NOEXCEPT;	446	~failure() _NOEXCEPT override;
445	};	447	};
446		448
447	_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY	449	_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
...	@@ -641,7 +643,7 @@ public:	...	@@ -641,7 +643,7 @@ public:
641	// 27.5.4.1 Constructor/destructor:	643	// 27.5.4.1 Constructor/destructor:
642	_LIBCPP_INLINE_VISIBILITY	644	_LIBCPP_INLINE_VISIBILITY
643	explicit basic_ios(basic_streambuf<char_type,traits_type>* __sb);	645	explicit basic_ios(basic_streambuf<char_type,traits_type>* __sb);
644	virtual ~basic_ios();	646	~basic_ios() override;
645		647
646	// 27.5.4.2 Members:	648	// 27.5.4.2 Members:
647	_LIBCPP_INLINE_VISIBILITY	649	_LIBCPP_INLINE_VISIBILITY
...	@@ -764,7 +766,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -764,7 +766,7 @@ inline _LIBCPP_INLINE_VISIBILITY
764	char	766	char
765	basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const	767	basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const
766	{	768	{
767	return use_facet<ctype<char_type> >(getloc()).narrow(__c, __dfault);	769	return std::use_facet<ctype<char_type> >(getloc()).narrow(__c, __dfault);
768	}	770	}
769		771
770	template <class _CharT, class _Traits>	772	template <class _CharT, class _Traits>
...	@@ -772,7 +774,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -772,7 +774,7 @@ inline _LIBCPP_INLINE_VISIBILITY
772	_CharT	774	_CharT
773	basic_ios<_CharT, _Traits>::widen(char __c) const	775	basic_ios<_CharT, _Traits>::widen(char __c) const
774	{	776	{
775	return use_facet<ctype<char_type> >(getloc()).widen(__c);	777	return std::use_facet<ctype<char_type> >(getloc()).widen(__c);
776	}	778	}
777		779
778	template <class _CharT, class _Traits>	780	template <class _CharT, class _Traits>
...	@@ -842,7 +844,7 @@ basic_ios<_CharT, _Traits>::set_rdbuf(basic_streambuf<char_type, traits_type>* _	...	@@ -842,7 +844,7 @@ basic_ios<_CharT, _Traits>::set_rdbuf(basic_streambuf<char_type, traits_type>* _
842	ios_base::set_rdbuf(__sb);	844	ios_base::set_rdbuf(__sb);
843	}	845	}
844		846
845	inline	847	_LIBCPP_HIDE_FROM_ABI inline
846	ios_base&	848	ios_base&
847	boolalpha(ios_base& __str)	849	boolalpha(ios_base& __str)
848	{	850	{
...	@@ -850,7 +852,7 @@ boolalpha(ios_base& __str)	...	@@ -850,7 +852,7 @@ boolalpha(ios_base& __str)
850	return __str;	852	return __str;
851	}	853	}
852		854
853	inline	855	_LIBCPP_HIDE_FROM_ABI inline
854	ios_base&	856	ios_base&
855	noboolalpha(ios_base& __str)	857	noboolalpha(ios_base& __str)
856	{	858	{
...	@@ -858,7 +860,7 @@ noboolalpha(ios_base& __str)	...	@@ -858,7 +860,7 @@ noboolalpha(ios_base& __str)
858	return __str;	860	return __str;
859	}	861	}
860		862
861	inline	863	_LIBCPP_HIDE_FROM_ABI inline
862	ios_base&	864	ios_base&
863	showbase(ios_base& __str)	865	showbase(ios_base& __str)
864	{	866	{
...	@@ -866,7 +868,7 @@ showbase(ios_base& __str)	...	@@ -866,7 +868,7 @@ showbase(ios_base& __str)
866	return __str;	868	return __str;
867	}	869	}
868		870
869	inline	871	_LIBCPP_HIDE_FROM_ABI inline
870	ios_base&	872	ios_base&
871	noshowbase(ios_base& __str)	873	noshowbase(ios_base& __str)
872	{	874	{
...	@@ -874,7 +876,7 @@ noshowbase(ios_base& __str)	...	@@ -874,7 +876,7 @@ noshowbase(ios_base& __str)
874	return __str;	876	return __str;
875	}	877	}
876		878
877	inline	879	_LIBCPP_HIDE_FROM_ABI inline
878	ios_base&	880	ios_base&
879	showpoint(ios_base& __str)	881	showpoint(ios_base& __str)
880	{	882	{
...	@@ -882,7 +884,7 @@ showpoint(ios_base& __str)	...	@@ -882,7 +884,7 @@ showpoint(ios_base& __str)
882	return __str;	884	return __str;
883	}	885	}
884		886
885	inline	887	_LIBCPP_HIDE_FROM_ABI inline
886	ios_base&	888	ios_base&
887	noshowpoint(ios_base& __str)	889	noshowpoint(ios_base& __str)
888	{	890	{
...	@@ -890,7 +892,7 @@ noshowpoint(ios_base& __str)	...	@@ -890,7 +892,7 @@ noshowpoint(ios_base& __str)
890	return __str;	892	return __str;
891	}	893	}
892		894
893	inline	895	_LIBCPP_HIDE_FROM_ABI inline
894	ios_base&	896	ios_base&
895	showpos(ios_base& __str)	897	showpos(ios_base& __str)
896	{	898	{
...	@@ -898,7 +900,7 @@ showpos(ios_base& __str)	...	@@ -898,7 +900,7 @@ showpos(ios_base& __str)
898	return __str;	900	return __str;
899	}	901	}
900		902
901	inline	903	_LIBCPP_HIDE_FROM_ABI inline
902	ios_base&	904	ios_base&
903	noshowpos(ios_base& __str)	905	noshowpos(ios_base& __str)
904	{	906	{
...	@@ -906,7 +908,7 @@ noshowpos(ios_base& __str)	...	@@ -906,7 +908,7 @@ noshowpos(ios_base& __str)
906	return __str;	908	return __str;
907	}	909	}
908		910
909	inline	911	_LIBCPP_HIDE_FROM_ABI inline
910	ios_base&	912	ios_base&
911	skipws(ios_base& __str)	913	skipws(ios_base& __str)
912	{	914	{
...	@@ -914,7 +916,7 @@ skipws(ios_base& __str)	...	@@ -914,7 +916,7 @@ skipws(ios_base& __str)
914	return __str;	916	return __str;
915	}	917	}
916		918
917	inline	919	_LIBCPP_HIDE_FROM_ABI inline
918	ios_base&	920	ios_base&
919	noskipws(ios_base& __str)	921	noskipws(ios_base& __str)
920	{	922	{
...	@@ -922,7 +924,7 @@ noskipws(ios_base& __str)	...	@@ -922,7 +924,7 @@ noskipws(ios_base& __str)
922	return __str;	924	return __str;
923	}	925	}
924		926
925	inline	927	_LIBCPP_HIDE_FROM_ABI inline
926	ios_base&	928	ios_base&
927	uppercase(ios_base& __str)	929	uppercase(ios_base& __str)
928	{	930	{
...	@@ -930,7 +932,7 @@ uppercase(ios_base& __str)	...	@@ -930,7 +932,7 @@ uppercase(ios_base& __str)
930	return __str;	932	return __str;
931	}	933	}
932		934
933	inline	935	_LIBCPP_HIDE_FROM_ABI inline
934	ios_base&	936	ios_base&
935	nouppercase(ios_base& __str)	937	nouppercase(ios_base& __str)
936	{	938	{
...	@@ -938,7 +940,7 @@ nouppercase(ios_base& __str)	...	@@ -938,7 +940,7 @@ nouppercase(ios_base& __str)
938	return __str;	940	return __str;
939	}	941	}
940		942
941	inline	943	_LIBCPP_HIDE_FROM_ABI inline
942	ios_base&	944	ios_base&
943	unitbuf(ios_base& __str)	945	unitbuf(ios_base& __str)
944	{	946	{
...	@@ -946,7 +948,7 @@ unitbuf(ios_base& __str)	...	@@ -946,7 +948,7 @@ unitbuf(ios_base& __str)
946	return __str;	948	return __str;
947	}	949	}
948		950
949	inline	951	_LIBCPP_HIDE_FROM_ABI inline
950	ios_base&	952	ios_base&
951	nounitbuf(ios_base& __str)	953	nounitbuf(ios_base& __str)
952	{	954	{
...	@@ -954,7 +956,7 @@ nounitbuf(ios_base& __str)	...	@@ -954,7 +956,7 @@ nounitbuf(ios_base& __str)
954	return __str;	956	return __str;
955	}	957	}
956		958
957	inline	959	_LIBCPP_HIDE_FROM_ABI inline
958	ios_base&	960	ios_base&
959	internal(ios_base& __str)	961	internal(ios_base& __str)
960	{	962	{
...	@@ -962,7 +964,7 @@ internal(ios_base& __str)	...	@@ -962,7 +964,7 @@ internal(ios_base& __str)
962	return __str;	964	return __str;
963	}	965	}
964		966
965	inline	967	_LIBCPP_HIDE_FROM_ABI inline
966	ios_base&	968	ios_base&
967	left(ios_base& __str)	969	left(ios_base& __str)
968	{	970	{
...	@@ -970,7 +972,7 @@ left(ios_base& __str)	...	@@ -970,7 +972,7 @@ left(ios_base& __str)
970	return __str;	972	return __str;
971	}	973	}
972		974
973	inline	975	_LIBCPP_HIDE_FROM_ABI inline
974	ios_base&	976	ios_base&
975	right(ios_base& __str)	977	right(ios_base& __str)
976	{	978	{
...	@@ -978,7 +980,7 @@ right(ios_base& __str)	...	@@ -978,7 +980,7 @@ right(ios_base& __str)
978	return __str;	980	return __str;
979	}	981	}
980		982
981	inline	983	_LIBCPP_HIDE_FROM_ABI inline
982	ios_base&	984	ios_base&
983	dec(ios_base& __str)	985	dec(ios_base& __str)
984	{	986	{
...	@@ -986,7 +988,7 @@ dec(ios_base& __str)	...	@@ -986,7 +988,7 @@ dec(ios_base& __str)
986	return __str;	988	return __str;
987	}	989	}
988		990
989	inline	991	_LIBCPP_HIDE_FROM_ABI inline
990	ios_base&	992	ios_base&
991	hex(ios_base& __str)	993	hex(ios_base& __str)
992	{	994	{
...	@@ -994,7 +996,7 @@ hex(ios_base& __str)	...	@@ -994,7 +996,7 @@ hex(ios_base& __str)
994	return __str;	996	return __str;
995	}	997	}
996		998
997	inline	999	_LIBCPP_HIDE_FROM_ABI inline
998	ios_base&	1000	ios_base&
999	oct(ios_base& __str)	1001	oct(ios_base& __str)
1000	{	1002	{
...	@@ -1002,7 +1004,7 @@ oct(ios_base& __str)	...	@@ -1002,7 +1004,7 @@ oct(ios_base& __str)
1002	return __str;	1004	return __str;
1003	}	1005	}
1004		1006
1005	inline	1007	_LIBCPP_HIDE_FROM_ABI inline
1006	ios_base&	1008	ios_base&
1007	fixed(ios_base& __str)	1009	fixed(ios_base& __str)
1008	{	1010	{
...	@@ -1010,7 +1012,7 @@ fixed(ios_base& __str)	...	@@ -1010,7 +1012,7 @@ fixed(ios_base& __str)
1010	return __str;	1012	return __str;
1011	}	1013	}
1012		1014
1013	inline	1015	_LIBCPP_HIDE_FROM_ABI inline
1014	ios_base&	1016	ios_base&
1015	scientific(ios_base& __str)	1017	scientific(ios_base& __str)
1016	{	1018	{
...	@@ -1018,7 +1020,7 @@ scientific(ios_base& __str)	...	@@ -1018,7 +1020,7 @@ scientific(ios_base& __str)
1018	return __str;	1020	return __str;
1019	}	1021	}
1020		1022
1021	inline	1023	_LIBCPP_HIDE_FROM_ABI inline
1022	ios_base&	1024	ios_base&
1023	hexfloat(ios_base& __str)	1025	hexfloat(ios_base& __str)
1024	{	1026	{
...	@@ -1026,7 +1028,7 @@ hexfloat(ios_base& __str)	...	@@ -1026,7 +1028,7 @@ hexfloat(ios_base& __str)
1026	return __str;	1028	return __str;
1027	}	1029	}
1028		1030
1029	inline	1031	_LIBCPP_HIDE_FROM_ABI inline
1030	ios_base&	1032	ios_base&
1031	defaultfloat(ios_base& __str)	1033	defaultfloat(ios_base& __str)
1032	{	1034	{
...	@@ -1036,4 +1038,17 @@ defaultfloat(ios_base& __str)	...	@@ -1036,4 +1038,17 @@ defaultfloat(ios_base& __str)
1036		1038
1037	_LIBCPP_END_NAMESPACE_STD	1039	_LIBCPP_END_NAMESPACE_STD
1038		1040
		1041	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		1042	# include <concepts>
		1043	# include <cstddef>
		1044	# include <cstdlib>
		1045	# include <cstring>
		1046	# include <initializer_list>
		1047	# include <limits>
		1048	# include <new>
		1049	# include <stdexcept>
		1050	# include <type_traits>
		1051	# include <typeinfo>
		1052	#endif
		1053
1039	#endif // _LIBCPP_IOS	1054	#endif // _LIBCPP_IOS

lib/libcxx/include/iosfwd+1-25

...	@@ -96,6 +96,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;	...	@@ -96,6 +96,7 @@ using u32streampos = fpos<char_traits<char32_t>::state_type>;
96		96
97	#include <__assert> // all public C++ headers provide the assertion handler	97	#include <__assert> // all public C++ headers provide the assertion handler
98	#include <__config>	98	#include <__config>
		99	#include <__fwd/string.h>
99	#include <__mbstate_t.h>	100	#include <__mbstate_t.h>
100	#include <version>	101	#include <version>
101		102
...	@@ -107,19 +108,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -107,19 +108,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
107		108
108	class _LIBCPP_TYPE_VIS ios_base;	109	class _LIBCPP_TYPE_VIS ios_base;
109		110
110	template<class _CharT> struct _LIBCPP_TEMPLATE_VIS char_traits;
111	template<> struct char_traits<char>;
112	#ifndef _LIBCPP_HAS_NO_CHAR8_T
113	template<> struct char_traits<char8_t>;
114	#endif
115	template<> struct char_traits<char16_t>;
116	template<> struct char_traits<char32_t>;
117	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
118	template<> struct char_traits<wchar_t>;
119	#endif
120
121	template<class _Tp> class _LIBCPP_TEMPLATE_VIS allocator;
122
123	template <class _CharT, class _Traits = char_traits<_CharT> >	111	template <class _CharT, class _Traits = char_traits<_CharT> >
124	class _LIBCPP_TEMPLATE_VIS basic_ios;	112	class _LIBCPP_TEMPLATE_VIS basic_ios;
125		113
...	@@ -242,18 +230,6 @@ typedef long int streamoff; // for char_traits in <string>	...	@@ -242,18 +230,6 @@ typedef long int streamoff; // for char_traits in <string>
242	typedef long long streamoff; // for char_traits in <string>	230	typedef long long streamoff; // for char_traits in <string>
243	#endif	231	#endif
244		232
245	template <class _CharT, // for <stdexcept>
246	class _Traits = char_traits<_CharT>,
247	class _Allocator = allocator<_CharT> >
248	class _LIBCPP_TEMPLATE_VIS basic_string;
249	typedef basic_string<char, char_traits<char>, allocator<char> > string;
250	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
251	typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
252	#endif
253
254	template <class _CharT, class _Traits, class _Allocator>
255	class _LIBCPP_PREFERRED_NAME(string) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wstring)) basic_string;
256
257	// Include other forward declarations here	233	// Include other forward declarations here
258	template <class _Tp, class _Alloc = allocator<_Tp> >	234	template <class _Tp, class _Alloc = allocator<_Tp> >
259	class _LIBCPP_TEMPLATE_VIS vector;	235	class _LIBCPP_TEMPLATE_VIS vector;

lib/libcxx/include/iostream+2

...	@@ -38,6 +38,8 @@ extern wostream wclog;	...	@@ -38,6 +38,8 @@ extern wostream wclog;
38	#include <version>	38	#include <version>
39		39
40	// standard-mandated includes	40	// standard-mandated includes
		41
		42	// [iostream.syn]
41	#include <ios>	43	#include <ios>
42	#include <istream>	44	#include <istream>
43	#include <ostream>	45	#include <ostream>

lib/libcxx/include/istream+23-18

lib/libcxx/include/iterator+12-8

 @@ -717,22 +717,26 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
 #include <__iterator/wrap_iter.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
-#include <compare>
-#include <concepts> // Mandated by the Standard.
 #include <cstddef>
 #include <initializer_list>
-#include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+// standard-mandated includes
+// [iterator.synopsis]
+#include <compare>
+#include <concepts>
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #  include <exception>
 #  include <new>
+#  include <type_traits>
 #  include <typeinfo>
 #  include <utility>
 #endif
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
 #endif // _LIBCPP_ITERATOR

lib/libcxx/include/latch+6-6

...	@@ -64,7 +64,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -64,7 +64,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
64		64
65	class latch	65	class latch
66	{	66	{
67	__atomic_base<ptrdiff_t> __a;	67	__atomic_base<ptrdiff_t> __a_;
68		68
69	public:	69	public:
70	static constexpr ptrdiff_t max() noexcept {	70	static constexpr ptrdiff_t max() noexcept {
...	@@ -72,7 +72,7 @@ public:	...	@@ -72,7 +72,7 @@ public:
72	}	72	}
73		73
74	inline _LIBCPP_INLINE_VISIBILITY	74	inline _LIBCPP_INLINE_VISIBILITY
75	constexpr explicit latch(ptrdiff_t __expected) : __a(__expected) { }	75	constexpr explicit latch(ptrdiff_t __expected) : __a_(__expected) { }
76		76
77	~latch() = default;	77	~latch() = default;
78	latch(const latch&) = delete;	78	latch(const latch&) = delete;
...	@@ -81,19 +81,19 @@ public:	...	@@ -81,19 +81,19 @@ public:
81	inline _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	81	inline _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
82	void count_down(ptrdiff_t __update = 1)	82	void count_down(ptrdiff_t __update = 1)
83	{	83	{
84	auto const __old = __a.fetch_sub(__update, memory_order_release);	84	auto const __old = __a_.fetch_sub(__update, memory_order_release);
85	if(__old == __update)	85	if(__old == __update)
86	__a.notify_all();	86	__a_.notify_all();
87	}	87	}
88	inline _LIBCPP_INLINE_VISIBILITY	88	inline _LIBCPP_INLINE_VISIBILITY
89	bool try_wait() const noexcept	89	bool try_wait() const noexcept
90	{	90	{
91	return 0 == __a.load(memory_order_acquire);	91	return 0 == __a_.load(memory_order_acquire);
92	}	92	}
93	inline _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	93	inline _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
94	void wait() const	94	void wait() const
95	{	95	{
96	__cxx_atomic_wait(&__a.__a_, [&]() -> bool {	96	__cxx_atomic_wait(&__a_.__a_, [&]() -> bool {
97	return try_wait();	97	return try_wait();
98	});	98	});
99	}	99	}

lib/libcxx/include/limits+10-8

...	@@ -104,11 +104,9 @@ template<> class numeric_limits<cv long double>;	...	@@ -104,11 +104,9 @@ template<> class numeric_limits<cv long double>;
104		104
105	#include <__assert> // all public C++ headers provide the assertion handler	105	#include <__assert> // all public C++ headers provide the assertion handler
106	#include <__config>	106	#include <__config>
107	#include <type_traits>	107	#include <__type_traits/is_arithmetic.h>
108		108	#include <__type_traits/is_signed.h>
109	#if defined(_LIBCPP_COMPILER_MSVC)	109	#include <__type_traits/remove_cv.h>
110	#include "__support/win32/limits_msvc_win32.h"
111	#endif // _LIBCPP_MSVCRT
112		110
113	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	111	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
114	# pragma GCC system_header	112	# pragma GCC system_header
...	@@ -432,7 +430,7 @@ protected:	...	@@ -432,7 +430,7 @@ protected:
432	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}	430	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
433	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}	431	_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
434		432
435	#if (defined(__ppc__) \|\| defined(__ppc64__))	433	#if defined(__powerpc__) && defined(__LONG_DOUBLE_IBM128__)
436	static _LIBCPP_CONSTEXPR const bool is_iec559 = false;	434	static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
437	#else	435	#else
438	static _LIBCPP_CONSTEXPR const bool is_iec559 = true;	436	static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
...	@@ -451,9 +449,9 @@ protected:	...	@@ -451,9 +449,9 @@ protected:
451		449
452	template <class _Tp>	450	template <class _Tp>
453	class _LIBCPP_TEMPLATE_VIS numeric_limits	451	class _LIBCPP_TEMPLATE_VIS numeric_limits
454	: private __libcpp_numeric_limits<typename remove_cv<_Tp>::type>	452	: private __libcpp_numeric_limits<__remove_cv_t<_Tp> >
455	{	453	{
456	typedef __libcpp_numeric_limits<typename remove_cv<_Tp>::type> __base;	454	typedef __libcpp_numeric_limits<__remove_cv_t<_Tp> > __base;
457	typedef typename __base::type type;	455	typedef typename __base::type type;
458	public:	456	public:
459	static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;	457	static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
...	@@ -825,4 +823,8 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -825,4 +823,8 @@ _LIBCPP_END_NAMESPACE_STD
825		823
826	_LIBCPP_POP_MACROS	824	_LIBCPP_POP_MACROS
827		825
		826	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		827	# include <type_traits>
		828	#endif
		829
828	#endif // _LIBCPP_LIMITS	830	#endif // _LIBCPP_LIMITS

lib/libcxx/include/limits.h+13-6

...	@@ -43,13 +43,13 @@ Macros:	...	@@ -43,13 +43,13 @@ Macros:
43	# pragma GCC system_header	43	# pragma GCC system_header
44	#endif	44	#endif
45		45
46	#ifndef __GNUC__	46	#ifdef _LIBCPP_COMPILER_GCC
47	#include_next <limits.h>	47
48	#else
49	// GCC header limits.h recursively includes itself through another header called	48	// GCC header limits.h recursively includes itself through another header called
50	// syslimits.h for some reason. This setup breaks down if we directly	49	// syslimits.h for some reason. This setup breaks down if we directly
51	// #include_next GCC's limits.h (reasons not entirely clear to me). Therefore,	50	// #include_next GCC's limits.h (reasons not entirely clear to me).
52	// we manually re-create the necessary include sequence below:	51	// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107795 for more details.
		52	// Therefore, we manually re-create the necessary include sequence below:
53		53
54	// Get the system limits.h defines (force recurse into the next level)	54	// Get the system limits.h defines (force recurse into the next level)
55	#define _GCC_LIMITS_H_	55	#define _GCC_LIMITS_H_
...	@@ -59,6 +59,13 @@ Macros:	...	@@ -59,6 +59,13 @@ Macros:
59	// Get the ISO C defines	59	// Get the ISO C defines
60	#undef _GCC_LIMITS_H_	60	#undef _GCC_LIMITS_H_
61	#include_next <limits.h>	61	#include_next <limits.h>
62	#endif // __GNUC__	62
		63	#else
		64
		65	# if __has_include_next(<limits.h>)
		66	# include_next <limits.h>
		67	# endif
		68
		69	#endif // _LIBCPP_COMPILER_GCC
63		70
64	#endif // _LIBCPP_LIMITS_H	71	#endif // _LIBCPP_LIMITS_H

lib/libcxx/include/list+43-24

 @@ -194,21 +194,24 @@ template <class T, class Allocator, class Predicate>
 #include <__iterator/next.h>
 #include <__iterator/prev.h>
 #include <__iterator/reverse_iterator.h>
+#include <__memory/addressof.h>
+#include <__memory/allocator.h>
+#include <__memory/allocator_destructor.h>
+#include <__memory/allocator_traits.h>
+#include <__memory/compressed_pair.h>
+#include <__memory/pointer_traits.h>
 #include <__memory/swap_allocator.h>
+#include <__memory/unique_ptr.h>
+#include <__memory_resource/polymorphic_allocator.h>
+#include <__type_traits/is_allocator.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/swap.h>
+#include <cstring>
 #include <limits>
-#include <memory>
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <functional>
-#  include <iterator>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -237,26 +240,19 @@ template <class _Tp, class _VoidPtr> struct __list_node_base;
 template <class _Tp, class _VoidPtr>
 struct __list_node_pointer_traits {
-  typedef typename __rebind_pointer<_VoidPtr, __list_node<_Tp, _VoidPtr> >::type
+  typedef __rebind_pointer_t<_VoidPtr, __list_node<_Tp, _VoidPtr> >
         __node_pointer;
-  typedef typename __rebind_pointer<_VoidPtr, __list_node_base<_Tp, _VoidPtr> >::type
+  typedef __rebind_pointer_t<_VoidPtr, __list_node_base<_Tp, _VoidPtr> >
         __base_pointer;
 #if defined(_LIBCPP_ABI_LIST_REMOVE_NODE_POINTER_UB)
   typedef __base_pointer __link_pointer;
 #else
-  typedef typename conditional<
+  typedef __conditional_t<is_pointer<_VoidPtr>::value, __base_pointer, __node_pointer> __link_pointer;
-          is_pointer<_VoidPtr>::value,
-          __base_pointer,
-          __node_pointer
-  >::type __link_pointer;
 #endif
-  typedef typename conditional<
+  typedef __conditional_t<is_same<__link_pointer, __node_pointer>::value, __base_pointer, __node_pointer>
-          is_same<__link_pointer, __node_pointer>::value,
+      __non_link_pointer;
-          __base_pointer,
-          __node_pointer
-  >::type __non_link_pointer;
   static _LIBCPP_INLINE_VISIBILITY
   __link_pointer __unsafe_link_pointer_cast(__link_pointer __p) {
 @@ -340,7 +336,7 @@ public:
     typedef bidirectional_iterator_tag       iterator_category;
     typedef _Tp                              value_type;
     typedef value_type&                      reference;
-    typedef typename __rebind_pointer<_VoidPtr, value_type>::type pointer;
+    typedef __rebind_pointer_t<_VoidPtr, value_type> pointer;
     typedef typename pointer_traits<pointer>::difference_type difference_type;
     _LIBCPP_INLINE_VISIBILITY
 @@ -448,7 +444,7 @@ public:
     typedef bidirectional_iterator_tag       iterator_category;
     typedef _Tp                              value_type;
     typedef const value_type&                reference;
-    typedef typename __rebind_pointer<_VoidPtr, const value_type>::type pointer;
+    typedef __rebind_pointer_t<_VoidPtr, const value_type> pointer;
     typedef typename pointer_traits<pointer>::difference_type difference_type;
     _LIBCPP_INLINE_VISIBILITY
 @@ -555,7 +551,7 @@ protected:
     typedef __list_const_iterator<value_type, __void_pointer>       const_iterator;
     typedef __list_node_base<value_type, __void_pointer>            __node_base;
     typedef __list_node<value_type, __void_pointer>                 __node;
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node>::type __node_allocator;
+    typedef __rebind_alloc<__alloc_traits, __node>                  __node_allocator;
     typedef allocator_traits<__node_allocator>                       __node_alloc_traits;
     typedef typename __node_alloc_traits::pointer                    __node_pointer;
     typedef typename __node_alloc_traits::pointer                    __node_const_pointer;
 @@ -566,7 +562,7 @@ protected:
     typedef typename __alloc_traits::const_pointer                   const_pointer;
     typedef typename __alloc_traits::difference_type                 difference_type;
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node_base>::type __node_base_allocator;
+    typedef __rebind_alloc<__alloc_traits, __node_base>               __node_base_allocator;
     typedef typename allocator_traits<__node_base_allocator>::pointer __node_base_pointer;
     static_assert((!is_same<allocator_type, __node_allocator>::value),
                   "internal allocator type must differ from user-specified "
 @@ -845,6 +841,10 @@ public:
     typedef void                                           __remove_return_type;
 #endif
+    static_assert(is_same<allocator_type, __rebind_alloc<allocator_traits<allocator_type>, value_type> >::value,
+                  "[allocator.requirements] states that rebinding an allocator to the same type should result in the "
+                  "original allocator");
     _LIBCPP_INLINE_VISIBILITY
     list()
         _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
 @@ -1063,7 +1063,7 @@ public:
     __remove_return_type remove(const value_type& __x);
     template <class _Pred> __remove_return_type remove_if(_Pred __pred);
     _LIBCPP_INLINE_VISIBILITY
-    __remove_return_type unique() { return unique(__equal_to<value_type>()); }
+    __remove_return_type unique() { return unique(__equal_to()); }
     template <class _BinaryPred>
         __remove_return_type unique(_BinaryPred __binary_pred);
     _LIBCPP_INLINE_VISIBILITY
 @@ -2362,6 +2362,25 @@ inline constexpr bool __format::__enable_insertable<std::list<wchar_t>> = true;
 _LIBCPP_END_NAMESPACE_STD
+#if _LIBCPP_STD_VER > 14
+_LIBCPP_BEGIN_NAMESPACE_STD
+namespace pmr {
+template <class _ValueT>
+using list = std::list<_ValueT, polymorphic_allocator<_ValueT>>;
+} // namespace pmr
+_LIBCPP_END_NAMESPACE_STD
+#endif
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <atomic>
+#  include <concepts>
+#  include <functional>
+#  include <iosfwd>
+#  include <iterator>
+#  include <typeinfo>
+#endif
 #endif // _LIBCPP_LIST

lib/libcxx/include/locale+136-140

...	@@ -201,19 +201,18 @@ template <class charT> class messages_byname;	...	@@ -201,19 +201,18 @@ template <class charT> class messages_byname;
201	#include <__iterator/istreambuf_iterator.h>	201	#include <__iterator/istreambuf_iterator.h>
202	#include <__iterator/ostreambuf_iterator.h>	202	#include <__iterator/ostreambuf_iterator.h>
203	#include <__locale>	203	#include <__locale>
204	#include <cstdarg> // TODO: Remove this include	204	#include <__memory/unique_ptr.h>
205	#include <cstdio>	205	#include <cstdio>
206	#include <cstdlib>	206	#include <cstdlib>
207	#include <ctime>	207	#include <ctime>
208	#include <ios>	208	#include <ios>
209	#include <limits>	209	#include <limits>
210	#include <memory>	210	#include <new>
211	#include <streambuf>	211	#include <streambuf>
212	#include <version>	212	#include <version>
213		213
214	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES	214	// TODO: Fix __bsd_locale_defaults.h
215	# include <iterator>	215	// NOLINTBEGIN(libcpp-robust-against-adl)
216	#endif
217		216
218	#if defined(__unix__) \|\| (defined(__APPLE__) && defined(__MACH__))	217	#if defined(__unix__) \|\| (defined(__APPLE__) && defined(__MACH__))
219	// Most unix variants have catopen. These are the specific ones that don't.	218	// Most unix variants have catopen. These are the specific ones that don't.
...	@@ -239,7 +238,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -239,7 +238,7 @@ _LIBCPP_PUSH_MACROS
239		238
240	_LIBCPP_BEGIN_NAMESPACE_STD	239	_LIBCPP_BEGIN_NAMESPACE_STD
241		240
242	#if defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__DragonFly__)	241	#if defined(__APPLE__) \|\| defined(__FreeBSD__)
243	# define _LIBCPP_GET_C_LOCALE 0	242	# define _LIBCPP_GET_C_LOCALE 0
244	#elif defined(__NetBSD__)	243	#elif defined(__NetBSD__)
245	# define _LIBCPP_GET_C_LOCALE LC_C_LOCALE	244	# define _LIBCPP_GET_C_LOCALE LC_C_LOCALE
...	@@ -269,7 +268,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -269,7 +268,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
269	// If the input is "a", the first keyword matches and eofbit is set.	268	// If the input is "a", the first keyword matches and eofbit is set.
270	// If the input is "abc", no match is found and "ab" are consumed.	269	// If the input is "abc", no match is found and "ab" are consumed.
271	template <class _InputIterator, class _ForwardIterator, class _Ctype>	270	template <class _InputIterator, class _ForwardIterator, class _Ctype>
272	_LIBCPP_HIDDEN	271	_LIBCPP_HIDE_FROM_ABI
273	_ForwardIterator	272	_ForwardIterator
274	__scan_keyword(_InputIterator& __b, _InputIterator __e,	273	__scan_keyword(_InputIterator& __b, _InputIterator __e,
275	_ForwardIterator __kb, _ForwardIterator __ke,	274	_ForwardIterator __kb, _ForwardIterator __ke,
...	@@ -450,8 +449,8 @@ string	...	@@ -450,8 +449,8 @@ string
450	__num_get<_CharT>::__stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep)	449	__num_get<_CharT>::__stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep)
451	{	450	{
452	locale __loc = __iob.getloc();	451	locale __loc = __iob.getloc();
453	use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 26, __atoms);	452	std::use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 26, __atoms);
454	const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);	453	const numpunct<_CharT>& __np = std::use_facet<numpunct<_CharT> >(__loc);
455	__thousands_sep = __np.thousands_sep();	454	__thousands_sep = __np.thousands_sep();
456	return __np.grouping();	455	return __np.grouping();
457	}	456	}
...	@@ -463,8 +462,8 @@ __num_get<_CharT>::__stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT&	...	@@ -463,8 +462,8 @@ __num_get<_CharT>::__stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT&
463	_CharT& __thousands_sep)	462	_CharT& __thousands_sep)
464	{	463	{
465	locale __loc = __iob.getloc();	464	locale __loc = __iob.getloc();
466	use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 32, __atoms);	465	std::use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 32, __atoms);
467	const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);	466	const numpunct<_CharT>& __np = std::use_facet<numpunct<_CharT> >(__loc);
468	__decimal_point = __np.decimal_point();	467	__decimal_point = __np.decimal_point();
469	__thousands_sep = __np.thousands_sep();	468	__thousands_sep = __np.thousands_sep();
470	return __np.grouping();	469	return __np.grouping();
...	@@ -498,7 +497,7 @@ __num_get<_CharT>::__stage2_int_loop(_CharT __ct, int __base, char* __a, char*&	...	@@ -498,7 +497,7 @@ __num_get<_CharT>::__stage2_int_loop(_CharT __ct, int __base, char* __a, char*&
498	}	497	}
499	return 0;	498	return 0;
500	}	499	}
501	ptrdiff_t __f = find(__atoms, __atoms + 26, __ct) - __atoms;	500	ptrdiff_t __f = std::find(__atoms, __atoms + 26, __ct) - __atoms;
502	if (__f >= 24)	501	if (__f >= 24)
503	return -1;	502	return -1;
504	switch (__base)	503	switch (__base)
...	@@ -551,13 +550,13 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex	...	@@ -551,13 +550,13 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex
551	}	550	}
552	return 0;	551	return 0;
553	}	552	}
554	ptrdiff_t __f = find(__atoms, __atoms + 32, __ct) - __atoms;	553	ptrdiff_t __f = std::find(__atoms, __atoms + 32, __ct) - __atoms;
555	if (__f >= 32)	554	if (__f >= 32)
556	return -1;	555	return -1;
557	char __x = __src[__f];	556	char __x = __src[__f];
558	if (__x == '-' \|\| __x == '+')	557	if (__x == '-' \|\| __x == '+')
559	{	558	{
560	if (__a_end == __a \|\| (__a_end[-1] & 0x5F) == (__exp & 0x7F))	559	if (__a_end == __a \|\| (std::toupper(__a_end[-1]) == std::toupper(__exp)))
561	{	560	{
562	*__a_end++ = __x;	561	*__a_end++ = __x;
563	return 0;	562	return 0;
...	@@ -566,9 +565,9 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex	...	@@ -566,9 +565,9 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex
566	}	565	}
567	if (__x == 'x' \|\| __x == 'X')	566	if (__x == 'x' \|\| __x == 'X')
568	__exp = 'P';	567	__exp = 'P';
569	else if ((__x & 0x5F) == __exp)	568	else if (std::toupper(__x) == __exp)
570	{	569	{
571	__exp \|= (char) 0x80;	570	__exp = std::tolower(__exp);
572	if (__in_units)	571	if (__in_units)
573	{	572	{
574	__in_units = false;	573	__in_units = false;
...	@@ -681,8 +680,7 @@ public:	...	@@ -681,8 +680,7 @@ public:
681	static locale::id id;	680	static locale::id id;
682		681
683	protected:	682	protected:
684	_LIBCPP_INLINE_VISIBILITY	683	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~num_get() override {}
685	~num_get() {}
686		684
687	template <class _Fp>	685	template <class _Fp>
688	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS	686	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
...	@@ -751,17 +749,17 @@ locale::id	...	@@ -751,17 +749,17 @@ locale::id
751	num_get<_CharT, _InputIterator>::id;	749	num_get<_CharT, _InputIterator>::id;
752		750
753	template <class _Tp>	751	template <class _Tp>
754	_LIBCPP_HIDDEN _Tp	752	_LIBCPP_HIDE_FROM_ABI _Tp
755	__num_get_signed_integral(const char* __a, const char* __a_end,	753	__num_get_signed_integral(const char* __a, const char* __a_end,
756	ios_base::iostate& __err, int __base)	754	ios_base::iostate& __err, int __base)
757	{	755	{
758	if (__a != __a_end)	756	if (__a != __a_end)
759	{	757	{
760	typename remove_reference<decltype(errno)>::type __save_errno = errno;	758	__libcpp_remove_reference_t<decltype(errno)> __save_errno = errno;
761	errno = 0;	759	errno = 0;
762	char *__p2;	760	char *__p2;
763	long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);	761	long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
764	typename remove_reference<decltype(errno)>::type __current_errno = errno;	762	__libcpp_remove_reference_t<decltype(errno)> __current_errno = errno;
765	if (__current_errno == 0)	763	if (__current_errno == 0)
766	errno = __save_errno;	764	errno = __save_errno;
767	if (__p2 != __a_end)	765	if (__p2 != __a_end)
...	@@ -786,7 +784,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,	...	@@ -786,7 +784,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
786	}	784	}
787		785
788	template <class _Tp>	786	template <class _Tp>
789	_LIBCPP_HIDDEN _Tp	787	_LIBCPP_HIDE_FROM_ABI _Tp
790	__num_get_unsigned_integral(const char* __a, const char* __a_end,	788	__num_get_unsigned_integral(const char* __a, const char* __a_end,
791	ios_base::iostate& __err, int __base)	789	ios_base::iostate& __err, int __base)
792	{	790	{
...	@@ -797,11 +795,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,	...	@@ -797,11 +795,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
797	__err = ios_base::failbit;	795	__err = ios_base::failbit;
798	return 0;	796	return 0;
799	}	797	}
800	typename remove_reference<decltype(errno)>::type __save_errno = errno;	798	__libcpp_remove_reference_t<decltype(errno)> __save_errno = errno;
801	errno = 0;	799	errno = 0;
802	char *__p2;	800	char *__p2;
803	unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);	801	unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
804	typename remove_reference<decltype(errno)>::type __current_errno = errno;	802	__libcpp_remove_reference_t<decltype(errno)> __current_errno = errno;
805	if (__current_errno == 0)	803	if (__current_errno == 0)
806	errno = __save_errno;	804	errno = __save_errno;
807	if (__p2 != __a_end)	805	if (__p2 != __a_end)
...	@@ -845,17 +843,17 @@ long double __do_strtod<long double>(const char* __a, char** __p2) {	...	@@ -845,17 +843,17 @@ long double __do_strtod<long double>(const char* __a, char** __p2) {
845	}	843	}
846		844
847	template <class _Tp>	845	template <class _Tp>
848	_LIBCPP_HIDDEN	846	_LIBCPP_HIDE_FROM_ABI
849	_Tp	847	_Tp
850	__num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)	848	__num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)
851	{	849	{
852	if (__a != __a_end)	850	if (__a != __a_end)
853	{	851	{
854	typename remove_reference<decltype(errno)>::type __save_errno = errno;	852	__libcpp_remove_reference_t<decltype(errno)> __save_errno = errno;
855	errno = 0;	853	errno = 0;
856	char *__p2;	854	char *__p2;
857	_Tp __ld = __do_strtod<_Tp>(__a, &__p2);	855	_Tp __ld = std::__do_strtod<_Tp>(__a, &__p2);
858	typename remove_reference<decltype(errno)>::type __current_errno = errno;	856	__libcpp_remove_reference_t<decltype(errno)> __current_errno = errno;
859	if (__current_errno == 0)	857	if (__current_errno == 0)
860	errno = __save_errno;	858	errno = __save_errno;
861	if (__p2 != __a_end)	859	if (__p2 != __a_end)
...	@@ -897,8 +895,8 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -897,8 +895,8 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
897	}	895	}
898	return __b;	896	return __b;
899	}	897	}
900	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__iob.getloc());	898	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__iob.getloc());
901	const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__iob.getloc());	899	const numpunct<_CharT>& __np = std::use_facet<numpunct<_CharT> >(__iob.getloc());
902	typedef typename numpunct<_CharT>::string_type string_type;	900	typedef typename numpunct<_CharT>::string_type string_type;
903	const string_type __names[2] = {__np.truename(), __np.falsename()};	901	const string_type __names[2] = {__np.truename(), __np.falsename()};
904	const string_type* __i = _VSTD::__scan_keyword(__b, __e, __names, __names+2,	902	const string_type* __i = _VSTD::__scan_keyword(__b, __e, __names, __names+2,
...	@@ -955,7 +953,7 @@ num_get<_CharT, _InputIterator>::__do_get_signed(iter_type __b, iter_type __e,	...	@@ -955,7 +953,7 @@ num_get<_CharT, _InputIterator>::__do_get_signed(iter_type __b, iter_type __e,
955	if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)	953	if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
956	*__g_end++ = __dc;	954	*__g_end++ = __dc;
957	// Stage 3	955	// Stage 3
958	__v = __num_get_signed_integral<_Signed>(__a, __a_end, __err, __base);	956	__v = std::__num_get_signed_integral<_Signed>(__a, __a_end, __err, __base);
959	// Digit grouping checked	957	// Digit grouping checked
960	__check_grouping(__grouping, __g, __g_end, __err);	958	__check_grouping(__grouping, __g, __g_end, __err);
961	// EOF checked	959	// EOF checked
...	@@ -1012,7 +1010,7 @@ num_get<_CharT, _InputIterator>::__do_get_unsigned(iter_type __b, iter_type __e,	...	@@ -1012,7 +1010,7 @@ num_get<_CharT, _InputIterator>::__do_get_unsigned(iter_type __b, iter_type __e,
1012	if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)	1010	if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
1013	*__g_end++ = __dc;	1011	*__g_end++ = __dc;
1014	// Stage 3	1012	// Stage 3
1015	__v = __num_get_unsigned_integral<_Unsigned>(__a, __a_end, __err, __base);	1013	__v = std::__num_get_unsigned_integral<_Unsigned>(__a, __a_end, __err, __base);
1016	// Digit grouping checked	1014	// Digit grouping checked
1017	__check_grouping(__grouping, __g, __g_end, __err);	1015	__check_grouping(__grouping, __g, __g_end, __err);
1018	// EOF checked	1016	// EOF checked
...	@@ -1067,7 +1065,7 @@ num_get<_CharT, _InputIterator>::__do_get_floating_point(iter_type __b, iter_typ	...	@@ -1067,7 +1065,7 @@ num_get<_CharT, _InputIterator>::__do_get_floating_point(iter_type __b, iter_typ
1067	if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)	1065	if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
1068	*__g_end++ = __dc;	1066	*__g_end++ = __dc;
1069	// Stage 3	1067	// Stage 3
1070	__v = __num_get_float<_Fp>(__a, __a_end, __err);	1068	__v = std::__num_get_float<_Fp>(__a, __a_end, __err);
1071	// Digit grouping checked	1069	// Digit grouping checked
1072	__check_grouping(__grouping, __g, __g_end, __err);	1070	__check_grouping(__grouping, __g, __g_end, __err);
1073	// EOF checked	1071	// EOF checked
...	@@ -1089,8 +1087,8 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -1089,8 +1087,8 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
1089	char_type __atoms[26];	1087	char_type __atoms[26];
1090	char_type __thousands_sep = 0;	1088	char_type __thousands_sep = 0;
1091	string __grouping;	1089	string __grouping;
1092	use_facet<ctype<_CharT> >(__iob.getloc()).widen(__num_get_base::__src,	1090	std::use_facet<ctype<_CharT> >(__iob.getloc()).widen(__num_get_base::__src,
1093	__num_get_base::__src + 26, __atoms);	1091	__num_get_base::__src + 26, __atoms);
1094	string __buf;	1092	string __buf;
1095	__buf.resize(__buf.capacity());	1093	__buf.resize(__buf.capacity());
1096	char* __a = &__buf[0];	1094	char* __a = &__buf[0];
...	@@ -1157,8 +1155,8 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,	...	@@ -1157,8 +1155,8 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,
1157	_CharT* __ob, _CharT& __op, _CharT& __oe,	1155	_CharT* __ob, _CharT& __op, _CharT& __oe,
1158	const locale& __loc)	1156	const locale& __loc)
1159	{	1157	{
1160	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> > (__loc);	1158	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> > (__loc);
1161	const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);	1159	const numpunct<_CharT>& __npt = std::use_facet<numpunct<_CharT> >(__loc);
1162	string __grouping = __npt.grouping();	1160	string __grouping = __npt.grouping();
1163	if (__grouping.empty())	1161	if (__grouping.empty())
1164	{	1162	{
...	@@ -1177,7 +1175,7 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,	...	@@ -1177,7 +1175,7 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,
1177	__oe++ = __ct.widen(__nf++);	1175	__oe++ = __ct.widen(__nf++);
1178	__oe++ = __ct.widen(__nf++);	1176	__oe++ = __ct.widen(__nf++);
1179	}	1177	}
1180	reverse(__nf, __ne);	1178	std::reverse(__nf, __ne);
1181	_CharT __thousands_sep = __npt.thousands_sep();	1179	_CharT __thousands_sep = __npt.thousands_sep();
1182	unsigned __dc = 0;	1180	unsigned __dc = 0;
1183	unsigned __dg = 0;	1181	unsigned __dg = 0;
...	@@ -1194,7 +1192,7 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,	...	@@ -1194,7 +1192,7 @@ __num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,
1194	__oe++ = __ct.widen(__p);	1192	__oe++ = __ct.widen(__p);
1195	++__dc;	1193	++__dc;
1196	}	1194	}
1197	reverse(__ob + (__nf - __nb), __oe);	1195	std::reverse(__ob + (__nf - __nb), __oe);
1198	}	1196	}
1199	if (__np == __ne)	1197	if (__np == __ne)
1200	__op = __oe;	1198	__op = __oe;
...	@@ -1208,8 +1206,8 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,	...	@@ -1208,8 +1206,8 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
1208	_CharT* __ob, _CharT& __op, _CharT& __oe,	1206	_CharT* __ob, _CharT& __op, _CharT& __oe,
1209	const locale& __loc)	1207	const locale& __loc)
1210	{	1208	{
1211	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> > (__loc);	1209	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> > (__loc);
1212	const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);	1210	const numpunct<_CharT>& __npt = std::use_facet<numpunct<_CharT> >(__loc);
1213	string __grouping = __npt.grouping();	1211	string __grouping = __npt.grouping();
1214	__oe = __ob;	1212	__oe = __ob;
1215	char* __nf = __nb;	1213	char* __nf = __nb;
...	@@ -1238,7 +1236,7 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,	...	@@ -1238,7 +1236,7 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
1238	}	1236	}
1239	else	1237	else
1240	{	1238	{
1241	reverse(__nf, __ns);	1239	std::reverse(__nf, __ns);
1242	_CharT __thousands_sep = __npt.thousands_sep();	1240	_CharT __thousands_sep = __npt.thousands_sep();
1243	unsigned __dc = 0;	1241	unsigned __dc = 0;
1244	unsigned __dg = 0;	1242	unsigned __dg = 0;
...	@@ -1254,7 +1252,7 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,	...	@@ -1254,7 +1252,7 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
1254	__oe++ = __ct.widen(__p);	1252	__oe++ = __ct.widen(__p);
1255	++__dc;	1253	++__dc;
1256	}	1254	}
1257	reverse(__ob + (__nf - __nb), __oe);	1255	std::reverse(__ob + (__nf - __nb), __oe);
1258	}	1256	}
1259	for (__nf = __ns; __nf < __ne; ++__nf)	1257	for (__nf = __ns; __nf < __ne; ++__nf)
1260	{	1258	{
...	@@ -1352,8 +1350,7 @@ public:	...	@@ -1352,8 +1350,7 @@ public:
1352	static locale::id id;	1350	static locale::id id;
1353		1351
1354	protected:	1352	protected:
1355	_LIBCPP_INLINE_VISIBILITY	1353	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~num_put() override {}
1356	~num_put() {}
1357		1354
1358	virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,	1355	virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
1359	bool __v) const;	1356	bool __v) const;
...	@@ -1390,7 +1387,7 @@ locale::id	...	@@ -1390,7 +1387,7 @@ locale::id
1390	num_put<_CharT, _OutputIterator>::id;	1387	num_put<_CharT, _OutputIterator>::id;
1391		1388
1392	template <class _CharT, class _OutputIterator>	1389	template <class _CharT, class _OutputIterator>
1393	_LIBCPP_HIDDEN	1390	_LIBCPP_HIDE_FROM_ABI
1394	_OutputIterator	1391	_OutputIterator
1395	__pad_and_output(_OutputIterator __s,	1392	__pad_and_output(_OutputIterator __s,
1396	const _CharT* __ob, const _CharT* __op, const _CharT* __oe,	1393	const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
...	@@ -1413,7 +1410,7 @@ __pad_and_output(_OutputIterator __s,	...	@@ -1413,7 +1410,7 @@ __pad_and_output(_OutputIterator __s,
1413	}	1410	}
1414		1411
1415	template <class _CharT, class _Traits>	1412	template <class _CharT, class _Traits>
1416	_LIBCPP_HIDDEN	1413	_LIBCPP_HIDE_FROM_ABI
1417	ostreambuf_iterator<_CharT, _Traits>	1414	ostreambuf_iterator<_CharT, _Traits>
1418	__pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,	1415	__pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,
1419	const _CharT* __ob, const _CharT* __op, const _CharT* __oe,	1416	const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
...	@@ -1465,7 +1462,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,	...	@@ -1465,7 +1462,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
1465	{	1462	{
1466	if ((__iob.flags() & ios_base::boolalpha) == 0)	1463	if ((__iob.flags() & ios_base::boolalpha) == 0)
1467	return do_put(__s, __iob, __fl, (unsigned long)__v);	1464	return do_put(__s, __iob, __fl, (unsigned long)__v);
1468	const numpunct<char_type>& __np = use_facet<numpunct<char_type> >(__iob.getloc());	1465	const numpunct<char_type>& __np = std::use_facet<numpunct<char_type> >(__iob.getloc());
1469	typedef typename numpunct<char_type>::string_type string_type;	1466	typedef typename numpunct<char_type>::string_type string_type;
1470	#ifdef _LIBCPP_ENABLE_DEBUG_MODE	1467	#ifdef _LIBCPP_ENABLE_DEBUG_MODE
1471	string_type __tmp(__v ? __np.truename() : __np.falsename());	1468	string_type __tmp(__v ? __np.truename() : __np.falsename());
...	@@ -1511,7 +1508,7 @@ num_put<_CharT, _OutputIterator>::__do_put_integral(iter_type __s, ios_base& __i	...	@@ -1511,7 +1508,7 @@ num_put<_CharT, _OutputIterator>::__do_put_integral(iter_type __s, ios_base& __i
1511	this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());	1508	this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
1512	// [__o, __oe) contains thousands_sep'd wide number	1509	// [__o, __oe) contains thousands_sep'd wide number
1513	// Stage 3 & 4	1510	// Stage 3 & 4
1514	return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);	1511	return std::__pad_and_output(__s, __o, __op, __oe, __iob, __fl);
1515	}	1512	}
1516		1513
1517	template <class _CharT, class _OutputIterator>	1514	template <class _CharT, class _OutputIterator>
...	@@ -1599,7 +1596,7 @@ num_put<_CharT, _OutputIterator>::__do_put_floating_point(iter_type __s, ios_bas	...	@@ -1599,7 +1596,7 @@ num_put<_CharT, _OutputIterator>::__do_put_floating_point(iter_type __s, ios_bas
1599	this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());	1596	this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());
1600	// [__o, __oe) contains thousands_sep'd wide number	1597	// [__o, __oe) contains thousands_sep'd wide number
1601	// Stage 3 & 4	1598	// Stage 3 & 4
1602	__s = __pad_and_output(__s, __ob, __op, __oe, __iob, __fl);	1599	__s = std::__pad_and_output(__s, __ob, __op, __oe, __iob, __fl);
1603	return __s;	1600	return __s;
1604	}	1601	}
1605		1602
...	@@ -1634,7 +1631,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,	...	@@ -1634,7 +1631,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
1634	char_type __o[2*(__nbuf-1) - 1];	1631	char_type __o[2*(__nbuf-1) - 1];
1635	char_type* __op; // pad here	1632	char_type* __op; // pad here
1636	char_type* __oe; // end of output	1633	char_type* __oe; // end of output
1637	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	1634	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
1638	__ct.widen(__nar, __ne, __o);	1635	__ct.widen(__nar, __ne, __o);
1639	__oe = __o + (__ne - __nar);	1636	__oe = __o + (__ne - __nar);
1640	if (__np == __ne)	1637	if (__np == __ne)
...	@@ -1643,7 +1640,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,	...	@@ -1643,7 +1640,7 @@ num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
1643	__op = __o + (__np - __nar);	1640	__op = __o + (__np - __nar);
1644	// [__o, __oe) contains wide number	1641	// [__o, __oe) contains wide number
1645	// Stage 3 & 4	1642	// Stage 3 & 4
1646	return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);	1643	return std::__pad_and_output(__s, __o, __op, __oe, __iob, __fl);
1647	}	1644	}
1648		1645
1649	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<char>;	1646	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<char>;
...	@@ -1652,7 +1649,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<wchar_t>;	...	@@ -1652,7 +1649,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<wchar_t>;
1652	#endif	1649	#endif
1653		1650
1654	template <class _CharT, class _InputIterator>	1651	template <class _CharT, class _InputIterator>
1655	_LIBCPP_HIDDEN	1652	_LIBCPP_HIDE_FROM_ABI
1656	int	1653	int
1657	__get_up_to_n_digits(_InputIterator& __b, _InputIterator __e,	1654	__get_up_to_n_digits(_InputIterator& __b, _InputIterator __e,
1658	ios_base::iostate& __err, const ctype<_CharT>& __ct, int __n)	1655	ios_base::iostate& __err, const ctype<_CharT>& __ct, int __n)
...	@@ -1798,8 +1795,7 @@ public:	...	@@ -1798,8 +1795,7 @@ public:
1798	static locale::id id;	1795	static locale::id id;
1799		1796
1800	protected:	1797	protected:
1801	_LIBCPP_INLINE_VISIBILITY	1798	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~time_get() override {}
1802	~time_get() {}
1803		1799
1804	virtual dateorder do_date_order() const;	1800	virtual dateorder do_date_order() const;
1805	virtual iter_type do_get_time(iter_type __b, iter_type __e, ios_base& __iob,	1801	virtual iter_type do_get_time(iter_type __b, iter_type __e, ios_base& __iob,
...	@@ -1930,7 +1926,7 @@ time_get<_CharT, _InputIterator>::__get_month(int& __m,	...	@@ -1930,7 +1926,7 @@ time_get<_CharT, _InputIterator>::__get_month(int& __m,
1930	ios_base::iostate& __err,	1926	ios_base::iostate& __err,
1931	const ctype<char_type>& __ct) const	1927	const ctype<char_type>& __ct) const
1932	{	1928	{
1933	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2) - 1;	1929	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 2) - 1;
1934	if (!(__err & ios_base::failbit) && 0 <= __t && __t <= 11)	1930	if (!(__err & ios_base::failbit) && 0 <= __t && __t <= 11)
1935	__m = __t;	1931	__m = __t;
1936	else	1932	else
...	@@ -1944,7 +1940,7 @@ time_get<_CharT, _InputIterator>::__get_year(int& __y,	...	@@ -1944,7 +1940,7 @@ time_get<_CharT, _InputIterator>::__get_year(int& __y,
1944	ios_base::iostate& __err,	1940	ios_base::iostate& __err,
1945	const ctype<char_type>& __ct) const	1941	const ctype<char_type>& __ct) const
1946	{	1942	{
1947	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);	1943	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 4);
1948	if (!(__err & ios_base::failbit))	1944	if (!(__err & ios_base::failbit))
1949	{	1945	{
1950	if (__t < 69)	1946	if (__t < 69)
...	@@ -1962,7 +1958,7 @@ time_get<_CharT, _InputIterator>::__get_year4(int& __y,	...	@@ -1962,7 +1958,7 @@ time_get<_CharT, _InputIterator>::__get_year4(int& __y,
1962	ios_base::iostate& __err,	1958	ios_base::iostate& __err,
1963	const ctype<char_type>& __ct) const	1959	const ctype<char_type>& __ct) const
1964	{	1960	{
1965	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);	1961	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 4);
1966	if (!(__err & ios_base::failbit))	1962	if (!(__err & ios_base::failbit))
1967	__y = __t - 1900;	1963	__y = __t - 1900;
1968	}	1964	}
...	@@ -1974,7 +1970,7 @@ time_get<_CharT, _InputIterator>::__get_hour(int& __h,	...	@@ -1974,7 +1970,7 @@ time_get<_CharT, _InputIterator>::__get_hour(int& __h,
1974	ios_base::iostate& __err,	1970	ios_base::iostate& __err,
1975	const ctype<char_type>& __ct) const	1971	const ctype<char_type>& __ct) const
1976	{	1972	{
1977	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);	1973	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 2);
1978	if (!(__err & ios_base::failbit) && __t <= 23)	1974	if (!(__err & ios_base::failbit) && __t <= 23)
1979	__h = __t;	1975	__h = __t;
1980	else	1976	else
...	@@ -1988,7 +1984,7 @@ time_get<_CharT, _InputIterator>::__get_12_hour(int& __h,	...	@@ -1988,7 +1984,7 @@ time_get<_CharT, _InputIterator>::__get_12_hour(int& __h,
1988	ios_base::iostate& __err,	1984	ios_base::iostate& __err,
1989	const ctype<char_type>& __ct) const	1985	const ctype<char_type>& __ct) const
1990	{	1986	{
1991	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);	1987	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 2);
1992	if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 12)	1988	if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 12)
1993	__h = __t;	1989	__h = __t;
1994	else	1990	else
...	@@ -2002,7 +1998,7 @@ time_get<_CharT, _InputIterator>::__get_minute(int& __m,	...	@@ -2002,7 +1998,7 @@ time_get<_CharT, _InputIterator>::__get_minute(int& __m,
2002	ios_base::iostate& __err,	1998	ios_base::iostate& __err,
2003	const ctype<char_type>& __ct) const	1999	const ctype<char_type>& __ct) const
2004	{	2000	{
2005	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);	2001	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 2);
2006	if (!(__err & ios_base::failbit) && __t <= 59)	2002	if (!(__err & ios_base::failbit) && __t <= 59)
2007	__m = __t;	2003	__m = __t;
2008	else	2004	else
...	@@ -2016,7 +2012,7 @@ time_get<_CharT, _InputIterator>::__get_second(int& __s,	...	@@ -2016,7 +2012,7 @@ time_get<_CharT, _InputIterator>::__get_second(int& __s,
2016	ios_base::iostate& __err,	2012	ios_base::iostate& __err,
2017	const ctype<char_type>& __ct) const	2013	const ctype<char_type>& __ct) const
2018	{	2014	{
2019	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);	2015	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 2);
2020	if (!(__err & ios_base::failbit) && __t <= 60)	2016	if (!(__err & ios_base::failbit) && __t <= 60)
2021	__s = __t;	2017	__s = __t;
2022	else	2018	else
...	@@ -2030,7 +2026,7 @@ time_get<_CharT, _InputIterator>::__get_weekday(int& __w,	...	@@ -2030,7 +2026,7 @@ time_get<_CharT, _InputIterator>::__get_weekday(int& __w,
2030	ios_base::iostate& __err,	2026	ios_base::iostate& __err,
2031	const ctype<char_type>& __ct) const	2027	const ctype<char_type>& __ct) const
2032	{	2028	{
2033	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 1);	2029	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 1);
2034	if (!(__err & ios_base::failbit) && __t <= 6)	2030	if (!(__err & ios_base::failbit) && __t <= 6)
2035	__w = __t;	2031	__w = __t;
2036	else	2032	else
...	@@ -2044,7 +2040,7 @@ time_get<_CharT, _InputIterator>::__get_day_year_num(int& __d,	...	@@ -2044,7 +2040,7 @@ time_get<_CharT, _InputIterator>::__get_day_year_num(int& __d,
2044	ios_base::iostate& __err,	2040	ios_base::iostate& __err,
2045	const ctype<char_type>& __ct) const	2041	const ctype<char_type>& __ct) const
2046	{	2042	{
2047	int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 3);	2043	int __t = std::__get_up_to_n_digits(__b, __e, __err, __ct, 3);
2048	if (!(__err & ios_base::failbit) && __t <= 365)	2044	if (!(__err & ios_base::failbit) && __t <= 365)
2049	__d = __t;	2045	__d = __t;
2050	else	2046	else
...	@@ -2109,7 +2105,7 @@ time_get<_CharT, _InputIterator>::get(iter_type __b, iter_type __e,	...	@@ -2109,7 +2105,7 @@ time_get<_CharT, _InputIterator>::get(iter_type __b, iter_type __e,
2109	ios_base::iostate& __err, tm* __tm,	2105	ios_base::iostate& __err, tm* __tm,
2110	const char_type* __fmtb, const char_type* __fmte) const	2106	const char_type* __fmtb, const char_type* __fmte) const
2111	{	2107	{
2112	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2108	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2113	__err = ios_base::goodbit;	2109	__err = ios_base::goodbit;
2114	while (__fmtb != __fmte && __err == ios_base::goodbit)	2110	while (__fmtb != __fmte && __err == ios_base::goodbit)
2115	{	2111	{
...	@@ -2196,7 +2192,7 @@ time_get<_CharT, _InputIterator>::do_get_weekday(iter_type __b, iter_type __e,	...	@@ -2196,7 +2192,7 @@ time_get<_CharT, _InputIterator>::do_get_weekday(iter_type __b, iter_type __e,
2196	ios_base::iostate& __err,	2192	ios_base::iostate& __err,
2197	tm* __tm) const	2193	tm* __tm) const
2198	{	2194	{
2199	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2195	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2200	__get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);	2196	__get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);
2201	return __b;	2197	return __b;
2202	}	2198	}
...	@@ -2208,7 +2204,7 @@ time_get<_CharT, _InputIterator>::do_get_monthname(iter_type __b, iter_type __e,	...	@@ -2208,7 +2204,7 @@ time_get<_CharT, _InputIterator>::do_get_monthname(iter_type __b, iter_type __e,
2208	ios_base::iostate& __err,	2204	ios_base::iostate& __err,
2209	tm* __tm) const	2205	tm* __tm) const
2210	{	2206	{
2211	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2207	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2212	__get_monthname(__tm->tm_mon, __b, __e, __err, __ct);	2208	__get_monthname(__tm->tm_mon, __b, __e, __err, __ct);
2213	return __b;	2209	return __b;
2214	}	2210	}
...	@@ -2220,7 +2216,7 @@ time_get<_CharT, _InputIterator>::do_get_year(iter_type __b, iter_type __e,	...	@@ -2220,7 +2216,7 @@ time_get<_CharT, _InputIterator>::do_get_year(iter_type __b, iter_type __e,
2220	ios_base::iostate& __err,	2216	ios_base::iostate& __err,
2221	tm* __tm) const	2217	tm* __tm) const
2222	{	2218	{
2223	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2219	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2224	__get_year(__tm->tm_year, __b, __e, __err, __ct);	2220	__get_year(__tm->tm_year, __b, __e, __err, __ct);
2225	return __b;	2221	return __b;
2226	}	2222	}
...	@@ -2233,7 +2229,7 @@ time_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -2233,7 +2229,7 @@ time_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
2233	char __fmt, char) const	2229	char __fmt, char) const
2234	{	2230	{
2235	__err = ios_base::goodbit;	2231	__err = ios_base::goodbit;
2236	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2232	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2237	switch (__fmt)	2233	switch (__fmt)
2238	{	2234	{
2239	case 'a':	2235	case 'a':
...	@@ -2392,7 +2388,9 @@ extern template _LIBCPP_FUNC_VIS __time_get_storage<_CharT>::string_type __time_	...	@@ -2392,7 +2388,9 @@ extern template _LIBCPP_FUNC_VIS __time_get_storage<_CharT>::string_type __time_
2392	/**/	2388	/**/
2393		2389
2394	_LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION(char)	2390	_LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION(char)
		2391	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
2395	_LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION(wchar_t)	2392	_LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION(wchar_t)
		2393	#endif
2396	#undef _LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION	2394	#undef _LIBCPP_TIME_GET_STORAGE_EXPLICIT_INSTANTIATION
2397		2395
2398	template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >	2396	template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
...	@@ -2416,26 +2414,17 @@ public:	...	@@ -2416,26 +2414,17 @@ public:
2416	__time_get_storage<_CharT>(__nm) {}	2414	__time_get_storage<_CharT>(__nm) {}
2417		2415
2418	protected:	2416	protected:
2419	_LIBCPP_INLINE_VISIBILITY	2417	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~time_get_byname() override {}
2420	~time_get_byname() {}
2421		2418
2422	_LIBCPP_INLINE_VISIBILITY	2419	_LIBCPP_HIDE_FROM_ABI_VIRTUAL dateorder do_date_order() const override {return this->__do_date_order();}
2423	virtual dateorder do_date_order() const {return this->__do_date_order();}
2424	private:	2420	private:
2425	_LIBCPP_INLINE_VISIBILITY	2421	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type* __weeks() const override {return this->__weeks_;}
2426	virtual const string_type* __weeks() const {return this->__weeks_;}	2422	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type* __months() const override {return this->__months_;}
2427	_LIBCPP_INLINE_VISIBILITY	2423	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type* __am_pm() const override {return this->__am_pm_;}
2428	virtual const string_type* __months() const {return this->__months_;}	2424	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type& __c() const override {return this->__c_;}
2429	_LIBCPP_INLINE_VISIBILITY	2425	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type& __r() const override {return this->__r_;}
2430	virtual const string_type* __am_pm() const {return this->__am_pm_;}	2426	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type& __x() const override {return this->__x_;}
2431	_LIBCPP_INLINE_VISIBILITY	2427	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const string_type& __X() const override {return this->__X_;}
2432	virtual const string_type& __c() const {return this->__c_;}
2433	_LIBCPP_INLINE_VISIBILITY
2434	virtual const string_type& __r() const {return this->__r_;}
2435	_LIBCPP_INLINE_VISIBILITY
2436	virtual const string_type& __x() const {return this->__x_;}
2437	_LIBCPP_INLINE_VISIBILITY
2438	virtual const string_type& __X() const {return this->__X_;}
2439	};	2428	};
2440		2429
2441	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_get_byname<char>;	2430	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_get_byname<char>;
...	@@ -2453,8 +2442,10 @@ protected:	...	@@ -2453,8 +2442,10 @@ protected:
2453	~__time_put();	2442	~__time_put();
2454	void __do_put(char* __nb, char& __ne, const tm __tm,	2443	void __do_put(char* __nb, char& __ne, const tm __tm,
2455	char __fmt, char __mod) const;	2444	char __fmt, char __mod) const;
		2445	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
2456	void __do_put(wchar_t* __wb, wchar_t& __we, const tm __tm,	2446	void __do_put(wchar_t* __wb, wchar_t& __we, const tm __tm,
2457	char __fmt, char __mod) const;	2447	char __fmt, char __mod) const;
		2448	#endif
2458	};	2449	};
2459		2450
2460	template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >	2451	template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
...	@@ -2483,8 +2474,7 @@ public:	...	@@ -2483,8 +2474,7 @@ public:
2483	static locale::id id;	2474	static locale::id id;
2484		2475
2485	protected:	2476	protected:
2486	_LIBCPP_INLINE_VISIBILITY	2477	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~time_put() override {}
2487	~time_put() {}
2488	virtual iter_type do_put(iter_type __s, ios_base&, char_type, const tm* __tm,	2478	virtual iter_type do_put(iter_type __s, ios_base&, char_type, const tm* __tm,
2489	char __fmt, char __mod) const;	2479	char __fmt, char __mod) const;
2490		2480
...	@@ -2509,7 +2499,7 @@ time_put<_CharT, _OutputIterator>::put(iter_type __s, ios_base& __iob,	...	@@ -2509,7 +2499,7 @@ time_put<_CharT, _OutputIterator>::put(iter_type __s, ios_base& __iob,
2509	const char_type* __pb,	2499	const char_type* __pb,
2510	const char_type* __pe) const	2500	const char_type* __pe) const
2511	{	2501	{
2512	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());	2502	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__iob.getloc());
2513	for (; __pb != __pe; ++__pb)	2503	for (; __pb != __pe; ++__pb)
2514	{	2504	{
2515	if (__ct.narrow(*__pb, 0) == '%')	2505	if (__ct.narrow(*__pb, 0) == '%')
...	@@ -2572,8 +2562,7 @@ public:	...	@@ -2572,8 +2562,7 @@ public:
2572	: time_put<_CharT, _OutputIterator>(__nm, __refs) {}	2562	: time_put<_CharT, _OutputIterator>(__nm, __refs) {}
2573		2563
2574	protected:	2564	protected:
2575	_LIBCPP_INLINE_VISIBILITY	2565	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~time_put_byname() override {}
2576	~time_put_byname() {}
2577	};	2566	};
2578		2567
2579	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<char>;	2568	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<char>;
...	@@ -2621,8 +2610,7 @@ public:	...	@@ -2621,8 +2610,7 @@ public:
2621	static const bool intl = _International;	2610	static const bool intl = _International;
2622		2611
2623	protected:	2612	protected:
2624	_LIBCPP_INLINE_VISIBILITY	2613	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~moneypunct() override {}
2625	~moneypunct() {}
2626		2614
2627	virtual char_type do_decimal_point() const {return numeric_limits<char_type>::max();}	2615	virtual char_type do_decimal_point() const {return numeric_limits<char_type>::max();}
2628	virtual char_type do_thousands_sep() const {return numeric_limits<char_type>::max();}	2616	virtual char_type do_thousands_sep() const {return numeric_limits<char_type>::max();}
...	@@ -2672,18 +2660,17 @@ public:	...	@@ -2672,18 +2660,17 @@ public:
2672	: moneypunct<_CharT, _International>(__refs) {init(__nm.c_str());}	2660	: moneypunct<_CharT, _International>(__refs) {init(__nm.c_str());}
2673		2661
2674	protected:	2662	protected:
2675	_LIBCPP_INLINE_VISIBILITY	2663	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~moneypunct_byname() override {}
2676	~moneypunct_byname() {}	2664
2677		2665	char_type do_decimal_point() const override {return __decimal_point_;}
2678	virtual char_type do_decimal_point() const {return __decimal_point_;}	2666	char_type do_thousands_sep() const override {return __thousands_sep_;}
2679	virtual char_type do_thousands_sep() const {return __thousands_sep_;}	2667	string do_grouping() const override {return __grouping_;}
2680	virtual string do_grouping() const {return __grouping_;}	2668	string_type do_curr_symbol() const override {return __curr_symbol_;}
2681	virtual string_type do_curr_symbol() const {return __curr_symbol_;}	2669	string_type do_positive_sign() const override {return __positive_sign_;}
2682	virtual string_type do_positive_sign() const {return __positive_sign_;}	2670	string_type do_negative_sign() const override {return __negative_sign_;}
2683	virtual string_type do_negative_sign() const {return __negative_sign_;}	2671	int do_frac_digits() const override {return __frac_digits_;}
2684	virtual int do_frac_digits() const {return __frac_digits_;}	2672	pattern do_pos_format() const override {return __pos_format_;}
2685	virtual pattern do_pos_format() const {return __pos_format_;}	2673	pattern do_neg_format() const override {return __neg_format_;}
2686	virtual pattern do_neg_format() const {return __neg_format_;}
2687		2674
2688	private:	2675	private:
2689	char_type __decimal_point_;	2676	char_type __decimal_point_;
...	@@ -2740,7 +2727,7 @@ __money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,	...	@@ -2740,7 +2727,7 @@ __money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,
2740	if (__intl)	2727	if (__intl)
2741	{	2728	{
2742	const moneypunct<char_type, true>& __mp =	2729	const moneypunct<char_type, true>& __mp =
2743	use_facet<moneypunct<char_type, true> >(__loc);	2730	std::use_facet<moneypunct<char_type, true> >(__loc);
2744	__pat = __mp.neg_format();	2731	__pat = __mp.neg_format();
2745	__nsn = __mp.negative_sign();	2732	__nsn = __mp.negative_sign();
2746	__psn = __mp.positive_sign();	2733	__psn = __mp.positive_sign();
...	@@ -2753,7 +2740,7 @@ __money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,	...	@@ -2753,7 +2740,7 @@ __money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,
2753	else	2740	else
2754	{	2741	{
2755	const moneypunct<char_type, false>& __mp =	2742	const moneypunct<char_type, false>& __mp =
2756	use_facet<moneypunct<char_type, false> >(__loc);	2743	std::use_facet<moneypunct<char_type, false> >(__loc);
2757	__pat = __mp.neg_format();	2744	__pat = __mp.neg_format();
2758	__nsn = __mp.negative_sign();	2745	__nsn = __mp.negative_sign();
2759	__psn = __mp.positive_sign();	2746	__psn = __mp.positive_sign();
...	@@ -2801,9 +2788,7 @@ public:	...	@@ -2801,9 +2788,7 @@ public:
2801	static locale::id id;	2788	static locale::id id;
2802		2789
2803	protected:	2790	protected:
2804		2791	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~money_get() override {}
2805	_LIBCPP_INLINE_VISIBILITY
2806	~money_get() {}
2807		2792
2808	virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,	2793	virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,
2809	ios_base& __iob, ios_base::iostate& __err,	2794	ios_base& __iob, ios_base::iostate& __err,
...	@@ -2828,7 +2813,7 @@ money_get<_CharT, _InputIterator>::id;	...	@@ -2828,7 +2813,7 @@ money_get<_CharT, _InputIterator>::id;
2828	_LIBCPP_FUNC_VIS void __do_nothing(void*);	2813	_LIBCPP_FUNC_VIS void __do_nothing(void*);
2829		2814
2830	template <class _Tp>	2815	template <class _Tp>
2831	_LIBCPP_HIDDEN	2816	_LIBCPP_HIDE_FROM_ABI
2832	void	2817	void
2833	__double_or_nothing(unique_ptr<_Tp, void()(void)>& __b, _Tp& __n, _Tp& __e)	2818	__double_or_nothing(unique_ptr<_Tp, void()(void)>& __b, _Tp& __n, _Tp& __e)
2834	{	2819	{
...	@@ -2839,7 +2824,7 @@ __double_or_nothing(unique_ptr<_Tp, void()(void)>& __b, _Tp& __n, _Tp& __e)	...	@@ -2839,7 +2824,7 @@ __double_or_nothing(unique_ptr<_Tp, void()(void)>& __b, _Tp& __n, _Tp& __e)
2839	if (__new_cap == 0)	2824	if (__new_cap == 0)
2840	__new_cap = sizeof(_Tp);	2825	__new_cap = sizeof(_Tp);
2841	size_t __n_off = static_cast<size_t>(__n - __b.get());	2826	size_t __n_off = static_cast<size_t>(__n - __b.get());
2842	_Tp* __t = (_Tp*)realloc(__owns ? __b.get() : 0, __new_cap);	2827	_Tp* __t = (_Tp*)std::realloc(__owns ? __b.get() : 0, __new_cap);
2843	if (__t == 0)	2828	if (__t == 0)
2844	__throw_bad_alloc();	2829	__throw_bad_alloc();
2845	if (__owns)	2830	if (__owns)
...	@@ -2954,7 +2939,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,	...	@@ -2954,7 +2939,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
2954	++__sym_space_end;	2939	++__sym_space_end;
2955	const size_t __num_spaces = __sym_space_end - __sym.begin();	2940	const size_t __num_spaces = __sym_space_end - __sym.begin();
2956	if (__num_spaces > __spaces.size() \|\|	2941	if (__num_spaces > __spaces.size() \|\|
2957	!equal(__spaces.end() - __num_spaces, __spaces.end(),	2942	!std::equal(__spaces.end() - __num_spaces, __spaces.end(),
2958	__sym.begin())) {	2943	__sym.begin())) {
2959	// No match. Put __sym_space_end back at the	2944	// No match. Put __sym_space_end back at the
2960	// beginning of __sym, which will prevent a	2945	// beginning of __sym, which will prevent a
...	@@ -2985,14 +2970,14 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,	...	@@ -2985,14 +2970,14 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
2985	if (__ct.is(ctype_base::digit, __c))	2970	if (__ct.is(ctype_base::digit, __c))
2986	{	2971	{
2987	if (__wn == __we)	2972	if (__wn == __we)
2988	__double_or_nothing(__wb, __wn, __we);	2973	std::__double_or_nothing(__wb, __wn, __we);
2989	*__wn++ = __c;	2974	*__wn++ = __c;
2990	++__ng;	2975	++__ng;
2991	}	2976	}
2992	else if (__grp.size() > 0 && __ng > 0 && __c == __ts)	2977	else if (__grp.size() > 0 && __ng > 0 && __c == __ts)
2993	{	2978	{
2994	if (__gn == __ge)	2979	if (__gn == __ge)
2995	__double_or_nothing(__gb, __gn, __ge);	2980	std::__double_or_nothing(__gb, __gn, __ge);
2996	*__gn++ = __ng;	2981	*__gn++ = __ng;
2997	__ng = 0;	2982	__ng = 0;
2998	}	2983	}
...	@@ -3002,7 +2987,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,	...	@@ -3002,7 +2987,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
3002	if (__gb.get() != __gn && __ng > 0)	2987	if (__gb.get() != __gn && __ng > 0)
3003	{	2988	{
3004	if (__gn == __ge)	2989	if (__gn == __ge)
3005	__double_or_nothing(__gb, __gn, __ge);	2990	std::__double_or_nothing(__gb, __gn, __ge);
3006	*__gn++ = __ng;	2991	*__gn++ = __ng;
3007	}	2992	}
3008	if (__fd > 0)	2993	if (__fd > 0)
...	@@ -3020,7 +3005,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,	...	@@ -3020,7 +3005,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
3020	return false;	3005	return false;
3021	}	3006	}
3022	if (__wn == __we)	3007	if (__wn == __we)
3023	__double_or_nothing(__wb, __wn, __we);	3008	std::__double_or_nothing(__wb, __wn, __we);
3024	__wn++ = __b;	3009	__wn++ = __b;
3025	}	3010	}
3026	}	3011	}
...	@@ -3070,7 +3055,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -3070,7 +3055,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
3070	char_type* __wn;	3055	char_type* __wn;
3071	char_type* __we = __wbuf + __bz;	3056	char_type* __we = __wbuf + __bz;
3072	locale __loc = __iob.getloc();	3057	locale __loc = __iob.getloc();
3073	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);	3058	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__loc);
3074	bool __neg = false;	3059	bool __neg = false;
3075	if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,	3060	if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
3076	__wb, __wn, __we))	3061	__wb, __wn, __we))
...	@@ -3091,7 +3076,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -3091,7 +3076,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
3091	if (__neg)	3076	if (__neg)
3092	*__nc++ = '-';	3077	*__nc++ = '-';
3093	for (const char_type* __w = __wb.get(); __w < __wn; ++__w, ++__nc)	3078	for (const char_type* __w = __wb.get(); __w < __wn; ++__w, ++__nc)
3094	__nc = __src[find(__atoms, _VSTD::end(__atoms), __w) - __atoms];	3079	__nc = __src[std::find(__atoms, _VSTD::end(__atoms), __w) - __atoms];
3095	*__nc = char();	3080	*__nc = char();
3096	if (sscanf(__nbuf, "%Lf", &__v) != 1)	3081	if (sscanf(__nbuf, "%Lf", &__v) != 1)
3097	__throw_runtime_error("money_get error");	3082	__throw_runtime_error("money_get error");
...	@@ -3114,7 +3099,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,	...	@@ -3114,7 +3099,7 @@ money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
3114	char_type* __wn;	3099	char_type* __wn;
3115	char_type* __we = __wbuf + __bz;	3100	char_type* __we = __wbuf + __bz;
3116	locale __loc = __iob.getloc();	3101	locale __loc = __iob.getloc();
3117	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);	3102	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__loc);
3118	bool __neg = false;	3103	bool __neg = false;
3119	if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,	3104	if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
3120	__wb, __wn, __we))	3105	__wb, __wn, __we))
...	@@ -3176,7 +3161,7 @@ __money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,	...	@@ -3176,7 +3161,7 @@ __money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,
3176	if (__intl)	3161	if (__intl)
3177	{	3162	{
3178	const moneypunct<char_type, true>& __mp =	3163	const moneypunct<char_type, true>& __mp =
3179	use_facet<moneypunct<char_type, true> >(__loc);	3164	std::use_facet<moneypunct<char_type, true> >(__loc);
3180	if (__neg)	3165	if (__neg)
3181	{	3166	{
3182	__pat = __mp.neg_format();	3167	__pat = __mp.neg_format();
...	@@ -3196,7 +3181,7 @@ __money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,	...	@@ -3196,7 +3181,7 @@ __money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,
3196	else	3181	else
3197	{	3182	{
3198	const moneypunct<char_type, false>& __mp =	3183	const moneypunct<char_type, false>& __mp =
3199	use_facet<moneypunct<char_type, false> >(__loc);	3184	std::use_facet<moneypunct<char_type, false> >(__loc);
3200	if (__neg)	3185	if (__neg)
3201	{	3186	{
3202	__pat = __mp.neg_format();	3187	__pat = __mp.neg_format();
...	@@ -3296,7 +3281,7 @@ __money_put<_CharT>::__format(char_type* __mb, char_type& __mi, char_type& __m	...	@@ -3296,7 +3281,7 @@ __money_put<_CharT>::__format(char_type* __mb, char_type& __mi, char_type& __m
3296	}	3281	}
3297	}	3282	}
3298	// reverse it	3283	// reverse it
3299	reverse(__t, __me);	3284	std::reverse(__t, __me);
3300	}	3285	}
3301	break;	3286	break;
3302	}	3287	}
...	@@ -3347,8 +3332,7 @@ public:	...	@@ -3347,8 +3332,7 @@ public:
3347	static locale::id id;	3332	static locale::id id;
3348		3333
3349	protected:	3334	protected:
3350	_LIBCPP_INLINE_VISIBILITY	3335	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~money_put() override {}
3351	~money_put() {}
3352		3336
3353	virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,	3337	virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,
3354	char_type __fl, long double __units) const;	3338	char_type __fl, long double __units) const;
...	@@ -3389,7 +3373,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,	...	@@ -3389,7 +3373,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
3389	}	3373	}
3390	// gather info	3374	// gather info
3391	locale __loc = __iob.getloc();	3375	locale __loc = __iob.getloc();
3392	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);	3376	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__loc);
3393	__ct.widen(__bb, __bb + __n, __db);	3377	__ct.widen(__bb, __bb + __n, __db);
3394	bool __neg = __n > 0 && __bb[0] == '-';	3378	bool __neg = __n > 0 && __bb[0] == '-';
3395	money_base::pattern __pat;	3379	money_base::pattern __pat;
...	@@ -3421,7 +3405,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,	...	@@ -3421,7 +3405,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
3421	this->__format(__mb, __mi, __me, __iob.flags(),	3405	this->__format(__mb, __mi, __me, __iob.flags(),
3422	__db, __db + __n, __ct,	3406	__db, __db + __n, __ct,
3423	__neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);	3407	__neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
3424	return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);	3408	return std::__pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
3425	}	3409	}
3426		3410
3427	template <class _CharT, class _OutputIterator>	3411	template <class _CharT, class _OutputIterator>
...	@@ -3432,7 +3416,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,	...	@@ -3432,7 +3416,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
3432	{	3416	{
3433	// gather info	3417	// gather info
3434	locale __loc = __iob.getloc();	3418	locale __loc = __iob.getloc();
3435	const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);	3419	const ctype<char_type>& __ct = std::use_facet<ctype<char_type> >(__loc);
3436	bool __neg = __digits.size() > 0 && __digits[0] == __ct.widen('-');	3420	bool __neg = __digits.size() > 0 && __digits[0] == __ct.widen('-');
3437	money_base::pattern __pat;	3421	money_base::pattern __pat;
3438	char_type __dp;	3422	char_type __dp;
...	@@ -3463,7 +3447,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,	...	@@ -3463,7 +3447,7 @@ money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
3463	this->__format(__mb, __mi, __me, __iob.flags(),	3447	this->__format(__mb, __mi, __me, __iob.flags(),
3464	__digits.data(), __digits.data() + __digits.size(), __ct,	3448	__digits.data(), __digits.data() + __digits.size(), __ct,
3465	__neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);	3449	__neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
3466	return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);	3450	return std::__pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
3467	}	3451	}
3468		3452
3469	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS money_put<char>;	3453	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS money_put<char>;
...	@@ -3516,8 +3500,7 @@ public:	...	@@ -3516,8 +3500,7 @@ public:
3516	static locale::id id;	3500	static locale::id id;
3517		3501
3518	protected:	3502	protected:
3519	_LIBCPP_INLINE_VISIBILITY	3503	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~messages() override {}
3520	~messages() {}
3521		3504
3522	virtual catalog do_open(const basic_string<char>&, const locale&) const;	3505	virtual catalog do_open(const basic_string<char>&, const locale&) const;
3523	virtual string_type do_get(catalog, int __set, int __msgid,	3506	virtual string_type do_get(catalog, int __set, int __msgid,
...	@@ -3551,7 +3534,7 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid,	...	@@ -3551,7 +3534,7 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
3551	{	3534	{
3552	#ifdef _LIBCPP_HAS_CATOPEN	3535	#ifdef _LIBCPP_HAS_CATOPEN
3553	string __ndflt;	3536	string __ndflt;
3554	__narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__ndflt),	3537	__narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(std::back_inserter(__ndflt),
3555	__dflt.c_str(),	3538	__dflt.c_str(),
3556	__dflt.c_str() + __dflt.size());	3539	__dflt.c_str() + __dflt.size());
3557	if (__c != -1)	3540	if (__c != -1)
...	@@ -3559,7 +3542,7 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid,	...	@@ -3559,7 +3542,7 @@ messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
3559	nl_catd __cat = (nl_catd)__c;	3542	nl_catd __cat = (nl_catd)__c;
3560	char* __n = catgets(__cat, __set, __msgid, __ndflt.c_str());	3543	char* __n = catgets(__cat, __set, __msgid, __ndflt.c_str());
3561	string_type __w;	3544	string_type __w;
3562	__widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__w),	3545	__widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(std::back_inserter(__w),
3563	__n, __n + _VSTD::strlen(__n));	3546	__n, __n + _VSTD::strlen(__n));
3564	return __w;	3547	return __w;
3565	#else // !_LIBCPP_HAS_CATOPEN	3548	#else // !_LIBCPP_HAS_CATOPEN
...	@@ -3606,8 +3589,7 @@ public:	...	@@ -3606,8 +3589,7 @@ public:
3606	: messages<_CharT>(__refs) {}	3589	: messages<_CharT>(__refs) {}
3607		3590
3608	protected:	3591	protected:
3609	_LIBCPP_INLINE_VISIBILITY	3592	_LIBCPP_HIDE_FROM_ABI_VIRTUAL ~messages_byname() override {}
3610	~messages_byname() {}
3611	};	3593	};
3612		3594
3613	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<char>;	3595	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<char>;
...	@@ -4007,7 +3989,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -4007,7 +3989,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
4007	char_type __1buf;	3989	char_type __1buf;
4008	if (this->gptr() == 0)	3990	if (this->gptr() == 0)
4009	this->setg(&__1buf, &__1buf+1, &__1buf+1);	3991	this->setg(&__1buf, &__1buf+1, &__1buf+1);
4010	const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);	3992	const size_t __unget_sz = __initial ? 0 : std::min<size_t>((this->egptr() - this->eback()) / 2, 4);
4011	int_type __c = traits_type::eof();	3993	int_type __c = traits_type::eof();
4012	if (this->gptr() == this->egptr())	3994	if (this->gptr() == this->egptr())
4013	{	3995	{
...	@@ -4026,9 +4008,11 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -4026,9 +4008,11 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
4026	}	4008	}
4027	else	4009	else
4028	{	4010	{
4029	_LIBCPP_ASSERT(!(__extbufnext_ == NULL && (__extbufend_ != __extbufnext_)), "underflow moving from NULL" );	4011	if (__extbufend_ != __extbufnext_) {
4030	if (__extbufend_ != __extbufnext_)	4012	_LIBCPP_ASSERT(__extbufnext_ != nullptr, "underflow moving from nullptr");
		4013	_LIBCPP_ASSERT(__extbuf_ != nullptr, "underflow moving into nullptr");
4031	_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);	4014	_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
		4015	}
4032	__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);	4016	__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
4033	__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);	4017	__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
4034	streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),	4018	streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
...	@@ -4276,7 +4260,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -4276,7 +4260,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
4276	{	4260	{
4277	if (this->gptr() != this->egptr())	4261	if (this->gptr() != this->egptr())
4278	{	4262	{
4279	reverse(this->gptr(), this->egptr());	4263	std::reverse(this->gptr(), this->egptr());
4280	codecvt_base::result __r;	4264	codecvt_base::result __r;
4281	const char_type* __e = this->gptr();	4265	const char_type* __e = this->gptr();
4282	char* __extbe;	4266	char* __extbe;
...	@@ -4369,4 +4353,16 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -4369,4 +4353,16 @@ _LIBCPP_END_NAMESPACE_STD
4369		4353
4370	_LIBCPP_POP_MACROS	4354	_LIBCPP_POP_MACROS
4371		4355
		4356	// NOLINTEND(libcpp-robust-against-adl)
		4357
		4358	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		4359	# include <atomic>
		4360	# include <concepts>
		4361	# include <cstdarg>
		4362	# include <iterator>
		4363	# include <stdexcept>
		4364	# include <type_traits>
		4365	# include <typeinfo>
		4366	#endif
		4367
4372	#endif // _LIBCPP_LOCALE	4368	#endif // _LIBCPP_LOCALE

lib/libcxx/include/locale.h+3-1

...	@@ -43,6 +43,8 @@ Functions:	...	@@ -43,6 +43,8 @@ Functions:
43	# pragma GCC system_header	43	# pragma GCC system_header
44	#endif	44	#endif
45		45
46	#include_next <locale.h>	46	#if __has_include_next(<locale.h>)
		47	# include_next <locale.h>
		48	#endif
47		49
48	#endif // _LIBCPP_LOCALE_H	50	#endif // _LIBCPP_LOCALE_H

lib/libcxx/include/map+52-29

 @@ -538,20 +538,18 @@ erase_if(multimap<Key, T, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__iterator/erase_if_container.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/reverse_iterator.h>
+#include <__memory/allocator.h>
+#include <__memory_resource/polymorphic_allocator.h>
 #include <__node_handle>
 #include <__tree>
+#include <__type_traits/is_allocator.h>
 #include <__utility/forward.h>
+#include <__utility/piecewise_construct.h>
 #include <__utility/swap.h>
-#include <memory>
+#include <tuple>
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#  include <iterator>
-#  include <utility>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -619,46 +617,46 @@ public:
 template <class _Key, class _CP, class _Compare>
 class __map_value_compare<_Key, _CP, _Compare, false>
 {
-    _Compare comp;
+    _Compare __comp_;
 public:
     _LIBCPP_INLINE_VISIBILITY
     __map_value_compare()
         _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
-        : comp() {}
+        : __comp_() {}
     _LIBCPP_INLINE_VISIBILITY
     __map_value_compare(_Compare __c)
         _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
-        : comp(__c) {}
+        : __comp_(__c) {}
     _LIBCPP_INLINE_VISIBILITY
-    const _Compare& key_comp() const _NOEXCEPT {return comp;}
+    const _Compare& key_comp() const _NOEXCEPT {return __comp_;}
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _CP& __x, const _CP& __y) const
-        {return comp(__x.__get_value().first, __y.__get_value().first);}
+        {return __comp_(__x.__get_value().first, __y.__get_value().first);}
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _CP& __x, const _Key& __y) const
-        {return comp(__x.__get_value().first, __y);}
+        {return __comp_(__x.__get_value().first, __y);}
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Key& __x, const _CP& __y) const
-        {return comp(__x, __y.__get_value().first);}
+        {return __comp_(__x, __y.__get_value().first);}
     void swap(__map_value_compare& __y)
         _NOEXCEPT_(__is_nothrow_swappable<_Compare>::value)
     {
         using _VSTD::swap;
-        swap(comp, __y.comp);
+        swap(__comp_, __y.__comp_);
     }
 #if _LIBCPP_STD_VER > 11
     template <typename _K2>
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _K2& __x, const _CP& __y) const
-        {return comp(__x, __y.__get_value().first);}
+        {return __comp_(__x, __y.__get_value().first);}
     template <typename _K2>
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _CP& __x, const _K2& __y) const
-        {return comp(__x.__get_value().first, __y);}
+        {return __comp_(__x.__get_value().first, __y);}
 #endif
 };
 @@ -738,16 +736,16 @@ struct _LIBCPP_STANDALONE_DEBUG __value_type
     typedef pair<key_type&&, mapped_type&&>          __nc_rref_pair_type;
 private:
-    value_type __cc;
+    value_type __cc_;
 public:
     _LIBCPP_INLINE_VISIBILITY
     value_type& __get_value()
     {
 #if _LIBCPP_STD_VER > 14
-        return *_VSTD::launder(_VSTD::addressof(__cc));
+        return *_VSTD::launder(_VSTD::addressof(__cc_));
 #else
-        return __cc;
+        return __cc_;
 #endif
     }
 @@ -755,9 +753,9 @@ public:
     const value_type& __get_value() const
     {
 #if _LIBCPP_STD_VER > 14
-        return *_VSTD::launder(_VSTD::addressof(__cc));
+        return *_VSTD::launder(_VSTD::addressof(__cc_));
 #else
-        return __cc;
+        return __cc_;
 #endif
     }
 @@ -818,13 +816,13 @@ struct __value_type
     typedef pair<const key_type, mapped_type>        value_type;
 private:
-    value_type __cc;
+    value_type __cc_;
 public:
     _LIBCPP_INLINE_VISIBILITY
-    value_type& __get_value() { return __cc; }
+    value_type& __get_value() { return __cc_; }
     _LIBCPP_INLINE_VISIBILITY
-    const value_type& __get_value() const { return __cc; }
+    const value_type& __get_value() const { return __cc_; }
 private:
    __value_type();
 @@ -1001,12 +999,15 @@ private:
     typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
     typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>,
+    typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
-                                                 __value_type>::type __allocator_type;
     typedef __tree<__value_type, __vc, __allocator_type>   __base;
     typedef typename __base::__node_traits                 __node_traits;
     typedef allocator_traits<allocator_type>               __alloc_traits;
+    static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
+                  "[allocator.requirements] states that rebinding an allocator to the same type should result in the "
+                  "original allocator");
     __base __tree_;
 public:
 @@ -1778,12 +1779,15 @@ private:
     typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
     typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>,
+    typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
-                                                 __value_type>::type __allocator_type;
     typedef __tree<__value_type, __vc, __allocator_type>            __base;
     typedef typename __base::__node_traits                          __node_traits;
     typedef allocator_traits<allocator_type>                        __alloc_traits;
+    static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
+                  "[allocator.requirements] states that rebinding an allocator to the same type should result in the "
+                  "original allocator");
     __base __tree_;
 public:
 @@ -2335,4 +2339,23 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_END_NAMESPACE_STD
+#if _LIBCPP_STD_VER > 14
+_LIBCPP_BEGIN_NAMESPACE_STD
+namespace pmr {
+template <class _KeyT, class _ValueT, class _CompareT = std::less<_KeyT>>
+using map = std::map<_KeyT, _ValueT, _CompareT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
+template <class _KeyT, class _ValueT, class _CompareT = std::less<_KeyT>>
+using multimap = std::multimap<_KeyT, _ValueT, _CompareT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
+} // namespace pmr
+_LIBCPP_END_NAMESPACE_STD
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#  include <iterator>
+#  include <utility>
+#endif
 #endif // _LIBCPP_MAP

lib/libcxx/include/math.h+747-801

...	@@ -297,7 +297,9 @@ long double truncl(long double x);	...	@@ -297,7 +297,9 @@ long double truncl(long double x);
297	# pragma GCC system_header	297	# pragma GCC system_header
298	#endif	298	#endif
299		299
300	#include_next <math.h>	300	# if __has_include_next(<math.h>)
		301	# include_next <math.h>
		302	# endif
301		303
302	#ifdef __cplusplus	304	#ifdef __cplusplus
303		305
...	@@ -305,479 +307,237 @@ long double truncl(long double x);	...	@@ -305,479 +307,237 @@ long double truncl(long double x);
305	// back to C++ linkage before including these C++ headers.	307	// back to C++ linkage before including these C++ headers.
306	extern "C++" {	308	extern "C++" {
307		309
		310	#include <__type_traits/enable_if.h>
		311	#include <__type_traits/is_floating_point.h>
		312	#include <__type_traits/is_integral.h>
		313	#include <__type_traits/is_same.h>
308	#include <__type_traits/promote.h>	314	#include <__type_traits/promote.h>
309	#include <limits>	315	#include <limits>
310	#include <stdlib.h>	316	#include <stdlib.h>
311	#include <type_traits>
312		317
313	// signbit
314		318
315	#ifdef signbit	319	# ifdef fpclassify
		320	# undef fpclassify
		321	# endif
316		322
317	template <class _A1>	323	# ifdef signbit
318	_LIBCPP_INLINE_VISIBILITY	324	# undef signbit
319	bool	325	# endif
320	__libcpp_signbit(_A1 __lcpp_x) _NOEXCEPT
321	{
322	#if __has_builtin(__builtin_signbit)
323	return __builtin_signbit(__lcpp_x);
324	#else
325	return signbit(__lcpp_x);
326	#endif
327	}
328		326
329	#undef signbit	327	# ifdef isfinite
		328	# undef isfinite
		329	# endif
330		330
331	template <class _A1>	331	# ifdef isinf
332	inline _LIBCPP_INLINE_VISIBILITY	332	# undef isinf
333	typename std::enable_if<std::is_floating_point<_A1>::value, bool>::type	333	# endif
334	signbit(_A1 __lcpp_x) _NOEXCEPT
335	{
336	return __libcpp_signbit((typename std::__promote<_A1>::type)__lcpp_x);
337	}
338		334
339	template <class _A1>	335	# ifdef isnan
340	inline _LIBCPP_INLINE_VISIBILITY	336	# undef isnan
341	typename std::enable_if<	337	# endif
342	std::is_integral<_A1>::value && std::is_signed<_A1>::value, bool>::type
343	signbit(_A1 __lcpp_x) _NOEXCEPT
344	{ return __lcpp_x < 0; }
345		338
346	template <class _A1>	339	# ifdef isnormal
347	inline _LIBCPP_INLINE_VISIBILITY	340	# undef isnormal
348	typename std::enable_if<	341	# endif
349	std::is_integral<_A1>::value && !std::is_signed<_A1>::value, bool>::type
350	signbit(_A1) _NOEXCEPT
351	{ return false; }
352
353	#elif defined(_LIBCPP_MSVCRT)
354
355	template <typename _A1>
356	inline _LIBCPP_INLINE_VISIBILITY
357	typename std::enable_if<std::is_floating_point<_A1>::value, bool>::type
358	signbit(_A1 __lcpp_x) _NOEXCEPT
359	{
360	return ::signbit(static_cast<typename std::__promote<_A1>::type>(__lcpp_x));
361	}
362		342
363	template <class _A1>	343	# ifdef isgreater
364	inline _LIBCPP_INLINE_VISIBILITY	344	# undef isgreater
365	typename std::enable_if<	345	# endif
366	std::is_integral<_A1>::value && std::is_signed<_A1>::value, bool>::type
367	signbit(_A1 __lcpp_x) _NOEXCEPT
368	{ return __lcpp_x < 0; }
369		346
370	template <class _A1>	347	# ifdef isgreaterequal
371	inline _LIBCPP_INLINE_VISIBILITY	348	# undef isgreaterequal
372	typename std::enable_if<	349	# endif
373	std::is_integral<_A1>::value && !std::is_signed<_A1>::value, bool>::type	350
374	signbit(_A1) _NOEXCEPT	351	# ifdef isless
375	{ return false; }	352	# undef isless
		353	# endif
376		354
377	#endif // signbit	355	# ifdef islessequal
		356	# undef islessequal
		357	# endif
378		358
379	// fpclassify	359	# ifdef islessgreater
		360	# undef islessgreater
		361	# endif
380		362
381	#ifdef fpclassify	363	# ifdef isunordered
		364	# undef isunordered
		365	# endif
382		366
383	template <class _A1>	367	// signbit
384	_LIBCPP_INLINE_VISIBILITY
385	int
386	__libcpp_fpclassify(_A1 __lcpp_x) _NOEXCEPT
387	{
388	#if __has_builtin(__builtin_fpclassify)
389	return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL,
390	FP_ZERO, __lcpp_x);
391	#else
392	return fpclassify(__lcpp_x);
393	#endif
394	}
395		368
396	#undef fpclassify	369	template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
		370	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1 __x) _NOEXCEPT {
		371	return __builtin_signbit(__x);
		372	}
397		373
398	template <class _A1>	374	template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value && std::is_signed<_A1>::value, int> = 0>
399	inline _LIBCPP_INLINE_VISIBILITY	375	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1 __x) _NOEXCEPT {
400	typename std::enable_if<std::is_floating_point<_A1>::value, int>::type	376	return __x < 0;
401	fpclassify(_A1 __lcpp_x) _NOEXCEPT
402	{
403	return __libcpp_fpclassify((typename std::__promote<_A1>::type)__lcpp_x);
404	}	377	}
405		378
406	template <class _A1>	379	template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value && !std::is_signed<_A1>::value, int> = 0>
407	inline _LIBCPP_INLINE_VISIBILITY	380	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1) _NOEXCEPT {
408	typename std::enable_if<std::is_integral<_A1>::value, int>::type	381	return false;
409	fpclassify(_A1 __lcpp_x) _NOEXCEPT	382	}
410	{ return __lcpp_x == 0 ? FP_ZERO : FP_NORMAL; }
411		383
412	#elif defined(_LIBCPP_MSVCRT)	384	// fpclassify
413		385
414	template <typename _A1>	386	template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
415	inline _LIBCPP_INLINE_VISIBILITY	387	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI int fpclassify(_A1 __x) _NOEXCEPT {
416	typename std::enable_if<std::is_floating_point<_A1>::value, bool>::type	388	return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, __x);
417	fpclassify(_A1 __lcpp_x) _NOEXCEPT
418	{
419	return ::fpclassify(static_cast<typename std::__promote<_A1>::type>(__lcpp_x));
420	}	389	}
421		390
422	template <class _A1>	391	template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value, int> = 0>
423	inline _LIBCPP_INLINE_VISIBILITY	392	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI int fpclassify(_A1 __x) _NOEXCEPT {
424	typename std::enable_if<std::is_integral<_A1>::value, int>::type	393	return __x == 0 ? FP_ZERO : FP_NORMAL;
425	fpclassify(_A1 __lcpp_x) _NOEXCEPT	394	}
426	{ return __lcpp_x == 0 ? FP_ZERO : FP_NORMAL; }
427		395
428	#endif // fpclassify	396	// The MSVC runtime already provides these functions as templates
		397	#ifndef _LIBCPP_MSVCRT
429		398
430	// isfinite	399	// isfinite
431		400
432	#ifdef isfinite	401	template <class _A1,
433		402	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity, int> = 0>
434	template <class _A1>	403	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isfinite(_A1 __x) _NOEXCEPT {
435	_LIBCPP_INLINE_VISIBILITY	404	return __builtin_isfinite((typename std::__promote<_A1>::type)__x);
436	bool
437	__libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT
438	{
439	#if __has_builtin(__builtin_isfinite)
440	return __builtin_isfinite(__lcpp_x);
441	#else
442	return isfinite(__lcpp_x);
443	#endif
444	}	405	}
445		406
446	#undef isfinite	407	template <class _A1,
447		408	std::__enable_if_t<std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity, int> = 0>
448	template <class _A1>	409	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isfinite(_A1) _NOEXCEPT {
449	inline _LIBCPP_INLINE_VISIBILITY	410	return true;
450	typename std::enable_if<
451	std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity,
452	bool>::type
453	isfinite(_A1 __lcpp_x) _NOEXCEPT
454	{
455	return __libcpp_isfinite((typename std::__promote<_A1>::type)__lcpp_x);
456	}	411	}
457		412
458	template <class _A1>
459	inline _LIBCPP_INLINE_VISIBILITY
460	typename std::enable_if<
461	std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity,
462	bool>::type
463	isfinite(_A1) _NOEXCEPT
464	{ return true; }
465
466	#endif // isfinite
467
468	// isinf	413	// isinf
469		414
470	#ifdef isinf	415	template <class _A1,
		416	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity, int> = 0>
		417	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isinf(_A1 __x) _NOEXCEPT {
		418	return __builtin_isinf((typename std::__promote<_A1>::type)__x);
		419	}
471		420
472	template <class _A1>	421	template <class _A1>
473	_LIBCPP_INLINE_VISIBILITY	422	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI
474	bool	423	typename std::enable_if< std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity, bool>::type
475	__libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT	424	isinf(_A1) _NOEXCEPT {
476	{	425	return false;
477	#if __has_builtin(__builtin_isinf)
478	return __builtin_isinf(__lcpp_x);
479	#else
480	return isinf(__lcpp_x);
481	#endif
482	}	426	}
483		427
484	#undef isinf	428	# ifdef _LIBCPP_PREFERRED_OVERLOAD
485		429	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isinf(float __x) _NOEXCEPT {
486	template <class _A1>	430	return __builtin_isinf(__x);
487	inline _LIBCPP_INLINE_VISIBILITY
488	typename std::enable_if<
489	std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity,
490	bool>::type
491	isinf(_A1 __lcpp_x) _NOEXCEPT
492	{
493	return __libcpp_isinf((typename std::__promote<_A1>::type)__lcpp_x);
494	}	431	}
495		432
496	template <class _A1>	433	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD bool isinf(double __x) _NOEXCEPT {
497	inline _LIBCPP_INLINE_VISIBILITY	434	return __builtin_isinf(__x);
498	typename std::enable_if<	435	}
499	std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity,
500	bool>::type
501	isinf(_A1) _NOEXCEPT
502	{ return false; }
503
504	#ifdef _LIBCPP_PREFERRED_OVERLOAD
505	inline _LIBCPP_INLINE_VISIBILITY
506	bool
507	isinf(float __lcpp_x) _NOEXCEPT { return __libcpp_isinf(__lcpp_x); }
508
509	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD
510	bool
511	isinf(double __lcpp_x) _NOEXCEPT { return __libcpp_isinf(__lcpp_x); }
512
513	inline _LIBCPP_INLINE_VISIBILITY
514	bool
515	isinf(long double __lcpp_x) _NOEXCEPT { return __libcpp_isinf(__lcpp_x); }
516	#endif
517		436
518	#endif // isinf	437	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isinf(long double __x) _NOEXCEPT {
		438	return __builtin_isinf(__x);
		439	}
		440	# endif
519		441
520	// isnan	442	// isnan
521		443
522	#ifdef isnan	444	template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
523		445	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(_A1 __x) _NOEXCEPT {
524	template <class _A1>	446	return __builtin_isnan(__x);
525	_LIBCPP_INLINE_VISIBILITY
526	bool
527	__libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT
528	{
529	#if __has_builtin(__builtin_isnan)
530	return __builtin_isnan(__lcpp_x);
531	#else
532	return isnan(__lcpp_x);
533	#endif
534	}	447	}
535		448
536	#undef isnan	449	template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value, int> = 0>
		450	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(_A1) _NOEXCEPT {
		451	return false;
		452	}
537		453
538	template <class _A1>	454	# ifdef _LIBCPP_PREFERRED_OVERLOAD
539	inline _LIBCPP_INLINE_VISIBILITY	455	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(float __x) _NOEXCEPT {
540	typename std::enable_if<std::is_floating_point<_A1>::value, bool>::type	456	return __builtin_isnan(__x);
541	isnan(_A1 __lcpp_x) _NOEXCEPT
542	{
543	return __libcpp_isnan((typename std::__promote<_A1>::type)__lcpp_x);
544	}	457	}
545		458
546	template <class _A1>	459	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD bool isnan(double __x) _NOEXCEPT {
547	inline _LIBCPP_INLINE_VISIBILITY	460	return __builtin_isnan(__x);
548	typename std::enable_if<std::is_integral<_A1>::value, bool>::type	461	}
549	isnan(_A1) _NOEXCEPT
550	{ return false; }
551
552	#ifdef _LIBCPP_PREFERRED_OVERLOAD
553	inline _LIBCPP_INLINE_VISIBILITY
554	bool
555	isnan(float __lcpp_x) _NOEXCEPT { return __libcpp_isnan(__lcpp_x); }
556
557	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD
558	bool
559	isnan(double __lcpp_x) _NOEXCEPT { return __libcpp_isnan(__lcpp_x); }
560
561	inline _LIBCPP_INLINE_VISIBILITY
562	bool
563	isnan(long double __lcpp_x) _NOEXCEPT { return __libcpp_isnan(__lcpp_x); }
564	#endif
565		462
566	#endif // isnan	463	_LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(long double __x) _NOEXCEPT {
		464	return __builtin_isnan(__x);
		465	}
		466	# endif
567		467
568	// isnormal	468	// isnormal
569		469
570	#ifdef isnormal	470	template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
571		471	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnormal(_A1 __x) _NOEXCEPT {
572	template <class _A1>	472	return __builtin_isnormal(__x);
573	_LIBCPP_INLINE_VISIBILITY
574	bool
575	__libcpp_isnormal(_A1 __lcpp_x) _NOEXCEPT
576	{
577	#if __has_builtin(__builtin_isnormal)
578	return __builtin_isnormal(__lcpp_x);
579	#else
580	return isnormal(__lcpp_x);
581	#endif
582	}	473	}
583		474
584	#undef isnormal	475	template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value, int> = 0>
585		476	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnormal(_A1 __x) _NOEXCEPT {
586	template <class _A1>	477	return __x != 0;
587	inline _LIBCPP_INLINE_VISIBILITY
588	typename std::enable_if<std::is_floating_point<_A1>::value, bool>::type
589	isnormal(_A1 __lcpp_x) _NOEXCEPT
590	{
591	return __libcpp_isnormal((typename std::__promote<_A1>::type)__lcpp_x);
592	}	478	}
593		479
594	template <class _A1>
595	inline _LIBCPP_INLINE_VISIBILITY
596	typename std::enable_if<std::is_integral<_A1>::value, bool>::type
597	isnormal(_A1 __lcpp_x) _NOEXCEPT
598	{ return __lcpp_x != 0; }
599
600	#endif // isnormal
601
602	// isgreater	480	// isgreater
603		481
604	#ifdef isgreater	482	template <class _A1,
605		483	class _A2,
606	template <class _A1, class _A2>	484	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
607	_LIBCPP_INLINE_VISIBILITY	485	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreater(_A1 __x, _A2 __y) _NOEXCEPT {
608	bool	486	typedef typename std::__promote<_A1, _A2>::type type;
609	__libcpp_isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	487	return __builtin_isgreater((type)__x, (type)__y);
610	{
611	return isgreater(__lcpp_x, __lcpp_y);
612	}	488	}
613		489
614	#undef isgreater
615
616	template <class _A1, class _A2>
617	inline _LIBCPP_INLINE_VISIBILITY
618	typename std::enable_if
619	<
620	std::is_arithmetic<_A1>::value &&
621	std::is_arithmetic<_A2>::value,
622	bool
623	>::type
624	isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
625	{
626	typedef typename std::__promote<_A1, _A2>::type type;
627	return __libcpp_isgreater((type)__lcpp_x, (type)__lcpp_y);
628	}
629
630	#endif // isgreater
631
632	// isgreaterequal	490	// isgreaterequal
633		491
634	#ifdef isgreaterequal	492	template <class _A1,
635		493	class _A2,
636	template <class _A1, class _A2>	494	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
637	_LIBCPP_INLINE_VISIBILITY	495	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreaterequal(_A1 __x, _A2 __y) _NOEXCEPT {
638	bool	496	typedef typename std::__promote<_A1, _A2>::type type;
639	__libcpp_isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	497	return __builtin_isgreaterequal((type)__x, (type)__y);
640	{
641	return isgreaterequal(__lcpp_x, __lcpp_y);
642	}
643
644	#undef isgreaterequal
645
646	template <class _A1, class _A2>
647	inline _LIBCPP_INLINE_VISIBILITY
648	typename std::enable_if
649	<
650	std::is_arithmetic<_A1>::value &&
651	std::is_arithmetic<_A2>::value,
652	bool
653	>::type
654	isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
655	{
656	typedef typename std::__promote<_A1, _A2>::type type;
657	return __libcpp_isgreaterequal((type)__lcpp_x, (type)__lcpp_y);
658	}	498	}
659		499
660	#endif // isgreaterequal
661
662	// isless	500	// isless
663		501
664	#ifdef isless	502	template <class _A1,
665		503	class _A2,
666	template <class _A1, class _A2>	504	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
667	_LIBCPP_INLINE_VISIBILITY	505	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isless(_A1 __x, _A2 __y) _NOEXCEPT {
668	bool	506	typedef typename std::__promote<_A1, _A2>::type type;
669	__libcpp_isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	507	return __builtin_isless((type)__x, (type)__y);
670	{
671	return isless(__lcpp_x, __lcpp_y);
672	}	508	}
673		509
674	#undef isless
675
676	template <class _A1, class _A2>
677	inline _LIBCPP_INLINE_VISIBILITY
678	typename std::enable_if
679	<
680	std::is_arithmetic<_A1>::value &&
681	std::is_arithmetic<_A2>::value,
682	bool
683	>::type
684	isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
685	{
686	typedef typename std::__promote<_A1, _A2>::type type;
687	return __libcpp_isless((type)__lcpp_x, (type)__lcpp_y);
688	}
689
690	#endif // isless
691
692	// islessequal	510	// islessequal
693		511
694	#ifdef islessequal	512	template <class _A1,
695		513	class _A2,
696	template <class _A1, class _A2>	514	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
697	_LIBCPP_INLINE_VISIBILITY	515	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessequal(_A1 __x, _A2 __y) _NOEXCEPT {
698	bool	516	typedef typename std::__promote<_A1, _A2>::type type;
699	__libcpp_islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	517	return __builtin_islessequal((type)__x, (type)__y);
700	{
701	return islessequal(__lcpp_x, __lcpp_y);
702	}	518	}
703		519
704	#undef islessequal
705
706	template <class _A1, class _A2>
707	inline _LIBCPP_INLINE_VISIBILITY
708	typename std::enable_if
709	<
710	std::is_arithmetic<_A1>::value &&
711	std::is_arithmetic<_A2>::value,
712	bool
713	>::type
714	islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
715	{
716	typedef typename std::__promote<_A1, _A2>::type type;
717	return __libcpp_islessequal((type)__lcpp_x, (type)__lcpp_y);
718	}
719
720	#endif // islessequal
721
722	// islessgreater	520	// islessgreater
723		521
724	#ifdef islessgreater	522	template <class _A1,
725		523	class _A2,
726	template <class _A1, class _A2>	524	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
727	_LIBCPP_INLINE_VISIBILITY	525	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessgreater(_A1 __x, _A2 __y) _NOEXCEPT {
728	bool	526	typedef typename std::__promote<_A1, _A2>::type type;
729	__libcpp_islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	527	return __builtin_islessgreater((type)__x, (type)__y);
730	{
731	return islessgreater(__lcpp_x, __lcpp_y);
732	}
733
734	#undef islessgreater
735
736	template <class _A1, class _A2>
737	inline _LIBCPP_INLINE_VISIBILITY
738	typename std::enable_if
739	<
740	std::is_arithmetic<_A1>::value &&
741	std::is_arithmetic<_A2>::value,
742	bool
743	>::type
744	islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
745	{
746	typedef typename std::__promote<_A1, _A2>::type type;
747	return __libcpp_islessgreater((type)__lcpp_x, (type)__lcpp_y);
748	}	528	}
749		529
750	#endif // islessgreater
751
752	// isunordered	530	// isunordered
753		531
754	#ifdef isunordered	532	template <class _A1,
755		533	class _A2,
756	template <class _A1, class _A2>	534	std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
757	_LIBCPP_INLINE_VISIBILITY	535	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isunordered(_A1 __x, _A2 __y) _NOEXCEPT {
758	bool	536	typedef typename std::__promote<_A1, _A2>::type type;
759	__libcpp_isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	537	return __builtin_isunordered((type)__x, (type)__y);
760	{
761	return isunordered(__lcpp_x, __lcpp_y);
762	}
763
764	#undef isunordered
765
766	template <class _A1, class _A2>
767	inline _LIBCPP_INLINE_VISIBILITY
768	typename std::enable_if
769	<
770	std::is_arithmetic<_A1>::value &&
771	std::is_arithmetic<_A2>::value,
772	bool
773	>::type
774	isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
775	{
776	typedef typename std::__promote<_A1, _A2>::type type;
777	return __libcpp_isunordered((type)__lcpp_x, (type)__lcpp_y);
778	}	538	}
779		539
780	#endif // isunordered	540	#endif // _LIBCPP_MSVCRT
781		541
782	// abs	542	// abs
783	//	543	//
...	@@ -787,497 +547,633 @@ isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	...	@@ -787,497 +547,633 @@ isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
787	//	547	//
788	// handled in stdlib.h	548	// handled in stdlib.h
789		549
		550	// We have to provide double overloads for <math.h> to work on platforms that don't provide the full set of math
		551	// functions. To make the overload set work with multiple functions that take the same arguments, we make our overloads
		552	// templates. Functions are preferred over function templates during overload resolution, which means that our overload
		553	// will only be selected when the C library doesn't provide one.
		554
790	// acos	555	// acos
791		556
792	# if !defined(__sun__)	557	# if !defined(__sun__)
793	inline _LIBCPP_INLINE_VISIBILITY float acos(float __lcpp_x) _NOEXCEPT {return ::acosf(__lcpp_x);}	558	inline _LIBCPP_HIDE_FROM_ABI float acos(float __x) _NOEXCEPT {return __builtin_acosf(__x);}
794	inline _LIBCPP_INLINE_VISIBILITY long double acos(long double __lcpp_x) _NOEXCEPT {return ::acosl(__lcpp_x);}	559
		560	template <class = int>
		561	_LIBCPP_HIDE_FROM_ABI double acos(double __x) _NOEXCEPT {
		562	return __builtin_acos(__x);
		563	}
		564
		565	inline _LIBCPP_HIDE_FROM_ABI long double acos(long double __x) _NOEXCEPT {return __builtin_acosl(__x);}
795	# endif	566	# endif
796		567
797	template <class _A1>	568	template <class _A1>
798	inline _LIBCPP_INLINE_VISIBILITY	569	inline _LIBCPP_HIDE_FROM_ABI
799	typename std::enable_if<std::is_integral<_A1>::value, double>::type	570	typename std::enable_if<std::is_integral<_A1>::value, double>::type
800	acos(_A1 __lcpp_x) _NOEXCEPT {return ::acos((double)__lcpp_x);}	571	acos(_A1 __x) _NOEXCEPT {return __builtin_acos((double)__x);}
801		572
802	// asin	573	// asin
803		574
804	# if !defined(__sun__)	575	# if !defined(__sun__)
805	inline _LIBCPP_INLINE_VISIBILITY float asin(float __lcpp_x) _NOEXCEPT {return ::asinf(__lcpp_x);}	576	inline _LIBCPP_HIDE_FROM_ABI float asin(float __x) _NOEXCEPT {return __builtin_asinf(__x);}
806	inline _LIBCPP_INLINE_VISIBILITY long double asin(long double __lcpp_x) _NOEXCEPT {return ::asinl(__lcpp_x);}	577
		578	template <class = int>
		579	_LIBCPP_HIDE_FROM_ABI double asin(double __x) _NOEXCEPT {
		580	return __builtin_asin(__x);
		581	}
		582
		583	inline _LIBCPP_HIDE_FROM_ABI long double asin(long double __x) _NOEXCEPT {return __builtin_asinl(__x);}
807	# endif	584	# endif
808		585
809	template <class _A1>	586	template <class _A1>
810	inline _LIBCPP_INLINE_VISIBILITY	587	inline _LIBCPP_HIDE_FROM_ABI
811	typename std::enable_if<std::is_integral<_A1>::value, double>::type	588	typename std::enable_if<std::is_integral<_A1>::value, double>::type
812	asin(_A1 __lcpp_x) _NOEXCEPT {return ::asin((double)__lcpp_x);}	589	asin(_A1 __x) _NOEXCEPT {return __builtin_asin((double)__x);}
813		590
814	// atan	591	// atan
815		592
816	# if !defined(__sun__)	593	# if !defined(__sun__)
817	inline _LIBCPP_INLINE_VISIBILITY float atan(float __lcpp_x) _NOEXCEPT {return ::atanf(__lcpp_x);}	594	inline _LIBCPP_HIDE_FROM_ABI float atan(float __x) _NOEXCEPT {return __builtin_atanf(__x);}
818	inline _LIBCPP_INLINE_VISIBILITY long double atan(long double __lcpp_x) _NOEXCEPT {return ::atanl(__lcpp_x);}	595
		596	template <class = int>
		597	_LIBCPP_HIDE_FROM_ABI double atan(double __x) _NOEXCEPT {
		598	return __builtin_atan(__x);
		599	}
		600
		601	inline _LIBCPP_HIDE_FROM_ABI long double atan(long double __x) _NOEXCEPT {return __builtin_atanl(__x);}
819	# endif	602	# endif
820		603
821	template <class _A1>	604	template <class _A1>
822	inline _LIBCPP_INLINE_VISIBILITY	605	inline _LIBCPP_HIDE_FROM_ABI
823	typename std::enable_if<std::is_integral<_A1>::value, double>::type	606	typename std::enable_if<std::is_integral<_A1>::value, double>::type
824	atan(_A1 __lcpp_x) _NOEXCEPT {return ::atan((double)__lcpp_x);}	607	atan(_A1 __x) _NOEXCEPT {return __builtin_atan((double)__x);}
825		608
826	// atan2	609	// atan2
827		610
828	# if !defined(__sun__)	611	# if !defined(__sun__)
829	inline _LIBCPP_INLINE_VISIBILITY float atan2(float __lcpp_y, float __lcpp_x) _NOEXCEPT {return ::atan2f(__lcpp_y, __lcpp_x);}	612	inline _LIBCPP_HIDE_FROM_ABI float atan2(float __y, float __x) _NOEXCEPT {return __builtin_atan2f(__y, __x);}
830	inline _LIBCPP_INLINE_VISIBILITY long double atan2(long double __lcpp_y, long double __lcpp_x) _NOEXCEPT {return ::atan2l(__lcpp_y, __lcpp_x);}	613
		614	template <class = int>
		615	_LIBCPP_HIDE_FROM_ABI double atan2(double __x, double __y) _NOEXCEPT {
		616	return __builtin_atan2(__x, __y);
		617	}
		618
		619	inline _LIBCPP_HIDE_FROM_ABI long double atan2(long double __y, long double __x) _NOEXCEPT {return __builtin_atan2l(__y, __x);}
831	# endif	620	# endif
832		621
833	template <class _A1, class _A2>	622	template <class _A1, class _A2>
834	inline _LIBCPP_INLINE_VISIBILITY	623	inline _LIBCPP_HIDE_FROM_ABI
835	typename std::__enable_if_t	624	typename std::__enable_if_t
836	<	625	<
837	std::is_arithmetic<_A1>::value &&	626	std::is_arithmetic<_A1>::value &&
838	std::is_arithmetic<_A2>::value,	627	std::is_arithmetic<_A2>::value,
839	std::__promote<_A1, _A2>	628	std::__promote<_A1, _A2>
840	>::type	629	>::type
841	atan2(_A1 __lcpp_y, _A2 __lcpp_x) _NOEXCEPT	630	atan2(_A1 __y, _A2 __x) _NOEXCEPT
842	{	631	{
843	typedef typename std::__promote<_A1, _A2>::type __result_type;	632	typedef typename std::__promote<_A1, _A2>::type __result_type;
844	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	633	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
845	std::_IsSame<_A2, __result_type>::value)), "");	634	std::_IsSame<_A2, __result_type>::value)), "");
846	return ::atan2((__result_type)__lcpp_y, (__result_type)__lcpp_x);	635	return ::atan2((__result_type)__y, (__result_type)__x);
847	}	636	}
848		637
849	// ceil	638	// ceil
850		639
851	# if !defined(__sun__)	640	# if !defined(__sun__)
852	inline _LIBCPP_INLINE_VISIBILITY float ceil(float __lcpp_x) _NOEXCEPT {return ::ceilf(__lcpp_x);}	641	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float ceil(float __x) _NOEXCEPT {return __builtin_ceilf(__x);}
853	inline _LIBCPP_INLINE_VISIBILITY long double ceil(long double __lcpp_x) _NOEXCEPT {return ::ceill(__lcpp_x);}	642
		643	template <class = int>
		644	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double ceil(double __x) _NOEXCEPT {
		645	return __builtin_ceil(__x);
		646	}
		647
		648	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double ceil(long double __x) _NOEXCEPT {return __builtin_ceill(__x);}
854	# endif	649	# endif
855		650
856	template <class _A1>	651	template <class _A1>
857	inline _LIBCPP_INLINE_VISIBILITY	652	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
858	typename std::enable_if<std::is_integral<_A1>::value, double>::type	653	typename std::enable_if<std::is_integral<_A1>::value, double>::type
859	ceil(_A1 __lcpp_x) _NOEXCEPT {return ::ceil((double)__lcpp_x);}	654	ceil(_A1 __x) _NOEXCEPT {return __builtin_ceil((double)__x);}
860		655
861	// cos	656	// cos
862		657
863	# if !defined(__sun__)	658	# if !defined(__sun__)
864	inline _LIBCPP_INLINE_VISIBILITY float cos(float __lcpp_x) _NOEXCEPT {return ::cosf(__lcpp_x);}	659	inline _LIBCPP_HIDE_FROM_ABI float cos(float __x) _NOEXCEPT {return __builtin_cosf(__x);}
865	inline _LIBCPP_INLINE_VISIBILITY long double cos(long double __lcpp_x) _NOEXCEPT {return ::cosl(__lcpp_x);}	660
		661	template <class = int>
		662	_LIBCPP_HIDE_FROM_ABI double cos(double __x) _NOEXCEPT {
		663	return __builtin_cos(__x);
		664	}
		665
		666	inline _LIBCPP_HIDE_FROM_ABI long double cos(long double __x) _NOEXCEPT {return __builtin_cosl(__x);}
866	# endif	667	# endif
867		668
868	template <class _A1>	669	template <class _A1>
869	inline _LIBCPP_INLINE_VISIBILITY	670	inline _LIBCPP_HIDE_FROM_ABI
870	typename std::enable_if<std::is_integral<_A1>::value, double>::type	671	typename std::enable_if<std::is_integral<_A1>::value, double>::type
871	cos(_A1 __lcpp_x) _NOEXCEPT {return ::cos((double)__lcpp_x);}	672	cos(_A1 __x) _NOEXCEPT {return __builtin_cos((double)__x);}
872		673
873	// cosh	674	// cosh
874		675
875	# if !defined(__sun__)	676	# if !defined(__sun__)
876	inline _LIBCPP_INLINE_VISIBILITY float cosh(float __lcpp_x) _NOEXCEPT {return ::coshf(__lcpp_x);}	677	inline _LIBCPP_HIDE_FROM_ABI float cosh(float __x) _NOEXCEPT {return __builtin_coshf(__x);}
877	inline _LIBCPP_INLINE_VISIBILITY long double cosh(long double __lcpp_x) _NOEXCEPT {return ::coshl(__lcpp_x);}	678
		679	template <class = int>
		680	_LIBCPP_HIDE_FROM_ABI double cosh(double __x) _NOEXCEPT {
		681	return __builtin_cosh(__x);
		682	}
		683
		684	inline _LIBCPP_HIDE_FROM_ABI long double cosh(long double __x) _NOEXCEPT {return __builtin_coshl(__x);}
878	# endif	685	# endif
879		686
880	template <class _A1>	687	template <class _A1>
881	inline _LIBCPP_INLINE_VISIBILITY	688	inline _LIBCPP_HIDE_FROM_ABI
882	typename std::enable_if<std::is_integral<_A1>::value, double>::type	689	typename std::enable_if<std::is_integral<_A1>::value, double>::type
883	cosh(_A1 __lcpp_x) _NOEXCEPT {return ::cosh((double)__lcpp_x);}	690	cosh(_A1 __x) _NOEXCEPT {return __builtin_cosh((double)__x);}
884		691
885	// exp	692	// exp
886		693
887	# if !defined(__sun__)	694	# if !defined(__sun__)
888	inline _LIBCPP_INLINE_VISIBILITY float exp(float __lcpp_x) _NOEXCEPT {return ::expf(__lcpp_x);}	695	inline _LIBCPP_HIDE_FROM_ABI float exp(float __x) _NOEXCEPT {return __builtin_expf(__x);}
889	inline _LIBCPP_INLINE_VISIBILITY long double exp(long double __lcpp_x) _NOEXCEPT {return ::expl(__lcpp_x);}	696
		697	template <class = int>
		698	_LIBCPP_HIDE_FROM_ABI double exp(double __x) _NOEXCEPT {
		699	return __builtin_exp(__x);
		700	}
		701
		702	inline _LIBCPP_HIDE_FROM_ABI long double exp(long double __x) _NOEXCEPT {return __builtin_expl(__x);}
890	# endif	703	# endif
891		704
892	template <class _A1>	705	template <class _A1>
893	inline _LIBCPP_INLINE_VISIBILITY	706	inline _LIBCPP_HIDE_FROM_ABI
894	typename std::enable_if<std::is_integral<_A1>::value, double>::type	707	typename std::enable_if<std::is_integral<_A1>::value, double>::type
895	exp(_A1 __lcpp_x) _NOEXCEPT {return ::exp((double)__lcpp_x);}	708	exp(_A1 __x) _NOEXCEPT {return __builtin_exp((double)__x);}
896		709
897	// fabs	710	// fabs
898		711
899	# if !defined(__sun__)	712	# if !defined(__sun__)
900	inline _LIBCPP_INLINE_VISIBILITY float fabs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);}	713	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float fabs(float __x) _NOEXCEPT {return __builtin_fabsf(__x);}
901	inline _LIBCPP_INLINE_VISIBILITY long double fabs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);}	714
		715	template <class = int>
		716	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double fabs(double __x) _NOEXCEPT {
		717	return __builtin_fabs(__x);
		718	}
		719
		720	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fabs(long double __x) _NOEXCEPT {return __builtin_fabsl(__x);}
902	# endif	721	# endif
903		722
904	template <class _A1>	723	template <class _A1>
905	inline _LIBCPP_INLINE_VISIBILITY	724	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
906	typename std::enable_if<std::is_integral<_A1>::value, double>::type	725	typename std::enable_if<std::is_integral<_A1>::value, double>::type
907	fabs(_A1 __lcpp_x) _NOEXCEPT {return ::fabs((double)__lcpp_x);}	726	fabs(_A1 __x) _NOEXCEPT {return __builtin_fabs((double)__x);}
908		727
909	// floor	728	// floor
910		729
911	# if !defined(__sun__)	730	# if !defined(__sun__)
912	inline _LIBCPP_INLINE_VISIBILITY float floor(float __lcpp_x) _NOEXCEPT {return ::floorf(__lcpp_x);}	731	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float floor(float __x) _NOEXCEPT {return __builtin_floorf(__x);}
913	inline _LIBCPP_INLINE_VISIBILITY long double floor(long double __lcpp_x) _NOEXCEPT {return ::floorl(__lcpp_x);}	732
		733	template <class = int>
		734	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double floor(double __x) _NOEXCEPT {
		735	return __builtin_floor(__x);
		736	}
		737
		738	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double floor(long double __x) _NOEXCEPT {return __builtin_floorl(__x);}
914	# endif	739	# endif
915		740
916	template <class _A1>	741	template <class _A1>
917	inline _LIBCPP_INLINE_VISIBILITY	742	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
918	typename std::enable_if<std::is_integral<_A1>::value, double>::type	743	typename std::enable_if<std::is_integral<_A1>::value, double>::type
919	floor(_A1 __lcpp_x) _NOEXCEPT {return ::floor((double)__lcpp_x);}	744	floor(_A1 __x) _NOEXCEPT {return __builtin_floor((double)__x);}
920		745
921	// fmod	746	// fmod
922		747
923	# if !defined(__sun__)	748	# if !defined(__sun__)
924	inline _LIBCPP_INLINE_VISIBILITY float fmod(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::fmodf(__lcpp_x, __lcpp_y);}	749	inline _LIBCPP_HIDE_FROM_ABI float fmod(float __x, float __y) _NOEXCEPT {return __builtin_fmodf(__x, __y);}
925	inline _LIBCPP_INLINE_VISIBILITY long double fmod(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::fmodl(__lcpp_x, __lcpp_y);}	750
		751	template <class = int>
		752	_LIBCPP_HIDE_FROM_ABI double fmod(double __x, double __y) _NOEXCEPT {
		753	return __builtin_fmod(__x, __y);
		754	}
		755
		756	inline _LIBCPP_HIDE_FROM_ABI long double fmod(long double __x, long double __y) _NOEXCEPT {return __builtin_fmodl(__x, __y);}
926	# endif	757	# endif
927		758
928	template <class _A1, class _A2>	759	template <class _A1, class _A2>
929	inline _LIBCPP_INLINE_VISIBILITY	760	inline _LIBCPP_HIDE_FROM_ABI
930	typename std::__enable_if_t	761	typename std::__enable_if_t
931	<	762	<
932	std::is_arithmetic<_A1>::value &&	763	std::is_arithmetic<_A1>::value &&
933	std::is_arithmetic<_A2>::value,	764	std::is_arithmetic<_A2>::value,
934	std::__promote<_A1, _A2>	765	std::__promote<_A1, _A2>
935	>::type	766	>::type
936	fmod(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	767	fmod(_A1 __x, _A2 __y) _NOEXCEPT
937	{	768	{
938	typedef typename std::__promote<_A1, _A2>::type __result_type;	769	typedef typename std::__promote<_A1, _A2>::type __result_type;
939	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	770	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
940	std::_IsSame<_A2, __result_type>::value)), "");	771	std::_IsSame<_A2, __result_type>::value)), "");
941	return ::fmod((__result_type)__lcpp_x, (__result_type)__lcpp_y);	772	return ::fmod((__result_type)__x, (__result_type)__y);
942	}	773	}
943		774
944	// frexp	775	// frexp
945		776
946	# if !defined(__sun__)	777	# if !defined(__sun__)
947	inline _LIBCPP_INLINE_VISIBILITY float frexp(float __lcpp_x, int* __lcpp_e) _NOEXCEPT {return ::frexpf(__lcpp_x, __lcpp_e);}	778	inline _LIBCPP_HIDE_FROM_ABI float frexp(float __x, int* __e) _NOEXCEPT {return __builtin_frexpf(__x, __e);}
948	inline _LIBCPP_INLINE_VISIBILITY long double frexp(long double __lcpp_x, int* __lcpp_e) _NOEXCEPT {return ::frexpl(__lcpp_x, __lcpp_e);}	779
		780	template <class = int>
		781	_LIBCPP_HIDE_FROM_ABI double frexp(double __x, int* __e) _NOEXCEPT {
		782	return __builtin_frexp(__x, __e);
		783	}
		784
		785	inline _LIBCPP_HIDE_FROM_ABI long double frexp(long double __x, int* __e) _NOEXCEPT {return __builtin_frexpl(__x, __e);}
949	# endif	786	# endif
950		787
951	template <class _A1>	788	template <class _A1>
952	inline _LIBCPP_INLINE_VISIBILITY	789	inline _LIBCPP_HIDE_FROM_ABI
953	typename std::enable_if<std::is_integral<_A1>::value, double>::type	790	typename std::enable_if<std::is_integral<_A1>::value, double>::type
954	frexp(_A1 __lcpp_x, int* __lcpp_e) _NOEXCEPT {return ::frexp((double)__lcpp_x, __lcpp_e);}	791	frexp(_A1 __x, int* __e) _NOEXCEPT {return __builtin_frexp((double)__x, __e);}
955		792
956	// ldexp	793	// ldexp
957		794
958	# if !defined(__sun__)	795	# if !defined(__sun__)
959	inline _LIBCPP_INLINE_VISIBILITY float ldexp(float __lcpp_x, int __lcpp_e) _NOEXCEPT {return ::ldexpf(__lcpp_x, __lcpp_e);}	796	inline _LIBCPP_HIDE_FROM_ABI float ldexp(float __x, int __e) _NOEXCEPT {return __builtin_ldexpf(__x, __e);}
960	inline _LIBCPP_INLINE_VISIBILITY long double ldexp(long double __lcpp_x, int __lcpp_e) _NOEXCEPT {return ::ldexpl(__lcpp_x, __lcpp_e);}	797
		798	template <class = int>
		799	_LIBCPP_HIDE_FROM_ABI double ldexp(double __x, int __e) _NOEXCEPT {
		800	return __builtin_ldexp(__x, __e);
		801	}
		802
		803	inline _LIBCPP_HIDE_FROM_ABI long double ldexp(long double __x, int __e) _NOEXCEPT {return __builtin_ldexpl(__x, __e);}
961	# endif	804	# endif
962		805
963	template <class _A1>	806	template <class _A1>
964	inline _LIBCPP_INLINE_VISIBILITY	807	inline _LIBCPP_HIDE_FROM_ABI
965	typename std::enable_if<std::is_integral<_A1>::value, double>::type	808	typename std::enable_if<std::is_integral<_A1>::value, double>::type
966	ldexp(_A1 __lcpp_x, int __lcpp_e) _NOEXCEPT {return ::ldexp((double)__lcpp_x, __lcpp_e);}	809	ldexp(_A1 __x, int __e) _NOEXCEPT {return __builtin_ldexp((double)__x, __e);}
967		810
968	// log	811	// log
969		812
970	# if !defined(__sun__)	813	# if !defined(__sun__)
971	inline _LIBCPP_INLINE_VISIBILITY float log(float __lcpp_x) _NOEXCEPT {return ::logf(__lcpp_x);}	814	inline _LIBCPP_HIDE_FROM_ABI float log(float __x) _NOEXCEPT {return __builtin_logf(__x);}
972	inline _LIBCPP_INLINE_VISIBILITY long double log(long double __lcpp_x) _NOEXCEPT {return ::logl(__lcpp_x);}	815
		816	template <class = int>
		817	_LIBCPP_HIDE_FROM_ABI double log(double __x) _NOEXCEPT {
		818	return __builtin_log(__x);
		819	}
		820
		821	inline _LIBCPP_HIDE_FROM_ABI long double log(long double __x) _NOEXCEPT {return __builtin_logl(__x);}
973	# endif	822	# endif
974		823
975	template <class _A1>	824	template <class _A1>
976	inline _LIBCPP_INLINE_VISIBILITY	825	inline _LIBCPP_HIDE_FROM_ABI
977	typename std::enable_if<std::is_integral<_A1>::value, double>::type	826	typename std::enable_if<std::is_integral<_A1>::value, double>::type
978	log(_A1 __lcpp_x) _NOEXCEPT {return ::log((double)__lcpp_x);}	827	log(_A1 __x) _NOEXCEPT {return __builtin_log((double)__x);}
979		828
980	// log10	829	// log10
981		830
982	# if !defined(__sun__)	831	# if !defined(__sun__)
983	inline _LIBCPP_INLINE_VISIBILITY float log10(float __lcpp_x) _NOEXCEPT {return ::log10f(__lcpp_x);}	832	inline _LIBCPP_HIDE_FROM_ABI float log10(float __x) _NOEXCEPT {return __builtin_log10f(__x);}
984	inline _LIBCPP_INLINE_VISIBILITY long double log10(long double __lcpp_x) _NOEXCEPT {return ::log10l(__lcpp_x);}	833
		834
		835	template <class = int>
		836	_LIBCPP_HIDE_FROM_ABI double log10(double __x) _NOEXCEPT {
		837	return __builtin_log10(__x);
		838	}
		839
		840	inline _LIBCPP_HIDE_FROM_ABI long double log10(long double __x) _NOEXCEPT {return __builtin_log10l(__x);}
985	# endif	841	# endif
986		842
987	template <class _A1>	843	template <class _A1>
988	inline _LIBCPP_INLINE_VISIBILITY	844	inline _LIBCPP_HIDE_FROM_ABI
989	typename std::enable_if<std::is_integral<_A1>::value, double>::type	845	typename std::enable_if<std::is_integral<_A1>::value, double>::type
990	log10(_A1 __lcpp_x) _NOEXCEPT {return ::log10((double)__lcpp_x);}	846	log10(_A1 __x) _NOEXCEPT {return __builtin_log10((double)__x);}
991		847
992	// modf	848	// modf
993		849
994	# if !defined(__sun__)	850	# if !defined(__sun__)
995	inline _LIBCPP_INLINE_VISIBILITY float modf(float __lcpp_x, float* __lcpp_y) _NOEXCEPT {return ::modff(__lcpp_x, __lcpp_y);}	851	inline _LIBCPP_HIDE_FROM_ABI float modf(float __x, float* __y) _NOEXCEPT {return __builtin_modff(__x, __y);}
996	inline _LIBCPP_INLINE_VISIBILITY long double modf(long double __lcpp_x, long double* __lcpp_y) _NOEXCEPT {return ::modfl(__lcpp_x, __lcpp_y);}	852
		853	template <class = int>
		854	_LIBCPP_HIDE_FROM_ABI double modf(double __x, double* __y) _NOEXCEPT {
		855	return __builtin_modf(__x, __y);
		856	}
		857
		858	inline _LIBCPP_HIDE_FROM_ABI long double modf(long double __x, long double* __y) _NOEXCEPT {return __builtin_modfl(__x, __y);}
997	# endif	859	# endif
998		860
999	// pow	861	// pow
1000		862
1001	# if !defined(__sun__)	863	# if !defined(__sun__)
1002	inline _LIBCPP_INLINE_VISIBILITY float pow(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::powf(__lcpp_x, __lcpp_y);}	864	inline _LIBCPP_HIDE_FROM_ABI float pow(float __x, float __y) _NOEXCEPT {return __builtin_powf(__x, __y);}
1003	inline _LIBCPP_INLINE_VISIBILITY long double pow(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::powl(__lcpp_x, __lcpp_y);}	865
		866	template <class = int>
		867	_LIBCPP_HIDE_FROM_ABI double pow(double __x, double __y) _NOEXCEPT {
		868	return __builtin_pow(__x, __y);
		869	}
		870
		871	inline _LIBCPP_HIDE_FROM_ABI long double pow(long double __x, long double __y) _NOEXCEPT {return __builtin_powl(__x, __y);}
1004	# endif	872	# endif
1005		873
1006	template <class _A1, class _A2>	874	template <class _A1, class _A2>
1007	inline _LIBCPP_INLINE_VISIBILITY	875	inline _LIBCPP_HIDE_FROM_ABI
1008	typename std::__enable_if_t	876	typename std::__enable_if_t
1009	<	877	<
1010	std::is_arithmetic<_A1>::value &&	878	std::is_arithmetic<_A1>::value &&
1011	std::is_arithmetic<_A2>::value,	879	std::is_arithmetic<_A2>::value,
1012	std::__promote<_A1, _A2>	880	std::__promote<_A1, _A2>
1013	>::type	881	>::type
1014	pow(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	882	pow(_A1 __x, _A2 __y) _NOEXCEPT
1015	{	883	{
1016	typedef typename std::__promote<_A1, _A2>::type __result_type;	884	typedef typename std::__promote<_A1, _A2>::type __result_type;
1017	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	885	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1018	std::_IsSame<_A2, __result_type>::value)), "");	886	std::_IsSame<_A2, __result_type>::value)), "");
1019	return ::pow((__result_type)__lcpp_x, (__result_type)__lcpp_y);	887	return ::pow((__result_type)__x, (__result_type)__y);
1020	}	888	}
1021		889
1022	// sin	890	// sin
1023		891
1024	# if !defined(__sun__)	892	# if !defined(__sun__)
1025	inline _LIBCPP_INLINE_VISIBILITY float sin(float __lcpp_x) _NOEXCEPT {return ::sinf(__lcpp_x);}	893	inline _LIBCPP_HIDE_FROM_ABI float sin(float __x) _NOEXCEPT {return __builtin_sinf(__x);}
1026	inline _LIBCPP_INLINE_VISIBILITY long double sin(long double __lcpp_x) _NOEXCEPT {return ::sinl(__lcpp_x);}	894
		895	template <class = int>
		896	_LIBCPP_HIDE_FROM_ABI double sin(double __x) _NOEXCEPT {
		897	return __builtin_sin(__x);
		898	}
		899
		900	inline _LIBCPP_HIDE_FROM_ABI long double sin(long double __x) _NOEXCEPT {return __builtin_sinl(__x);}
1027	#endif	901	#endif
1028		902
1029	template <class _A1>	903	template <class _A1>
1030	inline _LIBCPP_INLINE_VISIBILITY	904	inline _LIBCPP_HIDE_FROM_ABI
1031	typename std::enable_if<std::is_integral<_A1>::value, double>::type	905	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1032	sin(_A1 __lcpp_x) _NOEXCEPT {return ::sin((double)__lcpp_x);}	906	sin(_A1 __x) _NOEXCEPT {return __builtin_sin((double)__x);}
1033		907
1034	// sinh	908	// sinh
1035		909
1036	# if !defined(__sun__)	910	# if !defined(__sun__)
1037	inline _LIBCPP_INLINE_VISIBILITY float sinh(float __lcpp_x) _NOEXCEPT {return ::sinhf(__lcpp_x);}	911	inline _LIBCPP_HIDE_FROM_ABI float sinh(float __x) _NOEXCEPT {return __builtin_sinhf(__x);}
1038	inline _LIBCPP_INLINE_VISIBILITY long double sinh(long double __lcpp_x) _NOEXCEPT {return ::sinhl(__lcpp_x);}	912
		913	template <class = int>
		914	_LIBCPP_HIDE_FROM_ABI double sinh(double __x) _NOEXCEPT {
		915	return __builtin_sinh(__x);
		916	}
		917
		918	inline _LIBCPP_HIDE_FROM_ABI long double sinh(long double __x) _NOEXCEPT {return __builtin_sinhl(__x);}
1039	# endif	919	# endif
1040		920
1041	template <class _A1>	921	template <class _A1>
1042	inline _LIBCPP_INLINE_VISIBILITY	922	inline _LIBCPP_HIDE_FROM_ABI
1043	typename std::enable_if<std::is_integral<_A1>::value, double>::type	923	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1044	sinh(_A1 __lcpp_x) _NOEXCEPT {return ::sinh((double)__lcpp_x);}	924	sinh(_A1 __x) _NOEXCEPT {return __builtin_sinh((double)__x);}
1045		925
1046	// sqrt	926	// sqrt
1047		927
1048	# if !defined(__sun__)	928	# if !defined(__sun__)
1049	inline _LIBCPP_INLINE_VISIBILITY float sqrt(float __lcpp_x) _NOEXCEPT {return ::sqrtf(__lcpp_x);}	929	inline _LIBCPP_HIDE_FROM_ABI float sqrt(float __x) _NOEXCEPT {return __builtin_sqrtf(__x);}
1050	inline _LIBCPP_INLINE_VISIBILITY long double sqrt(long double __lcpp_x) _NOEXCEPT {return ::sqrtl(__lcpp_x);}	930
		931	template <class = int>
		932	_LIBCPP_HIDE_FROM_ABI double sqrt(double __x) _NOEXCEPT {
		933	return __builtin_sqrt(__x);
		934	}
		935
		936	inline _LIBCPP_HIDE_FROM_ABI long double sqrt(long double __x) _NOEXCEPT {return __builtin_sqrtl(__x);}
1051	# endif	937	# endif
1052		938
1053	template <class _A1>	939	template <class _A1>
1054	inline _LIBCPP_INLINE_VISIBILITY	940	inline _LIBCPP_HIDE_FROM_ABI
1055	typename std::enable_if<std::is_integral<_A1>::value, double>::type	941	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1056	sqrt(_A1 __lcpp_x) _NOEXCEPT {return ::sqrt((double)__lcpp_x);}	942	sqrt(_A1 __x) _NOEXCEPT {return __builtin_sqrt((double)__x);}
1057		943
1058	// tan	944	// tan
1059		945
1060	# if !defined(__sun__)	946	# if !defined(__sun__)
1061	inline _LIBCPP_INLINE_VISIBILITY float tan(float __lcpp_x) _NOEXCEPT {return ::tanf(__lcpp_x);}	947	inline _LIBCPP_HIDE_FROM_ABI float tan(float __x) _NOEXCEPT {return __builtin_tanf(__x);}
1062	inline _LIBCPP_INLINE_VISIBILITY long double tan(long double __lcpp_x) _NOEXCEPT {return ::tanl(__lcpp_x);}	948
		949	template <class = int>
		950	_LIBCPP_HIDE_FROM_ABI double tan(double __x) _NOEXCEPT {
		951	return __builtin_tan(__x);
		952	}
		953
		954	inline _LIBCPP_HIDE_FROM_ABI long double tan(long double __x) _NOEXCEPT {return __builtin_tanl(__x);}
1063	# endif	955	# endif
1064		956
1065	template <class _A1>	957	template <class _A1>
1066	inline _LIBCPP_INLINE_VISIBILITY	958	inline _LIBCPP_HIDE_FROM_ABI
1067	typename std::enable_if<std::is_integral<_A1>::value, double>::type	959	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1068	tan(_A1 __lcpp_x) _NOEXCEPT {return ::tan((double)__lcpp_x);}	960	tan(_A1 __x) _NOEXCEPT {return __builtin_tan((double)__x);}
1069		961
1070	// tanh	962	// tanh
1071		963
1072	# if !defined(__sun__)	964	# if !defined(__sun__)
1073	inline _LIBCPP_INLINE_VISIBILITY float tanh(float __lcpp_x) _NOEXCEPT {return ::tanhf(__lcpp_x);}	965	inline _LIBCPP_HIDE_FROM_ABI float tanh(float __x) _NOEXCEPT {return __builtin_tanhf(__x);}
1074	inline _LIBCPP_INLINE_VISIBILITY long double tanh(long double __lcpp_x) _NOEXCEPT {return ::tanhl(__lcpp_x);}	966
		967	template <class = int>
		968	_LIBCPP_HIDE_FROM_ABI double tanh(double __x) _NOEXCEPT {
		969	return __builtin_tanh(__x);
		970	}
		971
		972	inline _LIBCPP_HIDE_FROM_ABI long double tanh(long double __x) _NOEXCEPT {return __builtin_tanhl(__x);}
1075	# endif	973	# endif
1076		974
1077	template <class _A1>	975	template <class _A1>
1078	inline _LIBCPP_INLINE_VISIBILITY	976	inline _LIBCPP_HIDE_FROM_ABI
1079	typename std::enable_if<std::is_integral<_A1>::value, double>::type	977	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1080	tanh(_A1 __lcpp_x) _NOEXCEPT {return ::tanh((double)__lcpp_x);}	978	tanh(_A1 __x) _NOEXCEPT {return __builtin_tanh((double)__x);}
1081		979
1082	// acosh	980	// acosh
1083		981
1084	inline _LIBCPP_INLINE_VISIBILITY float acosh(float __lcpp_x) _NOEXCEPT {return ::acoshf(__lcpp_x);}	982	inline _LIBCPP_HIDE_FROM_ABI float acosh(float __x) _NOEXCEPT {return __builtin_acoshf(__x);}
1085	inline _LIBCPP_INLINE_VISIBILITY long double acosh(long double __lcpp_x) _NOEXCEPT {return ::acoshl(__lcpp_x);}	983
		984	template <class = int>
		985	_LIBCPP_HIDE_FROM_ABI double acosh(double __x) _NOEXCEPT {
		986	return __builtin_acosh(__x);
		987	}
		988
		989	inline _LIBCPP_HIDE_FROM_ABI long double acosh(long double __x) _NOEXCEPT {return __builtin_acoshl(__x);}
1086		990
1087	template <class _A1>	991	template <class _A1>
1088	inline _LIBCPP_INLINE_VISIBILITY	992	inline _LIBCPP_HIDE_FROM_ABI
1089	typename std::enable_if<std::is_integral<_A1>::value, double>::type	993	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1090	acosh(_A1 __lcpp_x) _NOEXCEPT {return ::acosh((double)__lcpp_x);}	994	acosh(_A1 __x) _NOEXCEPT {return __builtin_acosh((double)__x);}
1091		995
1092	// asinh	996	// asinh
1093		997
1094	inline _LIBCPP_INLINE_VISIBILITY float asinh(float __lcpp_x) _NOEXCEPT {return ::asinhf(__lcpp_x);}	998	inline _LIBCPP_HIDE_FROM_ABI float asinh(float __x) _NOEXCEPT {return __builtin_asinhf(__x);}
1095	inline _LIBCPP_INLINE_VISIBILITY long double asinh(long double __lcpp_x) _NOEXCEPT {return ::asinhl(__lcpp_x);}	999
		1000	template <class = int>
		1001	_LIBCPP_HIDE_FROM_ABI double asinh(double __x) _NOEXCEPT {
		1002	return __builtin_asinh(__x);
		1003	}
		1004
		1005	inline _LIBCPP_HIDE_FROM_ABI long double asinh(long double __x) _NOEXCEPT {return __builtin_asinhl(__x);}
1096		1006
1097	template <class _A1>	1007	template <class _A1>
1098	inline _LIBCPP_INLINE_VISIBILITY	1008	inline _LIBCPP_HIDE_FROM_ABI
1099	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1009	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1100	asinh(_A1 __lcpp_x) _NOEXCEPT {return ::asinh((double)__lcpp_x);}	1010	asinh(_A1 __x) _NOEXCEPT {return __builtin_asinh((double)__x);}
1101		1011
1102	// atanh	1012	// atanh
1103		1013
1104	inline _LIBCPP_INLINE_VISIBILITY float atanh(float __lcpp_x) _NOEXCEPT {return ::atanhf(__lcpp_x);}	1014	inline _LIBCPP_HIDE_FROM_ABI float atanh(float __x) _NOEXCEPT {return __builtin_atanhf(__x);}
1105	inline _LIBCPP_INLINE_VISIBILITY long double atanh(long double __lcpp_x) _NOEXCEPT {return ::atanhl(__lcpp_x);}	1015
		1016	template <class = int>
		1017	_LIBCPP_HIDE_FROM_ABI double atanh(double __x) _NOEXCEPT {
		1018	return __builtin_atanh(__x);
		1019	}
		1020
		1021	inline _LIBCPP_HIDE_FROM_ABI long double atanh(long double __x) _NOEXCEPT {return __builtin_atanhl(__x);}
1106		1022
1107	template <class _A1>	1023	template <class _A1>
1108	inline _LIBCPP_INLINE_VISIBILITY	1024	inline _LIBCPP_HIDE_FROM_ABI
1109	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1025	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1110	atanh(_A1 __lcpp_x) _NOEXCEPT {return ::atanh((double)__lcpp_x);}	1026	atanh(_A1 __x) _NOEXCEPT {return __builtin_atanh((double)__x);}
1111		1027
1112	// cbrt	1028	// cbrt
1113		1029
1114	inline _LIBCPP_INLINE_VISIBILITY float cbrt(float __lcpp_x) _NOEXCEPT {return ::cbrtf(__lcpp_x);}	1030	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float cbrt(float __x) _NOEXCEPT {return __builtin_cbrtf(__x);}
1115	inline _LIBCPP_INLINE_VISIBILITY long double cbrt(long double __lcpp_x) _NOEXCEPT {return ::cbrtl(__lcpp_x);}	1031
		1032	template <class = int>
		1033	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double cbrt(double __x) _NOEXCEPT {
		1034	return __builtin_cbrt(__x);
		1035	}
		1036
		1037	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double cbrt(long double __x) _NOEXCEPT {return __builtin_cbrtl(__x);}
1116		1038
1117	template <class _A1>	1039	template <class _A1>
1118	inline _LIBCPP_INLINE_VISIBILITY	1040	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1119	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1041	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1120	cbrt(_A1 __lcpp_x) _NOEXCEPT {return ::cbrt((double)__lcpp_x);}	1042	cbrt(_A1 __x) _NOEXCEPT {return __builtin_cbrt((double)__x);}
1121		1043
1122	// copysign	1044	// copysign
1123		1045
1124	#if __has_builtin(__builtin_copysignf)	1046	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float copysign(float __x, float __y) _NOEXCEPT {
1125	_LIBCPP_CONSTEXPR	1047	return ::__builtin_copysignf(__x, __y);
1126	#endif
1127	inline _LIBCPP_INLINE_VISIBILITY float __libcpp_copysign(float __lcpp_x, float __lcpp_y) _NOEXCEPT {
1128	#if __has_builtin(__builtin_copysignf)
1129	return __builtin_copysignf(__lcpp_x, __lcpp_y);
1130	#else
1131	return ::copysignf(__lcpp_x, __lcpp_y);
1132	#endif
1133	}
1134
1135	#if __has_builtin(__builtin_copysign)
1136	_LIBCPP_CONSTEXPR
1137	#endif
1138	inline _LIBCPP_INLINE_VISIBILITY double __libcpp_copysign(double __lcpp_x, double __lcpp_y) _NOEXCEPT {
1139	#if __has_builtin(__builtin_copysign)
1140	return __builtin_copysign(__lcpp_x, __lcpp_y);
1141	#else
1142	return ::copysign(__lcpp_x, __lcpp_y);
1143	#endif
1144	}	1048	}
1145		1049
1146	#if __has_builtin(__builtin_copysignl)	1050	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double copysign(long double __x, long double __y) _NOEXCEPT {
1147	_LIBCPP_CONSTEXPR	1051	return ::__builtin_copysignl(__x, __y);
1148	#endif
1149	inline _LIBCPP_INLINE_VISIBILITY long double __libcpp_copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {
1150	#if __has_builtin(__builtin_copysignl)
1151	return __builtin_copysignl(__lcpp_x, __lcpp_y);
1152	#else
1153	return ::copysignl(__lcpp_x, __lcpp_y);
1154	#endif
1155	}	1052	}
1156		1053
1157	template <class _A1, class _A2>	1054	template <class _A1, class _A2>
1158	#if __has_builtin(__builtin_copysign)	1055	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1159	_LIBCPP_CONSTEXPR
1160	#endif
1161	inline _LIBCPP_INLINE_VISIBILITY
1162	typename std::__enable_if_t	1056	typename std::__enable_if_t
1163	<	1057	<
1164	std::is_arithmetic<_A1>::value &&	1058	std::is_arithmetic<_A1>::value &&
1165	std::is_arithmetic<_A2>::value,	1059	std::is_arithmetic<_A2>::value,
1166	std::__promote<_A1, _A2>	1060	std::__promote<_A1, _A2>
1167	>::type	1061	>::type
1168	__libcpp_copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT {	1062	copysign(_A1 __x, _A2 __y) _NOEXCEPT {
1169	typedef typename std::__promote<_A1, _A2>::type __result_type;	1063	return ::__builtin_copysign(__x, __y);
1170	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1171	std::_IsSame<_A2, __result_type>::value)), "");
1172	#if __has_builtin(__builtin_copysign)
1173	return __builtin_copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
1174	#else
1175	return ::copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
1176	#endif
1177	}	1064	}
1178		1065
1179	inline _LIBCPP_INLINE_VISIBILITY float copysign(float __lcpp_x, float __lcpp_y) _NOEXCEPT {	1066	// erf
1180	return ::__libcpp_copysign(__lcpp_x, __lcpp_y);
1181	}
1182		1067
1183	inline _LIBCPP_INLINE_VISIBILITY long double copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {	1068	inline _LIBCPP_HIDE_FROM_ABI float erf(float __x) _NOEXCEPT {return __builtin_erff(__x);}
1184	return ::__libcpp_copysign(__lcpp_x, __lcpp_y);
1185	}
1186		1069
1187	template <class _A1, class _A2>	1070	template <class = int>
1188	inline _LIBCPP_INLINE_VISIBILITY	1071	_LIBCPP_HIDE_FROM_ABI double erf(double __x) _NOEXCEPT {
1189	typename std::__enable_if_t	1072	return __builtin_erf(__x);
1190	<
1191	std::is_arithmetic<_A1>::value &&
1192	std::is_arithmetic<_A2>::value,
1193	std::__promote<_A1, _A2>
1194	>::type
1195	copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT {
1196	return ::__libcpp_copysign(__lcpp_x, __lcpp_y);
1197	}	1073	}
1198		1074
1199	// erf	1075	inline _LIBCPP_HIDE_FROM_ABI long double erf(long double __x) _NOEXCEPT {return __builtin_erfl(__x);}
1200
1201	inline _LIBCPP_INLINE_VISIBILITY float erf(float __lcpp_x) _NOEXCEPT {return ::erff(__lcpp_x);}
1202	inline _LIBCPP_INLINE_VISIBILITY long double erf(long double __lcpp_x) _NOEXCEPT {return ::erfl(__lcpp_x);}
1203		1076
1204	template <class _A1>	1077	template <class _A1>
1205	inline _LIBCPP_INLINE_VISIBILITY	1078	inline _LIBCPP_HIDE_FROM_ABI
1206	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1079	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1207	erf(_A1 __lcpp_x) _NOEXCEPT {return ::erf((double)__lcpp_x);}	1080	erf(_A1 __x) _NOEXCEPT {return __builtin_erf((double)__x);}
1208		1081
1209	// erfc	1082	// erfc
1210		1083
1211	inline _LIBCPP_INLINE_VISIBILITY float erfc(float __lcpp_x) _NOEXCEPT {return ::erfcf(__lcpp_x);}	1084	inline _LIBCPP_HIDE_FROM_ABI float erfc(float __x) _NOEXCEPT {return __builtin_erfcf(__x);}
1212	inline _LIBCPP_INLINE_VISIBILITY long double erfc(long double __lcpp_x) _NOEXCEPT {return ::erfcl(__lcpp_x);}	1085
		1086	template <class = int>
		1087	_LIBCPP_HIDE_FROM_ABI double erfc(double __x) _NOEXCEPT {
		1088	return __builtin_erfc(__x);
		1089	}
		1090
		1091	inline _LIBCPP_HIDE_FROM_ABI long double erfc(long double __x) _NOEXCEPT {return __builtin_erfcl(__x);}
1213		1092
1214	template <class _A1>	1093	template <class _A1>
1215	inline _LIBCPP_INLINE_VISIBILITY	1094	inline _LIBCPP_HIDE_FROM_ABI
1216	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1095	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1217	erfc(_A1 __lcpp_x) _NOEXCEPT {return ::erfc((double)__lcpp_x);}	1096	erfc(_A1 __x) _NOEXCEPT {return __builtin_erfc((double)__x);}
1218		1097
1219	// exp2	1098	// exp2
1220		1099
1221	inline _LIBCPP_INLINE_VISIBILITY float exp2(float __lcpp_x) _NOEXCEPT {return ::exp2f(__lcpp_x);}	1100	inline _LIBCPP_HIDE_FROM_ABI float exp2(float __x) _NOEXCEPT {return __builtin_exp2f(__x);}
1222	inline _LIBCPP_INLINE_VISIBILITY long double exp2(long double __lcpp_x) _NOEXCEPT {return ::exp2l(__lcpp_x);}	1101
		1102	template <class = int>
		1103	_LIBCPP_HIDE_FROM_ABI double exp2(double __x) _NOEXCEPT {
		1104	return __builtin_exp2(__x);
		1105	}
		1106
		1107	inline _LIBCPP_HIDE_FROM_ABI long double exp2(long double __x) _NOEXCEPT {return __builtin_exp2l(__x);}
1223		1108
1224	template <class _A1>	1109	template <class _A1>
1225	inline _LIBCPP_INLINE_VISIBILITY	1110	inline _LIBCPP_HIDE_FROM_ABI
1226	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1111	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1227	exp2(_A1 __lcpp_x) _NOEXCEPT {return ::exp2((double)__lcpp_x);}	1112	exp2(_A1 __x) _NOEXCEPT {return __builtin_exp2((double)__x);}
1228		1113
1229	// expm1	1114	// expm1
1230		1115
1231	inline _LIBCPP_INLINE_VISIBILITY float expm1(float __lcpp_x) _NOEXCEPT {return ::expm1f(__lcpp_x);}	1116	inline _LIBCPP_HIDE_FROM_ABI float expm1(float __x) _NOEXCEPT {return __builtin_expm1f(__x);}
1232	inline _LIBCPP_INLINE_VISIBILITY long double expm1(long double __lcpp_x) _NOEXCEPT {return ::expm1l(__lcpp_x);}	1117
		1118	template <class = int>
		1119	_LIBCPP_HIDE_FROM_ABI double expm1(double __x) _NOEXCEPT {
		1120	return __builtin_expm1(__x);
		1121	}
		1122
		1123	inline _LIBCPP_HIDE_FROM_ABI long double expm1(long double __x) _NOEXCEPT {return __builtin_expm1l(__x);}
1233		1124
1234	template <class _A1>	1125	template <class _A1>
1235	inline _LIBCPP_INLINE_VISIBILITY	1126	inline _LIBCPP_HIDE_FROM_ABI
1236	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1127	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1237	expm1(_A1 __lcpp_x) _NOEXCEPT {return ::expm1((double)__lcpp_x);}	1128	expm1(_A1 __x) _NOEXCEPT {return __builtin_expm1((double)__x);}
1238		1129
1239	// fdim	1130	// fdim
1240		1131
1241	inline _LIBCPP_INLINE_VISIBILITY float fdim(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::fdimf(__lcpp_x, __lcpp_y);}	1132	inline _LIBCPP_HIDE_FROM_ABI float fdim(float __x, float __y) _NOEXCEPT {return __builtin_fdimf(__x, __y);}
1242	inline _LIBCPP_INLINE_VISIBILITY long double fdim(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::fdiml(__lcpp_x, __lcpp_y);}	1133
		1134	template <class = int>
		1135	_LIBCPP_HIDE_FROM_ABI double fdim(double __x, double __y) _NOEXCEPT {
		1136	return __builtin_fdim(__x, __y);
		1137	}
		1138
		1139	inline _LIBCPP_HIDE_FROM_ABI long double fdim(long double __x, long double __y) _NOEXCEPT {return __builtin_fdiml(__x, __y);}
1243		1140
1244	template <class _A1, class _A2>	1141	template <class _A1, class _A2>
1245	inline _LIBCPP_INLINE_VISIBILITY	1142	inline _LIBCPP_HIDE_FROM_ABI
1246	typename std::__enable_if_t	1143	typename std::__enable_if_t
1247	<	1144	<
1248	std::is_arithmetic<_A1>::value &&	1145	std::is_arithmetic<_A1>::value &&
1249	std::is_arithmetic<_A2>::value,	1146	std::is_arithmetic<_A2>::value,
1250	std::__promote<_A1, _A2>	1147	std::__promote<_A1, _A2>
1251	>::type	1148	>::type
1252	fdim(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1149	fdim(_A1 __x, _A2 __y) _NOEXCEPT
1253	{	1150	{
1254	typedef typename std::__promote<_A1, _A2>::type __result_type;	1151	typedef typename std::__promote<_A1, _A2>::type __result_type;
1255	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1152	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1256	std::_IsSame<_A2, __result_type>::value)), "");	1153	std::_IsSame<_A2, __result_type>::value)), "");
1257	return ::fdim((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1154	return ::fdim((__result_type)__x, (__result_type)__y);
1258	}	1155	}
1259		1156
1260	// fma	1157	// fma
1261		1158
1262	inline _LIBCPP_INLINE_VISIBILITY float fma(float __lcpp_x, float __lcpp_y, float __lcpp_z) _NOEXCEPT	1159	inline _LIBCPP_HIDE_FROM_ABI float fma(float __x, float __y, float __z) _NOEXCEPT
1263	{	1160	{
1264	#if __has_builtin(__builtin_fmaf)	1161	return __builtin_fmaf(__x, __y, __z);
1265	return __builtin_fmaf(__lcpp_x, __lcpp_y, __lcpp_z);	1162	}
1266	#else	1163
1267	return ::fmaf(__lcpp_x, __lcpp_y, __lcpp_z);	1164
1268	#endif	1165	template <class = int>
		1166	_LIBCPP_HIDE_FROM_ABI double fma(double __x, double __y, double __z) _NOEXCEPT {
		1167	return __builtin_fma(__x, __y, __z);
1269	}	1168	}
1270	inline _LIBCPP_INLINE_VISIBILITY long double fma(long double __lcpp_x, long double __lcpp_y, long double __lcpp_z) _NOEXCEPT	1169
		1170	inline _LIBCPP_HIDE_FROM_ABI long double fma(long double __x, long double __y, long double __z) _NOEXCEPT
1271	{	1171	{
1272	#if __has_builtin(__builtin_fmal)	1172	return __builtin_fmal(__x, __y, __z);
1273	return __builtin_fmal(__lcpp_x, __lcpp_y, __lcpp_z);
1274	#else
1275	return ::fmal(__lcpp_x, __lcpp_y, __lcpp_z);
1276	#endif
1277	}	1173	}
1278		1174
1279	template <class _A1, class _A2, class _A3>	1175	template <class _A1, class _A2, class _A3>
1280	inline _LIBCPP_INLINE_VISIBILITY	1176	inline _LIBCPP_HIDE_FROM_ABI
1281	typename std::__enable_if_t	1177	typename std::__enable_if_t
1282	<	1178	<
1283	std::is_arithmetic<_A1>::value &&	1179	std::is_arithmetic<_A1>::value &&
...	@@ -1285,462 +1181,512 @@ typename std::__enable_if_t	...	@@ -1285,462 +1181,512 @@ typename std::__enable_if_t
1285	std::is_arithmetic<_A3>::value,	1181	std::is_arithmetic<_A3>::value,
1286	std::__promote<_A1, _A2, _A3>	1182	std::__promote<_A1, _A2, _A3>
1287	>::type	1183	>::type
1288	fma(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT	1184	fma(_A1 __x, _A2 __y, _A3 __z) _NOEXCEPT
1289	{	1185	{
1290	typedef typename std::__promote<_A1, _A2, _A3>::type __result_type;	1186	typedef typename std::__promote<_A1, _A2, _A3>::type __result_type;
1291	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1187	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1292	std::_IsSame<_A2, __result_type>::value &&	1188	std::_IsSame<_A2, __result_type>::value &&
1293	std::_IsSame<_A3, __result_type>::value)), "");	1189	std::_IsSame<_A3, __result_type>::value)), "");
1294	#if __has_builtin(__builtin_fma)	1190	return __builtin_fma((__result_type)__x, (__result_type)__y, (__result_type)__z);
1295	return __builtin_fma((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
1296	#else
1297	return ::fma((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
1298	#endif
1299	}	1191	}
1300		1192
1301	// fmax	1193	// fmax
1302		1194
1303	inline _LIBCPP_INLINE_VISIBILITY float fmax(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::fmaxf(__lcpp_x, __lcpp_y);}	1195	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float fmax(float __x, float __y) _NOEXCEPT {return __builtin_fmaxf(__x, __y);}
1304	inline _LIBCPP_INLINE_VISIBILITY long double fmax(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::fmaxl(__lcpp_x, __lcpp_y);}	1196
		1197	template <class = int>
		1198	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double fmax(double __x, double __y) _NOEXCEPT {
		1199	return __builtin_fmax(__x, __y);
		1200	}
		1201
		1202	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fmax(long double __x, long double __y) _NOEXCEPT {return __builtin_fmaxl(__x, __y);}
1305		1203
1306	template <class _A1, class _A2>	1204	template <class _A1, class _A2>
1307	inline _LIBCPP_INLINE_VISIBILITY	1205	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1308	typename std::__enable_if_t	1206	typename std::__enable_if_t
1309	<	1207	<
1310	std::is_arithmetic<_A1>::value &&	1208	std::is_arithmetic<_A1>::value &&
1311	std::is_arithmetic<_A2>::value,	1209	std::is_arithmetic<_A2>::value,
1312	std::__promote<_A1, _A2>	1210	std::__promote<_A1, _A2>
1313	>::type	1211	>::type
1314	fmax(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1212	fmax(_A1 __x, _A2 __y) _NOEXCEPT
1315	{	1213	{
1316	typedef typename std::__promote<_A1, _A2>::type __result_type;	1214	typedef typename std::__promote<_A1, _A2>::type __result_type;
1317	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1215	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1318	std::_IsSame<_A2, __result_type>::value)), "");	1216	std::_IsSame<_A2, __result_type>::value)), "");
1319	return ::fmax((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1217	return ::fmax((__result_type)__x, (__result_type)__y);
1320	}	1218	}
1321		1219
1322	// fmin	1220	// fmin
1323		1221
1324	inline _LIBCPP_INLINE_VISIBILITY float fmin(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::fminf(__lcpp_x, __lcpp_y);}	1222	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float fmin(float __x, float __y) _NOEXCEPT {return __builtin_fminf(__x, __y);}
1325	inline _LIBCPP_INLINE_VISIBILITY long double fmin(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::fminl(__lcpp_x, __lcpp_y);}	1223
		1224	template <class = int>
		1225	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double fmin(double __x, double __y) _NOEXCEPT {
		1226	return __builtin_fmin(__x, __y);
		1227	}
		1228
		1229	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fmin(long double __x, long double __y) _NOEXCEPT {return __builtin_fminl(__x, __y);}
1326		1230
1327	template <class _A1, class _A2>	1231	template <class _A1, class _A2>
1328	inline _LIBCPP_INLINE_VISIBILITY	1232	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1329	typename std::__enable_if_t	1233	typename std::__enable_if_t
1330	<	1234	<
1331	std::is_arithmetic<_A1>::value &&	1235	std::is_arithmetic<_A1>::value &&
1332	std::is_arithmetic<_A2>::value,	1236	std::is_arithmetic<_A2>::value,
1333	std::__promote<_A1, _A2>	1237	std::__promote<_A1, _A2>
1334	>::type	1238	>::type
1335	fmin(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1239	fmin(_A1 __x, _A2 __y) _NOEXCEPT
1336	{	1240	{
1337	typedef typename std::__promote<_A1, _A2>::type __result_type;	1241	typedef typename std::__promote<_A1, _A2>::type __result_type;
1338	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1242	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1339	std::_IsSame<_A2, __result_type>::value)), "");	1243	std::_IsSame<_A2, __result_type>::value)), "");
1340	return ::fmin((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1244	return ::fmin((__result_type)__x, (__result_type)__y);
1341	}	1245	}
1342		1246
1343	// hypot	1247	// hypot
1344		1248
1345	inline _LIBCPP_INLINE_VISIBILITY float hypot(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::hypotf(__lcpp_x, __lcpp_y);}	1249	inline _LIBCPP_HIDE_FROM_ABI float hypot(float __x, float __y) _NOEXCEPT {return __builtin_hypotf(__x, __y);}
1346	inline _LIBCPP_INLINE_VISIBILITY long double hypot(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::hypotl(__lcpp_x, __lcpp_y);}	1250
		1251	template <class = int>
		1252	_LIBCPP_HIDE_FROM_ABI double hypot(double __x, double __y) _NOEXCEPT {
		1253	return __builtin_hypot(__x, __y);
		1254	}
		1255
		1256	inline _LIBCPP_HIDE_FROM_ABI long double hypot(long double __x, long double __y) _NOEXCEPT {return __builtin_hypotl(__x, __y);}
1347		1257
1348	template <class _A1, class _A2>	1258	template <class _A1, class _A2>
1349	inline _LIBCPP_INLINE_VISIBILITY	1259	inline _LIBCPP_HIDE_FROM_ABI
1350	typename std::__enable_if_t	1260	typename std::__enable_if_t
1351	<	1261	<
1352	std::is_arithmetic<_A1>::value &&	1262	std::is_arithmetic<_A1>::value &&
1353	std::is_arithmetic<_A2>::value,	1263	std::is_arithmetic<_A2>::value,
1354	std::__promote<_A1, _A2>	1264	std::__promote<_A1, _A2>
1355	>::type	1265	>::type
1356	hypot(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1266	hypot(_A1 __x, _A2 __y) _NOEXCEPT
1357	{	1267	{
1358	typedef typename std::__promote<_A1, _A2>::type __result_type;	1268	typedef typename std::__promote<_A1, _A2>::type __result_type;
1359	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1269	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1360	std::_IsSame<_A2, __result_type>::value)), "");	1270	std::_IsSame<_A2, __result_type>::value)), "");
1361	return ::hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1271	return ::hypot((__result_type)__x, (__result_type)__y);
1362	}	1272	}
1363		1273
1364	// ilogb	1274	// ilogb
1365		1275
1366	inline _LIBCPP_INLINE_VISIBILITY int ilogb(float __lcpp_x) _NOEXCEPT {return ::ilogbf(__lcpp_x);}	1276	inline _LIBCPP_HIDE_FROM_ABI int ilogb(float __x) _NOEXCEPT {return __builtin_ilogbf(__x);}
1367	inline _LIBCPP_INLINE_VISIBILITY int ilogb(long double __lcpp_x) _NOEXCEPT {return ::ilogbl(__lcpp_x);}	1277
		1278	template <class = int>
		1279	_LIBCPP_HIDE_FROM_ABI double ilogb(double __x) _NOEXCEPT {
		1280	return __builtin_ilogb(__x);
		1281	}
		1282
		1283	inline _LIBCPP_HIDE_FROM_ABI int ilogb(long double __x) _NOEXCEPT {return __builtin_ilogbl(__x);}
1368		1284
1369	template <class _A1>	1285	template <class _A1>
1370	inline _LIBCPP_INLINE_VISIBILITY	1286	inline _LIBCPP_HIDE_FROM_ABI
1371	typename std::enable_if<std::is_integral<_A1>::value, int>::type	1287	typename std::enable_if<std::is_integral<_A1>::value, int>::type
1372	ilogb(_A1 __lcpp_x) _NOEXCEPT {return ::ilogb((double)__lcpp_x);}	1288	ilogb(_A1 __x) _NOEXCEPT {return __builtin_ilogb((double)__x);}
1373		1289
1374	// lgamma	1290	// lgamma
1375		1291
1376	inline _LIBCPP_INLINE_VISIBILITY float lgamma(float __lcpp_x) _NOEXCEPT {return ::lgammaf(__lcpp_x);}	1292	inline _LIBCPP_HIDE_FROM_ABI float lgamma(float __x) _NOEXCEPT {return __builtin_lgammaf(__x);}
1377	inline _LIBCPP_INLINE_VISIBILITY long double lgamma(long double __lcpp_x) _NOEXCEPT {return ::lgammal(__lcpp_x);}	1293
		1294	template <class = int>
		1295	_LIBCPP_HIDE_FROM_ABI double lgamma(double __x) _NOEXCEPT {
		1296	return __builtin_lgamma(__x);
		1297	}
		1298
		1299	inline _LIBCPP_HIDE_FROM_ABI long double lgamma(long double __x) _NOEXCEPT {return __builtin_lgammal(__x);}
1378		1300
1379	template <class _A1>	1301	template <class _A1>
1380	inline _LIBCPP_INLINE_VISIBILITY	1302	inline _LIBCPP_HIDE_FROM_ABI
1381	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1303	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1382	lgamma(_A1 __lcpp_x) _NOEXCEPT {return ::lgamma((double)__lcpp_x);}	1304	lgamma(_A1 __x) _NOEXCEPT {return __builtin_lgamma((double)__x);}
1383		1305
1384	// llrint	1306	// llrint
1385		1307
1386	inline _LIBCPP_INLINE_VISIBILITY long long llrint(float __lcpp_x) _NOEXCEPT	1308	inline _LIBCPP_HIDE_FROM_ABI long long llrint(float __x) _NOEXCEPT
1387	{	1309	{
1388	#if __has_builtin(__builtin_llrintf)	1310	return __builtin_llrintf(__x);
1389	return __builtin_llrintf(__lcpp_x);	1311	}
1390	#else	1312
1391	return ::llrintf(__lcpp_x);	1313	template <class = int>
1392	#endif	1314	_LIBCPP_HIDE_FROM_ABI long long llrint(double __x) _NOEXCEPT {
		1315	return __builtin_llrint(__x);
1393	}	1316	}
1394	inline _LIBCPP_INLINE_VISIBILITY long long llrint(long double __lcpp_x) _NOEXCEPT	1317
		1318	inline _LIBCPP_HIDE_FROM_ABI long long llrint(long double __x) _NOEXCEPT
1395	{	1319	{
1396	#if __has_builtin(__builtin_llrintl)	1320	return __builtin_llrintl(__x);
1397	return __builtin_llrintl(__lcpp_x);
1398	#else
1399	return ::llrintl(__lcpp_x);
1400	#endif
1401	}	1321	}
1402		1322
1403	template <class _A1>	1323	template <class _A1>
1404	inline _LIBCPP_INLINE_VISIBILITY	1324	inline _LIBCPP_HIDE_FROM_ABI
1405	typename std::enable_if<std::is_integral<_A1>::value, long long>::type	1325	typename std::enable_if<std::is_integral<_A1>::value, long long>::type
1406	llrint(_A1 __lcpp_x) _NOEXCEPT	1326	llrint(_A1 __x) _NOEXCEPT
1407	{	1327	{
1408	#if __has_builtin(__builtin_llrint)	1328	return __builtin_llrint((double)__x);
1409	return __builtin_llrint((double)__lcpp_x);
1410	#else
1411	return ::llrint((double)__lcpp_x);
1412	#endif
1413	}	1329	}
1414		1330
1415	// llround	1331	// llround
1416		1332
1417	inline _LIBCPP_INLINE_VISIBILITY long long llround(float __lcpp_x) _NOEXCEPT	1333	inline _LIBCPP_HIDE_FROM_ABI long long llround(float __x) _NOEXCEPT
1418	{	1334	{
1419	#if __has_builtin(__builtin_llroundf)	1335	return __builtin_llroundf(__x);
1420	return __builtin_llroundf(__lcpp_x);	1336	}
1421	#else	1337
1422	return ::llroundf(__lcpp_x);	1338	template <class = int>
1423	#endif	1339	_LIBCPP_HIDE_FROM_ABI long long llround(double __x) _NOEXCEPT {
		1340	return __builtin_llround(__x);
1424	}	1341	}
1425	inline _LIBCPP_INLINE_VISIBILITY long long llround(long double __lcpp_x) _NOEXCEPT	1342
		1343	inline _LIBCPP_HIDE_FROM_ABI long long llround(long double __x) _NOEXCEPT
1426	{	1344	{
1427	#if __has_builtin(__builtin_llroundl)	1345	return __builtin_llroundl(__x);
1428	return __builtin_llroundl(__lcpp_x);
1429	#else
1430	return ::llroundl(__lcpp_x);
1431	#endif
1432	}	1346	}
1433		1347
1434	template <class _A1>	1348	template <class _A1>
1435	inline _LIBCPP_INLINE_VISIBILITY	1349	inline _LIBCPP_HIDE_FROM_ABI
1436	typename std::enable_if<std::is_integral<_A1>::value, long long>::type	1350	typename std::enable_if<std::is_integral<_A1>::value, long long>::type
1437	llround(_A1 __lcpp_x) _NOEXCEPT	1351	llround(_A1 __x) _NOEXCEPT
1438	{	1352	{
1439	#if __has_builtin(__builtin_llround)	1353	return __builtin_llround((double)__x);
1440	return __builtin_llround((double)__lcpp_x);
1441	#else
1442	return ::llround((double)__lcpp_x);
1443	#endif
1444	}	1354	}
1445		1355
1446	// log1p	1356	// log1p
1447		1357
1448	inline _LIBCPP_INLINE_VISIBILITY float log1p(float __lcpp_x) _NOEXCEPT {return ::log1pf(__lcpp_x);}	1358	inline _LIBCPP_HIDE_FROM_ABI float log1p(float __x) _NOEXCEPT {return __builtin_log1pf(__x);}
1449	inline _LIBCPP_INLINE_VISIBILITY long double log1p(long double __lcpp_x) _NOEXCEPT {return ::log1pl(__lcpp_x);}	1359
		1360	template <class = int>
		1361	_LIBCPP_HIDE_FROM_ABI double log1p(double __x) _NOEXCEPT {
		1362	return __builtin_log1p(__x);
		1363	}
		1364
		1365	inline _LIBCPP_HIDE_FROM_ABI long double log1p(long double __x) _NOEXCEPT {return __builtin_log1pl(__x);}
1450		1366
1451	template <class _A1>	1367	template <class _A1>
1452	inline _LIBCPP_INLINE_VISIBILITY	1368	inline _LIBCPP_HIDE_FROM_ABI
1453	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1369	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1454	log1p(_A1 __lcpp_x) _NOEXCEPT {return ::log1p((double)__lcpp_x);}	1370	log1p(_A1 __x) _NOEXCEPT {return __builtin_log1p((double)__x);}
1455		1371
1456	// log2	1372	// log2
1457		1373
1458	inline _LIBCPP_INLINE_VISIBILITY float log2(float __lcpp_x) _NOEXCEPT {return ::log2f(__lcpp_x);}	1374	inline _LIBCPP_HIDE_FROM_ABI float log2(float __x) _NOEXCEPT {return __builtin_log2f(__x);}
1459	inline _LIBCPP_INLINE_VISIBILITY long double log2(long double __lcpp_x) _NOEXCEPT {return ::log2l(__lcpp_x);}	1375
		1376	template <class = int>
		1377	_LIBCPP_HIDE_FROM_ABI double log2(double __x) _NOEXCEPT {
		1378	return __builtin_log2(__x);
		1379	}
		1380
		1381	inline _LIBCPP_HIDE_FROM_ABI long double log2(long double __x) _NOEXCEPT {return __builtin_log2l(__x);}
1460		1382
1461	template <class _A1>	1383	template <class _A1>
1462	inline _LIBCPP_INLINE_VISIBILITY	1384	inline _LIBCPP_HIDE_FROM_ABI
1463	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1385	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1464	log2(_A1 __lcpp_x) _NOEXCEPT {return ::log2((double)__lcpp_x);}	1386	log2(_A1 __x) _NOEXCEPT {return __builtin_log2((double)__x);}
1465		1387
1466	// logb	1388	// logb
1467		1389
1468	inline _LIBCPP_INLINE_VISIBILITY float logb(float __lcpp_x) _NOEXCEPT {return ::logbf(__lcpp_x);}	1390	inline _LIBCPP_HIDE_FROM_ABI float logb(float __x) _NOEXCEPT {return __builtin_logbf(__x);}
1469	inline _LIBCPP_INLINE_VISIBILITY long double logb(long double __lcpp_x) _NOEXCEPT {return ::logbl(__lcpp_x);}	1391
		1392	template <class = int>
		1393	_LIBCPP_HIDE_FROM_ABI double logb(double __x) _NOEXCEPT {
		1394	return __builtin_logb(__x);
		1395	}
		1396
		1397	inline _LIBCPP_HIDE_FROM_ABI long double logb(long double __x) _NOEXCEPT {return __builtin_logbl(__x);}
1470		1398
1471	template <class _A1>	1399	template <class _A1>
1472	inline _LIBCPP_INLINE_VISIBILITY	1400	inline _LIBCPP_HIDE_FROM_ABI
1473	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1401	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1474	logb(_A1 __lcpp_x) _NOEXCEPT {return ::logb((double)__lcpp_x);}	1402	logb(_A1 __x) _NOEXCEPT {return __builtin_logb((double)__x);}
1475		1403
1476	// lrint	1404	// lrint
1477		1405
1478	inline _LIBCPP_INLINE_VISIBILITY long lrint(float __lcpp_x) _NOEXCEPT	1406	inline _LIBCPP_HIDE_FROM_ABI long lrint(float __x) _NOEXCEPT
1479	{	1407	{
1480	#if __has_builtin(__builtin_lrintf)	1408	return __builtin_lrintf(__x);
1481	return __builtin_lrintf(__lcpp_x);
1482	#else
1483	return ::lrintf(__lcpp_x);
1484	#endif
1485	}	1409	}
1486	inline _LIBCPP_INLINE_VISIBILITY long lrint(long double __lcpp_x) _NOEXCEPT	1410
		1411	template <class = int>
		1412	_LIBCPP_HIDE_FROM_ABI long lrint(double __x) _NOEXCEPT {
		1413	return __builtin_lrint(__x);
		1414	}
		1415
		1416	inline _LIBCPP_HIDE_FROM_ABI long lrint(long double __x) _NOEXCEPT
1487	{	1417	{
1488	#if __has_builtin(__builtin_lrintl)	1418	return __builtin_lrintl(__x);
1489	return __builtin_lrintl(__lcpp_x);
1490	#else
1491	return ::lrintl(__lcpp_x);
1492	#endif
1493	}	1419	}
1494		1420
1495	template <class _A1>	1421	template <class _A1>
1496	inline _LIBCPP_INLINE_VISIBILITY	1422	inline _LIBCPP_HIDE_FROM_ABI
1497	typename std::enable_if<std::is_integral<_A1>::value, long>::type	1423	typename std::enable_if<std::is_integral<_A1>::value, long>::type
1498	lrint(_A1 __lcpp_x) _NOEXCEPT	1424	lrint(_A1 __x) _NOEXCEPT
1499	{	1425	{
1500	#if __has_builtin(__builtin_lrint)	1426	return __builtin_lrint((double)__x);
1501	return __builtin_lrint((double)__lcpp_x);
1502	#else
1503	return ::lrint((double)__lcpp_x);
1504	#endif
1505	}	1427	}
1506		1428
1507	// lround	1429	// lround
1508		1430
1509	inline _LIBCPP_INLINE_VISIBILITY long lround(float __lcpp_x) _NOEXCEPT	1431	inline _LIBCPP_HIDE_FROM_ABI long lround(float __x) _NOEXCEPT
1510	{	1432	{
1511	#if __has_builtin(__builtin_lroundf)	1433	return __builtin_lroundf(__x);
1512	return __builtin_lroundf(__lcpp_x);
1513	#else
1514	return ::lroundf(__lcpp_x);
1515	#endif
1516	}	1434	}
1517	inline _LIBCPP_INLINE_VISIBILITY long lround(long double __lcpp_x) _NOEXCEPT	1435
		1436	template <class = int>
		1437	_LIBCPP_HIDE_FROM_ABI long lround(double __x) _NOEXCEPT {
		1438	return __builtin_lround(__x);
		1439	}
		1440
		1441	inline _LIBCPP_HIDE_FROM_ABI long lround(long double __x) _NOEXCEPT
1518	{	1442	{
1519	#if __has_builtin(__builtin_lroundl)	1443	return __builtin_lroundl(__x);
1520	return __builtin_lroundl(__lcpp_x);
1521	#else
1522	return ::lroundl(__lcpp_x);
1523	#endif
1524	}	1444	}
1525		1445
1526	template <class _A1>	1446	template <class _A1>
1527	inline _LIBCPP_INLINE_VISIBILITY	1447	inline _LIBCPP_HIDE_FROM_ABI
1528	typename std::enable_if<std::is_integral<_A1>::value, long>::type	1448	typename std::enable_if<std::is_integral<_A1>::value, long>::type
1529	lround(_A1 __lcpp_x) _NOEXCEPT	1449	lround(_A1 __x) _NOEXCEPT
1530	{	1450	{
1531	#if __has_builtin(__builtin_lround)	1451	return __builtin_lround((double)__x);
1532	return __builtin_lround((double)__lcpp_x);
1533	#else
1534	return ::lround((double)__lcpp_x);
1535	#endif
1536	}	1452	}
1537		1453
1538	// nan	1454	// nan
1539		1455
1540	// nearbyint	1456	// nearbyint
1541		1457
1542	inline _LIBCPP_INLINE_VISIBILITY float nearbyint(float __lcpp_x) _NOEXCEPT {return ::nearbyintf(__lcpp_x);}	1458	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float nearbyint(float __x) _NOEXCEPT {return __builtin_nearbyintf(__x);}
1543	inline _LIBCPP_INLINE_VISIBILITY long double nearbyint(long double __lcpp_x) _NOEXCEPT {return ::nearbyintl(__lcpp_x);}	1459
		1460	template <class = int>
		1461	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double nearbyint(double __x) _NOEXCEPT {
		1462	return __builtin_nearbyint(__x);
		1463	}
		1464
		1465	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double nearbyint(long double __x) _NOEXCEPT {return __builtin_nearbyintl(__x);}
1544		1466
1545	template <class _A1>	1467	template <class _A1>
1546	inline _LIBCPP_INLINE_VISIBILITY	1468	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1547	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1469	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1548	nearbyint(_A1 __lcpp_x) _NOEXCEPT {return ::nearbyint((double)__lcpp_x);}	1470	nearbyint(_A1 __x) _NOEXCEPT {return __builtin_nearbyint((double)__x);}
1549		1471
1550	// nextafter	1472	// nextafter
1551		1473
1552	inline _LIBCPP_INLINE_VISIBILITY float nextafter(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::nextafterf(__lcpp_x, __lcpp_y);}	1474	inline _LIBCPP_HIDE_FROM_ABI float nextafter(float __x, float __y) _NOEXCEPT {return __builtin_nextafterf(__x, __y);}
1553	inline _LIBCPP_INLINE_VISIBILITY long double nextafter(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::nextafterl(__lcpp_x, __lcpp_y);}	1475
		1476	template <class = int>
		1477	_LIBCPP_HIDE_FROM_ABI double nextafter(double __x, double __y) _NOEXCEPT {
		1478	return __builtin_nextafter(__x, __y);
		1479	}
		1480
		1481	inline _LIBCPP_HIDE_FROM_ABI long double nextafter(long double __x, long double __y) _NOEXCEPT {return __builtin_nextafterl(__x, __y);}
1554		1482
1555	template <class _A1, class _A2>	1483	template <class _A1, class _A2>
1556	inline _LIBCPP_INLINE_VISIBILITY	1484	inline _LIBCPP_HIDE_FROM_ABI
1557	typename std::__enable_if_t	1485	typename std::__enable_if_t
1558	<	1486	<
1559	std::is_arithmetic<_A1>::value &&	1487	std::is_arithmetic<_A1>::value &&
1560	std::is_arithmetic<_A2>::value,	1488	std::is_arithmetic<_A2>::value,
1561	std::__promote<_A1, _A2>	1489	std::__promote<_A1, _A2>
1562	>::type	1490	>::type
1563	nextafter(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1491	nextafter(_A1 __x, _A2 __y) _NOEXCEPT
1564	{	1492	{
1565	typedef typename std::__promote<_A1, _A2>::type __result_type;	1493	typedef typename std::__promote<_A1, _A2>::type __result_type;
1566	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1494	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1567	std::_IsSame<_A2, __result_type>::value)), "");	1495	std::_IsSame<_A2, __result_type>::value)), "");
1568	return ::nextafter((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1496	return ::nextafter((__result_type)__x, (__result_type)__y);
1569	}	1497	}
1570		1498
1571	// nexttoward	1499	// nexttoward
1572		1500
1573	inline _LIBCPP_INLINE_VISIBILITY float nexttoward(float __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::nexttowardf(__lcpp_x, __lcpp_y);}	1501	inline _LIBCPP_HIDE_FROM_ABI float nexttoward(float __x, long double __y) _NOEXCEPT {return __builtin_nexttowardf(__x, __y);}
1574	inline _LIBCPP_INLINE_VISIBILITY long double nexttoward(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::nexttowardl(__lcpp_x, __lcpp_y);}	1502
		1503	template <class = int>
		1504	_LIBCPP_HIDE_FROM_ABI double nexttoward(double __x, long double __y) _NOEXCEPT {
		1505	return __builtin_nexttoward(__x, __y);
		1506	}
		1507
		1508	inline _LIBCPP_HIDE_FROM_ABI long double nexttoward(long double __x, long double __y) _NOEXCEPT {return __builtin_nexttowardl(__x, __y);}
1575		1509
1576	template <class _A1>	1510	template <class _A1>
1577	inline _LIBCPP_INLINE_VISIBILITY	1511	inline _LIBCPP_HIDE_FROM_ABI
1578	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1512	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1579	nexttoward(_A1 __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::nexttoward((double)__lcpp_x, __lcpp_y);}	1513	nexttoward(_A1 __x, long double __y) _NOEXCEPT {return __builtin_nexttoward((double)__x, __y);}
1580		1514
1581	// remainder	1515	// remainder
1582		1516
1583	inline _LIBCPP_INLINE_VISIBILITY float remainder(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return ::remainderf(__lcpp_x, __lcpp_y);}	1517	inline _LIBCPP_HIDE_FROM_ABI float remainder(float __x, float __y) _NOEXCEPT {return __builtin_remainderf(__x, __y);}
1584	inline _LIBCPP_INLINE_VISIBILITY long double remainder(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return ::remainderl(__lcpp_x, __lcpp_y);}	1518
		1519	template <class = int>
		1520	_LIBCPP_HIDE_FROM_ABI double remainder(double __x, double __y) _NOEXCEPT {
		1521	return __builtin_remainder(__x, __y);
		1522	}
		1523
		1524	inline _LIBCPP_HIDE_FROM_ABI long double remainder(long double __x, long double __y) _NOEXCEPT {return __builtin_remainderl(__x, __y);}
1585		1525
1586	template <class _A1, class _A2>	1526	template <class _A1, class _A2>
1587	inline _LIBCPP_INLINE_VISIBILITY	1527	inline _LIBCPP_HIDE_FROM_ABI
1588	typename std::__enable_if_t	1528	typename std::__enable_if_t
1589	<	1529	<
1590	std::is_arithmetic<_A1>::value &&	1530	std::is_arithmetic<_A1>::value &&
1591	std::is_arithmetic<_A2>::value,	1531	std::is_arithmetic<_A2>::value,
1592	std::__promote<_A1, _A2>	1532	std::__promote<_A1, _A2>
1593	>::type	1533	>::type
1594	remainder(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT	1534	remainder(_A1 __x, _A2 __y) _NOEXCEPT
1595	{	1535	{
1596	typedef typename std::__promote<_A1, _A2>::type __result_type;	1536	typedef typename std::__promote<_A1, _A2>::type __result_type;
1597	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1537	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1598	std::_IsSame<_A2, __result_type>::value)), "");	1538	std::_IsSame<_A2, __result_type>::value)), "");
1599	return ::remainder((__result_type)__lcpp_x, (__result_type)__lcpp_y);	1539	return ::remainder((__result_type)__x, (__result_type)__y);
1600	}	1540	}
1601		1541
1602	// remquo	1542	// remquo
1603		1543
1604	inline _LIBCPP_INLINE_VISIBILITY float remquo(float __lcpp_x, float __lcpp_y, int* __lcpp_z) _NOEXCEPT {return ::remquof(__lcpp_x, __lcpp_y, __lcpp_z);}	1544	inline _LIBCPP_HIDE_FROM_ABI float remquo(float __x, float __y, int* __z) _NOEXCEPT {return __builtin_remquof(__x, __y, __z);}
1605	inline _LIBCPP_INLINE_VISIBILITY long double remquo(long double __lcpp_x, long double __lcpp_y, int* __lcpp_z) _NOEXCEPT {return ::remquol(__lcpp_x, __lcpp_y, __lcpp_z);}	1545
		1546	template <class = int>
		1547	_LIBCPP_HIDE_FROM_ABI double remquo(double __x, double __y, int* __z) _NOEXCEPT {
		1548	return __builtin_remquo(__x, __y, __z);
		1549	}
		1550
		1551	inline _LIBCPP_HIDE_FROM_ABI long double remquo(long double __x, long double __y, int* __z) _NOEXCEPT {return __builtin_remquol(__x, __y, __z);}
1606		1552
1607	template <class _A1, class _A2>	1553	template <class _A1, class _A2>
1608	inline _LIBCPP_INLINE_VISIBILITY	1554	inline _LIBCPP_HIDE_FROM_ABI
1609	typename std::__enable_if_t	1555	typename std::__enable_if_t
1610	<	1556	<
1611	std::is_arithmetic<_A1>::value &&	1557	std::is_arithmetic<_A1>::value &&
1612	std::is_arithmetic<_A2>::value,	1558	std::is_arithmetic<_A2>::value,
1613	std::__promote<_A1, _A2>	1559	std::__promote<_A1, _A2>
1614	>::type	1560	>::type
1615	remquo(_A1 __lcpp_x, _A2 __lcpp_y, int* __lcpp_z) _NOEXCEPT	1561	remquo(_A1 __x, _A2 __y, int* __z) _NOEXCEPT
1616	{	1562	{
1617	typedef typename std::__promote<_A1, _A2>::type __result_type;	1563	typedef typename std::__promote<_A1, _A2>::type __result_type;
1618	static_assert((!(std::_IsSame<_A1, __result_type>::value &&	1564	static_assert((!(std::_IsSame<_A1, __result_type>::value &&
1619	std::_IsSame<_A2, __result_type>::value)), "");	1565	std::_IsSame<_A2, __result_type>::value)), "");
1620	return ::remquo((__result_type)__lcpp_x, (__result_type)__lcpp_y, __lcpp_z);	1566	return ::remquo((__result_type)__x, (__result_type)__y, __z);
1621	}	1567	}
1622		1568
1623	// rint	1569	// rint
1624		1570
1625	inline _LIBCPP_INLINE_VISIBILITY float rint(float __lcpp_x) _NOEXCEPT	1571	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float rint(float __x) _NOEXCEPT
1626	{	1572	{
1627	#if __has_builtin(__builtin_rintf)	1573	return __builtin_rintf(__x);
1628	return __builtin_rintf(__lcpp_x);
1629	#else
1630	return ::rintf(__lcpp_x);
1631	#endif
1632	}	1574	}
1633	inline _LIBCPP_INLINE_VISIBILITY long double rint(long double __lcpp_x) _NOEXCEPT	1575
		1576	template <class = int>
		1577	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double rint(double __x) _NOEXCEPT {
		1578	return __builtin_rint(__x);
		1579	}
		1580
		1581	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double rint(long double __x) _NOEXCEPT
1634	{	1582	{
1635	#if __has_builtin(__builtin_rintl)	1583	return __builtin_rintl(__x);
1636	return __builtin_rintl(__lcpp_x);
1637	#else
1638	return ::rintl(__lcpp_x);
1639	#endif
1640	}	1584	}
1641		1585
1642	template <class _A1>	1586	template <class _A1>
1643	inline _LIBCPP_INLINE_VISIBILITY	1587	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1644	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1588	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1645	rint(_A1 __lcpp_x) _NOEXCEPT	1589	rint(_A1 __x) _NOEXCEPT
1646	{	1590	{
1647	#if __has_builtin(__builtin_rint)	1591	return __builtin_rint((double)__x);
1648	return __builtin_rint((double)__lcpp_x);
1649	#else
1650	return ::rint((double)__lcpp_x);
1651	#endif
1652	}	1592	}
1653		1593
1654	// round	1594	// round
1655		1595
1656	inline _LIBCPP_INLINE_VISIBILITY float round(float __lcpp_x) _NOEXCEPT	1596	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float round(float __x) _NOEXCEPT
1657	{	1597	{
1658	#if __has_builtin(__builtin_round)	1598	return __builtin_round(__x);
1659	return __builtin_round(__lcpp_x);
1660	#else
1661	return ::round(__lcpp_x);
1662	#endif
1663	}	1599	}
1664	inline _LIBCPP_INLINE_VISIBILITY long double round(long double __lcpp_x) _NOEXCEPT	1600
		1601	template <class = int>
		1602	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double round(double __x) _NOEXCEPT {
		1603	return __builtin_round(__x);
		1604	}
		1605
		1606	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double round(long double __x) _NOEXCEPT
1665	{	1607	{
1666	#if __has_builtin(__builtin_roundl)	1608	return __builtin_roundl(__x);
1667	return __builtin_roundl(__lcpp_x);
1668	#else
1669	return ::roundl(__lcpp_x);
1670	#endif
1671	}	1609	}
1672		1610
1673	template <class _A1>	1611	template <class _A1>
1674	inline _LIBCPP_INLINE_VISIBILITY	1612	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1675	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1613	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1676	round(_A1 __lcpp_x) _NOEXCEPT	1614	round(_A1 __x) _NOEXCEPT
1677	{	1615	{
1678	#if __has_builtin(__builtin_round)	1616	return __builtin_round((double)__x);
1679	return __builtin_round((double)__lcpp_x);
1680	#else
1681	return ::round((double)__lcpp_x);
1682	#endif
1683	}	1617	}
1684		1618
1685	// scalbln	1619	// scalbln
1686		1620
1687	inline _LIBCPP_INLINE_VISIBILITY float scalbln(float __lcpp_x, long __lcpp_y) _NOEXCEPT {return ::scalblnf(__lcpp_x, __lcpp_y);}	1621	inline _LIBCPP_HIDE_FROM_ABI float scalbln(float __x, long __y) _NOEXCEPT {return __builtin_scalblnf(__x, __y);}
1688	inline _LIBCPP_INLINE_VISIBILITY long double scalbln(long double __lcpp_x, long __lcpp_y) _NOEXCEPT {return ::scalblnl(__lcpp_x, __lcpp_y);}	1622
		1623	template <class = int>
		1624	_LIBCPP_HIDE_FROM_ABI double scalbln(double __x, long __y) _NOEXCEPT {
		1625	return __builtin_scalbln(__x, __y);
		1626	}
		1627
		1628	inline _LIBCPP_HIDE_FROM_ABI long double scalbln(long double __x, long __y) _NOEXCEPT {return __builtin_scalblnl(__x, __y);}
1689		1629
1690	template <class _A1>	1630	template <class _A1>
1691	inline _LIBCPP_INLINE_VISIBILITY	1631	inline _LIBCPP_HIDE_FROM_ABI
1692	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1632	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1693	scalbln(_A1 __lcpp_x, long __lcpp_y) _NOEXCEPT {return ::scalbln((double)__lcpp_x, __lcpp_y);}	1633	scalbln(_A1 __x, long __y) _NOEXCEPT {return __builtin_scalbln((double)__x, __y);}
1694		1634
1695	// scalbn	1635	// scalbn
1696		1636
1697	inline _LIBCPP_INLINE_VISIBILITY float scalbn(float __lcpp_x, int __lcpp_y) _NOEXCEPT {return ::scalbnf(__lcpp_x, __lcpp_y);}	1637	inline _LIBCPP_HIDE_FROM_ABI float scalbn(float __x, int __y) _NOEXCEPT {return __builtin_scalbnf(__x, __y);}
1698	inline _LIBCPP_INLINE_VISIBILITY long double scalbn(long double __lcpp_x, int __lcpp_y) _NOEXCEPT {return ::scalbnl(__lcpp_x, __lcpp_y);}	1638
		1639	template <class = int>
		1640	_LIBCPP_HIDE_FROM_ABI double scalbn(double __x, int __y) _NOEXCEPT {
		1641	return __builtin_scalbn(__x, __y);
		1642	}
		1643
		1644	inline _LIBCPP_HIDE_FROM_ABI long double scalbn(long double __x, int __y) _NOEXCEPT {return __builtin_scalbnl(__x, __y);}
1699		1645
1700	template <class _A1>	1646	template <class _A1>
1701	inline _LIBCPP_INLINE_VISIBILITY	1647	inline _LIBCPP_HIDE_FROM_ABI
1702	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1648	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1703	scalbn(_A1 __lcpp_x, int __lcpp_y) _NOEXCEPT {return ::scalbn((double)__lcpp_x, __lcpp_y);}	1649	scalbn(_A1 __x, int __y) _NOEXCEPT {return __builtin_scalbn((double)__x, __y);}
1704		1650
1705	// tgamma	1651	// tgamma
1706		1652
1707	inline _LIBCPP_INLINE_VISIBILITY float tgamma(float __lcpp_x) _NOEXCEPT {return ::tgammaf(__lcpp_x);}	1653	inline _LIBCPP_HIDE_FROM_ABI float tgamma(float __x) _NOEXCEPT {return __builtin_tgammaf(__x);}
1708	inline _LIBCPP_INLINE_VISIBILITY long double tgamma(long double __lcpp_x) _NOEXCEPT {return ::tgammal(__lcpp_x);}	1654
		1655	template <class = int>
		1656	_LIBCPP_HIDE_FROM_ABI double tgamma(double __x) _NOEXCEPT {
		1657	return __builtin_tgamma(__x);
		1658	}
		1659
		1660	inline _LIBCPP_HIDE_FROM_ABI long double tgamma(long double __x) _NOEXCEPT {return __builtin_tgammal(__x);}
1709		1661
1710	template <class _A1>	1662	template <class _A1>
1711	inline _LIBCPP_INLINE_VISIBILITY	1663	inline _LIBCPP_HIDE_FROM_ABI
1712	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1664	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1713	tgamma(_A1 __lcpp_x) _NOEXCEPT {return ::tgamma((double)__lcpp_x);}	1665	tgamma(_A1 __x) _NOEXCEPT {return __builtin_tgamma((double)__x);}
1714		1666
1715	// trunc	1667	// trunc
1716		1668
1717	inline _LIBCPP_INLINE_VISIBILITY float trunc(float __lcpp_x) _NOEXCEPT	1669	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI float trunc(float __x) _NOEXCEPT
1718	{	1670	{
1719	#if __has_builtin(__builtin_trunc)	1671	return __builtin_trunc(__x);
1720	return __builtin_trunc(__lcpp_x);
1721	#else
1722	return ::trunc(__lcpp_x);
1723	#endif
1724	}	1672	}
1725	inline _LIBCPP_INLINE_VISIBILITY long double trunc(long double __lcpp_x) _NOEXCEPT	1673
		1674	template <class = int>
		1675	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI double trunc(double __x) _NOEXCEPT {
		1676	return __builtin_trunc(__x);
		1677	}
		1678
		1679	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double trunc(long double __x) _NOEXCEPT
1726	{	1680	{
1727	#if __has_builtin(__builtin_truncl)	1681	return __builtin_truncl(__x);
1728	return __builtin_truncl(__lcpp_x);
1729	#else
1730	return ::truncl(__lcpp_x);
1731	#endif
1732	}	1682	}
1733		1683
1734	template <class _A1>	1684	template <class _A1>
1735	inline _LIBCPP_INLINE_VISIBILITY	1685	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
1736	typename std::enable_if<std::is_integral<_A1>::value, double>::type	1686	typename std::enable_if<std::is_integral<_A1>::value, double>::type
1737	trunc(_A1 __lcpp_x) _NOEXCEPT	1687	trunc(_A1 __x) _NOEXCEPT
1738	{	1688	{
1739	#if __has_builtin(__builtin_trunc)	1689	return __builtin_trunc((double)__x);
1740	return __builtin_trunc((double)__lcpp_x);
1741	#else
1742	return ::trunc((double)__lcpp_x);
1743	#endif
1744	}	1690	}
1745		1691
1746	} // extern "C++"	1692	} // extern "C++"

lib/libcxx/include/memory+131-230

 @@ -406,16 +406,17 @@ template <class T>
 struct default_delete
 {
     constexpr default_delete() noexcept = default;
-    template <class U> default_delete(const default_delete<U>&) noexcept;
+    template <class U> constexpr default_delete(const default_delete<U>&) noexcept; // constexpr since C++23
-    void operator()(T*) const noexcept;
+    constexpr void operator()(T*) const noexcept;                                   // constexpr since C++23
 };
 template <class T>
 struct default_delete<T[]>
 {
     constexpr default_delete() noexcept = default;
-    void operator()(T*) const noexcept;
+    template <class U> constexpr default_delete(const default_delete <U[]>&) noexcept; // constexpr since C++23
+    constexpr void operator()(T*) const noexcept;                                      // constexpr since C++23
     template <class U> void operator()(U*) const = delete;
 };
 @@ -429,36 +430,37 @@ public:
     // constructors
     constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
+    constexpr explicit unique_ptr(pointer p) noexcept;           // constexpr since C++23
-    unique_ptr(pointer p, see below d1) noexcept;
+    constexpr unique_ptr(pointer p, see below d1) noexcept;      // constexpr since C++23
-    unique_ptr(pointer p, see below d2) noexcept;
+    constexpr unique_ptr(pointer p, see below d2) noexcept;      // constexpr since C++23
-    unique_ptr(unique_ptr&& u) noexcept;
+    constexpr unique_ptr(unique_ptr&& u) noexcept;               // constexpr since C++23
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
+    constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
     template <class U, class E>
-        unique_ptr(unique_ptr<U, E>&& u) noexcept;
+        constexpr unique_ptr(unique_ptr<U, E>&& u) noexcept;     // constexpr since C++23
     template <class U>
-        unique_ptr(auto_ptr<U>&& u) noexcept;       // removed in C++17
+        unique_ptr(auto_ptr<U>&& u) noexcept;                    // removed in C++17
     // destructor
-    ~unique_ptr();
+    constexpr ~unique_ptr();                                     // constexpr since C++23
     // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
+    constexpr unique_ptr& operator=(unique_ptr&& u) noexcept;                         // constexpr since C++23
-    template <class U, class E> unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept;
+    template <class U, class E>
-    unique_ptr& operator=(nullptr_t) noexcept;
+    constexpr unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept;                   // constexpr since C++23
+    constexpr unique_ptr& operator=(nullptr_t) noexcept;                              // constexpr since C++23
     // observers
-    typename add_lvalue_reference<T>::type operator*() const;
+    typename constexpr add_lvalue_reference<T>::type operator*() const;               // constexpr since C++23
-    pointer operator->() const noexcept;
+    constexpr pointer operator->() const noexcept;                                    // constexpr since C++23
-    pointer get() const noexcept;
+    constexpr pointer get() const noexcept;                                           // constexpr since C++23
-    deleter_type& get_deleter() noexcept;
+    constexpr deleter_type& get_deleter() noexcept;                                   // constexpr since C++23
-    const deleter_type& get_deleter() const noexcept;
+    constexpr const deleter_type& get_deleter() const noexcept;                       // constexpr since C++23
-    explicit operator bool() const noexcept;
+    constexpr explicit operator bool() const noexcept;                                // constexpr since C++23
     // modifiers
-    pointer release() noexcept;
+    constexpr pointer release() noexcept;                                             // constexpr since C++23
-    void reset(pointer p = pointer()) noexcept;
+    constexpr void reset(pointer p = pointer()) noexcept;                             // constexpr since C++23
-    void swap(unique_ptr& u) noexcept;
+    constexpr void swap(unique_ptr& u) noexcept;                                      // constexpr since C++23
 };
 template <class T, class D>
 @@ -471,41 +473,45 @@ public:
     // constructors
     constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
+    constexpr explicit unique_ptr(pointer p) noexcept;          // constexpr since C++23
-    unique_ptr(pointer p, see below d) noexcept;
+    constexpr unique_ptr(pointer p, see below d) noexcept;      // constexpr since C++23
-    unique_ptr(pointer p, see below d) noexcept;
+    constexpr unique_ptr(pointer p, see below d) noexcept;      // constexpr since C++23
-    unique_ptr(unique_ptr&& u) noexcept;
+    constexpr unique_ptr(unique_ptr&& u) noexcept;              // constexpr since C++23
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
+    template <class U, class E>
+    constexpr unique_ptr(unique_ptr <U, E>&& u) noexcept;       // constexpr since C++23
+    constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
     // destructor
-    ~unique_ptr();
+    constexpr ~unique_ptr();                                    // constexpr since C++23
     // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
+    constexpr unique_ptr& operator=(unique_ptr&& u) noexcept;        // constexpr since C++23
-    unique_ptr& operator=(nullptr_t) noexcept;
+    template <class U, class E>
+    constexpr unique_ptr& operator=(unique_ptr <U, E>&& u) noexcept; // constexpr since C++23
+    constexpr unique_ptr& operator=(nullptr_t) noexcept;             // constexpr since C++23
     // observers
-    T& operator[](size_t i) const;
+    constexpr T& operator[](size_t i) const;                    // constexpr since C++23
-    pointer get() const noexcept;
+    constexpr pointer get() const noexcept;                     // constexpr since C++23
-    deleter_type& get_deleter() noexcept;
+    constexpr deleter_type& get_deleter() noexcept;             // constexpr since C++23
-    const deleter_type& get_deleter() const noexcept;
+    constexpr const deleter_type& get_deleter() const noexcept; // constexpr since C++23
-    explicit operator bool() const noexcept;
+    constexpr explicit operator bool() const noexcept;          // constexpr since C++23
     // modifiers
-    pointer release() noexcept;
+    constexpr pointer release() noexcept;                       // constexpr since C++23
-    void reset(pointer p = pointer()) noexcept;
+    constexpr void reset(pointer p = pointer()) noexcept;       // constexpr since C++23
-    void reset(nullptr_t) noexcept;
+    constexpr void reset(nullptr_t) noexcept;                   // constexpr since C++23
   template <class U> void reset(U) = delete;
-    void swap(unique_ptr& u) noexcept;
+    constexpr void swap(unique_ptr& u) noexcept;                // constexpr since C++23
 };
 template <class T, class D>
-    void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept;
+    constexpr void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept;                 // constexpr since C++23
 template <class T1, class D1, class T2, class D2>
-    bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
+    constexpr bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);    // constexpr since C++23
 template <class T1, class D1, class T2, class D2>
-    bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
+    bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);              // removed in C++20
 template <class T1, class D1, class T2, class D2>
     bool operator<(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
 template <class T1, class D1, class T2, class D2>
 @@ -514,32 +520,42 @@ template <class T1, class D1, class T2, class D2>
     bool operator>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
 template <class T1, class D1, class T2, class D2>
     bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
+template<class T1, class D1, class T2, class D2>
+  requires three_way_comparable_with<typename unique_ptr<T1, D1>::pointer,
+                                     typename unique_ptr<T2, D2>::pointer>
+  compare_three_way_result_t<typename unique_ptr<T1, D1>::pointer,
+                             typename unique_ptr<T2, D2>::pointer>
+    operator<=>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);      // C++20
 template <class T, class D>
-    bool operator==(const unique_ptr<T, D>& x, nullptr_t) noexcept;
+    constexpr bool operator==(const unique_ptr<T, D>& x, nullptr_t) noexcept;   // constexpr since C++23
 template <class T, class D>
-    bool operator==(nullptr_t, const unique_ptr<T, D>& y) noexcept;
+    bool operator==(nullptr_t, const unique_ptr<T, D>& y) noexcept;             // removed in C++20
 template <class T, class D>
-    bool operator!=(const unique_ptr<T, D>& x, nullptr_t) noexcept;
+    bool operator!=(const unique_ptr<T, D>& x, nullptr_t) noexcept;             // removed in C++20
 template <class T, class D>
-    bool operator!=(nullptr_t, const unique_ptr<T, D>& y) noexcept;
+    bool operator!=(nullptr_t, const unique_ptr<T, D>& y) noexcept;             // removed in C++20
 template <class T, class D>
-    bool operator<(const unique_ptr<T, D>& x, nullptr_t);
+    constexpr bool operator<(const unique_ptr<T, D>& x, nullptr_t);     // constexpr since C++23
 template <class T, class D>
-    bool operator<(nullptr_t, const unique_ptr<T, D>& y);
+    constexpr bool operator<(nullptr_t, const unique_ptr<T, D>& y);     // constexpr since C++23
 template <class T, class D>
-    bool operator<=(const unique_ptr<T, D>& x, nullptr_t);
+    constexpr bool operator<=(const unique_ptr<T, D>& x, nullptr_t);    // constexpr since C++23
 template <class T, class D>
-    bool operator<=(nullptr_t, const unique_ptr<T, D>& y);
+    constexpr bool operator<=(nullptr_t, const unique_ptr<T, D>& y);    // constexpr since C++23
 template <class T, class D>
-    bool operator>(const unique_ptr<T, D>& x, nullptr_t);
+    constexpr bool operator>(const unique_ptr<T, D>& x, nullptr_t);     // constexpr since C++23
 template <class T, class D>
-    bool operator>(nullptr_t, const unique_ptr<T, D>& y);
+    constexpr bool operator>(nullptr_t, const unique_ptr<T, D>& y);     // constexpr since C++23
 template <class T, class D>
-    bool operator>=(const unique_ptr<T, D>& x, nullptr_t);
+    constexpr bool operator>=(const unique_ptr<T, D>& x, nullptr_t);    // constexpr since C++23
 template <class T, class D>
-    bool operator>=(nullptr_t, const unique_ptr<T, D>& y);
+    constexpr bool operator>=(nullptr_t, const unique_ptr<T, D>& y);    // constexpr since C++23
+template<class T, class D>
+  requires three_way_comparable<typename unique_ptr<T, D>::pointer>
+  compare_three_way_result_t<typename unique_ptr<T, D>::pointer>
+    constexpr operator<=>(const unique_ptr<T, D>& x, nullptr_t);        // C++20, constexpr since C++23
 class bad_weak_ptr
     : public std::exception
 @@ -547,10 +563,19 @@ class bad_weak_ptr
     bad_weak_ptr() noexcept;
 };
-template<class T, class... Args> unique_ptr<T> make_unique(Args&&... args);     // C++14
+template<class T, class... Args>
-template<class T>                unique_ptr<T> make_unique(size_t n);           // C++14
+constexpr unique_ptr<T> make_unique(Args&&... args);                            // C++14, constexpr since C++23
+template<class T>
+constexpr unique_ptr<T> make_unique(size_t n);                                  // C++14, constexpr since C++23
 template<class T, class... Args> unspecified   make_unique(Args&&...) = delete; // C++14, T == U[N]
+template<class T>
+  constexpr unique_ptr<T> make_unique_for_overwrite();                        // T is not array, C++20, constexpr since C++23
+template<class T>
+  constexpr unique_ptr<T> make_unique_for_overwrite(size_t n);                // T is U[], C++20, constexpr since C++23
+template<class T, class... Args>
+  unspecified make_unique_for_overwrite(Args&&...) = delete;                  // T is U[N], C++20
 template<class E, class T, class Y, class D>
     basic_ostream<E, T>& operator<< (basic_ostream<E, T>& os, unique_ptr<Y, D> const& p);
 @@ -617,40 +642,44 @@ shared_ptr(unique_ptr<T, D>) -> shared_ptr<T>;
 template<class T, class U>
     bool operator==(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
 template<class T, class U>
-    bool operator!=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
+    bool operator!=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;               // removed in C++20
+template<class T, class U>
+    bool operator<(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;                // removed in C++20
 template<class T, class U>
-    bool operator<(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
+    bool operator>(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;                // removed in C++20
 template<class T, class U>
-    bool operator>(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
+    bool operator<=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;               // removed in C++20
 template<class T, class U>
-    bool operator<=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
+    bool operator>=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;               // removed in C++20
 template<class T, class U>
-    bool operator>=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
+    strong_ordering operator<=>(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;   // C++20
 template <class T>
     bool operator==(const shared_ptr<T>& x, nullptr_t) noexcept;
 template <class T>
-    bool operator==(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator==(nullptr_t, const shared_ptr<T>& y) noexcept;               // removed in C++20
 template <class T>
-    bool operator!=(const shared_ptr<T>& x, nullptr_t) noexcept;
+    bool operator!=(const shared_ptr<T>& x, nullptr_t) noexcept;               // removed in C++20
 template <class T>
-    bool operator!=(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator!=(nullptr_t, const shared_ptr<T>& y) noexcept;               // removed in C++20
 template <class T>
-    bool operator<(const shared_ptr<T>& x, nullptr_t) noexcept;
+    bool operator<(const shared_ptr<T>& x, nullptr_t) noexcept;                // removed in C++20
 template <class T>
-bool operator<(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator<(nullptr_t, const shared_ptr<T>& y) noexcept;                // removed in C++20
 template <class T>
-    bool operator<=(const shared_ptr<T>& x, nullptr_t) noexcept;
+    bool operator<=(const shared_ptr<T>& x, nullptr_t) noexcept;               // removed in C++20
 template <class T>
-    bool operator<=(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator<=(nullptr_t, const shared_ptr<T>& y) noexcept;               // removed in C++20
 template <class T>
-    bool operator>(const shared_ptr<T>& x, nullptr_t) noexcept;
+    bool operator>(const shared_ptr<T>& x, nullptr_t) noexcept;                // removed in C++20
 template <class T>
-    bool operator>(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator>(nullptr_t, const shared_ptr<T>& y) noexcept;                // removed in C++20
 template <class T>
-    bool operator>=(const shared_ptr<T>& x, nullptr_t) noexcept;
+    bool operator>=(const shared_ptr<T>& x, nullptr_t) noexcept;               // removed in C++20
 template <class T>
-    bool operator>=(nullptr_t, const shared_ptr<T>& y) noexcept;
+    bool operator>=(nullptr_t, const shared_ptr<T>& y) noexcept;               // removed in C++20
+template<class T>
+    strong_ordering operator<=>(shared_ptr<T> const& x, nullptr_t) noexcept;   // C++20
 // shared_ptr specialized algorithms:
 template<class T> void swap(shared_ptr<T>& a, shared_ptr<T>& b) noexcept;
 @@ -695,6 +724,16 @@ template<class T> shared_ptr<T>
 template<class T, class A>
     shared_ptr<T> allocate_shared(const A& a, const remove_extent_t<T>& u); // T is U[N] (since C++20)
+template<class T>
+  shared_ptr<T> make_shared_for_overwrite();                                  // T is not U[], C++20
+template<class T, class A>
+  shared_ptr<T> allocate_shared_for_overwrite(const A& a);                    // T is not U[], C++20
+template<class T>
+  shared_ptr<T> make_shared_for_overwrite(size_t N);                          // T is U[], C++20
+template<class T, class A>
+  shared_ptr<T> allocate_shared_for_overwrite(const A& a, size_t N);          // T is U[], C++20
 template<class T>
 class weak_ptr
 {
 @@ -838,11 +877,10 @@ template<size_t N, class T>
 */
-#include <__algorithm/copy.h>
-#include <__algorithm/move.h>
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <__memory/addressof.h>
+#include <__memory/align.h>
 #include <__memory/allocate_at_least.h>
 #include <__memory/allocation_guard.h>
 #include <__memory/allocator.h>
 @@ -862,172 +900,35 @@ template<size_t N, class T>
 #include <__memory/uninitialized_algorithms.h>
 #include <__memory/unique_ptr.h>
 #include <__memory/uses_allocator.h>
-#include <cstddef>
+#include <__memory/uses_allocator_construction.h>
-#include <cstdint>
-#include <cstring>
-#include <iosfwd>
-#include <new>
-#include <stdexcept>
-#include <tuple>
-#include <type_traits>
-#include <typeinfo>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iterator>
-#  include <utility>
-#endif
 // standard-mandated includes
+// [memory.syn]
 #include <compare>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-struct __destruct_n
-{
-private:
-    size_t __size_;
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp* __p, false_type) _NOEXCEPT
-        {for (size_t __i = 0; __i < __size_; ++__i, ++__p) __p->~_Tp();}
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp*, true_type) _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY void __incr(false_type) _NOEXCEPT
-        {++__size_;}
-    _LIBCPP_INLINE_VISIBILITY void __incr(true_type) _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, false_type) _NOEXCEPT
-        {__size_ = __s;}
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t, true_type) _NOEXCEPT
-        {}
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __destruct_n(size_t __s) _NOEXCEPT
-        : __size_(__s) {}
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __incr() _NOEXCEPT
-        {__incr(integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, _Tp*) _NOEXCEPT
-        {__set(__s, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) _NOEXCEPT
-        {__process(__p, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-};
-_LIBCPP_FUNC_VIS void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
-template <typename _Alloc, typename _Traits=allocator_traits<_Alloc> >
-struct __noexcept_move_assign_container : public integral_constant<bool,
-    _Traits::propagate_on_container_move_assignment::value
-#if _LIBCPP_STD_VER > 14
-        || _Traits::is_always_equal::value
-#else
-        && is_nothrow_move_assignable<_Alloc>::value
-#endif
-    > {};
-template <class _Tp, class _Alloc>
-struct __temp_value {
-    typedef allocator_traits<_Alloc> _Traits;
-#ifdef _LIBCPP_CXX03_LANG
-    typename aligned_storage<sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp)>::type __v;
-#else
-    union { _Tp __v; };
-#endif
-    _Alloc &__a;
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _Tp *__addr() {
-#ifdef _LIBCPP_CXX03_LANG
-        return reinterpret_cast<_Tp*>(std::addressof(__v));
-#else
-        return std::addressof(__v);
-#endif
-    }
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 _Tp &   get() { return *__addr(); }
-    template<class... _Args>
-    _LIBCPP_NO_CFI
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 __temp_value(_Alloc &__alloc, _Args&& ... __args) : __a(__alloc) {
-      _Traits::construct(__a, __addr(), std::forward<_Args>(__args)...);
-    }
-    _LIBCPP_CONSTEXPR_AFTER_CXX17 ~__temp_value() { _Traits::destroy(__a, __addr()); }
-};
-template<typename _Alloc, typename = void, typename = void>
-struct __is_allocator : false_type {};
-template<typename _Alloc>
-struct __is_allocator<_Alloc,
-       typename __void_t<typename _Alloc::value_type>::type,
-       typename __void_t<decltype(declval<_Alloc&>().allocate(size_t(0)))>::type
-     >
-   : true_type {};
-// __builtin_new_allocator -- A non-templated helper for allocating and
-// deallocating memory using __builtin_operator_new and
-// __builtin_operator_delete. It should be used in preference to
-// `std::allocator<T>` to avoid additional instantiations.
-struct __builtin_new_allocator {
-  struct __builtin_new_deleter {
-    typedef void* pointer_type;
-    _LIBCPP_CONSTEXPR explicit __builtin_new_deleter(size_t __size, size_t __align)
-        : __size_(__size), __align_(__align) {}
-    void operator()(void* __p) const _NOEXCEPT {
-        _VSTD::__libcpp_deallocate(__p, __size_, __align_);
-    }
-   private:
-    size_t __size_;
-    size_t __align_;
-  };
-  typedef unique_ptr<void, __builtin_new_deleter> __holder_t;
-  static __holder_t __allocate_bytes(size_t __s, size_t __align) {
-      return __holder_t(_VSTD::__libcpp_allocate(__s, __align),
-                     __builtin_new_deleter(__s, __align));
-  }
-  static void __deallocate_bytes(void* __p, size_t __s,
-                                 size_t __align) _NOEXCEPT {
-      _VSTD::__libcpp_deallocate(__p, __s, __align);
-  }
-  template <class _Tp>
-  _LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
-  static __holder_t __allocate_type(size_t __n) {
-      return __allocate_bytes(__n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
-  }
-  template <class _Tp>
-  _LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
-  static void __deallocate_type(void* __p, size_t __n) _NOEXCEPT {
-      __deallocate_bytes(__p, __n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
-  }
-};
-_LIBCPP_END_NAMESPACE_STD
 #if defined(_LIBCPP_HAS_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
 #   include <__pstl_memory>
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <cstddef>
+#  include <cstdint>
+#  include <cstring>
+#  include <iosfwd>
+#  include <iterator>
+#  include <new>
+#  include <stdexcept>
+#  include <tuple>
+#  include <type_traits>
+#  include <typeinfo>
+#  include <utility>
+#endif
 #endif // _LIBCPP_MEMORY

lib/libcxx/include/memory_resource created+65

...	@@ -0,0 +1,65 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_MEMORY_RESOURCE
11	#define _LIBCPP_MEMORY_RESOURCE
12
13	/**
14	memory_resource synopsis
15
16	// C++17
17
18	namespace std::pmr {
19
20	class memory_resource;
21
22	bool operator==(const memory_resource& a,
23	const memory_resource& b) noexcept;
24	bool operator!=(const memory_resource& a,
25	const memory_resource& b) noexcept;
26
27	template <class Tp> class polymorphic_allocator;
28
29	template <class T1, class T2>
30	bool operator==(const polymorphic_allocator<T1>& a,
31	const polymorphic_allocator<T2>& b) noexcept;
32	template <class T1, class T2>
33	bool operator!=(const polymorphic_allocator<T1>& a,
34	const polymorphic_allocator<T2>& b) noexcept;
35
36	// Global memory resources
37	memory_resource* set_default_resource(memory_resource* r) noexcept;
38	memory_resource* get_default_resource() noexcept;
39	memory_resource* new_delete_resource() noexcept;
40	memory_resource* null_memory_resource() noexcept;
41
42	// Pool resource classes
43	struct pool_options;
44	class synchronized_pool_resource;
45	class unsynchronized_pool_resource;
46	class monotonic_buffer_resource;
47
48	} // namespace std::pmr
49
50	*/
51
52	#include <__config>
53	#include <__memory_resource/memory_resource.h>
54	#include <__memory_resource/monotonic_buffer_resource.h>
55	#include <__memory_resource/polymorphic_allocator.h>
56	#include <__memory_resource/pool_options.h>
57	#include <__memory_resource/synchronized_pool_resource.h>
58	#include <__memory_resource/unsynchronized_pool_resource.h>
59	#include <version>
60
61	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
62	# pragma GCC system_header
63	#endif
64
65	#endif /* _LIBCPP_MEMORY_RESOURCE */

lib/libcxx/include/mutex+19-16

...	@@ -188,20 +188,16 @@ template<class Callable, class ...Args>	...	@@ -188,20 +188,16 @@ template<class Callable, class ...Args>
188		188
189	#include <__assert> // all public C++ headers provide the assertion handler	189	#include <__assert> // all public C++ headers provide the assertion handler
190	#include <__config>	190	#include <__config>
		191	#include <__memory/shared_ptr.h>
191	#include <__mutex_base>	192	#include <__mutex_base>
192	#include <__threading_support>	193	#include <__threading_support>
193	#include <__utility/forward.h>	194	#include <__utility/forward.h>
194	#include <cstdint>	195	#include <cstdint>
195	#include <memory>
196	#ifndef _LIBCPP_CXX03_LANG	196	#ifndef _LIBCPP_CXX03_LANG
197	# include <tuple>	197	# include <tuple>
198	#endif	198	#endif
199	#include <version>	199	#include <version>
200		200
201	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
202	# include <functional>
203	#endif
204
205	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	201	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
206	# pragma GCC system_header	202	# pragma GCC system_header
207	#endif	203	#endif
...	@@ -329,7 +325,7 @@ recursive_timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration	...	@@ -329,7 +325,7 @@ recursive_timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration
329	}	325	}
330		326
331	template <class _L0, class _L1>	327	template <class _L0, class _L1>
332	int	328	_LIBCPP_HIDE_FROM_ABI int
333	try_lock(_L0& __l0, _L1& __l1)	329	try_lock(_L0& __l0, _L1& __l1)
334	{	330	{
335	unique_lock<_L0> __u0(__l0, try_to_lock);	331	unique_lock<_L0> __u0(__l0, try_to_lock);
...	@@ -349,14 +345,14 @@ try_lock(_L0& __l0, _L1& __l1)	...	@@ -349,14 +345,14 @@ try_lock(_L0& __l0, _L1& __l1)
349	#ifndef _LIBCPP_CXX03_LANG	345	#ifndef _LIBCPP_CXX03_LANG
350		346
351	template <class _L0, class _L1, class _L2, class... _L3>	347	template <class _L0, class _L1, class _L2, class... _L3>
352	int	348	_LIBCPP_HIDE_FROM_ABI int
353	try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)	349	try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)
354	{	350	{
355	int __r = 0;	351	int __r = 0;
356	unique_lock<_L0> __u0(__l0, try_to_lock);	352	unique_lock<_L0> __u0(__l0, try_to_lock);
357	if (__u0.owns_lock())	353	if (__u0.owns_lock())
358	{	354	{
359	__r = try_lock(__l1, __l2, __l3...);	355	__r = std::try_lock(__l1, __l2, __l3...);
360	if (__r == -1)	356	if (__r == -1)
361	__u0.release();	357	__u0.release();
362	else	358	else
...	@@ -368,7 +364,7 @@ try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)	...	@@ -368,7 +364,7 @@ try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)
368	#endif // _LIBCPP_CXX03_LANG	364	#endif // _LIBCPP_CXX03_LANG
369		365
370	template <class _L0, class _L1>	366	template <class _L0, class _L1>
371	void	367	_LIBCPP_HIDE_FROM_ABI void
372	lock(_L0& __l0, _L1& __l1)	368	lock(_L0& __l0, _L1& __l1)
373	{	369	{
374	while (true)	370	while (true)
...	@@ -407,7 +403,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)	...	@@ -407,7 +403,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
407	case 0:	403	case 0:
408	{	404	{
409	unique_lock<_L0> __u0(__l0);	405	unique_lock<_L0> __u0(__l0);
410	__i = try_lock(__l1, __l2, __l3...);	406	__i = std::try_lock(__l1, __l2, __l3...);
411	if (__i == -1)	407	if (__i == -1)
412	{	408	{
413	__u0.release();	409	__u0.release();
...	@@ -420,7 +416,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)	...	@@ -420,7 +416,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
420	case 1:	416	case 1:
421	{	417	{
422	unique_lock<_L1> __u1(__l1);	418	unique_lock<_L1> __u1(__l1);
423	__i = try_lock(__l2, __l3..., __l0);	419	__i = std::try_lock(__l2, __l3..., __l0);
424	if (__i == -1)	420	if (__i == -1)
425	{	421	{
426	__u1.release();	422	__u1.release();
...	@@ -434,7 +430,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)	...	@@ -434,7 +430,7 @@ __lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
434	__libcpp_thread_yield();	430	__libcpp_thread_yield();
435	break;	431	break;
436	default:	432	default:
437	__lock_first(__i - 2, __l2, __l3..., __l0, __l1);	433	std::__lock_first(__i - 2, __l2, __l3..., __l0, __l1);
438	return;	434	return;
439	}	435	}
440	}	436	}
...	@@ -445,7 +441,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -445,7 +441,7 @@ inline _LIBCPP_INLINE_VISIBILITY
445	void	441	void
446	lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)	442	lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
447	{	443	{
448	__lock_first(0, __l0, __l1, __l2, __l3...);	444	std::__lock_first(0, __l0, __l1, __l2, __l3...);
449	}	445	}
450		446
451	template <class _L0>	447	template <class _L0>
...	@@ -546,6 +542,7 @@ private:	...	@@ -546,6 +542,7 @@ private:
546		542
547	_MutexTuple __t_;	543	_MutexTuple __t_;
548	};	544	};
		545	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(scoped_lock);
549		546
550	#endif // _LIBCPP_STD_VER > 14	547	#endif // _LIBCPP_STD_VER > 14
551	#endif // !_LIBCPP_HAS_NO_THREADS	548	#endif // !_LIBCPP_HAS_NO_THREADS
...	@@ -670,7 +667,7 @@ call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args)	...	@@ -670,7 +667,7 @@ call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args)
670	typedef tuple<_Callable&&, _Args&&...> _Gp;	667	typedef tuple<_Callable&&, _Args&&...> _Gp;
671	_Gp __f(_VSTD::forward<_Callable>(__func), _VSTD::forward<_Args>(__args)...);	668	_Gp __f(_VSTD::forward<_Callable>(__func), _VSTD::forward<_Args>(__args)...);
672	__call_once_param<_Gp> __p(__f);	669	__call_once_param<_Gp> __p(__f);
673	__call_once(__flag.__state_, &__p, &__call_once_proxy<_Gp>);	670	std::__call_once(__flag.__state_, &__p, &__call_once_proxy<_Gp>);
674	}	671	}
675	}	672	}
676		673
...	@@ -684,7 +681,7 @@ call_once(once_flag& __flag, _Callable& __func)	...	@@ -684,7 +681,7 @@ call_once(once_flag& __flag, _Callable& __func)
684	if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))	681	if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))
685	{	682	{
686	__call_once_param<_Callable> __p(__func);	683	__call_once_param<_Callable> __p(__func);
687	__call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>);	684	std::__call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>);
688	}	685	}
689	}	686	}
690		687
...	@@ -696,7 +693,7 @@ call_once(once_flag& __flag, const _Callable& __func)	...	@@ -696,7 +693,7 @@ call_once(once_flag& __flag, const _Callable& __func)
696	if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))	693	if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))
697	{	694	{
698	__call_once_param<const _Callable> __p(__func);	695	__call_once_param<const _Callable> __p(__func);
699	__call_once(__flag.__state_, &__p, &__call_once_proxy<const _Callable>);	696	std::__call_once(__flag.__state_, &__p, &__call_once_proxy<const _Callable>);
700	}	697	}
701	}	698	}
702		699
...	@@ -706,4 +703,10 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -706,4 +703,10 @@ _LIBCPP_END_NAMESPACE_STD
706		703
707	_LIBCPP_POP_MACROS	704	_LIBCPP_POP_MACROS
708		705
		706	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		707	# include <concepts>
		708	# include <functional>
		709	# include <type_traits>
		710	#endif
		711
709	#endif // _LIBCPP_MUTEX	712	#endif // _LIBCPP_MUTEX

lib/libcxx/include/new+53-19

 @@ -89,10 +89,12 @@ void  operator delete[](void* ptr, void*) noexcept;
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__availability>
 #include <__config>
+#include <__type_traits/is_function.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/remove_cv.h>
 #include <cstddef>
 #include <cstdlib>
 #include <exception>
-#include <type_traits>
 #include <version>
 #if defined(_LIBCPP_ABI_VCRUNTIME)
 @@ -129,8 +131,8 @@ class _LIBCPP_EXCEPTION_ABI bad_alloc
 {
 public:
     bad_alloc() _NOEXCEPT;
-    virtual ~bad_alloc() _NOEXCEPT;
+    ~bad_alloc() _NOEXCEPT override;
-    virtual const char* what() const _NOEXCEPT;
+    const char* what() const _NOEXCEPT override;
 };
 class _LIBCPP_EXCEPTION_ABI bad_array_new_length
 @@ -138,15 +140,33 @@ class _LIBCPP_EXCEPTION_ABI bad_array_new_length
 {
 public:
     bad_array_new_length() _NOEXCEPT;
-    virtual ~bad_array_new_length() _NOEXCEPT;
+    ~bad_array_new_length() _NOEXCEPT override;
-    virtual const char* what() const _NOEXCEPT;
+    const char* what() const _NOEXCEPT override;
 };
 typedef void (*new_handler)();
 _LIBCPP_FUNC_VIS new_handler set_new_handler(new_handler) _NOEXCEPT;
 _LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT;
-#endif // !_LIBCPP_ABI_VCRUNTIME
+#elif defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS == 0 // !_LIBCPP_ABI_VCRUNTIME
+// When _HAS_EXCEPTIONS == 0, these complete definitions are needed,
+// since they would normally be provided in vcruntime_exception.h
+class bad_alloc : public exception {
+public:
+  bad_alloc() noexcept : exception("bad allocation") {}
+private:
+  friend class bad_array_new_length;
+  bad_alloc(char const* const __message) noexcept : exception(__message) {}
+};
+class bad_array_new_length : public bad_alloc {
+public:
+  bad_array_new_length() noexcept : bad_alloc("bad array new length") {}
+};
+#endif // defined(_LIBCPP_ABI_VCRUNTIME) && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS == 0
 _LIBCPP_NORETURN _LIBCPP_FUNC_VIS void __throw_bad_alloc();  // not in C++ spec
 @@ -277,9 +297,9 @@ _LIBCPP_INLINE_VISIBILITY
 void __do_deallocate_handle_size(void *__ptr, size_t __size, _Args ...__args) {
 #ifdef _LIBCPP_HAS_NO_SIZED_DEALLOCATION
   (void)__size;
-  return __libcpp_operator_delete(__ptr, __args...);
+  return std::__libcpp_operator_delete(__ptr, __args...);
 #else
-  return __libcpp_operator_delete(__ptr, __size, __args...);
+  return std::__libcpp_operator_delete(__ptr, __size, __args...);
 #endif
 }
 @@ -319,16 +339,26 @@ inline _LIBCPP_INLINE_VISIBILITY void __libcpp_deallocate_unsized(void* __ptr, s
 // chances are that you want to use `__libcpp_allocate` instead.
 //
 // Returns the allocated memory, or `nullptr` on failure.
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY void* __libcpp_aligned_alloc(std::size_t __alignment, std::size_t __size) {
-void* __libcpp_aligned_alloc(std::size_t __alignment, std::size_t __size) {
+#  if defined(_LIBCPP_MSVCRT_LIKE)
-#if defined(_LIBCPP_MSVCRT_LIKE)
+    return ::_aligned_malloc(__size, __alignment);
-  return ::_aligned_malloc(__size, __alignment);
+#  elif _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_C11_ALIGNED_ALLOC)
-#else
+    // aligned_alloc() requires that __size is a multiple of __alignment,
-  void* __result = nullptr;
+    // but for C++ [new.delete.general], only states "if the value of an
-  (void)::posix_memalign(&__result, __alignment, __size);
+    // alignment argument passed to any of these functions is not a valid
-  // If posix_memalign fails, __result is unmodified so we still return `nullptr`.
+    // alignment value, the behavior is undefined".
-  return __result;
+    // To handle calls such as ::operator new(1, std::align_val_t(128)), we
-#endif
+    // round __size up to the next multiple of __alignment.
+    size_t __rounded_size = (__size + __alignment - 1) & ~(__alignment - 1);
+    // Rounding up could have wrapped around to zero, so we have to add another
+    // max() ternary to the actual call site to avoid succeeded in that case.
+    return ::aligned_alloc(__alignment, __size > __rounded_size ? __size : __rounded_size);
+#  else
+    void* __result = nullptr;
+    (void)::posix_memalign(&__result, __alignment, __size);
+    // If posix_memalign fails, __result is unmodified so we still return `nullptr`.
+    return __result;
+#  endif
 }
 inline _LIBCPP_INLINE_VISIBILITY
 @@ -347,7 +377,7 @@ _LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_HIDE_FROM_ABI
 _LIBCPP_CONSTEXPR _Tp* __launder(_Tp* __p) _NOEXCEPT
 {
     static_assert (!(is_function<_Tp>::value), "can't launder functions" );
-    static_assert (!(is_same<void, typename remove_cv<_Tp>::type>::value), "can't launder cv-void" );
+    static_assert (!(is_same<void, __remove_cv_t<_Tp> >::value), "can't launder cv-void" );
     return __builtin_launder(__p);
 }
 @@ -373,4 +403,8 @@ inline constexpr size_t hardware_constructive_interference_size = __GCC_CONSTRUC
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_NEW

lib/libcxx/include/numbers+6-2

 @@ -59,9 +59,8 @@ namespace std::numbers {
 */
 #include <__assert> // all public C++ headers provide the assertion handler
+#include <__concepts/arithmetic.h>
 #include <__config>
-#include <concepts>
-#include <type_traits>
 #include <version>
 #if _LIBCPP_STD_VER > 17
 @@ -131,4 +130,9 @@ _LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP_STD_VER > 17
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_NUMBERS

lib/libcxx/include/numeric+7-5

 @@ -163,11 +163,6 @@ template<class T>
 #include <__numeric/transform_inclusive_scan.h>
 #include <__numeric/transform_reduce.h>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#  include <iterator>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -176,4 +171,11 @@ template<class T>
 #   include <__pstl_numeric>
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#  include <iterator>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_NUMERIC

lib/libcxx/include/optional+96-95

...	@@ -87,8 +87,8 @@ namespace std {	...	@@ -87,8 +87,8 @@ namespace std {
87	// 23.6.3.1, constructors	87	// 23.6.3.1, constructors
88	constexpr optional() noexcept;	88	constexpr optional() noexcept;
89	constexpr optional(nullopt_t) noexcept;	89	constexpr optional(nullopt_t) noexcept;
90	optional(const optional &);	90	constexpr optional(const optional &);
91	optional(optional &&) noexcept(see below);	91	constexpr optional(optional &&) noexcept(see below);
92	template <class... Args> constexpr explicit optional(in_place_t, Args &&...);	92	template <class... Args> constexpr explicit optional(in_place_t, Args &&...);
93	template <class U, class... Args>	93	template <class U, class... Args>
94	constexpr explicit optional(in_place_t, initializer_list<U>, Args &&...);	94	constexpr explicit optional(in_place_t, initializer_list<U>, Args &&...);
...	@@ -104,8 +104,8 @@ namespace std {	...	@@ -104,8 +104,8 @@ namespace std {
104		104
105	// 23.6.3.3, assignment	105	// 23.6.3.3, assignment
106	optional &operator=(nullopt_t) noexcept; // constexpr in C++20	106	optional &operator=(nullopt_t) noexcept; // constexpr in C++20
107	optional &operator=(const optional &); // constexpr in C++20	107	constexpr optional &operator=(const optional &);
108	optional &operator=(optional &&) noexcept(see below); // constexpr in C++20	108	constexpr optional &operator=(optional &&) noexcept(see below);
109	template <class U = T> optional &operator=(U &&); // constexpr in C++20	109	template <class U = T> optional &operator=(U &&); // constexpr in C++20
110	template <class U> optional &operator=(const optional<U> &); // constexpr in C++20	110	template <class U> optional &operator=(const optional<U> &); // constexpr in C++20
111	template <class U> optional &operator=(optional<U> &&); // constexpr in C++20	111	template <class U> optional &operator=(optional<U> &&); // constexpr in C++20
...	@@ -166,7 +166,7 @@ template<class T>	...	@@ -166,7 +166,7 @@ template<class T>
166	#include <__functional/invoke.h>	166	#include <__functional/invoke.h>
167	#include <__functional/unary_function.h>	167	#include <__functional/unary_function.h>
168	#include <__memory/construct_at.h>	168	#include <__memory/construct_at.h>
169	#include <__tuple>	169	#include <__tuple_dir/sfinae_helpers.h>
170	#include <__utility/forward.h>	170	#include <__utility/forward.h>
171	#include <__utility/in_place.h>	171	#include <__utility/in_place.h>
172	#include <__utility/move.h>	172	#include <__utility/move.h>
...	@@ -177,22 +177,9 @@ template<class T>	...	@@ -177,22 +177,9 @@ template<class T>
177	#include <type_traits>	177	#include <type_traits>
178	#include <version>	178	#include <version>
179		179
180	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
181	# include <atomic>
182	# include <chrono>
183	# include <climits>
184	# include <concepts>
185	# include <ctime>
186	# include <iterator>
187	# include <memory>
188	# include <ratio>
189	# include <tuple>
190	# include <typeinfo>
191	# include <utility>
192	# include <variant>
193	#endif
194
195	// standard-mandated includes	180	// standard-mandated includes
		181
		182	// [optional.syn]
196	#include <compare>	183	#include <compare>
197		184
198	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	185	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -207,8 +194,8 @@ class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optiona	...	@@ -207,8 +194,8 @@ class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optiona
207	{	194	{
208	public:	195	public:
209	// Get the key function ~bad_optional_access() into the dylib	196	// Get the key function ~bad_optional_access() into the dylib
210	virtual ~bad_optional_access() _NOEXCEPT;	197	~bad_optional_access() _NOEXCEPT override;
211	virtual const char* what() const _NOEXCEPT;	198	const char* what() const _NOEXCEPT override;
212	};	199	};
213		200
214	} // namespace std	201	} // namespace std
...	@@ -255,7 +242,7 @@ struct __optional_destruct_base<_Tp, false>	...	@@ -255,7 +242,7 @@ struct __optional_destruct_base<_Tp, false>
255	bool __engaged_;	242	bool __engaged_;
256		243
257	_LIBCPP_INLINE_VISIBILITY	244	_LIBCPP_INLINE_VISIBILITY
258	_LIBCPP_CONSTEXPR_AFTER_CXX17 ~__optional_destruct_base()	245	_LIBCPP_CONSTEXPR_SINCE_CXX20 ~__optional_destruct_base()
259	{	246	{
260	if (__engaged_)	247	if (__engaged_)
261	__val_.~value_type();	248	__val_.~value_type();
...	@@ -280,7 +267,7 @@ struct __optional_destruct_base<_Tp, false>	...	@@ -280,7 +267,7 @@ struct __optional_destruct_base<_Tp, false>
280	#endif	267	#endif
281		268
282	_LIBCPP_INLINE_VISIBILITY	269	_LIBCPP_INLINE_VISIBILITY
283	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reset() noexcept	270	_LIBCPP_CONSTEXPR_SINCE_CXX20 void reset() noexcept
284	{	271	{
285	if (__engaged_)	272	if (__engaged_)
286	{	273	{
...	@@ -322,7 +309,7 @@ struct __optional_destruct_base<_Tp, true>	...	@@ -322,7 +309,7 @@ struct __optional_destruct_base<_Tp, true>
322	#endif	309	#endif
323		310
324	_LIBCPP_INLINE_VISIBILITY	311	_LIBCPP_INLINE_VISIBILITY
325	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reset() noexcept	312	_LIBCPP_CONSTEXPR_SINCE_CXX20 void reset() noexcept
326	{	313	{
327	if (__engaged_)	314	if (__engaged_)
328	{	315	{
...	@@ -367,7 +354,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>	...	@@ -367,7 +354,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>
367		354
368	template <class... _Args>	355	template <class... _Args>
369	_LIBCPP_INLINE_VISIBILITY	356	_LIBCPP_INLINE_VISIBILITY
370	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct(_Args&&... __args)	357	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct(_Args&&... __args)
371	{	358	{
372	_LIBCPP_ASSERT(!has_value(), "__construct called for engaged __optional_storage");	359	_LIBCPP_ASSERT(!has_value(), "__construct called for engaged __optional_storage");
373	#if _LIBCPP_STD_VER > 17	360	#if _LIBCPP_STD_VER > 17
...	@@ -380,7 +367,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>	...	@@ -380,7 +367,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>
380		367
381	template <class _That>	368	template <class _That>
382	_LIBCPP_INLINE_VISIBILITY	369	_LIBCPP_INLINE_VISIBILITY
383	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_from(_That&& __opt)	370	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct_from(_That&& __opt)
384	{	371	{
385	if (__opt.has_value())	372	if (__opt.has_value())
386	__construct(_VSTD::forward<_That>(__opt).__get());	373	__construct(_VSTD::forward<_That>(__opt).__get());
...	@@ -388,7 +375,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>	...	@@ -388,7 +375,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>
388		375
389	template <class _That>	376	template <class _That>
390	_LIBCPP_INLINE_VISIBILITY	377	_LIBCPP_INLINE_VISIBILITY
391	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __assign_from(_That&& __opt)	378	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from(_That&& __opt)
392	{	379	{
393	if (this->__engaged_ == __opt.has_value())	380	if (this->__engaged_ == __opt.has_value())
394	{	381	{
...	@@ -417,14 +404,14 @@ struct __optional_storage_base<_Tp, true>	...	@@ -417,14 +404,14 @@ struct __optional_storage_base<_Tp, true>
417		404
418	template <class _Up>	405	template <class _Up>
419	static constexpr bool __can_bind_reference() {	406	static constexpr bool __can_bind_reference() {
420	using _RawUp = typename remove_reference<_Up>::type;	407	using _RawUp = __libcpp_remove_reference_t<_Up>;
421	using _UpPtr = _RawUp*;	408	using _UpPtr = _RawUp*;
422	using _RawTp = typename remove_reference<_Tp>::type;	409	using _RawTp = __libcpp_remove_reference_t<_Tp>;
423	using _TpPtr = _RawTp*;	410	using _TpPtr = _RawTp*;
424	using _CheckLValueArg = integral_constant<bool,	411	using _CheckLValueArg = integral_constant<bool,
425	(is_lvalue_reference<_Up>::value && is_convertible<_UpPtr, _TpPtr>::value)	412	(is_lvalue_reference<_Up>::value && is_convertible<_UpPtr, _TpPtr>::value)
426	\|\| is_same<_RawUp, reference_wrapper<_RawTp>>::value	413	\|\| is_same<_RawUp, reference_wrapper<_RawTp>>::value
427	\|\| is_same<_RawUp, reference_wrapper<typename remove_const<_RawTp>::type>>::value	414	\|\| is_same<_RawUp, reference_wrapper<__remove_const_t<_RawTp>>>::value
428	>;	415	>;
429	return (is_lvalue_reference<_Tp>::value && _CheckLValueArg::value)	416	return (is_lvalue_reference<_Tp>::value && _CheckLValueArg::value)
430	\|\| (is_rvalue_reference<_Tp>::value && !is_lvalue_reference<_Up>::value &&	417	\|\| (is_rvalue_reference<_Tp>::value && !is_lvalue_reference<_Up>::value &&
...	@@ -446,7 +433,7 @@ struct __optional_storage_base<_Tp, true>	...	@@ -446,7 +433,7 @@ struct __optional_storage_base<_Tp, true>
446	}	433	}
447		434
448	_LIBCPP_INLINE_VISIBILITY	435	_LIBCPP_INLINE_VISIBILITY
449	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reset() noexcept { __value_ = nullptr; }	436	_LIBCPP_CONSTEXPR_SINCE_CXX20 void reset() noexcept { __value_ = nullptr; }
450		437
451	_LIBCPP_INLINE_VISIBILITY	438	_LIBCPP_INLINE_VISIBILITY
452	constexpr bool has_value() const noexcept	439	constexpr bool has_value() const noexcept
...	@@ -462,7 +449,7 @@ struct __optional_storage_base<_Tp, true>	...	@@ -462,7 +449,7 @@ struct __optional_storage_base<_Tp, true>
462		449
463	template <class _UArg>	450	template <class _UArg>
464	_LIBCPP_INLINE_VISIBILITY	451	_LIBCPP_INLINE_VISIBILITY
465	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct(_UArg&& __val)	452	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct(_UArg&& __val)
466	{	453	{
467	_LIBCPP_ASSERT(!has_value(), "__construct called for engaged __optional_storage");	454	_LIBCPP_ASSERT(!has_value(), "__construct called for engaged __optional_storage");
468	static_assert(__can_bind_reference<_UArg>(),	455	static_assert(__can_bind_reference<_UArg>(),
...	@@ -473,7 +460,7 @@ struct __optional_storage_base<_Tp, true>	...	@@ -473,7 +460,7 @@ struct __optional_storage_base<_Tp, true>
473		460
474	template <class _That>	461	template <class _That>
475	_LIBCPP_INLINE_VISIBILITY	462	_LIBCPP_INLINE_VISIBILITY
476	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_from(_That&& __opt)	463	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct_from(_That&& __opt)
477	{	464	{
478	if (__opt.has_value())	465	if (__opt.has_value())
479	__construct(_VSTD::forward<_That>(__opt).__get());	466	__construct(_VSTD::forward<_That>(__opt).__get());
...	@@ -481,7 +468,7 @@ struct __optional_storage_base<_Tp, true>	...	@@ -481,7 +468,7 @@ struct __optional_storage_base<_Tp, true>
481		468
482	template <class _That>	469	template <class _That>
483	_LIBCPP_INLINE_VISIBILITY	470	_LIBCPP_INLINE_VISIBILITY
484	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __assign_from(_That&& __opt)	471	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __assign_from(_That&& __opt)
485	{	472	{
486	if (has_value() == __opt.has_value())	473	if (has_value() == __opt.has_value())
487	{	474	{
...	@@ -513,7 +500,7 @@ struct __optional_copy_base<_Tp, false> : __optional_storage_base<_Tp>	...	@@ -513,7 +500,7 @@ struct __optional_copy_base<_Tp, false> : __optional_storage_base<_Tp>
513	__optional_copy_base() = default;	500	__optional_copy_base() = default;
514		501
515	_LIBCPP_INLINE_VISIBILITY	502	_LIBCPP_INLINE_VISIBILITY
516	_LIBCPP_CONSTEXPR_AFTER_CXX17 __optional_copy_base(const __optional_copy_base& __opt)	503	_LIBCPP_CONSTEXPR_SINCE_CXX20 __optional_copy_base(const __optional_copy_base& __opt)
517	{	504	{
518	this->__construct_from(__opt);	505	this->__construct_from(__opt);
519	}	506	}
...	@@ -544,7 +531,7 @@ struct __optional_move_base<_Tp, false> : __optional_copy_base<_Tp>	...	@@ -544,7 +531,7 @@ struct __optional_move_base<_Tp, false> : __optional_copy_base<_Tp>
544	__optional_move_base(const __optional_move_base&) = default;	531	__optional_move_base(const __optional_move_base&) = default;
545		532
546	_LIBCPP_INLINE_VISIBILITY	533	_LIBCPP_INLINE_VISIBILITY
547	_LIBCPP_CONSTEXPR_AFTER_CXX17 __optional_move_base(__optional_move_base&& __opt)	534	_LIBCPP_CONSTEXPR_SINCE_CXX20 __optional_move_base(__optional_move_base&& __opt)
548	noexcept(is_nothrow_move_constructible_v<value_type>)	535	noexcept(is_nothrow_move_constructible_v<value_type>)
549	{	536	{
550	this->__construct_from(_VSTD::move(__opt));	537	this->__construct_from(_VSTD::move(__opt));
...	@@ -578,7 +565,7 @@ struct __optional_copy_assign_base<_Tp, false> : __optional_move_base<_Tp>	...	@@ -578,7 +565,7 @@ struct __optional_copy_assign_base<_Tp, false> : __optional_move_base<_Tp>
578	__optional_copy_assign_base(__optional_copy_assign_base&&) = default;	565	__optional_copy_assign_base(__optional_copy_assign_base&&) = default;
579		566
580	_LIBCPP_INLINE_VISIBILITY	567	_LIBCPP_INLINE_VISIBILITY
581	_LIBCPP_CONSTEXPR_AFTER_CXX17 __optional_copy_assign_base& operator=(const __optional_copy_assign_base& __opt)	568	_LIBCPP_CONSTEXPR_SINCE_CXX20 __optional_copy_assign_base& operator=(const __optional_copy_assign_base& __opt)
582	{	569	{
583	this->__assign_from(__opt);	570	this->__assign_from(__opt);
584	return *this;	571	return *this;
...	@@ -613,7 +600,7 @@ struct __optional_move_assign_base<_Tp, false> : __optional_copy_assign_base<_Tp	...	@@ -613,7 +600,7 @@ struct __optional_move_assign_base<_Tp, false> : __optional_copy_assign_base<_Tp
613	__optional_move_assign_base& operator=(const __optional_move_assign_base&) = default;	600	__optional_move_assign_base& operator=(const __optional_move_assign_base&) = default;
614		601
615	_LIBCPP_INLINE_VISIBILITY	602	_LIBCPP_INLINE_VISIBILITY
616	_LIBCPP_CONSTEXPR_AFTER_CXX17 __optional_move_assign_base& operator=(__optional_move_assign_base&& __opt)	603	_LIBCPP_CONSTEXPR_SINCE_CXX20 __optional_move_assign_base& operator=(__optional_move_assign_base&& __opt)
617	noexcept(is_nothrow_move_assignable_v<value_type> &&	604	noexcept(is_nothrow_move_assignable_v<value_type> &&
618	is_nothrow_move_constructible_v<value_type>)	605	is_nothrow_move_constructible_v<value_type>)
619	{	606	{
...	@@ -652,9 +639,9 @@ public:	...	@@ -652,9 +639,9 @@ public:
652		639
653	private:	640	private:
654	// Disable the reference extension using this static assert.	641	// Disable the reference extension using this static assert.
655	static_assert(!is_same_v<__uncvref_t<value_type>, in_place_t>,	642	static_assert(!is_same_v<__remove_cvref_t<value_type>, in_place_t>,
656	"instantiation of optional with in_place_t is ill-formed");	643	"instantiation of optional with in_place_t is ill-formed");
657	static_assert(!is_same_v<__uncvref_t<value_type>, nullopt_t>,	644	static_assert(!is_same_v<__remove_cvref_t<value_type>, nullopt_t>,
658	"instantiation of optional with nullopt_t is ill-formed");	645	"instantiation of optional with nullopt_t is ill-formed");
659	static_assert(!is_reference_v<value_type>,	646	static_assert(!is_reference_v<value_type>,
660	"instantiation of optional with a reference type is ill-formed");	647	"instantiation of optional with a reference type is ill-formed");
...	@@ -679,8 +666,8 @@ private:	...	@@ -679,8 +666,8 @@ private:
679	};	666	};
680	template <class _Up>	667	template <class _Up>
681	using _CheckOptionalArgsCtor = _If<	668	using _CheckOptionalArgsCtor = _If<
682	_IsNotSame<__uncvref_t<_Up>, in_place_t>::value &&	669	_IsNotSame<__remove_cvref_t<_Up>, in_place_t>::value &&
683	_IsNotSame<__uncvref_t<_Up>, optional>::value,	670	_IsNotSame<__remove_cvref_t<_Up>, optional>::value,
684	_CheckOptionalArgsConstructor,	671	_CheckOptionalArgsConstructor,
685	__check_tuple_constructor_fail	672	__check_tuple_constructor_fail
686	>;	673	>;
...	@@ -787,7 +774,7 @@ public:	...	@@ -787,7 +774,7 @@ public:
787	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>()	774	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>()
788	, int> = 0>	775	, int> = 0>
789	_LIBCPP_INLINE_VISIBILITY	776	_LIBCPP_INLINE_VISIBILITY
790	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional(const optional<_Up>& __v)	777	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional(const optional<_Up>& __v)
791	{	778	{
792	this->__construct_from(__v);	779	this->__construct_from(__v);
793	}	780	}
...	@@ -795,7 +782,7 @@ public:	...	@@ -795,7 +782,7 @@ public:
795	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>()	782	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>()
796	, int> = 0>	783	, int> = 0>
797	_LIBCPP_INLINE_VISIBILITY	784	_LIBCPP_INLINE_VISIBILITY
798	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit optional(const optional<_Up>& __v)	785	_LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(const optional<_Up>& __v)
799	{	786	{
800	this->__construct_from(__v);	787	this->__construct_from(__v);
801	}	788	}
...	@@ -805,7 +792,7 @@ public:	...	@@ -805,7 +792,7 @@ public:
805	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_implicit<_Up>()	792	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_implicit<_Up>()
806	, int> = 0>	793	, int> = 0>
807	_LIBCPP_INLINE_VISIBILITY	794	_LIBCPP_INLINE_VISIBILITY
808	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional(optional<_Up>&& __v)	795	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional(optional<_Up>&& __v)
809	{	796	{
810	this->__construct_from(_VSTD::move(__v));	797	this->__construct_from(_VSTD::move(__v));
811	}	798	}
...	@@ -813,7 +800,7 @@ public:	...	@@ -813,7 +800,7 @@ public:
813	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_explicit<_Up>()	800	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_explicit<_Up>()
814	, int> = 0>	801	, int> = 0>
815	_LIBCPP_INLINE_VISIBILITY	802	_LIBCPP_INLINE_VISIBILITY
816	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit optional(optional<_Up>&& __v)	803	_LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(optional<_Up>&& __v)
817	{	804	{
818	this->__construct_from(_VSTD::move(__v));	805	this->__construct_from(_VSTD::move(__v));
819	}	806	}
...	@@ -827,22 +814,22 @@ public:	...	@@ -827,22 +814,22 @@ public:
827	#endif	814	#endif
828		815
829	_LIBCPP_INLINE_VISIBILITY	816	_LIBCPP_INLINE_VISIBILITY
830	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional& operator=(nullopt_t) noexcept	817	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional& operator=(nullopt_t) noexcept
831	{	818	{
832	reset();	819	reset();
833	return *this;	820	return *this;
834	}	821	}
835		822
836	_LIBCPP_INLINE_VISIBILITY optional& operator=(const optional&) = default;	823	constexpr optional& operator=(const optional&) = default;
837	_LIBCPP_INLINE_VISIBILITY optional& operator=(optional&&) = default;	824	constexpr optional& operator=(optional&&) = default;
838		825
839	// LWG2756	826	// LWG2756
840	template <class _Up = value_type,	827	template <class _Up = value_type,
841	class = enable_if_t<	828	class = enable_if_t<
842	_And<	829	_And<
843	_IsNotSame<__uncvref_t<_Up>, optional>,	830	_IsNotSame<__remove_cvref_t<_Up>, optional>,
844	_Or<	831	_Or<
845	_IsNotSame<__uncvref_t<_Up>, value_type>,	832	_IsNotSame<__remove_cvref_t<_Up>, value_type>,
846	_Not<is_scalar<value_type>>	833	_Not<is_scalar<value_type>>
847	>,	834	>,
848	is_constructible<value_type, _Up>,	835	is_constructible<value_type, _Up>,
...	@@ -850,7 +837,7 @@ public:	...	@@ -850,7 +837,7 @@ public:
850	>::value>	837	>::value>
851	>	838	>
852	_LIBCPP_INLINE_VISIBILITY	839	_LIBCPP_INLINE_VISIBILITY
853	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional&	840	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional&
854	operator=(_Up&& __v)	841	operator=(_Up&& __v)
855	{	842	{
856	if (this->has_value())	843	if (this->has_value())
...	@@ -865,7 +852,7 @@ public:	...	@@ -865,7 +852,7 @@ public:
865	_CheckOptionalLikeAssign<_Up, _Up const&>::template __enable_assign<_Up>()	852	_CheckOptionalLikeAssign<_Up, _Up const&>::template __enable_assign<_Up>()
866	, int> = 0>	853	, int> = 0>
867	_LIBCPP_INLINE_VISIBILITY	854	_LIBCPP_INLINE_VISIBILITY
868	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional&	855	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional&
869	operator=(const optional<_Up>& __v)	856	operator=(const optional<_Up>& __v)
870	{	857	{
871	this->__assign_from(__v);	858	this->__assign_from(__v);
...	@@ -877,7 +864,7 @@ public:	...	@@ -877,7 +864,7 @@ public:
877	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_assign<_Up>()	864	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_assign<_Up>()
878	, int> = 0>	865	, int> = 0>
879	_LIBCPP_INLINE_VISIBILITY	866	_LIBCPP_INLINE_VISIBILITY
880	_LIBCPP_CONSTEXPR_AFTER_CXX17 optional&	867	_LIBCPP_CONSTEXPR_SINCE_CXX20 optional&
881	operator=(optional<_Up>&& __v)	868	operator=(optional<_Up>&& __v)
882	{	869	{
883	this->__assign_from(_VSTD::move(__v));	870	this->__assign_from(_VSTD::move(__v));
...	@@ -891,7 +878,7 @@ public:	...	@@ -891,7 +878,7 @@ public:
891	>	878	>
892	>	879	>
893	_LIBCPP_INLINE_VISIBILITY	880	_LIBCPP_INLINE_VISIBILITY
894	_LIBCPP_CONSTEXPR_AFTER_CXX17 _Tp &	881	_LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp &
895	emplace(_Args&&... __args)	882	emplace(_Args&&... __args)
896	{	883	{
897	reset();	884	reset();
...	@@ -906,7 +893,7 @@ public:	...	@@ -906,7 +893,7 @@ public:
906	>	893	>
907	>	894	>
908	_LIBCPP_INLINE_VISIBILITY	895	_LIBCPP_INLINE_VISIBILITY
909	_LIBCPP_CONSTEXPR_AFTER_CXX17 _Tp &	896	_LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp &
910	emplace(initializer_list<_Up> __il, _Args&&... __args)	897	emplace(initializer_list<_Up> __il, _Args&&... __args)
911	{	898	{
912	reset();	899	reset();
...	@@ -915,7 +902,7 @@ public:	...	@@ -915,7 +902,7 @@ public:
915	}	902	}
916		903
917	_LIBCPP_INLINE_VISIBILITY	904	_LIBCPP_INLINE_VISIBILITY
918	_LIBCPP_CONSTEXPR_AFTER_CXX17 void swap(optional& __opt)	905	_LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(optional& __opt)
919	noexcept(is_nothrow_move_constructible_v<value_type> &&	906	noexcept(is_nothrow_move_constructible_v<value_type> &&
920	is_nothrow_swappable_v<value_type>)	907	is_nothrow_swappable_v<value_type>)
921	{	908	{
...	@@ -1198,8 +1185,8 @@ template<class _Tp>	...	@@ -1198,8 +1185,8 @@ template<class _Tp>
1198	template <class _Tp, class _Up>	1185	template <class _Tp, class _Up>
1199	_LIBCPP_INLINE_VISIBILITY constexpr	1186	_LIBCPP_INLINE_VISIBILITY constexpr
1200	enable_if_t<	1187	enable_if_t<
1201	is_convertible_v<decltype(declval<const _Tp&>() ==	1188	is_convertible_v<decltype(std::declval<const _Tp&>() ==
1202	declval<const _Up&>()), bool>,	1189	std::declval<const _Up&>()), bool>,
1203	bool	1190	bool
1204	>	1191	>
1205	operator==(const optional<_Tp>& __x, const optional<_Up>& __y)	1192	operator==(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1214,8 +1201,8 @@ operator==(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1214,8 +1201,8 @@ operator==(const optional<_Tp>& __x, const optional<_Up>& __y)
1214	template <class _Tp, class _Up>	1201	template <class _Tp, class _Up>
1215	_LIBCPP_INLINE_VISIBILITY constexpr	1202	_LIBCPP_INLINE_VISIBILITY constexpr
1216	enable_if_t<	1203	enable_if_t<
1217	is_convertible_v<decltype(declval<const _Tp&>() !=	1204	is_convertible_v<decltype(std::declval<const _Tp&>() !=
1218	declval<const _Up&>()), bool>,	1205	std::declval<const _Up&>()), bool>,
1219	bool	1206	bool
1220	>	1207	>
1221	operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)	1208	operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1230,8 +1217,8 @@ operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1230,8 +1217,8 @@ operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)
1230	template <class _Tp, class _Up>	1217	template <class _Tp, class _Up>
1231	_LIBCPP_INLINE_VISIBILITY constexpr	1218	_LIBCPP_INLINE_VISIBILITY constexpr
1232	enable_if_t<	1219	enable_if_t<
1233	is_convertible_v<decltype(declval<const _Tp&>() <	1220	is_convertible_v<decltype(std::declval<const _Tp&>() <
1234	declval<const _Up&>()), bool>,	1221	std::declval<const _Up&>()), bool>,
1235	bool	1222	bool
1236	>	1223	>
1237	operator<(const optional<_Tp>& __x, const optional<_Up>& __y)	1224	operator<(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1246,8 +1233,8 @@ operator<(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1246,8 +1233,8 @@ operator<(const optional<_Tp>& __x, const optional<_Up>& __y)
1246	template <class _Tp, class _Up>	1233	template <class _Tp, class _Up>
1247	_LIBCPP_INLINE_VISIBILITY constexpr	1234	_LIBCPP_INLINE_VISIBILITY constexpr
1248	enable_if_t<	1235	enable_if_t<
1249	is_convertible_v<decltype(declval<const _Tp&>() >	1236	is_convertible_v<decltype(std::declval<const _Tp&>() >
1250	declval<const _Up&>()), bool>,	1237	std::declval<const _Up&>()), bool>,
1251	bool	1238	bool
1252	>	1239	>
1253	operator>(const optional<_Tp>& __x, const optional<_Up>& __y)	1240	operator>(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1262,8 +1249,8 @@ operator>(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1262,8 +1249,8 @@ operator>(const optional<_Tp>& __x, const optional<_Up>& __y)
1262	template <class _Tp, class _Up>	1249	template <class _Tp, class _Up>
1263	_LIBCPP_INLINE_VISIBILITY constexpr	1250	_LIBCPP_INLINE_VISIBILITY constexpr
1264	enable_if_t<	1251	enable_if_t<
1265	is_convertible_v<decltype(declval<const _Tp&>() <=	1252	is_convertible_v<decltype(std::declval<const _Tp&>() <=
1266	declval<const _Up&>()), bool>,	1253	std::declval<const _Up&>()), bool>,
1267	bool	1254	bool
1268	>	1255	>
1269	operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)	1256	operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1278,8 +1265,8 @@ operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1278,8 +1265,8 @@ operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)
1278	template <class _Tp, class _Up>	1265	template <class _Tp, class _Up>
1279	_LIBCPP_INLINE_VISIBILITY constexpr	1266	_LIBCPP_INLINE_VISIBILITY constexpr
1280	enable_if_t<	1267	enable_if_t<
1281	is_convertible_v<decltype(declval<const _Tp&>() >=	1268	is_convertible_v<decltype(std::declval<const _Tp&>() >=
1282	declval<const _Up&>()), bool>,	1269	std::declval<const _Up&>()), bool>,
1283	bool	1270	bool
1284	>	1271	>
1285	operator>=(const optional<_Tp>& __x, const optional<_Up>& __y)	1272	operator>=(const optional<_Tp>& __x, const optional<_Up>& __y)
...	@@ -1392,8 +1379,8 @@ operator>=(nullopt_t, const optional<_Tp>& __x) noexcept	...	@@ -1392,8 +1379,8 @@ operator>=(nullopt_t, const optional<_Tp>& __x) noexcept
1392	template <class _Tp, class _Up>	1379	template <class _Tp, class _Up>
1393	_LIBCPP_INLINE_VISIBILITY constexpr	1380	_LIBCPP_INLINE_VISIBILITY constexpr
1394	enable_if_t<	1381	enable_if_t<
1395	is_convertible_v<decltype(declval<const _Tp&>() ==	1382	is_convertible_v<decltype(std::declval<const _Tp&>() ==
1396	declval<const _Up&>()), bool>,	1383	std::declval<const _Up&>()), bool>,
1397	bool	1384	bool
1398	>	1385	>
1399	operator==(const optional<_Tp>& __x, const _Up& __v)	1386	operator==(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1404,8 +1391,8 @@ operator==(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1404,8 +1391,8 @@ operator==(const optional<_Tp>& __x, const _Up& __v)
1404	template <class _Tp, class _Up>	1391	template <class _Tp, class _Up>
1405	_LIBCPP_INLINE_VISIBILITY constexpr	1392	_LIBCPP_INLINE_VISIBILITY constexpr
1406	enable_if_t<	1393	enable_if_t<
1407	is_convertible_v<decltype(declval<const _Tp&>() ==	1394	is_convertible_v<decltype(std::declval<const _Tp&>() ==
1408	declval<const _Up&>()), bool>,	1395	std::declval<const _Up&>()), bool>,
1409	bool	1396	bool
1410	>	1397	>
1411	operator==(const _Tp& __v, const optional<_Up>& __x)	1398	operator==(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1416,8 +1403,8 @@ operator==(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1416,8 +1403,8 @@ operator==(const _Tp& __v, const optional<_Up>& __x)
1416	template <class _Tp, class _Up>	1403	template <class _Tp, class _Up>
1417	_LIBCPP_INLINE_VISIBILITY constexpr	1404	_LIBCPP_INLINE_VISIBILITY constexpr
1418	enable_if_t<	1405	enable_if_t<
1419	is_convertible_v<decltype(declval<const _Tp&>() !=	1406	is_convertible_v<decltype(std::declval<const _Tp&>() !=
1420	declval<const _Up&>()), bool>,	1407	std::declval<const _Up&>()), bool>,
1421	bool	1408	bool
1422	>	1409	>
1423	operator!=(const optional<_Tp>& __x, const _Up& __v)	1410	operator!=(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1428,8 +1415,8 @@ operator!=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1428,8 +1415,8 @@ operator!=(const optional<_Tp>& __x, const _Up& __v)
1428	template <class _Tp, class _Up>	1415	template <class _Tp, class _Up>
1429	_LIBCPP_INLINE_VISIBILITY constexpr	1416	_LIBCPP_INLINE_VISIBILITY constexpr
1430	enable_if_t<	1417	enable_if_t<
1431	is_convertible_v<decltype(declval<const _Tp&>() !=	1418	is_convertible_v<decltype(std::declval<const _Tp&>() !=
1432	declval<const _Up&>()), bool>,	1419	std::declval<const _Up&>()), bool>,
1433	bool	1420	bool
1434	>	1421	>
1435	operator!=(const _Tp& __v, const optional<_Up>& __x)	1422	operator!=(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1440,8 +1427,8 @@ operator!=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1440,8 +1427,8 @@ operator!=(const _Tp& __v, const optional<_Up>& __x)
1440	template <class _Tp, class _Up>	1427	template <class _Tp, class _Up>
1441	_LIBCPP_INLINE_VISIBILITY constexpr	1428	_LIBCPP_INLINE_VISIBILITY constexpr
1442	enable_if_t<	1429	enable_if_t<
1443	is_convertible_v<decltype(declval<const _Tp&>() <	1430	is_convertible_v<decltype(std::declval<const _Tp&>() <
1444	declval<const _Up&>()), bool>,	1431	std::declval<const _Up&>()), bool>,
1445	bool	1432	bool
1446	>	1433	>
1447	operator<(const optional<_Tp>& __x, const _Up& __v)	1434	operator<(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1452,8 +1439,8 @@ operator<(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1452,8 +1439,8 @@ operator<(const optional<_Tp>& __x, const _Up& __v)
1452	template <class _Tp, class _Up>	1439	template <class _Tp, class _Up>
1453	_LIBCPP_INLINE_VISIBILITY constexpr	1440	_LIBCPP_INLINE_VISIBILITY constexpr
1454	enable_if_t<	1441	enable_if_t<
1455	is_convertible_v<decltype(declval<const _Tp&>() <	1442	is_convertible_v<decltype(std::declval<const _Tp&>() <
1456	declval<const _Up&>()), bool>,	1443	std::declval<const _Up&>()), bool>,
1457	bool	1444	bool
1458	>	1445	>
1459	operator<(const _Tp& __v, const optional<_Up>& __x)	1446	operator<(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1464,8 +1451,8 @@ operator<(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1464,8 +1451,8 @@ operator<(const _Tp& __v, const optional<_Up>& __x)
1464	template <class _Tp, class _Up>	1451	template <class _Tp, class _Up>
1465	_LIBCPP_INLINE_VISIBILITY constexpr	1452	_LIBCPP_INLINE_VISIBILITY constexpr
1466	enable_if_t<	1453	enable_if_t<
1467	is_convertible_v<decltype(declval<const _Tp&>() <=	1454	is_convertible_v<decltype(std::declval<const _Tp&>() <=
1468	declval<const _Up&>()), bool>,	1455	std::declval<const _Up&>()), bool>,
1469	bool	1456	bool
1470	>	1457	>
1471	operator<=(const optional<_Tp>& __x, const _Up& __v)	1458	operator<=(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1476,8 +1463,8 @@ operator<=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1476,8 +1463,8 @@ operator<=(const optional<_Tp>& __x, const _Up& __v)
1476	template <class _Tp, class _Up>	1463	template <class _Tp, class _Up>
1477	_LIBCPP_INLINE_VISIBILITY constexpr	1464	_LIBCPP_INLINE_VISIBILITY constexpr
1478	enable_if_t<	1465	enable_if_t<
1479	is_convertible_v<decltype(declval<const _Tp&>() <=	1466	is_convertible_v<decltype(std::declval<const _Tp&>() <=
1480	declval<const _Up&>()), bool>,	1467	std::declval<const _Up&>()), bool>,
1481	bool	1468	bool
1482	>	1469	>
1483	operator<=(const _Tp& __v, const optional<_Up>& __x)	1470	operator<=(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1488,8 +1475,8 @@ operator<=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1488,8 +1475,8 @@ operator<=(const _Tp& __v, const optional<_Up>& __x)
1488	template <class _Tp, class _Up>	1475	template <class _Tp, class _Up>
1489	_LIBCPP_INLINE_VISIBILITY constexpr	1476	_LIBCPP_INLINE_VISIBILITY constexpr
1490	enable_if_t<	1477	enable_if_t<
1491	is_convertible_v<decltype(declval<const _Tp&>() >	1478	is_convertible_v<decltype(std::declval<const _Tp&>() >
1492	declval<const _Up&>()), bool>,	1479	std::declval<const _Up&>()), bool>,
1493	bool	1480	bool
1494	>	1481	>
1495	operator>(const optional<_Tp>& __x, const _Up& __v)	1482	operator>(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1500,8 +1487,8 @@ operator>(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1500,8 +1487,8 @@ operator>(const optional<_Tp>& __x, const _Up& __v)
1500	template <class _Tp, class _Up>	1487	template <class _Tp, class _Up>
1501	_LIBCPP_INLINE_VISIBILITY constexpr	1488	_LIBCPP_INLINE_VISIBILITY constexpr
1502	enable_if_t<	1489	enable_if_t<
1503	is_convertible_v<decltype(declval<const _Tp&>() >	1490	is_convertible_v<decltype(std::declval<const _Tp&>() >
1504	declval<const _Up&>()), bool>,	1491	std::declval<const _Up&>()), bool>,
1505	bool	1492	bool
1506	>	1493	>
1507	operator>(const _Tp& __v, const optional<_Up>& __x)	1494	operator>(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1512,8 +1499,8 @@ operator>(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1512,8 +1499,8 @@ operator>(const _Tp& __v, const optional<_Up>& __x)
1512	template <class _Tp, class _Up>	1499	template <class _Tp, class _Up>
1513	_LIBCPP_INLINE_VISIBILITY constexpr	1500	_LIBCPP_INLINE_VISIBILITY constexpr
1514	enable_if_t<	1501	enable_if_t<
1515	is_convertible_v<decltype(declval<const _Tp&>() >=	1502	is_convertible_v<decltype(std::declval<const _Tp&>() >=
1516	declval<const _Up&>()), bool>,	1503	std::declval<const _Up&>()), bool>,
1517	bool	1504	bool
1518	>	1505	>
1519	operator>=(const optional<_Tp>& __x, const _Up& __v)	1506	operator>=(const optional<_Tp>& __x, const _Up& __v)
...	@@ -1524,8 +1511,8 @@ operator>=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1524,8 +1511,8 @@ operator>=(const optional<_Tp>& __x, const _Up& __v)
1524	template <class _Tp, class _Up>	1511	template <class _Tp, class _Up>
1525	_LIBCPP_INLINE_VISIBILITY constexpr	1512	_LIBCPP_INLINE_VISIBILITY constexpr
1526	enable_if_t<	1513	enable_if_t<
1527	is_convertible_v<decltype(declval<const _Tp&>() >=	1514	is_convertible_v<decltype(std::declval<const _Tp&>() >=
1528	declval<const _Up&>()), bool>,	1515	std::declval<const _Up&>()), bool>,
1529	bool	1516	bool
1530	>	1517	>
1531	operator>=(const _Tp& __v, const optional<_Up>& __x)	1518	operator>=(const _Tp& __v, const optional<_Up>& __x)
...	@@ -1535,7 +1522,7 @@ operator>=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1535,7 +1522,7 @@ operator>=(const _Tp& __v, const optional<_Up>& __x)
1535		1522
1536		1523
1537	template <class _Tp>	1524	template <class _Tp>
1538	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1525	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
1539	enable_if_t<	1526	enable_if_t<
1540	is_move_constructible_v<_Tp> && is_swappable_v<_Tp>,	1527	is_move_constructible_v<_Tp> && is_swappable_v<_Tp>,
1541	void	1528	void
...	@@ -1587,4 +1574,18 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -1587,4 +1574,18 @@ _LIBCPP_END_NAMESPACE_STD
1587		1574
1588	#endif // _LIBCPP_STD_VER > 14	1575	#endif // _LIBCPP_STD_VER > 14
1589		1576
		1577	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		1578	# include <atomic>
		1579	# include <climits>
		1580	# include <concepts>
		1581	# include <ctime>
		1582	# include <iterator>
		1583	# include <memory>
		1584	# include <ratio>
		1585	# include <tuple>
		1586	# include <typeinfo>
		1587	# include <utility>
		1588	# include <variant>
		1589	#endif
		1590
1590	#endif // _LIBCPP_OPTIONAL	1591	#endif // _LIBCPP_OPTIONAL

lib/libcxx/include/ostream+67-62

 @@ -165,16 +165,15 @@ basic_ostream<wchar_t, traits>& operator<<(basic_ostream<wchar_t, traits>&, cons
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
+#include <__memory/shared_ptr.h>
+#include <__memory/unique_ptr.h>
 #include <bitset>
 #include <ios>
 #include <locale>
+#include <new>
 #include <streambuf>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iterator>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -197,7 +196,7 @@ public:
     inline _LIBCPP_HIDE_FROM_ABI_AFTER_V1
     explicit basic_ostream(basic_streambuf<char_type, traits_type>* __sb)
     { this->init(__sb); }
-    virtual ~basic_ostream();
+    ~basic_ostream() override;
 protected:
     inline _LIBCPP_INLINE_VISIBILITY
     basic_ostream(basic_ostream&& __rhs);
 @@ -413,7 +412,7 @@ basic_ostream<_CharT, _Traits>::operator<<(bool __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -440,7 +439,7 @@ basic_ostream<_CharT, _Traits>::operator<<(short __n)
         {
             ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(),
                         __flags == ios_base::oct || __flags == ios_base::hex ?
                         static_cast<long>(static_cast<unsigned short>(__n))  :
 @@ -469,7 +468,7 @@ basic_ostream<_CharT, _Traits>::operator<<(unsigned short __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -496,7 +495,7 @@ basic_ostream<_CharT, _Traits>::operator<<(int __n)
         {
             ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(),
                         __flags == ios_base::oct || __flags == ios_base::hex ?
                         static_cast<long>(static_cast<unsigned int>(__n))  :
 @@ -525,7 +524,7 @@ basic_ostream<_CharT, _Traits>::operator<<(unsigned int __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -551,7 +550,7 @@ basic_ostream<_CharT, _Traits>::operator<<(long __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -577,7 +576,7 @@ basic_ostream<_CharT, _Traits>::operator<<(unsigned long __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -603,7 +602,7 @@ basic_ostream<_CharT, _Traits>::operator<<(long long __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -629,7 +628,7 @@ basic_ostream<_CharT, _Traits>::operator<<(unsigned long long __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -655,7 +654,7 @@ basic_ostream<_CharT, _Traits>::operator<<(float __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), static_cast<double>(__n)).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -681,7 +680,7 @@ basic_ostream<_CharT, _Traits>::operator<<(double __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -707,7 +706,7 @@ basic_ostream<_CharT, _Traits>::operator<<(long double __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -733,7 +732,7 @@ basic_ostream<_CharT, _Traits>::operator<<(const void* __n)
         if (__s)
         {
             typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
+            const _Fp& __f = std::use_facet<_Fp>(this->getloc());
             if (__f.put(*this, *this, this->fill(), __n).failed())
                 this->setstate(ios_base::badbit | ios_base::failbit);
         }
 @@ -748,7 +747,7 @@ basic_ostream<_CharT, _Traits>::operator<<(const void* __n)
 }
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 __put_character_sequence(basic_ostream<_CharT, _Traits>& __os,
                           const _CharT* __str, size_t __len)
 {
 @@ -760,14 +759,14 @@ __put_character_sequence(basic_ostream<_CharT, _Traits>& __os,
         if (__s)
         {
             typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
+            if (std::__pad_and_output(_Ip(__os),
-                                 __str,
+                                      __str,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
+                                      (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __str + __len :
+                                          __str + __len :
-                                     __str,
+                                          __str,
-                                 __str + __len,
+                                      __str + __len,
-                                 __os,
+                                      __os,
-                                 __os.fill()).failed())
+                                      __os.fill()).failed())
                 __os.setstate(ios_base::badbit | ios_base::failbit);
         }
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -782,14 +781,14 @@ __put_character_sequence(basic_ostream<_CharT, _Traits>& __os,
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c)
 {
     return _VSTD::__put_character_sequence(__os, &__c, 1);
 }
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn)
 {
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -801,14 +800,14 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn)
         {
             _CharT __c = __os.widen(__cn);
             typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
+            if (std::__pad_and_output(_Ip(__os),
-                                 &__c,
+                                      &__c,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
+                                      (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     &__c + 1 :
+                                          &__c + 1 :
-                                     &__c,
+                                          &__c,
-                                 &__c + 1,
+                                      &__c + 1,
-                                 __os,
+                                      __os,
-                                 __os.fill()).failed())
+                                      __os.fill()).failed())
                 __os.setstate(ios_base::badbit | ios_base::failbit);
         }
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -822,35 +821,35 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn)
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, char __c)
 {
     return _VSTD::__put_character_sequence(__os, &__c, 1);
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, signed char __c)
 {
     return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, unsigned char __c)
 {
     return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
 }
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const _CharT* __str)
 {
     return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
 }
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn)
 {
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -875,14 +874,14 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn)
             }
             for (_CharT* __p = __wb; *__strn != '\0'; ++__strn, ++__p)
                 *__p = __os.widen(*__strn);
-            if (__pad_and_output(_Ip(__os),
+            if (std::__pad_and_output(_Ip(__os),
-                                 __wb,
+                                      __wb,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
+                                      (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __wb + __len :
+                                          __wb + __len :
-                                     __wb,
+                                          __wb,
-                                 __wb + __len,
+                                      __wb + __len,
-                                 __os,
+                                      __os,
-                                 __os.fill()).failed())
+                                      __os.fill()).failed())
                 __os.setstate(ios_base::badbit | ios_base::failbit);
         }
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -896,14 +895,14 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn)
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, const char* __str)
 {
     return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, const signed char* __str)
 {
     const char *__s = (const char *) __str;
 @@ -911,7 +910,7 @@ operator<<(basic_ostream<char, _Traits>& __os, const signed char* __str)
 }
 template<class _Traits>
-basic_ostream<char, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<char, _Traits>&
 operator<<(basic_ostream<char, _Traits>& __os, const unsigned char* __str)
 {
     const char *__s = (const char *) __str;
 @@ -1032,7 +1031,7 @@ basic_ostream<_CharT, _Traits>::seekp(off_type __off, ios_base::seekdir __dir)
 }
 template <class _CharT, class _Traits>
-inline
+_LIBCPP_HIDE_FROM_ABI inline
 basic_ostream<_CharT, _Traits>&
 endl(basic_ostream<_CharT, _Traits>& __os)
 {
 @@ -1042,7 +1041,7 @@ endl(basic_ostream<_CharT, _Traits>& __os)
 }
 template <class _CharT, class _Traits>
-inline
+_LIBCPP_HIDE_FROM_ABI inline
 basic_ostream<_CharT, _Traits>&
 ends(basic_ostream<_CharT, _Traits>& __os)
 {
 @@ -1051,7 +1050,7 @@ ends(basic_ostream<_CharT, _Traits>& __os)
 }
 template <class _CharT, class _Traits>
-inline
+_LIBCPP_HIDE_FROM_ABI inline
 basic_ostream<_CharT, _Traits>&
 flush(basic_ostream<_CharT, _Traits>& __os)
 {
 @@ -1064,7 +1063,7 @@ struct __is_ostreamable : false_type { };
 template <class _Stream, class _Tp>
 struct __is_ostreamable<_Stream, _Tp, decltype(
-    declval<_Stream>() << declval<_Tp>(), void()
+    std::declval<_Stream>() << std::declval<_Tp>(), void()
 )> : true_type { };
 template <class _Stream, class _Tp, class = typename enable_if<
 @@ -1087,7 +1086,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
 }
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os,
            basic_string_view<_CharT, _Traits> __sv)
 {
 @@ -1114,7 +1113,7 @@ template<class _CharT, class _Traits, class _Yp, class _Dp>
 inline _LIBCPP_INLINE_VISIBILITY
 typename enable_if
 <
-    is_same<void, typename __void_t<decltype((declval<basic_ostream<_CharT, _Traits>&>() << declval<typename unique_ptr<_Yp, _Dp>::pointer>()))>::type>::value,
+    is_same<void, __void_t<decltype((std::declval<basic_ostream<_CharT, _Traits>&>() << std::declval<typename unique_ptr<_Yp, _Dp>::pointer>()))> >::value,
     basic_ostream<_CharT, _Traits>&
 >::type
 operator<<(basic_ostream<_CharT, _Traits>& __os, unique_ptr<_Yp, _Dp> const& __p)
 @@ -1123,12 +1122,12 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, unique_ptr<_Yp, _Dp> const& __p
 }
 template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x)
 {
     return __os << __x.template to_string<_CharT, _Traits>
-                        (use_facet<ctype<_CharT> >(__os.getloc()).widen('0'),
+                        (std::use_facet<ctype<_CharT> >(__os.getloc()).widen('0'),
-                         use_facet<ctype<_CharT> >(__os.getloc()).widen('1'));
+                         std::use_facet<ctype<_CharT> >(__os.getloc()).widen('1'));
 }
 #if _LIBCPP_STD_VER > 17
 @@ -1189,4 +1188,10 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostream<wchar_t>;
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <iterator>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_OSTREAM

lib/libcxx/include/queue+11-4

 @@ -231,11 +231,9 @@ template <class T, class Container, class Compare>
 #include <vector>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#endif
 // standard-mandated includes
+// [queue.syn]
 #include <compare>
 #include <initializer_list>
 @@ -384,6 +382,8 @@ public:
         swap(c, __q.c);
     }
+    _LIBCPP_NODISCARD _LIBCPP_HIDE_FROM_ABI const _Container& __get_container() const { return c; }
     template <class _T1, class _C1>
     friend
     _LIBCPP_INLINE_VISIBILITY
 @@ -635,6 +635,8 @@ public:
     void swap(priority_queue& __q)
         _NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
                    __is_nothrow_swappable<value_compare>::value);
+    _LIBCPP_NODISCARD _LIBCPP_HIDE_FROM_ABI const _Container& __get_container() const { return c; }
 };
 #if _LIBCPP_STD_VER >= 17
 @@ -960,4 +962,9 @@ struct _LIBCPP_TEMPLATE_VIS uses_allocator<priority_queue<_Tp, _Container, _Comp
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#endif
 #endif // _LIBCPP_QUEUE

lib/libcxx/include/random+17-14

 @@ -1718,25 +1718,28 @@ class piecewise_linear_distribution
 #include <__random/weibull_distribution.h>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#endif
 // standard-mandated includes
-#include <initializer_list>
-#include <cmath>       // for backward compatibility; TODO remove it
+// [rand.synopsis]
-#include <cstddef>     // for backward compatibility; TODO remove it
+#include <initializer_list>
-#include <cstdint>     // for backward compatibility; TODO remove it
-#include <iosfwd>      // for backward compatibility; TODO remove it
-#include <limits>      // for backward compatibility; TODO remove it
-#include <numeric>     // for backward compatibility; TODO remove it
-#include <string>      // for backward compatibility; TODO remove it
-#include <type_traits> // for backward compatibility; TODO remove it
-#include <vector>      // for backward compatibility; TODO remove it
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <climits>
+#  include <cmath>
+#  include <concepts>
+#  include <cstddef>
+#  include <cstdint>
+#  include <iosfwd>
+#  include <limits>
+#  include <numeric>
+#  include <string>
+#  include <type_traits>
+#  include <vector>
+#endif
 #endif // _LIBCPP_RANDOM

lib/libcxx/include/ranges+88-4

...	@@ -115,6 +115,27 @@ namespace std::ranges {	...	@@ -115,6 +115,27 @@ namespace std::ranges {
115	template<range R>	115	template<range R>
116	using borrowed_subrange_t = see below;	116	using borrowed_subrange_t = see below;
117		117
		118	// [range.elements], elements view
		119	template<input_range V, size_t N>
		120	requires see below
		121	class elements_view;
		122
		123	template<class T, size_t N>
		124	inline constexpr bool enable_borrowed_range<elements_view<T, N>> =
		125	enable_borrowed_range<T>;
		126
		127	template<class R>
		128	using keys_view = elements_view<R, 0>;
		129	template<class R>
		130	using values_view = elements_view<R, 1>;
		131
		132	namespace views {
		133	template<size_t N>
		134	inline constexpr unspecified elements = unspecified;
		135	inline constexpr auto keys = elements<0>;
		136	inline constexpr auto values = elements<1>;
		137	}
		138
118	// [range.empty], empty view	139	// [range.empty], empty view
119	template<class T>	140	template<class T>
120	requires is_object_v<T>	141	requires is_object_v<T>
...	@@ -166,6 +187,18 @@ namespace std::ranges {	...	@@ -166,6 +187,18 @@ namespace std::ranges {
166	template<class T>	187	template<class T>
167	inline constexpr bool enable_borrowed_range<drop_view<T>> = enable_borrowed_range<T>;	188	inline constexpr bool enable_borrowed_range<drop_view<T>> = enable_borrowed_range<T>;
168		189
		190	// [range.drop.while], drop while view
		191	template<view V, class Pred>
		192	requires input_range<V> && is_object_v<Pred> &&
		193	indirect_unary_predicate<const Pred, iterator_t<V>>
		194	class drop_while_view;
		195
		196	template<class T, class Pred>
		197	inline constexpr bool enable_borrowed_range<drop_while_view<T, Pred>> =
		198	enable_borrowed_range<T>;
		199
		200	namespace views { inline constexpr unspecified drop_while = unspecified; }
		201
169	// [range.transform], transform view	202	// [range.transform], transform view
170	template<input_range V, copy_constructible F>	203	template<input_range V, copy_constructible F>
171	requires view<V> && is_object_v<F> &&	204	requires view<V> && is_object_v<F> &&
...	@@ -198,6 +231,14 @@ namespace std::ranges {	...	@@ -198,6 +231,14 @@ namespace std::ranges {
198	template<class T>	231	template<class T>
199	inline constexpr bool enable_borrowed_range<take_view<T>> = enable_borrowed_range<T>;	232	inline constexpr bool enable_borrowed_range<take_view<T>> = enable_borrowed_range<T>;
200		233
		234	// [range.take.while], take while view
		235	template<view V, class Pred>
		236	requires input_range<V> && is_object_v<Pred> &&
		237	indirect_unary_predicate<const Pred, iterator_t<V>>
		238	class take_while_view;
		239
		240	namespace views { inline constexpr unspecified take_while = unspecified; }
		241
201	template<copy_constructible T>	242	template<copy_constructible T>
202	requires is_object_v<T>	243	requires is_object_v<T>
203	class single_view;	244	class single_view;
...	@@ -224,10 +265,30 @@ namespace std::ranges {	...	@@ -224,10 +265,30 @@ namespace std::ranges {
224	(forward_range<V> \|\| tiny-range<Pattern>)	265	(forward_range<V> \|\| tiny-range<Pattern>)
225	class lazy_split_view;	266	class lazy_split_view;
226		267
		268	// [range.split], split view
		269	template<forward_range V, forward_range Pattern>
		270	requires view<V> && view<Pattern> &&
		271	indirectly_comparable<iterator_t<V>, iterator_t<Pattern>, ranges::equal_to>
		272	class split_view;
		273
227	namespace views {	274	namespace views {
228	inline constexpr unspecified lazy_split = unspecified;	275	inline constexpr unspecified lazy_split = unspecified;
		276	inline constexpr unspecified split = unspecified;
229	}	277	}
230		278
		279	// [range.istream], istream view
		280	template<movable Val, class CharT, class Traits = char_traits<CharT>>
		281	requires see below
		282	class basic_istream_view;
		283
		284	template<class Val>
		285	using istream_view = basic_istream_view<Val, char>;
		286
		287	template<class Val>
		288	using wistream_view = basic_istream_view<Val, wchar_t>;
		289
		290	namespace views { template<class T> inline constexpr unspecified istream = unspecified; }
		291
231	// [range.zip], zip view	292	// [range.zip], zip view
232	template<input_range... Views>	293	template<input_range... Views>
233	requires (view<Views> && ...) && (sizeof...(Views) > 0)	294	requires (view<Views> && ...) && (sizeof...(Views) > 0)
...	@@ -238,6 +299,13 @@ namespace std::ranges {	...	@@ -238,6 +299,13 @@ namespace std::ranges {
238	(enable_borrowed_range<Views> && ...);	299	(enable_borrowed_range<Views> && ...);
239		300
240	namespace views { inline constexpr unspecified zip = unspecified; } // C++2b	301	namespace views { inline constexpr unspecified zip = unspecified; } // C++2b
		302
		303	// [range.as.rvalue]
		304	template <view V>
		305	requires input_range<V>
		306	class as_rvalue_view; // since C++23
		307
		308	namespace views { inline constexpr unspecified as_rvalue ) unspecified; } // since C++23
241	}	309	}
242		310
243	namespace std {	311	namespace std {
...	@@ -276,12 +344,15 @@ namespace std {	...	@@ -276,12 +344,15 @@ namespace std {
276	#include <__config>	344	#include <__config>
277	#include <__ranges/access.h>	345	#include <__ranges/access.h>
278	#include <__ranges/all.h>	346	#include <__ranges/all.h>
		347	#include <__ranges/as_rvalue_view.h>
279	#include <__ranges/common_view.h>	348	#include <__ranges/common_view.h>
280	#include <__ranges/concepts.h>	349	#include <__ranges/concepts.h>
281	#include <__ranges/counted.h>	350	#include <__ranges/counted.h>
282	#include <__ranges/dangling.h>	351	#include <__ranges/dangling.h>
283	#include <__ranges/data.h>	352	#include <__ranges/data.h>
284	#include <__ranges/drop_view.h>	353	#include <__ranges/drop_view.h>
		354	#include <__ranges/drop_while_view.h>
		355	#include <__ranges/elements_view.h>
285	#include <__ranges/empty.h>	356	#include <__ranges/empty.h>
286	#include <__ranges/empty_view.h>	357	#include <__ranges/empty_view.h>
287	#include <__ranges/enable_borrowed_range.h>	358	#include <__ranges/enable_borrowed_range.h>
...	@@ -296,19 +367,32 @@ namespace std {	...	@@ -296,19 +367,32 @@ namespace std {
296	#include <__ranges/reverse_view.h>	367	#include <__ranges/reverse_view.h>
297	#include <__ranges/single_view.h>	368	#include <__ranges/single_view.h>
298	#include <__ranges/size.h>	369	#include <__ranges/size.h>
		370	#include <__ranges/split_view.h>
299	#include <__ranges/subrange.h>	371	#include <__ranges/subrange.h>
300	#include <__ranges/take_view.h>	372	#include <__ranges/take_view.h>
		373	#include <__ranges/take_while_view.h>
301	#include <__ranges/transform_view.h>	374	#include <__ranges/transform_view.h>
302	#include <__ranges/view_interface.h>	375	#include <__ranges/view_interface.h>
303	#include <__ranges/views.h>	376	#include <__ranges/views.h>
304	#include <__ranges/zip_view.h>	377	#include <__ranges/zip_view.h>
305	#include <__tuple> // TODO: <ranges> has to export std::tuple_size. Replace this, once <tuple> is granularized.
306	#include <compare> // Required by the standard.
307	#include <initializer_list> // Required by the standard.
308	#include <iterator> // Required by the standard.
309	#include <type_traits>	378	#include <type_traits>
310	#include <version>	379	#include <version>
311		380
		381	#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
		382	#include <__ranges/istream_view.h>
		383	#endif
		384
		385	// standard-mandated includes
		386
		387	// [ranges.syn]
		388	#include <compare>
		389	#include <initializer_list>
		390	#include <iterator>
		391
		392	// [tuple.helper]
		393	#include <__tuple_dir/tuple_element.h>
		394	#include <__tuple_dir/tuple_size.h>
		395
312	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	396	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
313	# pragma GCC system_header	397	# pragma GCC system_header
314	#endif	398	#endif

lib/libcxx/include/ratio+5-1

 @@ -79,9 +79,9 @@ typedef ratio<1000000000000000000000000, 1> yotta;  // not supported
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
+#include <__type_traits/integral_constant.h>
 #include <climits>
 #include <cstdint>
-#include <type_traits>
 #include <version>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -525,4 +525,8 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_RATIO

lib/libcxx/include/regex+66-37

 @@ -769,20 +769,17 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
 #include <__iterator/back_insert_iterator.h>
 #include <__iterator/wrap_iter.h>
 #include <__locale>
+#include <__memory_resource/polymorphic_allocator.h>
 #include <__utility/move.h>
+#include <__utility/pair.h>
 #include <__utility/swap.h>
+#include <cstring>
 #include <deque>
-#include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iterator>
-#  include <utility>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -833,7 +830,7 @@ enum syntax_option_type
     multiline  = 1 << 10
 };
-inline _LIBCPP_CONSTEXPR
+_LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR
 syntax_option_type __get_grammar(syntax_option_type __g)
 {
 #ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
 @@ -1006,8 +1003,8 @@ class _LIBCPP_EXCEPTION_ABI regex_error
 public:
     explicit regex_error(regex_constants::error_type __ecode);
     regex_error(const regex_error&) _NOEXCEPT = default;
-    virtual ~regex_error() _NOEXCEPT;
+    ~regex_error() _NOEXCEPT override;
-     _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY
     regex_constants::error_type code() const {return __code_;}
 };
 @@ -1029,7 +1026,7 @@ public:
     typedef _CharT                  char_type;
     typedef basic_string<char_type> string_type;
     typedef locale                  locale_type;
-#ifdef __BIONIC__
+#if defined(__BIONIC__) || defined(_NEWLIB_VERSION)
     // Originally bionic's ctype_base used its own ctype masks because the
     // builtin ctype implementation wasn't in libc++ yet. Bionic's ctype mask
     // was only 8 bits wide and already saturated, so it used a wider type here
 @@ -1038,6 +1035,11 @@ public:
     // implementation, but this was not updated to match. Since then Android has
     // needed to maintain a stable libc++ ABI, and this can't be changed without
     // an ABI break.
+    // We also need this workaround for newlib since _NEWLIB_VERSION is not
+    // defined yet inside __config, so we can't set the
+    // _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE macro. Additionally, newlib is
+    // often used for space constrained environments, so it makes sense not to
+    // duplicate the ctype table.
     typedef uint16_t char_class_type;
 #else
     typedef ctype_base::mask        char_class_type;
 @@ -1155,8 +1157,8 @@ template <class _CharT>
 void
 regex_traits<_CharT>::__init()
 {
-    __ct_ = &use_facet<ctype<char_type> >(__loc_);
+    __ct_ = &std::use_facet<ctype<char_type> >(__loc_);
-    __col_ = &use_facet<collate<char_type> >(__loc_);
+    __col_ = &std::use_facet<collate<char_type> >(__loc_);
 }
 template <class _CharT>
 @@ -1231,7 +1233,7 @@ regex_traits<_CharT>::__lookup_collatename(_ForwardIterator __f,
     string_type __r;
     if (!__s.empty())
     {
-        __r = __get_collation_name(__s.c_str());
+        __r = std::__get_collation_name(__s.c_str());
         if (__r.empty() && __s.size() <= 2)
         {
             __r = __col_->transform(__s.data(), __s.data() + __s.size());
 @@ -1294,7 +1296,7 @@ regex_traits<_CharT>::__lookup_classname(_ForwardIterator __f,
 {
     string_type __s(__f, __l);
     __ct_->tolower(&__s[0], &__s[0] + __s.size());
-    return __get_classname(__s.c_str(), __icase);
+    return std::__get_classname(__s.c_str(), __icase);
 }
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 @@ -1444,12 +1446,12 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     __node() {}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     virtual ~__node() {}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     virtual void __exec(__state&) const {}
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI_VIRTUAL
     virtual void __exec_split(bool, __state&) const {}
 };
 @@ -1507,7 +1509,7 @@ public:
     explicit __owns_one_state(__node<_CharT>* __s)
         : base(__s) {}
-    virtual ~__owns_one_state();
+    ~__owns_one_state() override;
 };
 template <class _CharT>
 @@ -2092,7 +2094,7 @@ __l_anchor_multiline<_CharT>::__exec(__state& __s) const
     }
     else if (__multiline_ &&
              !__s.__at_first_ &&
-             __is_eol(*_VSTD::prev(__s.__current_)))
+             std::__is_eol(*_VSTD::prev(__s.__current_)))
     {
         __s.__do_ = __state::__accept_but_not_consume;
         __s.__node_ = this->first();
 @@ -2134,7 +2136,7 @@ __r_anchor_multiline<_CharT>::__exec(__state& __s) const
         __s.__do_ = __state::__accept_but_not_consume;
         __s.__node_ = this->first();
     }
-    else if (__multiline_ && __is_eol(*__s.__current_))
+    else if (__multiline_ && std::__is_eol(*__s.__current_))
     {
         __s.__do_ = __state::__accept_but_not_consume;
         __s.__node_ = this->first();
 @@ -2196,7 +2198,7 @@ public:
     __match_any_but_newline(__node<_CharT>* __s)
         : base(__s) {}
-    virtual void __exec(__state&) const;
+    void __exec(__state&) const override;
 };
 template <> _LIBCPP_FUNC_VIS void __match_any_but_newline<char>::__exec(__state&) const;
 @@ -2403,7 +2405,7 @@ public:
                     for (size_t __i = 0; __i < __e.size(); ++__i)
                         __e[__i] = __traits_.translate(__e[__i]);
                 }
-                __ranges_.push_back(make_pair(
+                __ranges_.push_back(std::make_pair(
                                   __traits_.transform(__b.begin(), __b.end()),
                                   __traits_.transform(__e.begin(), __e.end())));
             }
 @@ -2416,20 +2418,20 @@ public:
                     __b[0] = __traits_.translate_nocase(__b[0]);
                     __e[0] = __traits_.translate_nocase(__e[0]);
                 }
-                __ranges_.push_back(make_pair(_VSTD::move(__b), _VSTD::move(__e)));
+                __ranges_.push_back(std::make_pair(_VSTD::move(__b), _VSTD::move(__e)));
             }
         }
     _LIBCPP_INLINE_VISIBILITY
     void __add_digraph(_CharT __c1, _CharT __c2)
         {
             if (__icase_)
-                __digraphs_.push_back(make_pair(__traits_.translate_nocase(__c1),
+                __digraphs_.push_back(std::make_pair(__traits_.translate_nocase(__c1),
-                                                __traits_.translate_nocase(__c2)));
+                                                     __traits_.translate_nocase(__c2)));
             else if (__collate_)
-                __digraphs_.push_back(make_pair(__traits_.translate(__c1),
+                __digraphs_.push_back(std::make_pair(__traits_.translate(__c1),
-                                                __traits_.translate(__c2)));
+                                                     __traits_.translate(__c2)));
             else
-                __digraphs_.push_back(make_pair(__c1, __c2));
+                __digraphs_.push_back(std::make_pair(__c1, __c2));
         }
     _LIBCPP_INLINE_VISIBILITY
     void __add_equivalence(const string_type& __s)
 @@ -5521,7 +5523,7 @@ public:
                regex_constants::match_flag_type __flags = regex_constants::format_default) const
         {
             basic_string<char_type, _ST, _SA> __r;
-            format(back_inserter(__r), __fmt.data(), __fmt.data() + __fmt.size(),
+            format(std::back_inserter(__r), __fmt.data(), __fmt.data() + __fmt.size(),
                    __flags);
             return __r;
         }
 @@ -5531,7 +5533,7 @@ public:
                regex_constants::match_flag_type __flags = regex_constants::format_default) const
         {
             string_type __r;
-            format(back_inserter(__r), __fmt,
+            format(std::back_inserter(__r), __fmt,
                    __fmt + char_traits<char_type>::length(__fmt), __flags);
             return __r;
         }
 @@ -5732,7 +5734,7 @@ match_results<_BidirectionalIterator, _Allocator>::swap(match_results& __m)
 }
 template <class _BidirectionalIterator, class _Allocator>
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 operator==(const match_results<_BidirectionalIterator, _Allocator>& __x,
            const match_results<_BidirectionalIterator, _Allocator>& __y)
 {
 @@ -6224,7 +6226,7 @@ regex_search(const basic_string<_Cp, _ST, _SA>&& __s,
 // regex_match
 template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
             match_results<_BidirectionalIterator, _Allocator>& __m,
             const basic_regex<_CharT, _Traits>& __e,
 @@ -6737,7 +6739,7 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
 template <class _OutputIterator, class _BidirectionalIterator,
           class _Traits, class _CharT>
-_OutputIterator
+_LIBCPP_HIDE_FROM_ABI _OutputIterator
 regex_replace(_OutputIterator __output_iter,
               _BidirectionalIterator __first, _BidirectionalIterator __last,
               const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
 @@ -6792,7 +6794,7 @@ regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
               regex_constants::match_flag_type __flags = regex_constants::match_default)
 {
     basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
+    _VSTD::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
                         __fmt.c_str(), __flags);
     return __r;
 }
 @@ -6805,7 +6807,7 @@ regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
               regex_constants::match_flag_type __flags = regex_constants::match_default)
 {
     basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
+    _VSTD::regex_replace(std::back_inserter(__r), __s.begin(), __s.end(), __e,
                         __fmt, __flags);
     return __r;
 }
 @@ -6819,7 +6821,7 @@ regex_replace(const _CharT* __s,
               regex_constants::match_flag_type __flags = regex_constants::match_default)
 {
     basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
+    _VSTD::regex_replace(std::back_inserter(__r), __s,
                         __s + char_traits<_CharT>::length(__s), __e,
                         __fmt.c_str(), __flags);
     return __r;
 @@ -6834,7 +6836,7 @@ regex_replace(const _CharT* __s,
               regex_constants::match_flag_type __flags = regex_constants::match_default)
 {
     basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
+    _VSTD::regex_replace(std::back_inserter(__r), __s,
                         __s + char_traits<_CharT>::length(__s), __e,
                         __fmt, __flags);
     return __r;
 @@ -6842,6 +6844,33 @@ regex_replace(const _CharT* __s,
 _LIBCPP_END_NAMESPACE_STD
+#if _LIBCPP_STD_VER > 14
+_LIBCPP_BEGIN_NAMESPACE_STD
+namespace pmr {
+template <class _BidirT>
+using match_results = std::match_results<_BidirT, polymorphic_allocator<std::sub_match<_BidirT>>>;
+using cmatch  = match_results<const char*>;
+using smatch  = match_results<std::pmr::string::const_iterator>;
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+using wcmatch = match_results<const wchar_t*>;
+using wsmatch = match_results<std::pmr::wstring::const_iterator>;
+#endif
+} // namespace pmr
+_LIBCPP_END_NAMESPACE_STD
+#endif
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <concepts>
+#  include <iosfwd>
+#  include <iterator>
+#  include <new>
+#  include <typeinfo>
+#  include <utility>
+#endif
 #endif // _LIBCPP_REGEX

lib/libcxx/include/scoped_allocator+44-6

 @@ -111,8 +111,19 @@ template <class OuterA1, class OuterA2, class... InnerAllocs>
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
+#include <__memory/allocator_traits.h>
+#include <__memory/uses_allocator_construction.h>
+#include <__type_traits/common_type.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/integral_constant.h>
+#include <__type_traits/is_constructible.h>
+#include <__type_traits/remove_reference.h>
+#include <__utility/declval.h>
 #include <__utility/forward.h>
-#include <memory>
+#include <__utility/move.h>
+#include <__utility/pair.h>
+#include <__utility/piecewise_construct.h>
+#include <tuple>
 #include <version>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -352,7 +363,7 @@ protected:
 // __outermost
 template <class _Alloc>
-decltype(declval<_Alloc>().outer_allocator(), true_type())
+decltype(std::declval<_Alloc>().outer_allocator(), true_type())
 __has_outer_allocator_test(_Alloc&& __a);
 template <class _Alloc>
 @@ -363,7 +374,7 @@ template <class _Alloc>
 struct __has_outer_allocator
     : public common_type
              <
-                 decltype(__has_outer_allocator_test(declval<_Alloc&>()))
+                 decltype(std::__has_outer_allocator_test(std::declval<_Alloc&>()))
              >::type
 {
 };
 @@ -379,10 +390,10 @@ struct __outermost
 template <class _Alloc>
 struct __outermost<_Alloc, true>
 {
-    typedef typename remove_reference
+    typedef __libcpp_remove_reference_t
                      <
-                        decltype(declval<_Alloc>().outer_allocator())
+                        decltype(std::declval<_Alloc>().outer_allocator())
-                     >::type                                    _OuterAlloc;
+                     >                                    _OuterAlloc;
     typedef typename __outermost<_OuterAlloc>::type             type;
     _LIBCPP_INLINE_VISIBILITY
     type& operator()(_Alloc& __a) const _NOEXCEPT
 @@ -501,6 +512,18 @@ public:
     size_type max_size() const
         {return allocator_traits<outer_allocator_type>::max_size(outer_allocator());}
+#if _LIBCPP_STD_VER >= 20
+    template <class _Type, class... _Args>
+    _LIBCPP_HIDE_FROM_ABI void construct(_Type* __ptr, _Args&&... __args) {
+      using _OM = __outermost<outer_allocator_type>;
+      std::apply(
+          [__ptr, this](auto&&... __newargs) {
+            allocator_traits<typename _OM::type>::construct(
+                _OM()(outer_allocator()), __ptr, std::forward<decltype(__newargs)>(__newargs)...);
+          },
+          std::uses_allocator_construction_args<_Type>(inner_allocator(), std::forward<_Args>(__args)...));
+    }
+#else
     template <class _Tp, class... _Args>
         _LIBCPP_INLINE_VISIBILITY
         void construct(_Tp* __p, _Args&& ...__args)
 @@ -555,6 +578,7 @@ public:
                   _VSTD::forward_as_tuple(_VSTD::forward<_Up>(__x.first)),
                   _VSTD::forward_as_tuple(_VSTD::forward<_Vp>(__x.second)));
     }
+#endif
     template <class _Tp>
         _LIBCPP_INLINE_VISIBILITY
 @@ -692,4 +716,18 @@ operator!=(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a,
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <atomic>
+#  include <climits>
+#  include <concepts>
+#  include <cstring>
+#  include <ctime>
+#  include <iterator>
+#  include <memory>
+#  include <ratio>
+#  include <stdexcept>
+#  include <type_traits>
+#  include <variant>
+#endif
 #endif // _LIBCPP_SCOPED_ALLOCATOR

lib/libcxx/include/semaphore+17-17

...	@@ -80,31 +80,31 @@ functions. It avoids contention against users' own use of those facilities.	...	@@ -80,31 +80,31 @@ functions. It avoids contention against users' own use of those facilities.
80		80
81	class __atomic_semaphore_base	81	class __atomic_semaphore_base
82	{	82	{
83	__atomic_base<ptrdiff_t> __a;	83	__atomic_base<ptrdiff_t> __a_;
84		84
85	public:	85	public:
86	_LIBCPP_INLINE_VISIBILITY	86	_LIBCPP_INLINE_VISIBILITY
87	constexpr explicit __atomic_semaphore_base(ptrdiff_t __count) : __a(__count)	87	constexpr explicit __atomic_semaphore_base(ptrdiff_t __count) : __a_(__count)
88	{	88	{
89	}	89	}
90	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	90	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
91	void release(ptrdiff_t __update = 1)	91	void release(ptrdiff_t __update = 1)
92	{	92	{
93	if(0 < __a.fetch_add(__update, memory_order_release))	93	if(0 < __a_.fetch_add(__update, memory_order_release))
94	;	94	;
95	else if(__update > 1)	95	else if(__update > 1)
96	__a.notify_all();	96	__a_.notify_all();
97	else	97	else
98	__a.notify_one();	98	__a_.notify_one();
99	}	99	}
100	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	100	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
101	void acquire()	101	void acquire()
102	{	102	{
103	auto const __test_fn = [this]() -> bool {	103	auto const __test_fn = [this]() -> bool {
104	auto __old = __a.load(memory_order_relaxed);	104	auto __old = __a_.load(memory_order_relaxed);
105	return (__old != 0) && __a.compare_exchange_strong(__old, __old - 1, memory_order_acquire, memory_order_relaxed);	105	return (__old != 0) && __a_.compare_exchange_strong(__old, __old - 1, memory_order_acquire, memory_order_relaxed);
106	};	106	};
107	__cxx_atomic_wait(&__a.__a_, __test_fn);	107	__cxx_atomic_wait(&__a_.__a_, __test_fn);
108	}	108	}
109	template <class Rep, class Period>	109	template <class Rep, class Period>
110	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	110	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
...	@@ -113,16 +113,16 @@ public:	...	@@ -113,16 +113,16 @@ public:
113	if (__rel_time == chrono::duration<Rep, Period>::zero())	113	if (__rel_time == chrono::duration<Rep, Period>::zero())
114	return try_acquire();	114	return try_acquire();
115	auto const __test_fn = [this]() { return try_acquire(); };	115	auto const __test_fn = [this]() { return try_acquire(); };
116	return __libcpp_thread_poll_with_backoff(__test_fn, __libcpp_timed_backoff_policy(), __rel_time);	116	return std::__libcpp_thread_poll_with_backoff(__test_fn, __libcpp_timed_backoff_policy(), __rel_time);
117	}	117	}
118	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	118	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
119	bool try_acquire()	119	bool try_acquire()
120	{	120	{
121	auto __old = __a.load(memory_order_acquire);	121	auto __old = __a_.load(memory_order_acquire);
122	while (true) {	122	while (true) {
123	if (__old == 0)	123	if (__old == 0)
124	return false;	124	return false;
125	if (__a.compare_exchange_strong(__old, __old - 1, memory_order_acquire, memory_order_relaxed))	125	if (__a_.compare_exchange_strong(__old, __old - 1, memory_order_acquire, memory_order_relaxed))
126	return true;	126	return true;
127	}	127	}
128	}	128	}
...	@@ -133,7 +133,7 @@ public:	...	@@ -133,7 +133,7 @@ public:
133	template<ptrdiff_t __least_max_value = _LIBCPP_SEMAPHORE_MAX>	133	template<ptrdiff_t __least_max_value = _LIBCPP_SEMAPHORE_MAX>
134	class counting_semaphore	134	class counting_semaphore
135	{	135	{
136	__atomic_semaphore_base __semaphore;	136	__atomic_semaphore_base __semaphore_;
137		137
138	public:	138	public:
139	static constexpr ptrdiff_t max() noexcept {	139	static constexpr ptrdiff_t max() noexcept {
...	@@ -141,7 +141,7 @@ public:	...	@@ -141,7 +141,7 @@ public:
141	}	141	}
142		142
143	_LIBCPP_INLINE_VISIBILITY	143	_LIBCPP_INLINE_VISIBILITY
144	constexpr explicit counting_semaphore(ptrdiff_t __count) : __semaphore(__count) { }	144	constexpr explicit counting_semaphore(ptrdiff_t __count) : __semaphore_(__count) { }
145	~counting_semaphore() = default;	145	~counting_semaphore() = default;
146		146
147	counting_semaphore(const counting_semaphore&) = delete;	147	counting_semaphore(const counting_semaphore&) = delete;
...	@@ -150,23 +150,23 @@ public:	...	@@ -150,23 +150,23 @@ public:
150	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	150	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
151	void release(ptrdiff_t __update = 1)	151	void release(ptrdiff_t __update = 1)
152	{	152	{
153	__semaphore.release(__update);	153	__semaphore_.release(__update);
154	}	154	}
155	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	155	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
156	void acquire()	156	void acquire()
157	{	157	{
158	__semaphore.acquire();	158	__semaphore_.acquire();
159	}	159	}
160	template<class Rep, class Period>	160	template<class Rep, class Period>
161	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	161	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
162	bool try_acquire_for(chrono::duration<Rep, Period> const& __rel_time)	162	bool try_acquire_for(chrono::duration<Rep, Period> const& __rel_time)
163	{	163	{
164	return __semaphore.try_acquire_for(chrono::duration_cast<chrono::nanoseconds>(__rel_time));	164	return __semaphore_.try_acquire_for(chrono::duration_cast<chrono::nanoseconds>(__rel_time));
165	}	165	}
166	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	166	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
167	bool try_acquire()	167	bool try_acquire()
168	{	168	{
169	return __semaphore.try_acquire();	169	return __semaphore_.try_acquire();
170	}	170	}
171	template <class Clock, class Duration>	171	template <class Clock, class Duration>
172	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY	172	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY

lib/libcxx/include/set+29-5

...	@@ -480,16 +480,14 @@ erase_if(multiset<Key, Compare, Allocator>& c, Predicate pred); // C++20	...	@@ -480,16 +480,14 @@ erase_if(multiset<Key, Compare, Allocator>& c, Predicate pred); // C++20
480	#include <__iterator/erase_if_container.h>	480	#include <__iterator/erase_if_container.h>
481	#include <__iterator/iterator_traits.h>	481	#include <__iterator/iterator_traits.h>
482	#include <__iterator/reverse_iterator.h>	482	#include <__iterator/reverse_iterator.h>
		483	#include <__memory/allocator.h>
		484	#include <__memory_resource/polymorphic_allocator.h>
483	#include <__node_handle>	485	#include <__node_handle>
484	#include <__tree>	486	#include <__tree>
		487	#include <__type_traits/is_allocator.h>
485	#include <__utility/forward.h>	488	#include <__utility/forward.h>
486	#include <version>	489	#include <version>
487		490
488	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
489	# include <functional>
490	# include <iterator>
491	#endif
492
493	// standard-mandated includes	491	// standard-mandated includes
494		492
495	// [iterator.range]	493	// [iterator.range]
...	@@ -533,6 +531,10 @@ private:	...	@@ -533,6 +531,10 @@ private:
533	typedef __tree<value_type, value_compare, allocator_type> __base;	531	typedef __tree<value_type, value_compare, allocator_type> __base;
534	typedef allocator_traits<allocator_type> __alloc_traits;	532	typedef allocator_traits<allocator_type> __alloc_traits;
535		533
		534	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		535	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		536	"original allocator");
		537
536	__base __tree_;	538	__base __tree_;
537		539
538	public:	540	public:
...	@@ -1066,6 +1068,10 @@ private:	...	@@ -1066,6 +1068,10 @@ private:
1066	typedef __tree<value_type, value_compare, allocator_type> __base;	1068	typedef __tree<value_type, value_compare, allocator_type> __base;
1067	typedef allocator_traits<allocator_type> __alloc_traits;	1069	typedef allocator_traits<allocator_type> __alloc_traits;
1068		1070
		1071	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		1072	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		1073	"original allocator");
		1074
1069	__base __tree_;	1075	__base __tree_;
1070		1076
1071	public:	1077	public:
...	@@ -1578,4 +1584,22 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -1578,4 +1584,22 @@ inline _LIBCPP_INLINE_VISIBILITY
1578		1584
1579	_LIBCPP_END_NAMESPACE_STD	1585	_LIBCPP_END_NAMESPACE_STD
1580		1586
		1587	#if _LIBCPP_STD_VER > 14
		1588	_LIBCPP_BEGIN_NAMESPACE_STD
		1589	namespace pmr {
		1590	template <class _KeyT, class _CompareT = std::less<_KeyT>>
		1591	using set = std::set<_KeyT, _CompareT, polymorphic_allocator<_KeyT>>;
		1592
		1593	template <class _KeyT, class _CompareT = std::less<_KeyT>>
		1594	using multiset = std::multiset<_KeyT, _CompareT, polymorphic_allocator<_KeyT>>;
		1595	} // namespace pmr
		1596	_LIBCPP_END_NAMESPACE_STD
		1597	#endif
		1598
		1599	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		1600	# include <concepts>
		1601	# include <functional>
		1602	# include <iterator>
		1603	#endif
		1604
1581	#endif // _LIBCPP_SET	1605	#endif // _LIBCPP_SET

lib/libcxx/include/setjmp.h+3-1

...	@@ -31,7 +31,9 @@ void longjmp(jmp_buf env, int val);	...	@@ -31,7 +31,9 @@ void longjmp(jmp_buf env, int val);
31	# pragma GCC system_header	31	# pragma GCC system_header
32	#endif	32	#endif
33		33
34	#include_next <setjmp.h>	34	#if __has_include_next(<setjmp.h>)
		35	# include_next <setjmp.h>
		36	#endif
35		37
36	#ifdef __cplusplus	38	#ifdef __cplusplus
37		39

lib/libcxx/include/shared_mutex+28-27

 @@ -180,23 +180,23 @@ __shared_mutex_base
 #if _LIBCPP_STD_VER > 14
 class _LIBCPP_TYPE_VIS _LIBCPP_AVAILABILITY_SHARED_MUTEX shared_mutex
 {
-    __shared_mutex_base __base;
+    __shared_mutex_base __base_;
 public:
-    _LIBCPP_INLINE_VISIBILITY shared_mutex() : __base() {}
+    _LIBCPP_INLINE_VISIBILITY shared_mutex() : __base_() {}
     _LIBCPP_INLINE_VISIBILITY ~shared_mutex() = default;
     shared_mutex(const shared_mutex&) = delete;
     shared_mutex& operator=(const shared_mutex&) = delete;
     // Exclusive ownership
-    _LIBCPP_INLINE_VISIBILITY void lock()     { return __base.lock(); }
+    _LIBCPP_INLINE_VISIBILITY void lock()     { return __base_.lock(); }
-    _LIBCPP_INLINE_VISIBILITY bool try_lock() { return __base.try_lock(); }
+    _LIBCPP_INLINE_VISIBILITY bool try_lock() { return __base_.try_lock(); }
-    _LIBCPP_INLINE_VISIBILITY void unlock()   { return __base.unlock(); }
+    _LIBCPP_INLINE_VISIBILITY void unlock()   { return __base_.unlock(); }
     // Shared ownership
-    _LIBCPP_INLINE_VISIBILITY void lock_shared()     { return __base.lock_shared(); }
+    _LIBCPP_INLINE_VISIBILITY void lock_shared()     { return __base_.lock_shared(); }
-    _LIBCPP_INLINE_VISIBILITY bool try_lock_shared() { return __base.try_lock_shared(); }
+    _LIBCPP_INLINE_VISIBILITY bool try_lock_shared() { return __base_.try_lock_shared(); }
-    _LIBCPP_INLINE_VISIBILITY void unlock_shared()   { return __base.unlock_shared(); }
+    _LIBCPP_INLINE_VISIBILITY void unlock_shared()   { return __base_.unlock_shared(); }
 //     typedef __shared_mutex_base::native_handle_type native_handle_type;
 //     _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() { return __base::unlock_shared(); }
 @@ -206,7 +206,7 @@ public:
 class _LIBCPP_TYPE_VIS _LIBCPP_AVAILABILITY_SHARED_MUTEX shared_timed_mutex
 {
-    __shared_mutex_base __base;
+    __shared_mutex_base __base_;
 public:
     shared_timed_mutex();
     _LIBCPP_INLINE_VISIBILITY ~shared_timed_mutex() = default;
 @@ -252,30 +252,30 @@ bool
 shared_timed_mutex::try_lock_until(
                         const chrono::time_point<_Clock, _Duration>& __abs_time)
 {
-    unique_lock<mutex> __lk(__base.__mut_);
+    unique_lock<mutex> __lk(__base_.__mut_);
-    if (__base.__state_ & __base.__write_entered_)
+    if (__base_.__state_ & __base_.__write_entered_)
     {
         while (true)
         {
-            cv_status __status = __base.__gate1_.wait_until(__lk, __abs_time);
+            cv_status __status = __base_.__gate1_.wait_until(__lk, __abs_time);
-            if ((__base.__state_ & __base.__write_entered_) == 0)
+            if ((__base_.__state_ & __base_.__write_entered_) == 0)
                 break;
             if (__status == cv_status::timeout)
                 return false;
         }
     }
-    __base.__state_ |= __base.__write_entered_;
+    __base_.__state_ |= __base_.__write_entered_;
-    if (__base.__state_ & __base.__n_readers_)
+    if (__base_.__state_ & __base_.__n_readers_)
     {
         while (true)
         {
-            cv_status __status = __base.__gate2_.wait_until(__lk, __abs_time);
+            cv_status __status = __base_.__gate2_.wait_until(__lk, __abs_time);
-            if ((__base.__state_ & __base.__n_readers_) == 0)
+            if ((__base_.__state_ & __base_.__n_readers_) == 0)
                 break;
             if (__status == cv_status::timeout)
             {
-                __base.__state_ &= ~__base.__write_entered_;
+                __base_.__state_ &= ~__base_.__write_entered_;
-                __base.__gate1_.notify_all();
+                __base_.__gate1_.notify_all();
                 return false;
             }
         }
 @@ -288,22 +288,22 @@ bool
 shared_timed_mutex::try_lock_shared_until(
                         const chrono::time_point<_Clock, _Duration>& __abs_time)
 {
-    unique_lock<mutex> __lk(__base.__mut_);
+    unique_lock<mutex> __lk(__base_.__mut_);
-    if ((__base.__state_ & __base.__write_entered_) || (__base.__state_ & __base.__n_readers_) == __base.__n_readers_)
+    if ((__base_.__state_ & __base_.__write_entered_) || (__base_.__state_ & __base_.__n_readers_) == __base_.__n_readers_)
     {
         while (true)
         {
-            cv_status status = __base.__gate1_.wait_until(__lk, __abs_time);
+            cv_status status = __base_.__gate1_.wait_until(__lk, __abs_time);
-            if ((__base.__state_ & __base.__write_entered_) == 0 &&
+            if ((__base_.__state_ & __base_.__write_entered_) == 0 &&
-                                       (__base.__state_ & __base.__n_readers_) < __base.__n_readers_)
+                                       (__base_.__state_ & __base_.__n_readers_) < __base_.__n_readers_)
                 break;
             if (status == cv_status::timeout)
                 return false;
         }
     }
-    unsigned __num_readers = (__base.__state_ & __base.__n_readers_) + 1;
+    unsigned __num_readers = (__base_.__state_ & __base_.__n_readers_) + 1;
-    __base.__state_ &= ~__base.__n_readers_;
+    __base_.__state_ &= ~__base_.__n_readers_;
-    __base.__state_ |= __num_readers;
+    __base_.__state_ |= __num_readers;
     return true;
 }
 @@ -432,6 +432,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     mutex_type* mutex() const _NOEXCEPT {return __m_;}
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(shared_lock);
 template <class _Mutex>
 void

lib/libcxx/include/source_location created+85

...	@@ -0,0 +1,85 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_SOURCE_LOCATION
11	#define _LIBCPP_SOURCE_LOCATION
12
13	/* source_location synopsis
14
15	namespace std {
16	struct source_location {
17	static consteval source_location current() noexcept;
18	constexpr source_location() noexcept;
19
20	constexpr uint_least32_t line() const noexcept;
21	constexpr uint_least32_t column() const noexcept;
22	constexpr const char* file_name() const noexcept;
23	constexpr const char* function_name() const noexcept;
24	};
25	}
26	*/
27
28	#include <__config>
29	#include <cstdint>
30	#include <version>
31
32	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
33	# pragma GCC system_header
34	#endif
35
36	_LIBCPP_BEGIN_NAMESPACE_STD
37
38	#if _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location)
39
40	class source_location {
41	// The names source_location::__impl, _M_file_name, _M_function_name, _M_line, and _M_column
42	// are hard-coded in the compiler and must not be changed here.
43	struct __impl {
44	const char* _M_file_name;
45	const char* _M_function_name;
46	unsigned _M_line;
47	unsigned _M_column;
48	};
49	const __impl* __ptr_ = nullptr;
50	// GCC returns the type 'const void*' from the builtin, while clang returns
51	// `const __impl`. Per C++ [expr.const], casts from void are not permitted
52	// in constant evaluation, so we don't want to use `void*` as the argument
53	// type unless the builtin returned that, anyhow, and the invalid cast is
54	// unavoidable.
55	using __bsl_ty = decltype(__builtin_source_location());
56
57	public:
58	// The defaulted __ptr argument is necessary so that the builtin is evaluated
59	// in the context of the caller. An explicit value should never be provided.
60	static consteval source_location current(__bsl_ty __ptr = __builtin_source_location()) noexcept {
61	source_location __sl;
62	__sl.__ptr_ = static_cast<const __impl*>(__ptr);
63	return __sl;
64	}
65	_LIBCPP_HIDE_FROM_ABI constexpr source_location() noexcept = default;
66
67	_LIBCPP_HIDE_FROM_ABI constexpr uint_least32_t line() const noexcept {
68	return __ptr_ != nullptr ? __ptr_->_M_line : 0;
69	}
70	_LIBCPP_HIDE_FROM_ABI constexpr uint_least32_t column() const noexcept {
71	return __ptr_ != nullptr ? __ptr_->_M_column : 0;
72	}
73	_LIBCPP_HIDE_FROM_ABI constexpr const char* file_name() const noexcept {
74	return __ptr_ != nullptr ? __ptr_->_M_file_name : "";
75	}
76	_LIBCPP_HIDE_FROM_ABI constexpr const char* function_name() const noexcept {
77	return __ptr_ != nullptr ? __ptr_->_M_function_name : "";
78	}
79	};
80
81	#endif // _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location)
82
83	_LIBCPP_END_NAMESPACE_STD
84
85	#endif // _LIBCPP_SOURCE_LOCATION

lib/libcxx/include/span+43-94

 @@ -148,11 +148,6 @@ template<class R>
 #include <type_traits>  // for remove_cv, etc
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#  include <iterator>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -185,23 +180,6 @@ struct __is_std_span : false_type {};
 template <class _Tp, size_t _Sz>
 struct __is_std_span<span<_Tp, _Sz>> : true_type {};
-#if defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
-// This is a temporary workaround until we ship <ranges> -- we've unfortunately been
-// shipping <span> before its API was finalized, and we used to provide a constructor
-// from container types that had the requirements below. To avoid breaking code that
-// has started relying on the range-based constructor until we ship all of <ranges>,
-// we emulate the constructor requirements like this.
-template <class _Range, class _ElementType>
-concept __span_compatible_range =
-  !__is_std_span<remove_cvref_t<_Range>>::value  &&
-  !__is_std_array<remove_cvref_t<_Range>>::value &&
-  !is_array_v<remove_cvref_t<_Range>> &&
-  requires (_Range&& __r) {
-      data(std::forward<_Range>(__r));
-      size(std::forward<_Range>(__r));
-  } &&
-  is_convertible_v<remove_reference_t<ranges::range_reference_t<_Range>>(*)[], _ElementType(*)[]>;
-#else
 template <class _Range, class _ElementType>
 concept __span_compatible_range =
   ranges::contiguous_range<_Range> &&
 @@ -211,7 +189,6 @@ concept __span_compatible_range =
   !__is_std_array<remove_cvref_t<_Range>>::value &&
   !is_array_v<remove_cvref_t<_Range>> &&
   is_convertible_v<remove_reference_t<ranges::range_reference_t<_Range>>(*)[], _ElementType(*)[]>;
-#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
 template <class _From, class _To>
 concept __span_array_convertible = is_convertible_v<_From(*)[], _To(*)[]>;
 @@ -234,7 +211,7 @@ public:
     using const_pointer          = const _Tp *;
     using reference              = _Tp &;
     using const_reference        = const _Tp &;
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
     using iterator               = __bounded_iter<pointer>;
 #else
     using iterator               = __wrap_iter<pointer>;
 @@ -245,7 +222,7 @@ public:
 // [span.cons], span constructors, copy, assignment, and destructor
     template <size_t _Sz = _Extent> requires(_Sz == 0)
-    _LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data{nullptr} {}
+    _LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data_{nullptr} {}
     constexpr span           (const span&) noexcept = default;
     constexpr span& operator=(const span&) noexcept = default;
 @@ -253,61 +230,46 @@ public:
     template <__span_compatible_iterator<element_type> _It>
     _LIBCPP_INLINE_VISIBILITY
     constexpr explicit span(_It __first, size_type __count)
-        : __data{_VSTD::to_address(__first)} {
+        : __data_{_VSTD::to_address(__first)} {
       (void)__count;
       _LIBCPP_ASSERT(_Extent == __count, "size mismatch in span's constructor (iterator, len)");
     }
     template <__span_compatible_iterator<element_type> _It, __span_compatible_sentinel_for<_It> _End>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr explicit span(_It __first, _End __last) : __data{_VSTD::to_address(__first)} {
+    constexpr explicit span(_It __first, _End __last) : __data_{_VSTD::to_address(__first)} {
       (void)__last;
       _LIBCPP_ASSERT((__last - __first >= 0), "invalid range in span's constructor (iterator, sentinel)");
       _LIBCPP_ASSERT(__last - __first == _Extent,
                      "invalid range in span's constructor (iterator, sentinel): last - first != extent");
     }
-    _LIBCPP_INLINE_VISIBILITY constexpr span(type_identity_t<element_type> (&__arr)[_Extent]) noexcept : __data{__arr} {}
+    _LIBCPP_INLINE_VISIBILITY constexpr span(type_identity_t<element_type> (&__arr)[_Extent]) noexcept : __data_{__arr} {}
     template <__span_array_convertible<element_type> _OtherElementType>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(array<_OtherElementType, _Extent>& __arr) noexcept : __data{__arr.data()} {}
+    constexpr span(array<_OtherElementType, _Extent>& __arr) noexcept : __data_{__arr.data()} {}
     template <class _OtherElementType>
         requires __span_array_convertible<const _OtherElementType, element_type>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(const array<_OtherElementType, _Extent>& __arr) noexcept : __data{__arr.data()} {}
+    constexpr span(const array<_OtherElementType, _Extent>& __arr) noexcept : __data_{__arr.data()} {}
-#if defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
-    template <class _Container>
-        requires __span_compatible_range<_Container, element_type>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr explicit span(_Container& __c) : __data{std::data(__c)} {
-      _LIBCPP_ASSERT(std::size(__c) == _Extent, "size mismatch in span's constructor (range)");
-    }
-    template <class _Container>
-        requires __span_compatible_range<const _Container, element_type>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr explicit span(const _Container& __c) : __data{std::data(__c)} {
-      _LIBCPP_ASSERT(std::size(__c) == _Extent, "size mismatch in span's constructor (range)");
-    }
-#else
     template <__span_compatible_range<element_type> _Range>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr explicit span(_Range&& __r) : __data{ranges::data(__r)} {
+    constexpr explicit span(_Range&& __r) : __data_{ranges::data(__r)} {
       _LIBCPP_ASSERT(ranges::size(__r) == _Extent, "size mismatch in span's constructor (range)");
     }
-#endif
     template <__span_array_convertible<element_type> _OtherElementType>
     _LIBCPP_INLINE_VISIBILITY
         constexpr span(const span<_OtherElementType, _Extent>& __other)
-        : __data{__other.data()} {}
+        : __data_{__other.data()} {}
     template <__span_array_convertible<element_type> _OtherElementType>
     _LIBCPP_INLINE_VISIBILITY
         constexpr explicit span(const span<_OtherElementType, dynamic_extent>& __other) noexcept
-        : __data{__other.data()} { _LIBCPP_ASSERT(_Extent == __other.size(), "size mismatch in span's constructor (other span)"); }
+        : __data_{__other.data()} { _LIBCPP_ASSERT(_Extent == __other.size(), "size mismatch in span's constructor (other span)"); }
 //  ~span() noexcept = default;
 @@ -374,33 +336,33 @@ public:
     _LIBCPP_INLINE_VISIBILITY constexpr reference operator[](size_type __idx) const noexcept
     {
         _LIBCPP_ASSERT(__idx < size(), "span<T, N>::operator[](index): index out of range");
-        return __data[__idx];
+        return __data_[__idx];
     }
     _LIBCPP_INLINE_VISIBILITY constexpr reference front() const noexcept
     {
         _LIBCPP_ASSERT(!empty(), "span<T, N>::front() on empty span");
-        return __data[0];
+        return __data_[0];
     }
     _LIBCPP_INLINE_VISIBILITY constexpr reference back() const noexcept
     {
         _LIBCPP_ASSERT(!empty(), "span<T, N>::back() on empty span");
-        return __data[size()-1];
+        return __data_[size()-1];
     }
-    _LIBCPP_INLINE_VISIBILITY constexpr pointer data()                         const noexcept { return __data; }
+    _LIBCPP_INLINE_VISIBILITY constexpr pointer data()                         const noexcept { return __data_; }
 // [span.iter], span iterator support
     _LIBCPP_INLINE_VISIBILITY constexpr iterator begin() const noexcept {
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
         return std::__make_bounded_iter(data(), data(), data() + size());
 #else
         return iterator(this, data());
 #endif
     }
     _LIBCPP_INLINE_VISIBILITY constexpr iterator end() const noexcept {
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
         return std::__make_bounded_iter(data() + size(), data(), data() + size());
 #else
         return iterator(this, data() + size());
 @@ -416,7 +378,7 @@ public:
     { return span<byte, _Extent * sizeof(element_type)>{reinterpret_cast<byte *>(data()), size_bytes()}; }
 private:
-    pointer    __data;
+    pointer    __data_;
 };
 @@ -432,7 +394,7 @@ public:
     using const_pointer          = const _Tp *;
     using reference              = _Tp &;
     using const_reference        = const _Tp &;
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
     using iterator               = __bounded_iter<pointer>;
 #else
     using iterator               = __wrap_iter<pointer>;
 @@ -442,7 +404,7 @@ public:
     static constexpr size_type extent = dynamic_extent;
 // [span.cons], span constructors, copy, assignment, and destructor
-    _LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data{nullptr}, __size{0} {}
+    _LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data_{nullptr}, __size_{0} {}
     constexpr span           (const span&) noexcept = default;
     constexpr span& operator=(const span&) noexcept = default;
 @@ -450,46 +412,35 @@ public:
     template <__span_compatible_iterator<element_type> _It>
     _LIBCPP_INLINE_VISIBILITY
     constexpr span(_It __first, size_type __count)
-        : __data{_VSTD::to_address(__first)}, __size{__count} {}
+        : __data_{_VSTD::to_address(__first)}, __size_{__count} {}
     template <__span_compatible_iterator<element_type> _It, __span_compatible_sentinel_for<_It> _End>
     _LIBCPP_INLINE_VISIBILITY constexpr span(_It __first, _End __last)
-        : __data(_VSTD::to_address(__first)), __size(__last - __first) {
+        : __data_(_VSTD::to_address(__first)), __size_(__last - __first) {
       _LIBCPP_ASSERT(__last - __first >= 0, "invalid range in span's constructor (iterator, sentinel)");
     }
     template <size_t _Sz>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(type_identity_t<element_type> (&__arr)[_Sz]) noexcept : __data{__arr}, __size{_Sz} {}
+    constexpr span(type_identity_t<element_type> (&__arr)[_Sz]) noexcept : __data_{__arr}, __size_{_Sz} {}
     template <__span_array_convertible<element_type> _OtherElementType, size_t _Sz>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
+    constexpr span(array<_OtherElementType, _Sz>& __arr) noexcept : __data_{__arr.data()}, __size_{_Sz} {}
     template <class _OtherElementType, size_t _Sz>
         requires __span_array_convertible<const _OtherElementType, element_type>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(const array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
+    constexpr span(const array<_OtherElementType, _Sz>& __arr) noexcept : __data_{__arr.data()}, __size_{_Sz} {}
-#if defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
-    template <class _Container>
-        requires __span_compatible_range<_Container, element_type>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr span(_Container& __c) : __data(std::data(__c)), __size{std::size(__c)} {}
-    template <class _Container>
-        requires __span_compatible_range<const _Container, element_type>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr span(const _Container& __c) : __data(std::data(__c)), __size{std::size(__c)} {}
-#else
     template <__span_compatible_range<element_type> _Range>
     _LIBCPP_INLINE_VISIBILITY
-    constexpr span(_Range&& __r) : __data(ranges::data(__r)), __size{ranges::size(__r)} {}
+    constexpr span(_Range&& __r) : __data_(ranges::data(__r)), __size_{ranges::size(__r)} {}
-#endif
     template <__span_array_convertible<element_type> _OtherElementType, size_t _OtherExtent>
     _LIBCPP_INLINE_VISIBILITY
         constexpr span(const span<_OtherElementType, _OtherExtent>& __other)  noexcept
-        : __data{__other.data()}, __size{__other.size()} {}
+        : __data_{__other.data()}, __size_{__other.size()} {}
 //    ~span() noexcept = default;
 @@ -544,41 +495,41 @@ public:
         return {data() + __offset, __count};
     }
-    _LIBCPP_INLINE_VISIBILITY constexpr size_type size()           const noexcept { return __size; }
+    _LIBCPP_INLINE_VISIBILITY constexpr size_type size()           const noexcept { return __size_; }
-    _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes()     const noexcept { return __size * sizeof(element_type); }
+    _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes()     const noexcept { return __size_ * sizeof(element_type); }
-    [[nodiscard]] _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return __size == 0; }
+    [[nodiscard]] _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return __size_ == 0; }
     _LIBCPP_INLINE_VISIBILITY constexpr reference operator[](size_type __idx) const noexcept
     {
         _LIBCPP_ASSERT(__idx < size(), "span<T>::operator[](index): index out of range");
-        return __data[__idx];
+        return __data_[__idx];
     }
     _LIBCPP_INLINE_VISIBILITY constexpr reference front() const noexcept
     {
         _LIBCPP_ASSERT(!empty(), "span<T>::front() on empty span");
-        return __data[0];
+        return __data_[0];
     }
     _LIBCPP_INLINE_VISIBILITY constexpr reference back() const noexcept
     {
         _LIBCPP_ASSERT(!empty(), "span<T>::back() on empty span");
-        return __data[size()-1];
+        return __data_[size()-1];
     }
-    _LIBCPP_INLINE_VISIBILITY constexpr pointer data()                         const noexcept { return __data; }
+    _LIBCPP_INLINE_VISIBILITY constexpr pointer data()                         const noexcept { return __data_; }
 // [span.iter], span iterator support
     _LIBCPP_INLINE_VISIBILITY constexpr iterator begin() const noexcept {
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
         return std::__make_bounded_iter(data(), data(), data() + size());
 #else
         return iterator(this, data());
 #endif
     }
     _LIBCPP_INLINE_VISIBILITY constexpr iterator end() const noexcept {
-#ifdef _LIBCPP_ENABLE_DEBUG_MODE
+#ifdef _LIBCPP_DEBUG_ITERATOR_BOUNDS_CHECKING
         return std::__make_bounded_iter(data() + size(), data(), data() + size());
 #else
         return iterator(this, data() + size());
 @@ -594,8 +545,8 @@ public:
     { return {reinterpret_cast<byte *>(data()), size_bytes()}; }
 private:
-    pointer   __data;
+    pointer   __data_;
-    size_type __size;
+    size_type __size_;
 };
 template <class _Tp, size_t _Extent>
 @@ -629,16 +580,8 @@ template<class _Tp, size_t _Sz>
 template<class _Tp, size_t _Sz>
     span(const array<_Tp, _Sz>&) -> span<const _Tp, _Sz>;
-#if defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
-template<class _Container>
-    span(_Container&) -> span<typename _Container::value_type>;
-template<class _Container>
-    span(const _Container&) -> span<const typename _Container::value_type>;
-#else
 template<ranges::contiguous_range _Range>
     span(_Range&&) -> span<remove_reference_t<ranges::range_reference_t<_Range>>>;
-#endif
 #endif // _LIBCPP_STD_VER > 17
 @@ -646,4 +589,10 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#  include <iterator>
+#endif
 #endif // _LIBCPP_SPAN

lib/libcxx/include/sstream+48-39

...	@@ -11,8 +11,9 @@	...	@@ -11,8 +11,9 @@
11	#define _LIBCPP_SSTREAM	11	#define _LIBCPP_SSTREAM
12		12
13	/*	13	/*
14	sstream synopsis	14	sstream synopsis [sstream.syn]
15		15
		16	// Class template basic_stringbuf [stringbuf]
16	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >	17	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
17	class basic_stringbuf	18	class basic_stringbuf
18	: public basic_streambuf<charT, traits>	19	: public basic_streambuf<charT, traits>
...	@@ -25,7 +26,7 @@ public:	...	@@ -25,7 +26,7 @@ public:
25	typedef typename traits_type::off_type off_type;	26	typedef typename traits_type::off_type off_type;
26	typedef Allocator allocator_type;	27	typedef Allocator allocator_type;
27		28
28	// 27.8.1.1 [stringbuf.cons], constructors:	29	// [stringbuf.cons] constructors:
29	explicit basic_stringbuf(ios_base::openmode which = ios_base::in \| ios_base::out); // before C++20	30	explicit basic_stringbuf(ios_base::openmode which = ios_base::in \| ios_base::out); // before C++20
30	basic_stringbuf() : basic_stringbuf(ios_base::in \| ios_base::out) {} // C++20	31	basic_stringbuf() : basic_stringbuf(ios_base::in \| ios_base::out) {} // C++20
31	explicit basic_stringbuf(ios_base::openmode which); // C++20	32	explicit basic_stringbuf(ios_base::openmode which); // C++20
...	@@ -33,16 +34,16 @@ public:	...	@@ -33,16 +34,16 @@ public:
33	ios_base::openmode which = ios_base::in \| ios_base::out);	34	ios_base::openmode which = ios_base::in \| ios_base::out);
34	basic_stringbuf(basic_stringbuf&& rhs);	35	basic_stringbuf(basic_stringbuf&& rhs);
35		36
36	// 27.8.1.2 Assign and swap:	37	// [stringbuf.assign] Assign and swap:
37	basic_stringbuf& operator=(basic_stringbuf&& rhs);	38	basic_stringbuf& operator=(basic_stringbuf&& rhs);
38	void swap(basic_stringbuf& rhs);	39	void swap(basic_stringbuf& rhs);
39		40
40	// 27.8.1.3 Get and set:	41	// [stringbuf.members] Member functions:
41	basic_string<char_type, traits_type, allocator_type> str() const;	42	basic_string<char_type, traits_type, allocator_type> str() const;
42	void str(const basic_string<char_type, traits_type, allocator_type>& s);	43	void str(const basic_string<char_type, traits_type, allocator_type>& s);
43		44
44	protected:	45	protected:
45	// 27.8.1.4 Overridden virtual functions:	46	// [stringbuf.virtuals] Overridden virtual functions:
46	virtual int_type underflow();	47	virtual int_type underflow();
47	virtual int_type pbackfail(int_type c = traits_type::eof());	48	virtual int_type pbackfail(int_type c = traits_type::eof());
48	virtual int_type overflow (int_type c = traits_type::eof());	49	virtual int_type overflow (int_type c = traits_type::eof());
...	@@ -53,6 +54,7 @@ protected:	...	@@ -53,6 +54,7 @@ protected:
53	ios_base::openmode which = ios_base::in \| ios_base::out);	54	ios_base::openmode which = ios_base::in \| ios_base::out);
54	};	55	};
55		56
		57	// [stringbuf.assign] non member swap
56	template <class charT, class traits, class Allocator>	58	template <class charT, class traits, class Allocator>
57	void swap(basic_stringbuf<charT, traits, Allocator>& x,	59	void swap(basic_stringbuf<charT, traits, Allocator>& x,
58	basic_stringbuf<charT, traits, Allocator>& y);	60	basic_stringbuf<charT, traits, Allocator>& y);
...	@@ -60,6 +62,7 @@ template <class charT, class traits, class Allocator>	...	@@ -60,6 +62,7 @@ template <class charT, class traits, class Allocator>
60	typedef basic_stringbuf<char> stringbuf;	62	typedef basic_stringbuf<char> stringbuf;
61	typedef basic_stringbuf<wchar_t> wstringbuf;	63	typedef basic_stringbuf<wchar_t> wstringbuf;
62		64
		65	// Class template basic_istringstream [istringstream]
63	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >	66	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
64	class basic_istringstream	67	class basic_istringstream
65	: public basic_istream<charT, traits>	68	: public basic_istream<charT, traits>
...	@@ -72,7 +75,7 @@ public:	...	@@ -72,7 +75,7 @@ public:
72	typedef typename traits_type::off_type off_type;	75	typedef typename traits_type::off_type off_type;
73	typedef Allocator allocator_type;	76	typedef Allocator allocator_type;
74		77
75	// 27.8.2.1 Constructors:	78	// [istringstream.cons] Constructors:
76	explicit basic_istringstream(ios_base::openmode which = ios_base::in); // before C++20	79	explicit basic_istringstream(ios_base::openmode which = ios_base::in); // before C++20
77	basic_istringstream() : basic_istringstream(ios_base::in) {} // C++20	80	basic_istringstream() : basic_istringstream(ios_base::in) {} // C++20
78	explicit basic_istringstream(ios_base::openmode which); // C++20	81	explicit basic_istringstream(ios_base::openmode which); // C++20
...	@@ -81,11 +84,11 @@ public:	...	@@ -81,11 +84,11 @@ public:
81	ios_base::openmode which = ios_base::in);	84	ios_base::openmode which = ios_base::in);
82	basic_istringstream(basic_istringstream&& rhs);	85	basic_istringstream(basic_istringstream&& rhs);
83		86
84	// 27.8.2.2 Assign and swap:	87	// [istringstream.assign] Assign and swap:
85	basic_istringstream& operator=(basic_istringstream&& rhs);	88	basic_istringstream& operator=(basic_istringstream&& rhs);
86	void swap(basic_istringstream& rhs);	89	void swap(basic_istringstream& rhs);
87		90
88	// 27.8.2.3 Members:	91	// [istringstream.members] Member functions:
89	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;	92	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
90	basic_string<char_type, traits_type, allocator_type> str() const;	93	basic_string<char_type, traits_type, allocator_type> str() const;
91	void str(const basic_string<char_type, traits_type, allocator_type>& s);	94	void str(const basic_string<char_type, traits_type, allocator_type>& s);
...	@@ -98,6 +101,7 @@ template <class charT, class traits, class Allocator>	...	@@ -98,6 +101,7 @@ template <class charT, class traits, class Allocator>
98	typedef basic_istringstream<char> istringstream;	101	typedef basic_istringstream<char> istringstream;
99	typedef basic_istringstream<wchar_t> wistringstream;	102	typedef basic_istringstream<wchar_t> wistringstream;
100		103
		104	// Class template basic_ostringstream [ostringstream]
101	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >	105	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
102	class basic_ostringstream	106	class basic_ostringstream
103	: public basic_ostream<charT, traits>	107	: public basic_ostream<charT, traits>
...	@@ -111,7 +115,7 @@ public:	...	@@ -111,7 +115,7 @@ public:
111	typedef typename traits_type::off_type off_type;	115	typedef typename traits_type::off_type off_type;
112	typedef Allocator allocator_type;	116	typedef Allocator allocator_type;
113		117
114	// 27.8.3.1 Constructors/destructor:	118	// [ostringstream.cons] Constructors:
115	explicit basic_ostringstream(ios_base::openmode which = ios_base::out); // before C++20	119	explicit basic_ostringstream(ios_base::openmode which = ios_base::out); // before C++20
116	basic_ostringstream() : basic_ostringstream(ios_base::out) {} // C++20	120	basic_ostringstream() : basic_ostringstream(ios_base::out) {} // C++20
117	explicit basic_ostringstream(ios_base::openmode which); // C++20	121	explicit basic_ostringstream(ios_base::openmode which); // C++20
...	@@ -120,11 +124,11 @@ public:	...	@@ -120,11 +124,11 @@ public:
120	ios_base::openmode which = ios_base::out);	124	ios_base::openmode which = ios_base::out);
121	basic_ostringstream(basic_ostringstream&& rhs);	125	basic_ostringstream(basic_ostringstream&& rhs);
122		126
123	// 27.8.3.2 Assign/swap:	127	// [ostringstream.assign] Assign and swap:
124	basic_ostringstream& operator=(basic_ostringstream&& rhs);	128	basic_ostringstream& operator=(basic_ostringstream&& rhs);
125	void swap(basic_ostringstream& rhs);	129	void swap(basic_ostringstream& rhs);
126		130
127	// 27.8.3.3 Members:	131	// [ostringstream.members] Member functions:
128	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;	132	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
129	basic_string<char_type, traits_type, allocator_type> str() const;	133	basic_string<char_type, traits_type, allocator_type> str() const;
130	void str(const basic_string<char_type, traits_type, allocator_type>& s);	134	void str(const basic_string<char_type, traits_type, allocator_type>& s);
...	@@ -137,6 +141,7 @@ template <class charT, class traits, class Allocator>	...	@@ -137,6 +141,7 @@ template <class charT, class traits, class Allocator>
137	typedef basic_ostringstream<char> ostringstream;	141	typedef basic_ostringstream<char> ostringstream;
138	typedef basic_ostringstream<wchar_t> wostringstream;	142	typedef basic_ostringstream<wchar_t> wostringstream;
139		143
		144	// Class template basic_stringstream [stringstream]
140	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >	145	template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
141	class basic_stringstream	146	class basic_stringstream
142	: public basic_iostream<charT, traits>	147	: public basic_iostream<charT, traits>
...	@@ -150,7 +155,7 @@ public:	...	@@ -150,7 +155,7 @@ public:
150	typedef typename traits_type::off_type off_type;	155	typedef typename traits_type::off_type off_type;
151	typedef Allocator allocator_type;	156	typedef Allocator allocator_type;
152		157
153	// constructors/destructor	158	// [stringstream.cons] constructors
154	explicit basic_stringstream(ios_base::openmode which = ios_base::out \| ios_base::in); // before C++20	159	explicit basic_stringstream(ios_base::openmode which = ios_base::out \| ios_base::in); // before C++20
155	basic_stringstream() : basic_stringstream(ios_base::out \| ios_base::in) {} // C++20	160	basic_stringstream() : basic_stringstream(ios_base::out \| ios_base::in) {} // C++20
156	explicit basic_stringstream(ios_base::openmode which); // C++20	161	explicit basic_stringstream(ios_base::openmode which); // C++20
...	@@ -159,11 +164,11 @@ public:	...	@@ -159,11 +164,11 @@ public:
159	ios_base::openmode which = ios_base::out\|ios_base::in);	164	ios_base::openmode which = ios_base::out\|ios_base::in);
160	basic_stringstream(basic_stringstream&& rhs);	165	basic_stringstream(basic_stringstream&& rhs);
161		166
162	// 27.8.5.1 Assign/swap:	167	// [stringstream.assign] Assign and swap:
163	basic_stringstream& operator=(basic_stringstream&& rhs);	168	basic_stringstream& operator=(basic_stringstream&& rhs);
164	void swap(basic_stringstream& rhs);	169	void swap(basic_stringstream& rhs);
165		170
166	// Members:	171	// [stringstream.members] Member functions:
167	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;	172	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
168	basic_string<char_type, traits_type, allocator_type> str() const;	173	basic_string<char_type, traits_type, allocator_type> str() const;
169	void str(const basic_string<char_type, traits_type, allocator_type>& str);	174	void str(const basic_string<char_type, traits_type, allocator_type>& str);
...	@@ -198,7 +203,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -198,7 +203,7 @@ _LIBCPP_PUSH_MACROS
198		203
199	_LIBCPP_BEGIN_NAMESPACE_STD	204	_LIBCPP_BEGIN_NAMESPACE_STD
200		205
201	// basic_stringbuf	206	// Class template basic_stringbuf [stringbuf]
202		207
203	template <class _CharT, class _Traits, class _Allocator>	208	template <class _CharT, class _Traits, class _Allocator>
204	class _LIBCPP_TEMPLATE_VIS basic_stringbuf	209	class _LIBCPP_TEMPLATE_VIS basic_stringbuf
...	@@ -221,7 +226,7 @@ private:	...	@@ -221,7 +226,7 @@ private:
221	ios_base::openmode __mode_;	226	ios_base::openmode __mode_;
222		227
223	public:	228	public:
224	// 30.8.2.1 [stringbuf.cons], constructors	229	// [stringbuf.cons] constructors:
225	_LIBCPP_INLINE_VISIBILITY	230	_LIBCPP_INLINE_VISIBILITY
226	basic_stringbuf()	231	basic_stringbuf()
227	: __hm_(nullptr), __mode_(ios_base::in \| ios_base::out) {}	232	: __hm_(nullptr), __mode_(ios_base::in \| ios_base::out) {}
...	@@ -240,24 +245,24 @@ public:	...	@@ -240,24 +245,24 @@ public:
240		245
241	basic_stringbuf(basic_stringbuf&& __rhs);	246	basic_stringbuf(basic_stringbuf&& __rhs);
242		247
243	// 27.8.1.2 Assign and swap:	248	// [stringbuf.assign] Assign and swap:
244	basic_stringbuf& operator=(basic_stringbuf&& __rhs);	249	basic_stringbuf& operator=(basic_stringbuf&& __rhs);
245	void swap(basic_stringbuf& __rhs);	250	void swap(basic_stringbuf& __rhs);
246		251
247	// 27.8.1.3 Get and set:	252	// [stringbuf.members] Member functions:
248	string_type str() const;	253	string_type str() const;
249	void str(const string_type& __s);	254	void str(const string_type& __s);
250		255
251	protected:	256	protected:
252	// 27.8.1.4 Overridden virtual functions:	257	// [stringbuf.virtuals] Overridden virtual functions:
253	virtual int_type underflow();	258	int_type underflow() override;
254	virtual int_type pbackfail(int_type __c = traits_type::eof());	259	int_type pbackfail(int_type __c = traits_type::eof()) override;
255	virtual int_type overflow (int_type __c = traits_type::eof());	260	int_type overflow (int_type __c = traits_type::eof()) override;
256	virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,	261	pos_type seekoff(off_type __off, ios_base::seekdir __way,
257	ios_base::openmode __wch = ios_base::in \| ios_base::out);	262	ios_base::openmode __wch = ios_base::in \| ios_base::out) override;
258	_LIBCPP_INLINE_VISIBILITY	263	_LIBCPP_HIDE_FROM_ABI_VIRTUAL
259	virtual pos_type seekpos(pos_type __sp,	264	pos_type seekpos(pos_type __sp,
260	ios_base::openmode __wch = ios_base::in \| ios_base::out) {	265	ios_base::openmode __wch = ios_base::in \| ios_base::out) override {
261	return seekoff(__sp, ios_base::beg, __wch);	266	return seekoff(__sp, ios_base::beg, __wch);
262	}	267	}
263	};	268	};
...	@@ -619,7 +624,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff(off_type __off,	...	@@ -619,7 +624,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff(off_type __off,
619	return pos_type(__noff);	624	return pos_type(__noff);
620	}	625	}
621		626
622	// basic_istringstream	627	// Class template basic_istringstream [istringstream]
623		628
624	template <class _CharT, class _Traits, class _Allocator>	629	template <class _CharT, class _Traits, class _Allocator>
625	class _LIBCPP_TEMPLATE_VIS basic_istringstream	630	class _LIBCPP_TEMPLATE_VIS basic_istringstream
...	@@ -639,7 +644,7 @@ private:	...	@@ -639,7 +644,7 @@ private:
639	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;	644	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
640		645
641	public:	646	public:
642	// 30.8.3.1 [istringstream.cons], constructors	647	// [istringstream.cons] Constructors:
643	_LIBCPP_INLINE_VISIBILITY	648	_LIBCPP_INLINE_VISIBILITY
644	basic_istringstream()	649	basic_istringstream()
645	: basic_istream<_CharT, _Traits>(&__sb_), __sb_(ios_base::in) {}	650	: basic_istream<_CharT, _Traits>(&__sb_), __sb_(ios_base::in) {}
...	@@ -663,7 +668,7 @@ public:	...	@@ -663,7 +668,7 @@ public:
663	basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);	668	basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
664	}	669	}
665		670
666	// 27.8.2.2 Assign and swap:	671	// [istringstream.assign] Assign and swap:
667	basic_istringstream& operator=(basic_istringstream&& __rhs) {	672	basic_istringstream& operator=(basic_istringstream&& __rhs) {
668	basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));	673	basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
669	__sb_ = _VSTD::move(__rhs.__sb_);	674	__sb_ = _VSTD::move(__rhs.__sb_);
...	@@ -675,7 +680,7 @@ public:	...	@@ -675,7 +680,7 @@ public:
675	__sb_.swap(__rhs.__sb_);	680	__sb_.swap(__rhs.__sb_);
676	}	681	}
677		682
678	// 27.8.2.3 Members:	683	// [istringstream.members] Member functions:
679	_LIBCPP_INLINE_VISIBILITY	684	_LIBCPP_INLINE_VISIBILITY
680	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {	685	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {
681	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);	686	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
...	@@ -699,7 +704,7 @@ swap(basic_istringstream<_CharT, _Traits, _Allocator>& __x,	...	@@ -699,7 +704,7 @@ swap(basic_istringstream<_CharT, _Traits, _Allocator>& __x,
699	__x.swap(__y);	704	__x.swap(__y);
700	}	705	}
701		706
702	// basic_ostringstream	707	// Class template basic_ostringstream [ostringstream]
703		708
704	template <class _CharT, class _Traits, class _Allocator>	709	template <class _CharT, class _Traits, class _Allocator>
705	class _LIBCPP_TEMPLATE_VIS basic_ostringstream	710	class _LIBCPP_TEMPLATE_VIS basic_ostringstream
...	@@ -719,7 +724,7 @@ private:	...	@@ -719,7 +724,7 @@ private:
719	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;	724	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
720		725
721	public:	726	public:
722	// 30.8.4.1 [ostringstream.cons], constructors	727	// [ostringstream.cons] Constructors:
723	_LIBCPP_INLINE_VISIBILITY	728	_LIBCPP_INLINE_VISIBILITY
724	basic_ostringstream()	729	basic_ostringstream()
725	: basic_ostream<_CharT, _Traits>(&__sb_), __sb_(ios_base::out) {}	730	: basic_ostream<_CharT, _Traits>(&__sb_), __sb_(ios_base::out) {}
...	@@ -743,7 +748,7 @@ public:	...	@@ -743,7 +748,7 @@ public:
743	basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_);	748	basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_);
744	}	749	}
745		750
746	// 27.8.2.2 Assign and swap:	751	// [ostringstream.assign] Assign and swap:
747	basic_ostringstream& operator=(basic_ostringstream&& __rhs) {	752	basic_ostringstream& operator=(basic_ostringstream&& __rhs) {
748	basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));	753	basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
749	__sb_ = _VSTD::move(__rhs.__sb_);	754	__sb_ = _VSTD::move(__rhs.__sb_);
...	@@ -756,7 +761,7 @@ public:	...	@@ -756,7 +761,7 @@ public:
756	__sb_.swap(__rhs.__sb_);	761	__sb_.swap(__rhs.__sb_);
757	}	762	}
758		763
759	// 27.8.2.3 Members:	764	// [ostringstream.members] Member functions:
760	_LIBCPP_INLINE_VISIBILITY	765	_LIBCPP_INLINE_VISIBILITY
761	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {	766	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {
762	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);	767	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
...	@@ -780,7 +785,7 @@ swap(basic_ostringstream<_CharT, _Traits, _Allocator>& __x,	...	@@ -780,7 +785,7 @@ swap(basic_ostringstream<_CharT, _Traits, _Allocator>& __x,
780	__x.swap(__y);	785	__x.swap(__y);
781	}	786	}
782		787
783	// basic_stringstream	788	// Class template basic_stringstream [stringstream]
784		789
785	template <class _CharT, class _Traits, class _Allocator>	790	template <class _CharT, class _Traits, class _Allocator>
786	class _LIBCPP_TEMPLATE_VIS basic_stringstream	791	class _LIBCPP_TEMPLATE_VIS basic_stringstream
...	@@ -800,7 +805,7 @@ private:	...	@@ -800,7 +805,7 @@ private:
800	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;	805	basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
801		806
802	public:	807	public:
803	// 30.8.5.1 [stringstream.cons], constructors	808	// [stringstream.cons] constructors
804	_LIBCPP_INLINE_VISIBILITY	809	_LIBCPP_INLINE_VISIBILITY
805	basic_stringstream()	810	basic_stringstream()
806	: basic_iostream<_CharT, _Traits>(&__sb_), __sb_(ios_base::in \| ios_base::out) {}	811	: basic_iostream<_CharT, _Traits>(&__sb_), __sb_(ios_base::in \| ios_base::out) {}
...	@@ -824,7 +829,7 @@ public:	...	@@ -824,7 +829,7 @@ public:
824	basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);	829	basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
825	}	830	}
826		831
827	// 27.8.2.2 Assign and swap:	832	// [stringstream.assign] Assign and swap:
828	basic_stringstream& operator=(basic_stringstream&& __rhs) {	833	basic_stringstream& operator=(basic_stringstream&& __rhs) {
829	basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));	834	basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
830	__sb_ = _VSTD::move(__rhs.__sb_);	835	__sb_ = _VSTD::move(__rhs.__sb_);
...	@@ -836,7 +841,7 @@ public:	...	@@ -836,7 +841,7 @@ public:
836	__sb_.swap(__rhs.__sb_);	841	__sb_.swap(__rhs.__sb_);
837	}	842	}
838		843
839	// 27.8.2.3 Members:	844	// [stringstream.members] Member functions:
840	_LIBCPP_INLINE_VISIBILITY	845	_LIBCPP_INLINE_VISIBILITY
841	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {	846	basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const {
842	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);	847	return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
...	@@ -871,4 +876,8 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -871,4 +876,8 @@ _LIBCPP_END_NAMESPACE_STD
871		876
872	_LIBCPP_POP_MACROS	877	_LIBCPP_POP_MACROS
873		878
		879	#if _LIBCPP_STD_VER <= 20 && !defined(_LIPCPP_REMOVE_TRANSITIVE_INCLUDES)
		880	# include <type_traits>
		881	#endif
		882
874	#endif // _LIBCPP_SSTREAM	883	#endif // _LIBCPP_SSTREAM

lib/libcxx/include/stack+9-4

 @@ -107,11 +107,9 @@ template <class T, class Container>
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#endif
 // standard-mandated includes
+// [stack.syn]
 #include <compare>
 #include <initializer_list>
 @@ -257,6 +255,8 @@ public:
         swap(c, __s.c);
     }
+    _LIBCPP_NODISCARD _LIBCPP_HIDE_FROM_ABI const _Container& __get_container() const { return c; }
     template <class T1, class _C1>
     friend
     bool
 @@ -363,4 +363,9 @@ struct _LIBCPP_TEMPLATE_VIS uses_allocator<stack<_Tp, _Container>, _Alloc>
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#endif
 #endif // _LIBCPP_STACK

lib/libcxx/include/stdbool.h+4-1

...	@@ -6,6 +6,7 @@	...	@@ -6,6 +6,7 @@
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
		9
9	#ifndef _LIBCPP_STDBOOL_H	10	#ifndef _LIBCPP_STDBOOL_H
10	#define _LIBCPP_STDBOOL_H	11	#define _LIBCPP_STDBOOL_H
11		12
...	@@ -24,7 +25,9 @@ Macros:	...	@@ -24,7 +25,9 @@ Macros:
24	# pragma GCC system_header	25	# pragma GCC system_header
25	#endif	26	#endif
26		27
27	#include_next <stdbool.h>	28	#if __has_include_next(<stdbool.h>)
		29	# include_next <stdbool.h>
		30	#endif
28		31
29	#ifdef __cplusplus	32	#ifdef __cplusplus
30	#undef bool	33	#undef bool

lib/libcxx/include/stddef.h+3-1

 @@ -42,7 +42,9 @@ Types:
 #  pragma GCC system_header
 #endif
-#include_next <stddef.h>
+#  if __has_include_next(<stddef.h>)
+#    include_next <stddef.h>
+#  endif
 #ifdef __cplusplus
     typedef decltype(nullptr) nullptr_t;

lib/libcxx/include/stdexcept+11-11

...	@@ -87,9 +87,9 @@ public:	...	@@ -87,9 +87,9 @@ public:
87	logic_error(const logic_error&) _NOEXCEPT;	87	logic_error(const logic_error&) _NOEXCEPT;
88	logic_error& operator=(const logic_error&) _NOEXCEPT;	88	logic_error& operator=(const logic_error&) _NOEXCEPT;
89		89
90	virtual ~logic_error() _NOEXCEPT;	90	~logic_error() _NOEXCEPT override;
91		91
92	virtual const char* what() const _NOEXCEPT;	92	const char* what() const _NOEXCEPT override;
93	#else	93	#else
94	public:	94	public:
95	explicit logic_error(const _VSTD::string&); // Symbol uses versioned std::string	95	explicit logic_error(const _VSTD::string&); // Symbol uses versioned std::string
...	@@ -110,9 +110,9 @@ public:	...	@@ -110,9 +110,9 @@ public:
110	runtime_error(const runtime_error&) _NOEXCEPT;	110	runtime_error(const runtime_error&) _NOEXCEPT;
111	runtime_error& operator=(const runtime_error&) _NOEXCEPT;	111	runtime_error& operator=(const runtime_error&) _NOEXCEPT;
112		112
113	virtual ~runtime_error() _NOEXCEPT;	113	~runtime_error() _NOEXCEPT override;
114		114
115	virtual const char* what() const _NOEXCEPT;	115	const char* what() const _NOEXCEPT override;
116	#else	116	#else
117	public:	117	public:
118	explicit runtime_error(const _VSTD::string&); // Symbol uses versioned std::string	118	explicit runtime_error(const _VSTD::string&); // Symbol uses versioned std::string
...	@@ -129,7 +129,7 @@ public:	...	@@ -129,7 +129,7 @@ public:
129		129
130	#ifndef _LIBCPP_ABI_VCRUNTIME	130	#ifndef _LIBCPP_ABI_VCRUNTIME
131	domain_error(const domain_error&) _NOEXCEPT = default;	131	domain_error(const domain_error&) _NOEXCEPT = default;
132	virtual ~domain_error() _NOEXCEPT;	132	~domain_error() _NOEXCEPT override;
133	#endif	133	#endif
134	};	134	};
135		135
...	@@ -142,7 +142,7 @@ public:	...	@@ -142,7 +142,7 @@ public:
142		142
143	#ifndef _LIBCPP_ABI_VCRUNTIME	143	#ifndef _LIBCPP_ABI_VCRUNTIME
144	invalid_argument(const invalid_argument&) _NOEXCEPT = default;	144	invalid_argument(const invalid_argument&) _NOEXCEPT = default;
145	virtual ~invalid_argument() _NOEXCEPT;	145	~invalid_argument() _NOEXCEPT override;
146	#endif	146	#endif
147	};	147	};
148		148
...	@@ -154,7 +154,7 @@ public:	...	@@ -154,7 +154,7 @@ public:
154	_LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s) : logic_error(__s) {}	154	_LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s) : logic_error(__s) {}
155	#ifndef _LIBCPP_ABI_VCRUNTIME	155	#ifndef _LIBCPP_ABI_VCRUNTIME
156	length_error(const length_error&) _NOEXCEPT = default;	156	length_error(const length_error&) _NOEXCEPT = default;
157	virtual ~length_error() _NOEXCEPT;	157	~length_error() _NOEXCEPT override;
158	#endif	158	#endif
159	};	159	};
160		160
...	@@ -167,7 +167,7 @@ public:	...	@@ -167,7 +167,7 @@ public:
167		167
168	#ifndef _LIBCPP_ABI_VCRUNTIME	168	#ifndef _LIBCPP_ABI_VCRUNTIME
169	out_of_range(const out_of_range&) _NOEXCEPT = default;	169	out_of_range(const out_of_range&) _NOEXCEPT = default;
170	virtual ~out_of_range() _NOEXCEPT;	170	~out_of_range() _NOEXCEPT override;
171	#endif	171	#endif
172	};	172	};
173		173
...	@@ -180,7 +180,7 @@ public:	...	@@ -180,7 +180,7 @@ public:
180		180
181	#ifndef _LIBCPP_ABI_VCRUNTIME	181	#ifndef _LIBCPP_ABI_VCRUNTIME
182	range_error(const range_error&) _NOEXCEPT = default;	182	range_error(const range_error&) _NOEXCEPT = default;
183	virtual ~range_error() _NOEXCEPT;	183	~range_error() _NOEXCEPT override;
184	#endif	184	#endif
185	};	185	};
186		186
...	@@ -193,7 +193,7 @@ public:	...	@@ -193,7 +193,7 @@ public:
193		193
194	#ifndef _LIBCPP_ABI_VCRUNTIME	194	#ifndef _LIBCPP_ABI_VCRUNTIME
195	overflow_error(const overflow_error&) _NOEXCEPT = default;	195	overflow_error(const overflow_error&) _NOEXCEPT = default;
196	virtual ~overflow_error() _NOEXCEPT;	196	~overflow_error() _NOEXCEPT override;
197	#endif	197	#endif
198	};	198	};
199		199
...	@@ -206,7 +206,7 @@ public:	...	@@ -206,7 +206,7 @@ public:
206		206
207	#ifndef _LIBCPP_ABI_VCRUNTIME	207	#ifndef _LIBCPP_ABI_VCRUNTIME
208	underflow_error(const underflow_error&) _NOEXCEPT = default;	208	underflow_error(const underflow_error&) _NOEXCEPT = default;
209	virtual ~underflow_error() _NOEXCEPT;	209	~underflow_error() _NOEXCEPT override;
210	#endif	210	#endif
211	};	211	};
212		212

lib/libcxx/include/stdint.h+3-1

...	@@ -120,6 +120,8 @@ Macros:	...	@@ -120,6 +120,8 @@ Macros:
120	# define __STDC_CONSTANT_MACROS	120	# define __STDC_CONSTANT_MACROS
121	#endif	121	#endif
122		122
123	#include_next <stdint.h>	123	#if __has_include_next(<stdint.h>)
		124	# include_next <stdint.h>
		125	#endif
124		126
125	#endif // _LIBCPP_STDINT_H	127	#endif // _LIBCPP_STDINT_H

lib/libcxx/include/stdio.h+3-1

...	@@ -104,7 +104,9 @@ void perror(const char* s);	...	@@ -104,7 +104,9 @@ void perror(const char* s);
104	# pragma GCC system_header	104	# pragma GCC system_header
105	#endif	105	#endif
106		106
107	#include_next <stdio.h>	107	# if __has_include_next(<stdio.h>)
		108	# include_next <stdio.h>
		109	# endif
108		110
109	#ifdef __cplusplus	111	#ifdef __cplusplus
110		112

lib/libcxx/include/stdlib.h+8-6

 @@ -90,7 +90,9 @@ void *aligned_alloc(size_t alignment, size_t size);                       // C11
 #  pragma GCC system_header
 #endif
-#include_next <stdlib.h>
+#  if __has_include_next(<stdlib.h>)
+#    include_next <stdlib.h>
+#  endif
 #ifdef __cplusplus
 extern "C++" {
 @@ -108,24 +110,24 @@ extern "C++" {
 // MSVCRT already has the correct prototype in <stdlib.h> if __cplusplus is defined
 #if !defined(_LIBCPP_MSVCRT) && !defined(__sun__)
-inline _LIBCPP_INLINE_VISIBILITY long abs(long __x) _NOEXCEPT {
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY long abs(long __x) _NOEXCEPT {
   return __builtin_labs(__x);
 }
-inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {
   return __builtin_llabs(__x);
 }
 #endif // !defined(_LIBCPP_MSVCRT) && !defined(__sun__)
 #if !defined(__sun__)
-inline _LIBCPP_INLINE_VISIBILITY float abs(float __lcpp_x) _NOEXCEPT {
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY float abs(float __lcpp_x) _NOEXCEPT {
   return __builtin_fabsf(__lcpp_x); // Use builtins to prevent needing math.h
 }
-inline _LIBCPP_INLINE_VISIBILITY double abs(double __lcpp_x) _NOEXCEPT {
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY double abs(double __lcpp_x) _NOEXCEPT {
   return __builtin_fabs(__lcpp_x);
 }
-inline _LIBCPP_INLINE_VISIBILITY long double
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY long double
 abs(long double __lcpp_x) _NOEXCEPT {
   return __builtin_fabsl(__lcpp_x);
 }

lib/libcxx/include/streambuf+4-2

 @@ -489,10 +489,12 @@ basic_streambuf<_CharT, _Traits>::overflow(int_type)
 }
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_streambuf<char>;
-extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_streambuf<wchar_t>;
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ios<char>;
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_streambuf<wchar_t>;
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ios<wchar_t>;
+#endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/string+777-860

...	@@ -13,6 +13,9 @@	...	@@ -13,6 +13,9 @@
13	/*	13	/*
14	string synopsis	14	string synopsis
15		15
		16	#include <compare>
		17	#include <initializer_list>
		18
16	namespace std	19	namespace std
17	{	20	{
18		21
...	@@ -43,11 +46,13 @@ template <class stateT> bool operator!=(const fpos<stateT>& x, const fpos<stateT	...	@@ -43,11 +46,13 @@ template <class stateT> bool operator!=(const fpos<stateT>& x, const fpos<stateT
43	template <class charT>	46	template <class charT>
44	struct char_traits	47	struct char_traits
45	{	48	{
46	typedef charT char_type;	49	using char_type = charT;
47	typedef ... int_type;	50	using int_type = ...;
48	typedef streamoff off_type;	51	using off_type = streamoff;
49	typedef streampos pos_type;	52	using pos_type = streampos;
50	typedef mbstate_t state_type;	53	using state_type = mbstate_t;
		54	using comparison_category = strong_ordering; // Since C++20 only for the specializations
		55	// char, wchar_t, char8_t, char16_t, and char32_t.
51		56
52	static void assign(char_type& c1, const char_type& c2) noexcept;	57	static void assign(char_type& c1, const char_type& c2) noexcept;
53	static constexpr bool eq(char_type c1, char_type c2) noexcept;	58	static constexpr bool eq(char_type c1, char_type c2) noexcept;
...	@@ -104,6 +109,10 @@ public:	...	@@ -104,6 +109,10 @@ public:
104	const allocator_type& a = allocator_type()); // constexpr since C++20	109	const allocator_type& a = allocator_type()); // constexpr since C++20
105	basic_string(const basic_string& str, size_type pos, size_type n,	110	basic_string(const basic_string& str, size_type pos, size_type n,
106	const Allocator& a = Allocator()); // constexpr since C++20	111	const Allocator& a = Allocator()); // constexpr since C++20
		112	constexpr basic_string(
		113	basic_string&& str, size_type pos, const Allocator& a = Allocator()); // since C++23
		114	constexpr basic_string(
		115	basic_string&& str, size_type pos, size_type n, const Allocator& a = Allocator()); // since C++23
107	template<class T>	116	template<class T>
108	basic_string(const T& t, size_type pos, size_type n, const Allocator& a = Allocator()); // C++17, constexpr since C++20	117	basic_string(const T& t, size_type pos, size_type n, const Allocator& a = Allocator()); // C++17, constexpr since C++20
109	template <class T>	118	template <class T>
...	@@ -256,8 +265,9 @@ public:	...	@@ -256,8 +265,9 @@ public:
256	basic_string& replace(const_iterator i1, const_iterator i2, initializer_list<value_type>); // constexpr since C++20	265	basic_string& replace(const_iterator i1, const_iterator i2, initializer_list<value_type>); // constexpr since C++20
257		266
258	size_type copy(value_type* s, size_type n, size_type pos = 0) const; // constexpr since C++20	267	size_type copy(value_type* s, size_type n, size_type pos = 0) const; // constexpr since C++20
259	basic_string substr(size_type pos = 0, size_type n = npos) const; // constexpr since C++20	268	basic_string substr(size_type pos = 0, size_type n = npos) const; // constexpr in C++20, removed in C++23
260		269	basic_string substr(size_type pos = 0, size_type n = npos) const&; // since C++23
		270	constexpr basic_string substr(size_type pos = 0, size_type n = npos) &&; // since C++23
261	void swap(basic_string& str)	271	void swap(basic_string& str)
262	noexcept(allocator_traits<allocator_type>::propagate_on_container_swap::value \|\|	272	noexcept(allocator_traits<allocator_type>::propagate_on_container_swap::value \|\|
263	allocator_traits<allocator_type>::is_always_equal::value); // C++17, constexpr since C++20	273	allocator_traits<allocator_type>::is_always_equal::value); // C++17, constexpr since C++20
...	@@ -370,60 +380,68 @@ bool operator==(const basic_string<charT, traits, Allocator>& lhs,	...	@@ -370,60 +380,68 @@ bool operator==(const basic_string<charT, traits, Allocator>& lhs,
370	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	380	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20
371		381
372	template<class charT, class traits, class Allocator>	382	template<class charT, class traits, class Allocator>
373	bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	383	bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
374		384
375	template<class charT, class traits, class Allocator>	385	template<class charT, class traits, class Allocator>
376	bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	386	bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20
377		387
378	template<class charT, class traits, class Allocator>	388	template<class charT, class traits, class Allocator>
379	bool operator!=(const basic_string<charT,traits,Allocator>& lhs,	389	bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
380	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	390	const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
381		391
382	template<class charT, class traits, class Allocator>	392	template<class charT, class traits, class Allocator>
383	bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	393	bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
384		394
385	template<class charT, class traits, class Allocator>	395	template<class charT, class traits, class Allocator>
386	bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	396	bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
387		397
388	template<class charT, class traits, class Allocator>	398	template<class charT, class traits, class Allocator>
389	bool operator< (const basic_string<charT, traits, Allocator>& lhs,	399	bool operator< (const basic_string<charT, traits, Allocator>& lhs,
390	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	400	const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
391		401
392	template<class charT, class traits, class Allocator>	402	template<class charT, class traits, class Allocator>
393	bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	403	bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
394		404
395	template<class charT, class traits, class Allocator>	405	template<class charT, class traits, class Allocator>
396	bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	406	bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
397		407
398	template<class charT, class traits, class Allocator>	408	template<class charT, class traits, class Allocator>
399	bool operator> (const basic_string<charT, traits, Allocator>& lhs,	409	bool operator> (const basic_string<charT, traits, Allocator>& lhs,
400	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	410	const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
401		411
402	template<class charT, class traits, class Allocator>	412	template<class charT, class traits, class Allocator>
403	bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	413	bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
404		414
405	template<class charT, class traits, class Allocator>	415	template<class charT, class traits, class Allocator>
406	bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	416	bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
407		417
408	template<class charT, class traits, class Allocator>	418	template<class charT, class traits, class Allocator>
409	bool operator<=(const basic_string<charT, traits, Allocator>& lhs,	419	bool operator<=(const basic_string<charT, traits, Allocator>& lhs,
410	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	420	const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
411		421
412	template<class charT, class traits, class Allocator>	422	template<class charT, class traits, class Allocator>
413	bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	423	bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
414		424
415	template<class charT, class traits, class Allocator>	425	template<class charT, class traits, class Allocator>
416	bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	426	bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
417		427
418	template<class charT, class traits, class Allocator>	428	template<class charT, class traits, class Allocator>
419	bool operator>=(const basic_string<charT, traits, Allocator>& lhs,	429	bool operator>=(const basic_string<charT, traits, Allocator>& lhs,
420	const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	430	const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
421		431
422	template<class charT, class traits, class Allocator>	432	template<class charT, class traits, class Allocator>
423	bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20	433	bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
424		434
425	template<class charT, class traits, class Allocator>	435	template<class charT, class traits, class Allocator>
426	bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20	436	bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
		437
		438	template<class charT, class traits, class Allocator> // since C++20
		439	constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs,
		440	const basic_string<charT, traits, Allocator>& rhs) noexcept;
		441
		442	template<class charT, class traits, class Allocator> // since C++20
		443	constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs,
		444	const charT* rhs) noexcept;
427		445
428	template<class charT, class traits, class Allocator>	446	template<class charT, class traits, class Allocator>
429	void swap(basic_string<charT, traits, Allocator>& lhs,	447	void swap(basic_string<charT, traits, Allocator>& lhs,
...	@@ -526,15 +544,24 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );	...	@@ -526,15 +544,24 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );
526	#include <__format/enable_insertable.h>	544	#include <__format/enable_insertable.h>
527	#include <__functional/hash.h>	545	#include <__functional/hash.h>
528	#include <__functional/unary_function.h>	546	#include <__functional/unary_function.h>
		547	#include <__fwd/string.h>
529	#include <__ios/fpos.h>	548	#include <__ios/fpos.h>
530	#include <__iterator/distance.h>	549	#include <__iterator/distance.h>
531	#include <__iterator/iterator_traits.h>	550	#include <__iterator/iterator_traits.h>
532	#include <__iterator/reverse_iterator.h>	551	#include <__iterator/reverse_iterator.h>
533	#include <__iterator/wrap_iter.h>	552	#include <__iterator/wrap_iter.h>
534	#include <__memory/allocate_at_least.h>	553	#include <__memory/allocate_at_least.h>
		554	#include <__memory/allocator.h>
		555	#include <__memory/allocator_traits.h>
		556	#include <__memory/compressed_pair.h>
		557	#include <__memory/construct_at.h>
		558	#include <__memory/pointer_traits.h>
535	#include <__memory/swap_allocator.h>	559	#include <__memory/swap_allocator.h>
		560	#include <__memory_resource/polymorphic_allocator.h>
536	#include <__string/char_traits.h>	561	#include <__string/char_traits.h>
537	#include <__string/extern_template_lists.h>	562	#include <__string/extern_template_lists.h>
		563	#include <__type_traits/is_allocator.h>
		564	#include <__type_traits/noexcept_move_assign_container.h>
538	#include <__utility/auto_cast.h>	565	#include <__utility/auto_cast.h>
539	#include <__utility/move.h>	566	#include <__utility/move.h>
540	#include <__utility/swap.h>	567	#include <__utility/swap.h>
...	@@ -544,9 +571,7 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );	...	@@ -544,9 +571,7 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );
544	#include <cstdio> // EOF	571	#include <cstdio> // EOF
545	#include <cstdlib>	572	#include <cstdlib>
546	#include <cstring>	573	#include <cstring>
547	#include <iosfwd>
548	#include <limits>	574	#include <limits>
549	#include <memory>
550	#include <stdexcept>	575	#include <stdexcept>
551	#include <string_view>	576	#include <string_view>
552	#include <type_traits>	577	#include <type_traits>
...	@@ -556,16 +581,6 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );	...	@@ -556,16 +581,6 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );
556	# include <cwchar>	581	# include <cwchar>
557	#endif	582	#endif
558		583
559	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
560	# include <algorithm>
561	# include <functional>
562	# include <iterator>
563	# include <new>
564	# include <typeinfo>
565	# include <utility>
566	# include <vector>
567	#endif
568
569	// standard-mandated includes	584	// standard-mandated includes
570		585
571	// [iterator.range]	586	// [iterator.range]
...	@@ -593,27 +608,27 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -593,27 +608,27 @@ _LIBCPP_BEGIN_NAMESPACE_STD
593		608
594	template<class _CharT, class _Traits, class _Allocator>	609	template<class _CharT, class _Traits, class _Allocator>
595	basic_string<_CharT, _Traits, _Allocator>	610	basic_string<_CharT, _Traits, _Allocator>
596	_LIBCPP_CONSTEXPR_AFTER_CXX17	611	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
597	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x,	612	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x,
598	const basic_string<_CharT, _Traits, _Allocator>& __y);	613	const basic_string<_CharT, _Traits, _Allocator>& __y);
599		614
600	template<class _CharT, class _Traits, class _Allocator>	615	template<class _CharT, class _Traits, class _Allocator>
601	_LIBCPP_CONSTEXPR_AFTER_CXX17	616	_LIBCPP_HIDDEN _LIBCPP_CONSTEXPR_SINCE_CXX20
602	basic_string<_CharT, _Traits, _Allocator>	617	basic_string<_CharT, _Traits, _Allocator>
603	operator+(const _CharT* __x, const basic_string<_CharT,_Traits,_Allocator>& __y);	618	operator+(const _CharT* __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
604		619
605	template<class _CharT, class _Traits, class _Allocator>	620	template<class _CharT, class _Traits, class _Allocator>
606	_LIBCPP_CONSTEXPR_AFTER_CXX17	621	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
607	basic_string<_CharT, _Traits, _Allocator>	622	basic_string<_CharT, _Traits, _Allocator>
608	operator+(_CharT __x, const basic_string<_CharT,_Traits,_Allocator>& __y);	623	operator+(_CharT __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
609		624
610	template<class _CharT, class _Traits, class _Allocator>	625	template<class _CharT, class _Traits, class _Allocator>
611	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	626	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
612	basic_string<_CharT, _Traits, _Allocator>	627	basic_string<_CharT, _Traits, _Allocator>
613	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, const _CharT* __y);	628	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, const _CharT* __y);
614		629
615	template<class _CharT, class _Traits, class _Allocator>	630	template<class _CharT, class _Traits, class _Allocator>
616	_LIBCPP_CONSTEXPR_AFTER_CXX17	631	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
617	basic_string<_CharT, _Traits, _Allocator>	632	basic_string<_CharT, _Traits, _Allocator>
618	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, _CharT __y);	633	operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, _CharT __y);
619		634
...	@@ -636,23 +651,10 @@ struct __can_be_converted_to_string_view : public _BoolConstant<	...	@@ -636,23 +651,10 @@ struct __can_be_converted_to_string_view : public _BoolConstant<
636	!is_convertible<const _Tp&, const _CharT*>::value	651	!is_convertible<const _Tp&, const _CharT*>::value
637	> {};	652	> {};
638		653
639	#ifndef _LIBCPP_HAS_NO_CHAR8_T
640	typedef basic_string<char8_t> u8string;
641	#endif
642	typedef basic_string<char16_t> u16string;
643	typedef basic_string<char32_t> u32string;
644
645	struct __uninitialized_size_tag {};	654	struct __uninitialized_size_tag {};
646		655
647	template<class _CharT, class _Traits, class _Allocator>	656	template<class _CharT, class _Traits, class _Allocator>
648	class	657	class basic_string
649	_LIBCPP_TEMPLATE_VIS
650	#ifndef _LIBCPP_HAS_NO_CHAR8_T
651	_LIBCPP_PREFERRED_NAME(u8string)
652	#endif
653	_LIBCPP_PREFERRED_NAME(u16string)
654	_LIBCPP_PREFERRED_NAME(u32string)
655	basic_string
656	{	658	{
657	public:	659	public:
658	typedef basic_string __self;	660	typedef basic_string __self;
...	@@ -676,6 +678,11 @@ public:	...	@@ -676,6 +678,11 @@ public:
676	static_assert(( is_same<typename allocator_type::value_type, value_type>::value),	678	static_assert(( is_same<typename allocator_type::value_type, value_type>::value),
677	"Allocator::value_type must be same type as value_type");	679	"Allocator::value_type must be same type as value_type");
678		680
		681	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		682	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		683	"original allocator");
		684
		685	// TODO: Implement iterator bounds checking without requiring the global database.
679	typedef __wrap_iter<pointer> iterator;	686	typedef __wrap_iter<pointer> iterator;
680	typedef __wrap_iter<const_pointer> const_iterator;	687	typedef __wrap_iter<const_pointer> const_iterator;
681	typedef std::reverse_iterator<iterator> reverse_iterator;	688	typedef std::reverse_iterator<iterator> reverse_iterator;
...	@@ -787,13 +794,13 @@ private:	...	@@ -787,13 +794,13 @@ private:
787	// Construct a string with the given allocator and enough storage to hold `__size` characters, but	794	// Construct a string with the given allocator and enough storage to hold `__size` characters, but
788	// don't initialize the characters. The contents of the string, including the null terminator, must be	795	// don't initialize the characters. The contents of the string, including the null terminator, must be
789	// initialized separately.	796	// initialized separately.
790	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	797	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
791	explicit basic_string(__uninitialized_size_tag, size_type __size, const allocator_type& __a)	798	explicit basic_string(__uninitialized_size_tag, size_type __size, const allocator_type& __a)
792	: __r_(__default_init_tag(), __a) {	799	: __r_(__default_init_tag(), __a) {
793	if (__size > max_size())	800	if (__size > max_size())
794	__throw_length_error();	801	__throw_length_error();
795	if (__fits_in_sso(__size)) {	802	if (__fits_in_sso(__size)) {
796	__zero();	803	__r_.first() = __rep();
797	__set_short_size(__size);	804	__set_short_size(__size);
798	} else {	805	} else {
799	auto __capacity = __recommend(__size) + 1;	806	auto __capacity = __recommend(__size) + 1;
...	@@ -806,176 +813,289 @@ private:	...	@@ -806,176 +813,289 @@ private:
806	std::__debug_db_insert_c(this);	813	std::__debug_db_insert_c(this);
807	}	814	}
808		815
		816	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator __make_iterator(pointer __p) {
		817	return iterator(this, __p);
		818	}
		819
		820	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_iterator __make_const_iterator(const_pointer __p) const {
		821	return const_iterator(this, __p);
		822	}
		823
809	public:	824	public:
810	_LIBCPP_TEMPLATE_DATA_VIS	825	_LIBCPP_TEMPLATE_DATA_VIS static const size_type npos = -1;
811	static const size_type npos = -1;
812		826
813	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string()	827	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string()
814	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);	828	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
		829	: __r_(__default_init_tag(), __default_init_tag()) {
		830	std::__debug_db_insert_c(this);
		831	__default_init();
		832	}
815		833
816	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit basic_string(const allocator_type& __a)	834	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(const allocator_type& __a)
817	#if _LIBCPP_STD_VER <= 14	835	#if _LIBCPP_STD_VER <= 14
818	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value);	836	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
819	#else	837	#else
820	_NOEXCEPT;	838	_NOEXCEPT
821	#endif	839	#endif
		840	: __r_(__default_init_tag(), __a) {
		841	std::__debug_db_insert_c(this);
		842	__default_init();
		843	}
822		844
823	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string(const basic_string& __str);	845	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const basic_string& __str);
824	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string(const basic_string& __str, const allocator_type& __a);	846	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const basic_string& __str, const allocator_type& __a);
825		847
826	#ifndef _LIBCPP_CXX03_LANG	848	#ifndef _LIBCPP_CXX03_LANG
827	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	849	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(basic_string&& __str)
828	basic_string(basic_string&& __str)	850	# if _LIBCPP_STD_VER <= 14
829	#if _LIBCPP_STD_VER <= 14	851	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
830	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);	852	# else
831	#else	853	_NOEXCEPT
832	_NOEXCEPT;	854	# endif
833	#endif	855	: __r_(std::move(__str.__r_)) {
		856	__str.__default_init();
		857	std::__debug_db_insert_c(this);
		858	if (__is_long())
		859	std::__debug_db_swap(this, &__str);
		860	}
834		861
835	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	862	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(basic_string&& __str, const allocator_type& __a)
836	basic_string(basic_string&& __str, const allocator_type& __a);	863	: __r_(__default_init_tag(), __a) {
		864	if (__str.__is_long() && __a != __str.__alloc()) // copy, not move
		865	__init(std::__to_address(__str.__get_long_pointer()), __str.__get_long_size());
		866	else {
		867	if (__libcpp_is_constant_evaluated())
		868	__r_.first() = __rep();
		869	__r_.first() = __str.__r_.first();
		870	__str.__default_init();
		871	}
		872	std::__debug_db_insert_c(this);
		873	if (__is_long())
		874	std::__debug_db_swap(this, &__str);
		875	}
837	#endif // _LIBCPP_CXX03_LANG	876	#endif // _LIBCPP_CXX03_LANG
838		877
839	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >	878	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >
840	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	879	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s)
841	basic_string(const _CharT* __s) : __r_(__default_init_tag(), __default_init_tag()) {	880	: __r_(__default_init_tag(), __default_init_tag()) {
842	_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr");	881	_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr");
843	__init(__s, traits_type::length(__s));	882	__init(__s, traits_type::length(__s));
844	std::__debug_db_insert_c(this);	883	std::__debug_db_insert_c(this);
845	}	884	}
846		885
847	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >	886	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >
848	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	887	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, const _Allocator& __a);
849	basic_string(const _CharT* __s, const _Allocator& __a);
850		888
851	#if _LIBCPP_STD_VER > 20	889	#if _LIBCPP_STD_VER > 20
852	basic_string(nullptr_t) = delete;	890	basic_string(nullptr_t) = delete;
853	#endif	891	#endif
854		892
855	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	893	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n)
856	basic_string(const _CharT* __s, size_type __n);	894	: __r_(__default_init_tag(), __default_init_tag()) {
857	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	895	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n) detected nullptr");
858	basic_string(const _CharT* __s, size_type __n, const _Allocator& __a);	896	__init(__s, __n);
859	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	897	std::__debug_db_insert_c(this);
860	basic_string(size_type __n, _CharT __c);	898	}
861		899
862	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >	900	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
863	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	901	basic_string(const _CharT* __s, size_type __n, const _Allocator& __a)
864	basic_string(size_type __n, _CharT __c, const _Allocator& __a);	902	: __r_(__default_init_tag(), __a) {
865		903	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");
866	_LIBCPP_CONSTEXPR_AFTER_CXX17	904	__init(__s, __n);
867	basic_string(const basic_string& __str, size_type __pos, size_type __n,	905	std::__debug_db_insert_c(this);
868	const _Allocator& __a = _Allocator());	906	}
869	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	907
870	basic_string(const basic_string& __str, size_type __pos,	908	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(size_type __n, _CharT __c)
871	const _Allocator& __a = _Allocator());	909	: __r_(__default_init_tag(), __default_init_tag()) {
872		910	__init(__n, __c);
873	template<class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value> >	911	std::__debug_db_insert_c(this);
874	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	912	}
875	basic_string(const _Tp& __t, size_type __pos, size_type __n,	913
876	const allocator_type& __a = allocator_type());	914	#if _LIBCPP_STD_VER > 20
877		915	_LIBCPP_HIDE_FROM_ABI constexpr
878	template<class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&	916	basic_string(basic_string&& __str, size_type __pos, const _Allocator& __alloc = _Allocator())
879	!__is_same_uncvref<_Tp, basic_string>::value> >	917	: basic_string(std::move(__str), __pos, npos, __alloc) {}
880	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	918
881	explicit basic_string(const _Tp& __t);	919	_LIBCPP_HIDE_FROM_ABI constexpr
882		920	basic_string(basic_string&& __str, size_type __pos, size_type __n, const _Allocator& __alloc = _Allocator())
883	template<class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value> >	921	: __r_(__default_init_tag(), __alloc) {
884	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	922	if (__pos > __str.size())
885	explicit basic_string(const _Tp& __t, const allocator_type& __a);	923	__throw_out_of_range();
886		924
887	template<class _InputIterator, class = __enable_if_t<__is_cpp17_input_iterator<_InputIterator>::value> >	925	auto __len = std::min<size_type>(__n, __str.size() - __pos);
888	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	926	if (__alloc_traits::is_always_equal::value \|\| __alloc == __str.__alloc()) {
889	basic_string(_InputIterator __first, _InputIterator __last);	927	__r_.first() = __str.__r_.first();
890	template<class _InputIterator, class = __enable_if_t<__is_cpp17_input_iterator<_InputIterator>::value> >	928	__str.__default_init();
891	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	929
892	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a);	930	_Traits::move(data(), data() + __pos, __len);
		931	__set_size(__len);
		932	_Traits::assign(data()[__len], value_type());
		933	} else {
		934	// Perform a copy because the allocators are not compatible.
		935	__init(__str.data() + __pos, __len);
		936	}
		937
		938	std::__debug_db_insert_c(this);
		939	if (__is_long())
		940	std::__debug_db_swap(this, &__str);
		941	}
		942	#endif
		943
		944	template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> >
		945	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(size_type __n, _CharT __c, const _Allocator& __a);
		946
		947	_LIBCPP_CONSTEXPR_SINCE_CXX20
		948	basic_string(const basic_string& __str, size_type __pos, size_type __n, const _Allocator& __a = _Allocator());
		949
		950	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
		951	basic_string(const basic_string& __str, size_type __pos, const _Allocator& __a = _Allocator())
		952	: __r_(__default_init_tag(), __a) {
		953	size_type __str_sz = __str.size();
		954	if (__pos > __str_sz)
		955	__throw_out_of_range();
		956	__init(__str.data() + __pos, __str_sz - __pos);
		957	std::__debug_db_insert_c(this);
		958	}
		959
		960	template <class _Tp,
		961	class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&
		962	!__is_same_uncvref<_Tp, basic_string>::value> >
		963	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
		964	basic_string(const _Tp& __t, size_type __pos, size_type __n, const allocator_type& __a = allocator_type());
		965
		966	template <class _Tp,
		967	class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&
		968	!__is_same_uncvref<_Tp, basic_string>::value> >
		969	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(
		970	const _Tp& __t);
		971
		972	template <class _Tp,
		973	class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&
		974	!__is_same_uncvref<_Tp, basic_string>::value> >
		975	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(
		976	const _Tp& __t, const allocator_type& __a);
		977
		978	template <class _InputIterator, class = __enable_if_t<__is_cpp17_input_iterator<_InputIterator>::value> >
		979	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(_InputIterator __first, _InputIterator __last)
		980	: __r_(__default_init_tag(), __default_init_tag()) {
		981	__init(__first, __last);
		982	std::__debug_db_insert_c(this);
		983	}
		984
		985	template <class _InputIterator, class = __enable_if_t<__is_cpp17_input_iterator<_InputIterator>::value> >
		986	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
		987	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a)
		988	: __r_(__default_init_tag(), __a) {
		989	__init(__first, __last);
		990	std::__debug_db_insert_c(this);
		991	}
		992
893	#ifndef _LIBCPP_CXX03_LANG	993	#ifndef _LIBCPP_CXX03_LANG
894	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	994	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(initializer_list<_CharT> __il)
895	basic_string(initializer_list<_CharT> __il);	995	: __r_(__default_init_tag(), __default_init_tag()) {
896	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	996	__init(__il.begin(), __il.end());
897	basic_string(initializer_list<_CharT> __il, const _Allocator& __a);	997	std::__debug_db_insert_c(this);
		998	}
		999
		1000	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(initializer_list<_CharT> __il, const _Allocator& __a)
		1001	: __r_(__default_init_tag(), __a) {
		1002	__init(__il.begin(), __il.end());
		1003	std::__debug_db_insert_c(this);
		1004	}
898	#endif // _LIBCPP_CXX03_LANG	1005	#endif // _LIBCPP_CXX03_LANG
899		1006
900	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 ~basic_string();	1007	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 ~basic_string();
901		1008
902	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1009	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
903	operator __self_view() const _NOEXCEPT { return __self_view(data(), size()); }	1010	operator __self_view() const _NOEXCEPT { return __self_view(data(), size()); }
904		1011
905	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator=(const basic_string& __str);	1012	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator=(const basic_string& __str);
906		1013
907	template <class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&	1014	template <class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value &&
908	!__is_same_uncvref<_Tp, basic_string>::value> >	1015	!__is_same_uncvref<_Tp, basic_string>::value> >
909	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator=(const _Tp& __t) {	1016	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator=(const _Tp& __t) {
910	__self_view __sv = __t;	1017	__self_view __sv = __t;
911	return assign(__sv);	1018	return assign(__sv);
912	}	1019	}
913		1020
914	#ifndef _LIBCPP_CXX03_LANG	1021	#ifndef _LIBCPP_CXX03_LANG
915	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1022	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator=(basic_string&& __str)
916	basic_string& operator=(basic_string&& __str)	1023	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value)) {
917	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value));	1024	__move_assign(__str, integral_constant<bool, __alloc_traits::propagate_on_container_move_assignment::value>());
918	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1025	return *this;
		1026	}
		1027
		1028	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
919	basic_string& operator=(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}	1029	basic_string& operator=(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
920	#endif	1030	#endif
921	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1031	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
922	basic_string& operator=(const value_type* __s) {return assign(__s);}	1032	basic_string& operator=(const value_type* __s) {return assign(__s);}
923	#if _LIBCPP_STD_VER > 20	1033	#if _LIBCPP_STD_VER > 20
924	basic_string& operator=(nullptr_t) = delete;	1034	basic_string& operator=(nullptr_t) = delete;
925	#endif	1035	#endif
926	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator=(value_type __c);	1036	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator=(value_type __c);
927		1037
928	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1038	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
929	iterator begin() _NOEXCEPT	1039	iterator begin() _NOEXCEPT
930	{return iterator(this, __get_pointer());}	1040	{return __make_iterator(__get_pointer());}
931	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1041	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
932	const_iterator begin() const _NOEXCEPT	1042	const_iterator begin() const _NOEXCEPT
933	{return const_iterator(this, __get_pointer());}	1043	{return __make_const_iterator(__get_pointer());}
934	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1044	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
935	iterator end() _NOEXCEPT	1045	iterator end() _NOEXCEPT
936	{return iterator(this, __get_pointer() + size());}	1046	{return __make_iterator(__get_pointer() + size());}
937	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1047	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
938	const_iterator end() const _NOEXCEPT	1048	const_iterator end() const _NOEXCEPT
939	{return const_iterator(this, __get_pointer() + size());}	1049	{return __make_const_iterator(__get_pointer() + size());}
940		1050
941	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1051	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
942	reverse_iterator rbegin() _NOEXCEPT	1052	reverse_iterator rbegin() _NOEXCEPT
943	{return reverse_iterator(end());}	1053	{return reverse_iterator(end());}
944	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1054	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
945	const_reverse_iterator rbegin() const _NOEXCEPT	1055	const_reverse_iterator rbegin() const _NOEXCEPT
946	{return const_reverse_iterator(end());}	1056	{return const_reverse_iterator(end());}
947	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1057	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
948	reverse_iterator rend() _NOEXCEPT	1058	reverse_iterator rend() _NOEXCEPT
949	{return reverse_iterator(begin());}	1059	{return reverse_iterator(begin());}
950	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1060	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
951	const_reverse_iterator rend() const _NOEXCEPT	1061	const_reverse_iterator rend() const _NOEXCEPT
952	{return const_reverse_iterator(begin());}	1062	{return const_reverse_iterator(begin());}
953		1063
954	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1064	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
955	const_iterator cbegin() const _NOEXCEPT	1065	const_iterator cbegin() const _NOEXCEPT
956	{return begin();}	1066	{return begin();}
957	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1067	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
958	const_iterator cend() const _NOEXCEPT	1068	const_iterator cend() const _NOEXCEPT
959	{return end();}	1069	{return end();}
960	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1070	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
961	const_reverse_iterator crbegin() const _NOEXCEPT	1071	const_reverse_iterator crbegin() const _NOEXCEPT
962	{return rbegin();}	1072	{return rbegin();}
963	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1073	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
964	const_reverse_iterator crend() const _NOEXCEPT	1074	const_reverse_iterator crend() const _NOEXCEPT
965	{return rend();}	1075	{return rend();}
966		1076
967	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 size_type size() const _NOEXCEPT	1077	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type size() const _NOEXCEPT
968	{return __is_long() ? __get_long_size() : __get_short_size();}	1078	{return __is_long() ? __get_long_size() : __get_short_size();}
969	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 size_type length() const _NOEXCEPT {return size();}	1079	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type length() const _NOEXCEPT {return size();}
970	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 size_type max_size() const _NOEXCEPT;	1080
971	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 size_type capacity() const _NOEXCEPT {	1081	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type max_size() const _NOEXCEPT {
		1082	size_type __m = __alloc_traits::max_size(__alloc());
		1083	if (__m <= std::numeric_limits<size_type>::max() / 2) {
		1084	return __m - __alignment;
		1085	} else {
		1086	bool __uses_lsb = __endian_factor == 2;
		1087	return __uses_lsb ? __m - __alignment : (__m / 2) - __alignment;
		1088	}
		1089	}
		1090
		1091	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type capacity() const _NOEXCEPT {
972	return (__is_long() ? __get_long_cap() : static_cast<size_type>(__min_cap)) - 1;	1092	return (__is_long() ? __get_long_cap() : static_cast<size_type>(__min_cap)) - 1;
973	}	1093	}
974		1094
975	_LIBCPP_CONSTEXPR_AFTER_CXX17 void resize(size_type __n, value_type __c);	1095	_LIBCPP_CONSTEXPR_SINCE_CXX20 void resize(size_type __n, value_type __c);
976	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void resize(size_type __n) { resize(__n, value_type()); }	1096	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void resize(size_type __n) { resize(__n, value_type()); }
977		1097
978	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reserve(size_type __requested_capacity);	1098	_LIBCPP_CONSTEXPR_SINCE_CXX20 void reserve(size_type __requested_capacity);
979		1099
980	#if _LIBCPP_STD_VER > 20	1100	#if _LIBCPP_STD_VER > 20
981	template <class _Op>	1101	template <class _Op>
...	@@ -986,28 +1106,34 @@ public:	...	@@ -986,28 +1106,34 @@ public:
986	}	1106	}
987	#endif	1107	#endif
988		1108
989	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __resize_default_init(size_type __n);	1109	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __resize_default_init(size_type __n);
990		1110
991	_LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_HIDE_FROM_ABI void reserve() _NOEXCEPT { shrink_to_fit(); }	1111	_LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_HIDE_FROM_ABI void reserve() _NOEXCEPT { shrink_to_fit(); }
992	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void shrink_to_fit() _NOEXCEPT;	1112	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void shrink_to_fit() _NOEXCEPT;
993	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void clear() _NOEXCEPT;	1113	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void clear() _NOEXCEPT;
994		1114
995	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1115	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
996	bool empty() const _NOEXCEPT {return size() == 0;}	1116	bool empty() const _NOEXCEPT {return size() == 0;}
997		1117
998	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1118	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference operator[](size_type __pos) const _NOEXCEPT {
999	const_reference operator[](size_type __pos) const _NOEXCEPT;	1119	_LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
1000	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 reference operator[](size_type __pos) _NOEXCEPT;	1120	return *(data() + __pos);
		1121	}
		1122
		1123	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator[](size_type __pos) _NOEXCEPT {
		1124	_LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
		1125	return *(__get_pointer() + __pos);
		1126	}
1001		1127
1002	_LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference at(size_type __n) const;	1128	_LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference at(size_type __n) const;
1003	_LIBCPP_CONSTEXPR_AFTER_CXX17 reference at(size_type __n);	1129	_LIBCPP_CONSTEXPR_SINCE_CXX20 reference at(size_type __n);
1004		1130
1005	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator+=(const basic_string& __str) {	1131	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator+=(const basic_string& __str) {
1006	return append(__str);	1132	return append(__str);
1007	}	1133	}
1008		1134
1009	template <class _Tp>	1135	template <class _Tp>
1010	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1136	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1011	__enable_if_t	1137	__enable_if_t
1012	<	1138	<
1013	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	1139	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
...	@@ -1018,35 +1144,36 @@ public:	...	@@ -1018,35 +1144,36 @@ public:
1018	__self_view __sv = __t; return append(__sv);	1144	__self_view __sv = __t; return append(__sv);
1019	}	1145	}
1020		1146
1021	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator+=(const value_type* __s) {	1147	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator+=(const value_type* __s) {
1022	return append(__s);	1148	return append(__s);
1023	}	1149	}
1024		1150
1025	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& operator+=(value_type __c) {	1151	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator+=(value_type __c) {
1026	push_back(__c);	1152	push_back(__c);
1027	return *this;	1153	return *this;
1028	}	1154	}
1029		1155
1030	#ifndef _LIBCPP_CXX03_LANG	1156	#ifndef _LIBCPP_CXX03_LANG
1031	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1157	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1032	basic_string& operator+=(initializer_list<value_type> __il) { return append(__il); }	1158	basic_string& operator+=(initializer_list<value_type> __il) { return append(__il); }
1033	#endif // _LIBCPP_CXX03_LANG	1159	#endif // _LIBCPP_CXX03_LANG
1034		1160
1035	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1161	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const basic_string& __str) {
1036	basic_string& append(const basic_string& __str);	1162	return append(__str.data(), __str.size());
		1163	}
1037		1164
1038	template <class _Tp>	1165	template <class _Tp>
1039	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1166	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1040	__enable_if_t<	1167	__enable_if_t<
1041	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	1168	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
1042	&& !__is_same_uncvref<_Tp, basic_string>::value,	1169	&& !__is_same_uncvref<_Tp, basic_string>::value,
1043	basic_string&	1170	basic_string&
1044	>	1171	>
1045	append(const _Tp& __t) { __self_view __sv = __t; return append(__sv.data(), __sv.size()); }	1172	append(const _Tp& __t) { __self_view __sv = __t; return append(__sv.data(), __sv.size()); }
1046	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& append(const basic_string& __str, size_type __pos, size_type __n=npos);	1173	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const basic_string& __str, size_type __pos, size_type __n=npos);
1047		1174
1048	template <class _Tp>	1175	template <class _Tp>
1049	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1176	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1050	__enable_if_t	1177	__enable_if_t
1051	<	1178	<
1052	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	1179	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
...	@@ -1054,11 +1181,11 @@ public:	...	@@ -1054,11 +1181,11 @@ public:
1054	basic_string&	1181	basic_string&
1055	>	1182	>
1056	append(const _Tp& __t, size_type __pos, size_type __n=npos);	1183	append(const _Tp& __t, size_type __pos, size_type __n=npos);
1057	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& append(const value_type* __s, size_type __n);	1184	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* __s, size_type __n);
1058	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& append(const value_type* __s);	1185	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* __s);
1059	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& append(size_type __n, value_type __c);	1186	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(size_type __n, value_type __c);
1060		1187
1061	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1188	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1062	void __append_default_init(size_type __n);	1189	void __append_default_init(size_type __n);
1063		1190
1064	template<class _InputIterator>	1191	template<class _InputIterator>
...	@@ -1068,7 +1195,7 @@ public:	...	@@ -1068,7 +1195,7 @@ public:
1068	__is_exactly_cpp17_input_iterator<_InputIterator>::value,	1195	__is_exactly_cpp17_input_iterator<_InputIterator>::value,
1069	basic_string&	1196	basic_string&
1070	>	1197	>
1071	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1198	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1072	append(_InputIterator __first, _InputIterator __last) {	1199	append(_InputIterator __first, _InputIterator __last) {
1073	const basic_string __temp(__first, __last, __alloc());	1200	const basic_string __temp(__first, __last, __alloc());
1074	append(__temp.data(), __temp.size());	1201	append(__temp.data(), __temp.size());
...	@@ -1081,40 +1208,56 @@ public:	...	@@ -1081,40 +1208,56 @@ public:
1081	__is_cpp17_forward_iterator<_ForwardIterator>::value,	1208	__is_cpp17_forward_iterator<_ForwardIterator>::value,
1082	basic_string&	1209	basic_string&
1083	>	1210	>
1084	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1211	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1085	append(_ForwardIterator __first, _ForwardIterator __last);	1212	append(_ForwardIterator __first, _ForwardIterator __last);
1086		1213
1087	#ifndef _LIBCPP_CXX03_LANG	1214	#ifndef _LIBCPP_CXX03_LANG
1088	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1215	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1089	basic_string& append(initializer_list<value_type> __il) {return append(__il.begin(), __il.size());}	1216	basic_string& append(initializer_list<value_type> __il) {return append(__il.begin(), __il.size());}
1090	#endif // _LIBCPP_CXX03_LANG	1217	#endif // _LIBCPP_CXX03_LANG
1091		1218
1092	_LIBCPP_CONSTEXPR_AFTER_CXX17 void push_back(value_type __c);	1219	_LIBCPP_CONSTEXPR_SINCE_CXX20 void push_back(value_type __c);
1093	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void pop_back();	1220	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void pop_back();
1094	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 reference front() _NOEXCEPT;	1221
1095	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference front() const _NOEXCEPT;	1222	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference front() _NOEXCEPT {
1096	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 reference back() _NOEXCEPT;	1223	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
1097	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference back() const _NOEXCEPT;	1224	return *__get_pointer();
		1225	}
		1226
		1227	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference front() const _NOEXCEPT {
		1228	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
		1229	return *data();
		1230	}
		1231
		1232	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference back() _NOEXCEPT {
		1233	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
		1234	return *(__get_pointer() + size() - 1);
		1235	}
		1236
		1237	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference back() const _NOEXCEPT {
		1238	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
		1239	return *(data() + size() - 1);
		1240	}
1098		1241
1099	template <class _Tp>	1242	template <class _Tp>
1100	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1243	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1101	__enable_if_t	1244	__enable_if_t
1102	<	1245	<
1103	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1246	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1104	basic_string&	1247	basic_string&
1105	>	1248	>
1106	assign(const _Tp & __t) { __self_view __sv = __t; return assign(__sv.data(), __sv.size()); }	1249	assign(const _Tp & __t) { __self_view __sv = __t; return assign(__sv.data(), __sv.size()); }
1107	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1250	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1108	basic_string& assign(const basic_string& __str) { return *this = __str; }	1251	basic_string& assign(const basic_string& __str) { return *this = __str; }
1109	#ifndef _LIBCPP_CXX03_LANG	1252	#ifndef _LIBCPP_CXX03_LANG
1110	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1253	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1111	basic_string& assign(basic_string&& __str)	1254	basic_string& assign(basic_string&& __str)
1112	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))	1255	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))
1113	{this = std::move(__str); return this;}	1256	{this = std::move(__str); return this;}
1114	#endif	1257	#endif
1115	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& assign(const basic_string& __str, size_type __pos, size_type __n=npos);	1258	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const basic_string& __str, size_type __pos, size_type __n=npos);
1116	template <class _Tp>	1259	template <class _Tp>
1117	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1260	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1118	__enable_if_t	1261	__enable_if_t
1119	<	1262	<
1120	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	1263	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
...	@@ -1122,11 +1265,11 @@ public:	...	@@ -1122,11 +1265,11 @@ public:
1122	basic_string&	1265	basic_string&
1123	>	1266	>
1124	assign(const _Tp & __t, size_type __pos, size_type __n=npos);	1267	assign(const _Tp & __t, size_type __pos, size_type __n=npos);
1125	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& assign(const value_type* __s, size_type __n);	1268	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* __s, size_type __n);
1126	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& assign(const value_type* __s);	1269	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* __s);
1127	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& assign(size_type __n, value_type __c);	1270	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(size_type __n, value_type __c);
1128	template<class _InputIterator>	1271	template<class _InputIterator>
1129	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1272	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1130	__enable_if_t	1273	__enable_if_t
1131	<	1274	<
1132	__is_exactly_cpp17_input_iterator<_InputIterator>::value,	1275	__is_exactly_cpp17_input_iterator<_InputIterator>::value,
...	@@ -1134,7 +1277,7 @@ public:	...	@@ -1134,7 +1277,7 @@ public:
1134	>	1277	>
1135	assign(_InputIterator __first, _InputIterator __last);	1278	assign(_InputIterator __first, _InputIterator __last);
1136	template<class _ForwardIterator>	1279	template<class _ForwardIterator>
1137	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1280	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1138	__enable_if_t	1281	__enable_if_t
1139	<	1282	<
1140	__is_cpp17_forward_iterator<_ForwardIterator>::value,	1283	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -1142,15 +1285,17 @@ public:	...	@@ -1142,15 +1285,17 @@ public:
1142	>	1285	>
1143	assign(_ForwardIterator __first, _ForwardIterator __last);	1286	assign(_ForwardIterator __first, _ForwardIterator __last);
1144	#ifndef _LIBCPP_CXX03_LANG	1287	#ifndef _LIBCPP_CXX03_LANG
1145	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1288	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1146	basic_string& assign(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}	1289	basic_string& assign(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
1147	#endif // _LIBCPP_CXX03_LANG	1290	#endif // _LIBCPP_CXX03_LANG
1148		1291
1149	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1292	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
1150	basic_string& insert(size_type __pos1, const basic_string& __str);	1293	insert(size_type __pos1, const basic_string& __str) {
		1294	return insert(__pos1, __str.data(), __str.size());
		1295	}
1151		1296
1152	template <class _Tp>	1297	template <class _Tp>
1153	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1298	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1154	__enable_if_t	1299	__enable_if_t
1155	<	1300	<
1156	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1301	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -1160,23 +1305,31 @@ public:	...	@@ -1160,23 +1305,31 @@ public:
1160	{ __self_view __sv = __t; return insert(__pos1, __sv.data(), __sv.size()); }	1305	{ __self_view __sv = __t; return insert(__pos1, __sv.data(), __sv.size()); }
1161		1306
1162	template <class _Tp>	1307	template <class _Tp>
1163	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1308	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1164	__enable_if_t	1309	__enable_if_t
1165	<	1310	<
1166	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,	1311	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,
1167	basic_string&	1312	basic_string&
1168	>	1313	>
1169	insert(size_type __pos1, const _Tp& __t, size_type __pos2, size_type __n=npos);	1314	insert(size_type __pos1, const _Tp& __t, size_type __pos2, size_type __n=npos);
1170	_LIBCPP_CONSTEXPR_AFTER_CXX17	1315	_LIBCPP_CONSTEXPR_SINCE_CXX20
1171	basic_string& insert(size_type __pos1, const basic_string& __str, size_type __pos2, size_type __n=npos);	1316	basic_string& insert(size_type __pos1, const basic_string& __str, size_type __pos2, size_type __n=npos);
1172	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& insert(size_type __pos, const value_type* __s, size_type __n);	1317	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& insert(size_type __pos, const value_type* __s, size_type __n);
1173	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& insert(size_type __pos, const value_type* __s);	1318	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& insert(size_type __pos, const value_type* __s);
1174	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& insert(size_type __pos, size_type __n, value_type __c);	1319	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& insert(size_type __pos, size_type __n, value_type __c);
1175	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __pos, value_type __c);	1320	_LIBCPP_CONSTEXPR_SINCE_CXX20 iterator insert(const_iterator __pos, value_type __c);
1176	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1321
1177	iterator insert(const_iterator __pos, size_type __n, value_type __c);	1322	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator
		1323	insert(const_iterator __pos, size_type __n, value_type __c) {
		1324	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
		1325	"string::insert(iterator, n, value) called with an iterator not referring to this string");
		1326	difference_type __p = __pos - begin();
		1327	insert(static_cast<size_type>(__p), __n, __c);
		1328	return begin() + __p;
		1329	}
		1330
1178	template<class _InputIterator>	1331	template<class _InputIterator>
1179	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1332	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1180	__enable_if_t	1333	__enable_if_t
1181	<	1334	<
1182	__is_exactly_cpp17_input_iterator<_InputIterator>::value,	1335	__is_exactly_cpp17_input_iterator<_InputIterator>::value,
...	@@ -1184,7 +1337,7 @@ public:	...	@@ -1184,7 +1337,7 @@ public:
1184	>	1337	>
1185	insert(const_iterator __pos, _InputIterator __first, _InputIterator __last);	1338	insert(const_iterator __pos, _InputIterator __first, _InputIterator __last);
1186	template<class _ForwardIterator>	1339	template<class _ForwardIterator>
1187	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1340	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1188	__enable_if_t	1341	__enable_if_t
1189	<	1342	<
1190	__is_cpp17_forward_iterator<_ForwardIterator>::value,	1343	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -1192,47 +1345,53 @@ public:	...	@@ -1192,47 +1345,53 @@ public:
1192	>	1345	>
1193	insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last);	1346	insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last);
1194	#ifndef _LIBCPP_CXX03_LANG	1347	#ifndef _LIBCPP_CXX03_LANG
1195	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1348	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1196	iterator insert(const_iterator __pos, initializer_list<value_type> __il)	1349	iterator insert(const_iterator __pos, initializer_list<value_type> __il)
1197	{return insert(__pos, __il.begin(), __il.end());}	1350	{return insert(__pos, __il.begin(), __il.end());}
1198	#endif // _LIBCPP_CXX03_LANG	1351	#endif // _LIBCPP_CXX03_LANG
1199		1352
1200	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& erase(size_type __pos = 0, size_type __n = npos);	1353	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& erase(size_type __pos = 0, size_type __n = npos);
1201	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1354	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1202	iterator erase(const_iterator __pos);	1355	iterator erase(const_iterator __pos);
1203	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1356	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1204	iterator erase(const_iterator __first, const_iterator __last);	1357	iterator erase(const_iterator __first, const_iterator __last);
1205		1358
1206	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1359	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
1207	basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str);	1360	replace(size_type __pos1, size_type __n1, const basic_string& __str) {
		1361	return replace(__pos1, __n1, __str.data(), __str.size());
		1362	}
1208		1363
1209	template <class _Tp>	1364	template <class _Tp>
1210	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1365	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1211	__enable_if_t	1366	__enable_if_t
1212	<	1367	<
1213	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1368	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1214	basic_string&	1369	basic_string&
1215	>	1370	>
1216	replace(size_type __pos1, size_type __n1, const _Tp& __t) { __self_view __sv = __t; return replace(__pos1, __n1, __sv.data(), __sv.size()); }	1371	replace(size_type __pos1, size_type __n1, const _Tp& __t) { __self_view __sv = __t; return replace(__pos1, __n1, __sv.data(), __sv.size()); }
1217	_LIBCPP_CONSTEXPR_AFTER_CXX17	1372	_LIBCPP_CONSTEXPR_SINCE_CXX20
1218	basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos);	1373	basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos);
1219	template <class _Tp>	1374	template <class _Tp>
1220	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1375	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1221	__enable_if_t	1376	__enable_if_t
1222	<	1377	<
1223	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,	1378	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,
1224	basic_string&	1379	basic_string&
1225	>	1380	>
1226	replace(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos);	1381	replace(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos);
1227	_LIBCPP_CONSTEXPR_AFTER_CXX17	1382	_LIBCPP_CONSTEXPR_SINCE_CXX20
1228	basic_string& replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2);	1383	basic_string& replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2);
1229	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& replace(size_type __pos, size_type __n1, const value_type* __s);	1384	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& replace(size_type __pos, size_type __n1, const value_type* __s);
1230	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& replace(size_type __pos, size_type __n1, size_type __n2, value_type __c);	1385	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& replace(size_type __pos, size_type __n1, size_type __n2, value_type __c);
1231	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1386
1232	basic_string& replace(const_iterator __i1, const_iterator __i2, const basic_string& __str);	1387	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
		1388	replace(const_iterator __i1, const_iterator __i2, const basic_string& __str) {
		1389	return replace(
		1390	static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __str.data(), __str.size());
		1391	}
1233		1392
1234	template <class _Tp>	1393	template <class _Tp>
1235	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1394	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1236	__enable_if_t	1395	__enable_if_t
1237	<	1396	<
1238	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1397	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -1240,14 +1399,23 @@ public:	...	@@ -1240,14 +1399,23 @@ public:
1240	>	1399	>
1241	replace(const_iterator __i1, const_iterator __i2, const _Tp& __t) { __self_view __sv = __t; return replace(__i1 - begin(), __i2 - __i1, __sv); }	1400	replace(const_iterator __i1, const_iterator __i2, const _Tp& __t) { __self_view __sv = __t; return replace(__i1 - begin(), __i2 - __i1, __sv); }
1242		1401
1243	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1402	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
1244	basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n);	1403	replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n) {
1245	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1404	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s, __n);
1246	basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s);	1405	}
1247	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1406
1248	basic_string& replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c);	1407	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
		1408	replace(const_iterator __i1, const_iterator __i2, const value_type* __s) {
		1409	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s);
		1410	}
		1411
		1412	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string&
		1413	replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c) {
		1414	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __n, __c);
		1415	}
		1416
1249	template<class _InputIterator>	1417	template<class _InputIterator>
1250	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1418	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1251	__enable_if_t	1419	__enable_if_t
1252	<	1420	<
1253	__is_cpp17_input_iterator<_InputIterator>::value,	1421	__is_cpp17_input_iterator<_InputIterator>::value,
...	@@ -1255,16 +1423,31 @@ public:	...	@@ -1255,16 +1423,31 @@ public:
1255	>	1423	>
1256	replace(const_iterator __i1, const_iterator __i2, _InputIterator __j1, _InputIterator __j2);	1424	replace(const_iterator __i1, const_iterator __i2, _InputIterator __j1, _InputIterator __j2);
1257	#ifndef _LIBCPP_CXX03_LANG	1425	#ifndef _LIBCPP_CXX03_LANG
1258	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1426	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1259	basic_string& replace(const_iterator __i1, const_iterator __i2, initializer_list<value_type> __il)	1427	basic_string& replace(const_iterator __i1, const_iterator __i2, initializer_list<value_type> __il)
1260	{return replace(__i1, __i2, __il.begin(), __il.end());}	1428	{return replace(__i1, __i2, __il.begin(), __il.end());}
1261	#endif // _LIBCPP_CXX03_LANG	1429	#endif // _LIBCPP_CXX03_LANG
1262		1430
1263	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_type copy(value_type* __s, size_type __n, size_type __pos = 0) const;	1431	_LIBCPP_CONSTEXPR_SINCE_CXX20 size_type copy(value_type* __s, size_type __n, size_type __pos = 0) const;
1264	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
1265	basic_string substr(size_type __pos = 0, size_type __n = npos) const;
1266		1432
1267	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1433	#if _LIBCPP_STD_VER <= 20
		1434	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
		1435	basic_string substr(size_type __pos = 0, size_type __n = npos) const {
		1436	return basic_string(*this, __pos, __n);
		1437	}
		1438	#else
		1439	_LIBCPP_HIDE_FROM_ABI constexpr
		1440	basic_string substr(size_type __pos = 0, size_type __n = npos) const& {
		1441	return basic_string(*this, __pos, __n);
		1442	}
		1443
		1444	_LIBCPP_HIDE_FROM_ABI constexpr
		1445	basic_string substr(size_type __pos = 0, size_type __n = npos) && {
		1446	return basic_string(std::move(*this), __pos, __n);
		1447	}
		1448	#endif
		1449
		1450	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1268	void swap(basic_string& __str)	1451	void swap(basic_string& __str)
1269	#if _LIBCPP_STD_VER >= 14	1452	#if _LIBCPP_STD_VER >= 14
1270	_NOEXCEPT;	1453	_NOEXCEPT;
...	@@ -1273,129 +1456,129 @@ public:	...	@@ -1273,129 +1456,129 @@ public:
1273	__is_nothrow_swappable<allocator_type>::value);	1456	__is_nothrow_swappable<allocator_type>::value);
1274	#endif	1457	#endif
1275		1458
1276	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1459	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1277	const value_type* c_str() const _NOEXCEPT {return data();}	1460	const value_type* c_str() const _NOEXCEPT {return data();}
1278	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1461	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1279	const value_type* data() const _NOEXCEPT {return std::__to_address(__get_pointer());}	1462	const value_type* data() const _NOEXCEPT {return std::__to_address(__get_pointer());}
1280	#if _LIBCPP_STD_VER > 14 \|\| defined(_LIBCPP_BUILDING_LIBRARY)	1463	#if _LIBCPP_STD_VER > 14 \|\| defined(_LIBCPP_BUILDING_LIBRARY)
1281	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1464	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1282	value_type* data() _NOEXCEPT {return std::__to_address(__get_pointer());}	1465	value_type* data() _NOEXCEPT {return std::__to_address(__get_pointer());}
1283	#endif	1466	#endif
1284		1467
1285	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1468	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1286	allocator_type get_allocator() const _NOEXCEPT {return __alloc();}	1469	allocator_type get_allocator() const _NOEXCEPT {return __alloc();}
1287		1470
1288	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1471	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1289	size_type find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;	1472	size_type find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
1290		1473
1291	template <class _Tp>	1474	template <class _Tp>
1292	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1475	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1293	__enable_if_t	1476	__enable_if_t
1294	<	1477	<
1295	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1478	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1296	size_type	1479	size_type
1297	>	1480	>
1298	find(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT;	1481	find(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT;
1299	_LIBCPP_CONSTEXPR_AFTER_CXX17	1482	_LIBCPP_CONSTEXPR_SINCE_CXX20
1300	size_type find(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1483	size_type find(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1301	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1484	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1302	size_type find(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;	1485	size_type find(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
1303	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT;	1486	_LIBCPP_CONSTEXPR_SINCE_CXX20 size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT;
1304		1487
1305	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1488	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1306	size_type rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;	1489	size_type rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
1307		1490
1308	template <class _Tp>	1491	template <class _Tp>
1309	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1492	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1310	__enable_if_t	1493	__enable_if_t
1311	<	1494	<
1312	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1495	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1313	size_type	1496	size_type
1314	>	1497	>
1315	rfind(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;	1498	rfind(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;
1316	_LIBCPP_CONSTEXPR_AFTER_CXX17	1499	_LIBCPP_CONSTEXPR_SINCE_CXX20
1317	size_type rfind(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1500	size_type rfind(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1318	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1501	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1319	size_type rfind(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;	1502	size_type rfind(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
1320	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_type rfind(value_type __c, size_type __pos = npos) const _NOEXCEPT;	1503	_LIBCPP_CONSTEXPR_SINCE_CXX20 size_type rfind(value_type __c, size_type __pos = npos) const _NOEXCEPT;
1321		1504
1322	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1505	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1323	size_type find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;	1506	size_type find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
1324		1507
1325	template <class _Tp>	1508	template <class _Tp>
1326	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1509	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1327	__enable_if_t	1510	__enable_if_t
1328	<	1511	<
1329	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1512	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1330	size_type	1513	size_type
1331	>	1514	>
1332	find_first_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT;	1515	find_first_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT;
1333	_LIBCPP_CONSTEXPR_AFTER_CXX17	1516	_LIBCPP_CONSTEXPR_SINCE_CXX20
1334	size_type find_first_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1517	size_type find_first_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1335	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1518	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1336	size_type find_first_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;	1519	size_type find_first_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
1337	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1520	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1338	size_type find_first_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;	1521	size_type find_first_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
1339		1522
1340	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1523	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1341	size_type find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;	1524	size_type find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
1342		1525
1343	template <class _Tp>	1526	template <class _Tp>
1344	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1527	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1345	__enable_if_t	1528	__enable_if_t
1346	<	1529	<
1347	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1530	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1348	size_type	1531	size_type
1349	>	1532	>
1350	find_last_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;	1533	find_last_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;
1351	_LIBCPP_CONSTEXPR_AFTER_CXX17	1534	_LIBCPP_CONSTEXPR_SINCE_CXX20
1352	size_type find_last_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1535	size_type find_last_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1353	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1536	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1354	size_type find_last_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;	1537	size_type find_last_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
1355	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1538	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1356	size_type find_last_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;	1539	size_type find_last_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
1357		1540
1358	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1541	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1359	size_type find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;	1542	size_type find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
1360		1543
1361	template <class _Tp>	1544	template <class _Tp>
1362	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1545	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1363	__enable_if_t	1546	__enable_if_t
1364	<	1547	<
1365	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1548	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1366	size_type	1549	size_type
1367	>	1550	>
1368	find_first_not_of(const _Tp &__t, size_type __pos = 0) const _NOEXCEPT;	1551	find_first_not_of(const _Tp &__t, size_type __pos = 0) const _NOEXCEPT;
1369	_LIBCPP_CONSTEXPR_AFTER_CXX17	1552	_LIBCPP_CONSTEXPR_SINCE_CXX20
1370	size_type find_first_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1553	size_type find_first_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1371	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1554	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1372	size_type find_first_not_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;	1555	size_type find_first_not_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
1373	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1556	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1374	size_type find_first_not_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;	1557	size_type find_first_not_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
1375		1558
1376	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1559	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1377	size_type find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;	1560	size_type find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
1378		1561
1379	template <class _Tp>	1562	template <class _Tp>
1380	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1563	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1381	__enable_if_t	1564	__enable_if_t
1382	<	1565	<
1383	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1566	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
1384	size_type	1567	size_type
1385	>	1568	>
1386	find_last_not_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;	1569	find_last_not_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT;
1387	_LIBCPP_CONSTEXPR_AFTER_CXX17	1570	_LIBCPP_CONSTEXPR_SINCE_CXX20
1388	size_type find_last_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;	1571	size_type find_last_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
1389	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1572	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1390	size_type find_last_not_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;	1573	size_type find_last_not_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
1391	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1574	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1392	size_type find_last_not_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;	1575	size_type find_last_not_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
1393		1576
1394	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1577	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1395	int compare(const basic_string& __str) const _NOEXCEPT;	1578	int compare(const basic_string& __str) const _NOEXCEPT;
1396		1579
1397	template <class _Tp>	1580	template <class _Tp>
1398	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1581	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1399	__enable_if_t	1582	__enable_if_t
1400	<	1583	<
1401	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1584	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -1404,7 +1587,7 @@ public:	...	@@ -1404,7 +1587,7 @@ public:
1404	compare(const _Tp &__t) const _NOEXCEPT;	1587	compare(const _Tp &__t) const _NOEXCEPT;
1405		1588
1406	template <class _Tp>	1589	template <class _Tp>
1407	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_AFTER_CXX17	1590	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS _LIBCPP_CONSTEXPR_SINCE_CXX20
1408	__enable_if_t	1591	__enable_if_t
1409	<	1592	<
1410	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	1593	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -1412,23 +1595,23 @@ public:	...	@@ -1412,23 +1595,23 @@ public:
1412	>	1595	>
1413	compare(size_type __pos1, size_type __n1, const _Tp& __t) const;	1596	compare(size_type __pos1, size_type __n1, const _Tp& __t) const;
1414		1597
1415	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1598	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1416	int compare(size_type __pos1, size_type __n1, const basic_string& __str) const;	1599	int compare(size_type __pos1, size_type __n1, const basic_string& __str) const;
1417	_LIBCPP_CONSTEXPR_AFTER_CXX17	1600	_LIBCPP_CONSTEXPR_SINCE_CXX20
1418	int compare(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2,	1601	int compare(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2,
1419	size_type __n2 = npos) const;	1602	size_type __n2 = npos) const;
1420		1603
1421	template <class _Tp>	1604	template <class _Tp>
1422	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1605	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1423	__enable_if_t	1606	__enable_if_t
1424	<	1607	<
1425	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,	1608	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value,
1426	int	1609	int
1427	>	1610	>
1428	compare(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos) const;	1611	compare(size_type __pos1, size_type __n1, const _Tp& __t, size_type __pos2, size_type __n2=npos) const;
1429	_LIBCPP_CONSTEXPR_AFTER_CXX17 int compare(const value_type* __s) const _NOEXCEPT;	1612	_LIBCPP_CONSTEXPR_SINCE_CXX20 int compare(const value_type* __s) const _NOEXCEPT;
1430	_LIBCPP_CONSTEXPR_AFTER_CXX17 int compare(size_type __pos1, size_type __n1, const value_type* __s) const;	1613	_LIBCPP_CONSTEXPR_SINCE_CXX20 int compare(size_type __pos1, size_type __n1, const value_type* __s) const;
1431	_LIBCPP_CONSTEXPR_AFTER_CXX17	1614	_LIBCPP_CONSTEXPR_SINCE_CXX20
1432	int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const;	1615	int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const;
1433		1616
1434	#if _LIBCPP_STD_VER > 17	1617	#if _LIBCPP_STD_VER > 17
...	@@ -1471,9 +1654,9 @@ public:	...	@@ -1471,9 +1654,9 @@ public:
1471	{ return __self_view(data(), size()).contains(__s); }	1654	{ return __self_view(data(), size()).contains(__s); }
1472	#endif	1655	#endif
1473		1656
1474	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 bool __invariants() const;	1657	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __invariants() const;
1475		1658
1476	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __clear_and_shrink() _NOEXCEPT;	1659	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __clear_and_shrink() _NOEXCEPT;
1477		1660
1478	#ifdef _LIBCPP_ENABLE_DEBUG_MODE	1661	#ifdef _LIBCPP_ENABLE_DEBUG_MODE
1479		1662
...	@@ -1486,20 +1669,20 @@ public:	...	@@ -1486,20 +1669,20 @@ public:
1486		1669
1487	private:	1670	private:
1488	template<class _Alloc>	1671	template<class _Alloc>
1489	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1672	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1490	bool friend operator==(const basic_string<char, char_traits<char>, _Alloc>& __lhs,	1673	bool friend operator==(const basic_string<char, char_traits<char>, _Alloc>& __lhs,
1491	const basic_string<char, char_traits<char>, _Alloc>& __rhs) _NOEXCEPT;	1674	const basic_string<char, char_traits<char>, _Alloc>& __rhs) _NOEXCEPT;
1492		1675
1493	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __shrink_or_extend(size_type __target_capacity);	1676	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __shrink_or_extend(size_type __target_capacity);
1494		1677
1495	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1678	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1496	bool __is_long() const _NOEXCEPT {	1679	bool __is_long() const _NOEXCEPT {
1497	if (__libcpp_is_constant_evaluated())	1680	if (__libcpp_is_constant_evaluated())
1498	return true;	1681	return true;
1499	return __r_.first().__s.__is_long_;	1682	return __r_.first().__s.__is_long_;
1500	}	1683	}
1501		1684
1502	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __begin_lifetime(pointer __begin, size_type __n) {	1685	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __begin_lifetime(pointer __begin, size_type __n) {
1503	#if _LIBCPP_STD_VER > 17	1686	#if _LIBCPP_STD_VER > 17
1504	if (__libcpp_is_constant_evaluated()) {	1687	if (__libcpp_is_constant_evaluated()) {
1505	for (size_type __i = 0; __i != __n; ++__i)	1688	for (size_type __i = 0; __i != __n; ++__i)
...	@@ -1511,8 +1694,8 @@ private:	...	@@ -1511,8 +1694,8 @@ private:
1511	#endif // _LIBCPP_STD_VER > 17	1694	#endif // _LIBCPP_STD_VER > 17
1512	}	1695	}
1513		1696
1514	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __default_init() {	1697	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __default_init() {
1515	__zero();	1698	__r_.first() = __rep();
1516	if (__libcpp_is_constant_evaluated()) {	1699	if (__libcpp_is_constant_evaluated()) {
1517	size_type __sz = __recommend(0) + 1;	1700	size_type __sz = __recommend(0) + 1;
1518	pointer __ptr = __alloc_traits::allocate(__alloc(), __sz);	1701	pointer __ptr = __alloc_traits::allocate(__alloc(), __sz);
...	@@ -1523,7 +1706,7 @@ private:	...	@@ -1523,7 +1706,7 @@ private:
1523	}	1706	}
1524	}	1707	}
1525		1708
1526	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __deallocate_constexpr() {	1709	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __deallocate_constexpr() {
1527	if (__libcpp_is_constant_evaluated() && __get_pointer() != nullptr)	1710	if (__libcpp_is_constant_evaluated() && __get_pointer() != nullptr)
1528	__alloc_traits::deallocate(__alloc(), __get_pointer(), __get_long_cap());	1711	__alloc_traits::deallocate(__alloc(), __get_pointer(), __get_long_cap());
1529	}	1712	}
...	@@ -1534,7 +1717,7 @@ private:	...	@@ -1534,7 +1717,7 @@ private:
1534	}	1717	}
1535		1718
1536	template <class _ForwardIterator>	1719	template <class _ForwardIterator>
1537	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	1720	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
1538	iterator __insert_from_safe_copy(size_type __n, size_type __ip, _ForwardIterator __first, _ForwardIterator __last) {	1721	iterator __insert_from_safe_copy(size_type __n, size_type __ip, _ForwardIterator __first, _ForwardIterator __last) {
1539	size_type __sz = size();	1722	size_type __sz = size();
1540	size_type __cap = capacity();	1723	size_type __cap = capacity();
...	@@ -1560,76 +1743,71 @@ private:	...	@@ -1560,76 +1743,71 @@ private:
1560	return begin() + __ip;	1743	return begin() + __ip;
1561	}	1744	}
1562		1745
1563	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 allocator_type& __alloc() _NOEXCEPT { return __r_.second(); }	1746	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 allocator_type& __alloc() _NOEXCEPT { return __r_.second(); }
1564	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR const allocator_type& __alloc() const _NOEXCEPT { return __r_.second(); }	1747	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR const allocator_type& __alloc() const _NOEXCEPT { return __r_.second(); }
1565		1748
1566	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1749	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1567	void __set_short_size(size_type __s) _NOEXCEPT {	1750	void __set_short_size(size_type __s) _NOEXCEPT {
1568	_LIBCPP_ASSERT(__s < __min_cap, "__s should never be greater than or equal to the short string capacity");	1751	_LIBCPP_ASSERT(__s < __min_cap, "__s should never be greater than or equal to the short string capacity");
1569	__r_.first().__s.__size_ = __s;	1752	__r_.first().__s.__size_ = __s;
1570	__r_.first().__s.__is_long_ = false;	1753	__r_.first().__s.__is_long_ = false;
1571	}	1754	}
1572		1755
1573	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1756	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1574	size_type __get_short_size() const _NOEXCEPT {	1757	size_type __get_short_size() const _NOEXCEPT {
1575	_LIBCPP_ASSERT(!__r_.first().__s.__is_long_, "String has to be short when trying to get the short size");	1758	_LIBCPP_ASSERT(!__r_.first().__s.__is_long_, "String has to be short when trying to get the short size");
1576	return __r_.first().__s.__size_;	1759	return __r_.first().__s.__size_;
1577	}	1760	}
1578		1761
1579	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1762	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1580	void __set_long_size(size_type __s) _NOEXCEPT	1763	void __set_long_size(size_type __s) _NOEXCEPT
1581	{__r_.first().__l.__size_ = __s;}	1764	{__r_.first().__l.__size_ = __s;}
1582	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1765	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1583	size_type __get_long_size() const _NOEXCEPT	1766	size_type __get_long_size() const _NOEXCEPT
1584	{return __r_.first().__l.__size_;}	1767	{return __r_.first().__l.__size_;}
1585	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1768	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1586	void __set_size(size_type __s) _NOEXCEPT	1769	void __set_size(size_type __s) _NOEXCEPT
1587	{if (__is_long()) __set_long_size(__s); else __set_short_size(__s);}	1770	{if (__is_long()) __set_long_size(__s); else __set_short_size(__s);}
1588		1771
1589	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1772	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1590	void __set_long_cap(size_type __s) _NOEXCEPT {	1773	void __set_long_cap(size_type __s) _NOEXCEPT {
1591	__r_.first().__l.__cap_ = __s / __endian_factor;	1774	__r_.first().__l.__cap_ = __s / __endian_factor;
1592	__r_.first().__l.__is_long_ = true;	1775	__r_.first().__l.__is_long_ = true;
1593	}	1776	}
1594		1777
1595	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1778	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1596	size_type __get_long_cap() const _NOEXCEPT {	1779	size_type __get_long_cap() const _NOEXCEPT {
1597	return __r_.first().__l.__cap_ * __endian_factor;	1780	return __r_.first().__l.__cap_ * __endian_factor;
1598	}	1781	}
1599		1782
1600	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1783	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1601	void __set_long_pointer(pointer __p) _NOEXCEPT	1784	void __set_long_pointer(pointer __p) _NOEXCEPT
1602	{__r_.first().__l.__data_ = __p;}	1785	{__r_.first().__l.__data_ = __p;}
1603	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1786	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1604	pointer __get_long_pointer() _NOEXCEPT	1787	pointer __get_long_pointer() _NOEXCEPT
1605	{return __r_.first().__l.__data_;}	1788	{return __r_.first().__l.__data_;}
1606	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1789	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1607	const_pointer __get_long_pointer() const _NOEXCEPT	1790	const_pointer __get_long_pointer() const _NOEXCEPT
1608	{return __r_.first().__l.__data_;}	1791	{return __r_.first().__l.__data_;}
1609	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1792	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1610	pointer __get_short_pointer() _NOEXCEPT	1793	pointer __get_short_pointer() _NOEXCEPT
1611	{return pointer_traits<pointer>::pointer_to(__r_.first().__s.__data_[0]);}	1794	{return pointer_traits<pointer>::pointer_to(__r_.first().__s.__data_[0]);}
1612	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1795	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1613	const_pointer __get_short_pointer() const _NOEXCEPT	1796	const_pointer __get_short_pointer() const _NOEXCEPT
1614	{return pointer_traits<const_pointer>::pointer_to(__r_.first().__s.__data_[0]);}	1797	{return pointer_traits<const_pointer>::pointer_to(__r_.first().__s.__data_[0]);}
1615	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1798	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1616	pointer __get_pointer() _NOEXCEPT	1799	pointer __get_pointer() _NOEXCEPT
1617	{return __is_long() ? __get_long_pointer() : __get_short_pointer();}	1800	{return __is_long() ? __get_long_pointer() : __get_short_pointer();}
1618	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1801	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1619	const_pointer __get_pointer() const _NOEXCEPT	1802	const_pointer __get_pointer() const _NOEXCEPT
1620	{return __is_long() ? __get_long_pointer() : __get_short_pointer();}	1803	{return __is_long() ? __get_long_pointer() : __get_short_pointer();}
1621		1804
1622	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17
1623	void __zero() _NOEXCEPT {
1624	__r_.first() = __rep();
1625	}
1626
1627	template <size_type __a> static	1805	template <size_type __a> static
1628	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1806	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1629	size_type __align_it(size_type __s) _NOEXCEPT	1807	size_type __align_it(size_type __s) _NOEXCEPT
1630	{return (__s + (__a-1)) & ~(__a-1);}	1808	{return (__s + (__a-1)) & ~(__a-1);}
1631	enum {__alignment = 16};	1809	enum {__alignment = 16};
1632	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1810	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1633	size_type __recommend(size_type __s) _NOEXCEPT	1811	size_type __recommend(size_type __s) _NOEXCEPT
1634	{	1812	{
1635	if (__s < __min_cap) {	1813	if (__s < __min_cap) {
...	@@ -1644,11 +1822,11 @@ private:	...	@@ -1644,11 +1822,11 @@ private:
1644	return __guess;	1822	return __guess;
1645	}	1823	}
1646		1824
1647	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	1825	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1648	void __init(const value_type* __s, size_type __sz, size_type __reserve);	1826	void __init(const value_type* __s, size_type __sz, size_type __reserve);
1649	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	1827	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1650	void __init(const value_type* __s, size_type __sz);	1828	void __init(const value_type* __s, size_type __sz);
1651	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	1829	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1652	void __init(size_type __n, value_type __c);	1830	void __init(size_type __n, value_type __c);
1653		1831
1654	// Slow path for the (inlined) copy constructor for 'long' strings.	1832	// Slow path for the (inlined) copy constructor for 'long' strings.
...	@@ -1659,10 +1837,10 @@ private:	...	@@ -1659,10 +1837,10 @@ private:
1659	// to call the __init() functions as those are marked as inline which may	1837	// to call the __init() functions as those are marked as inline which may
1660	// result in over-aggressive inlining by the compiler, where our aim is	1838	// result in over-aggressive inlining by the compiler, where our aim is
1661	// to only inline the fast path code directly in the ctor.	1839	// to only inline the fast path code directly in the ctor.
1662	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __init_copy_ctor_external(const value_type* __s, size_type __sz);	1840	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __init_copy_ctor_external(const value_type* __s, size_type __sz);
1663		1841
1664	template <class _InputIterator>	1842	template <class _InputIterator>
1665	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	1843	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1666	__enable_if_t	1844	__enable_if_t
1667	<	1845	<
1668	__is_exactly_cpp17_input_iterator<_InputIterator>::value	1846	__is_exactly_cpp17_input_iterator<_InputIterator>::value
...	@@ -1670,17 +1848,17 @@ private:	...	@@ -1670,17 +1848,17 @@ private:
1670	__init(_InputIterator __first, _InputIterator __last);	1848	__init(_InputIterator __first, _InputIterator __last);
1671		1849
1672	template <class _ForwardIterator>	1850	template <class _ForwardIterator>
1673	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	1851	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1674	__enable_if_t	1852	__enable_if_t
1675	<	1853	<
1676	__is_cpp17_forward_iterator<_ForwardIterator>::value	1854	__is_cpp17_forward_iterator<_ForwardIterator>::value
1677	>	1855	>
1678	__init(_ForwardIterator __first, _ForwardIterator __last);	1856	__init(_ForwardIterator __first, _ForwardIterator __last);
1679		1857
1680	_LIBCPP_CONSTEXPR_AFTER_CXX17	1858	_LIBCPP_CONSTEXPR_SINCE_CXX20
1681	void __grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,	1859	void __grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
1682	size_type __n_copy, size_type __n_del, size_type __n_add = 0);	1860	size_type __n_copy, size_type __n_del, size_type __n_add = 0);
1683	_LIBCPP_CONSTEXPR_AFTER_CXX17	1861	_LIBCPP_CONSTEXPR_SINCE_CXX20
1684	void __grow_by_and_replace(size_type __old_cap, size_type __delta_cap, size_type __old_sz,	1862	void __grow_by_and_replace(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
1685	size_type __n_copy, size_type __n_del,	1863	size_type __n_copy, size_type __n_del,
1686	size_type __n_add, const value_type* __p_new_stuff);	1864	size_type __n_add, const value_type* __p_new_stuff);
...	@@ -1689,21 +1867,22 @@ private:	...	@@ -1689,21 +1867,22 @@ private:
1689	// have proof that the input does not alias the current instance.	1867	// have proof that the input does not alias the current instance.
1690	// For example, operator=(basic_string) performs a 'self' check.	1868	// For example, operator=(basic_string) performs a 'self' check.
1691	template <bool __is_short>	1869	template <bool __is_short>
1692	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& __assign_no_alias(const value_type* __s, size_type __n);	1870	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& __assign_no_alias(const value_type* __s, size_type __n);
1693		1871
1694	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1872	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __erase_to_end(size_type __pos) {
1695	void __erase_to_end(size_type __pos);	1873	__null_terminate_at(std::__to_address(__get_pointer()), __pos);
		1874	}
1696		1875
1697	// __erase_external_with_move is invoked for erase() invocations where	1876	// __erase_external_with_move is invoked for erase() invocations where
1698	// `n ~= npos`, likely requiring memory moves on the string data.	1877	// `n ~= npos`, likely requiring memory moves on the string data.
1699	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __erase_external_with_move(size_type __pos, size_type __n);	1878	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __erase_external_with_move(size_type __pos, size_type __n);
1700		1879
1701	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1880	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1702	void __copy_assign_alloc(const basic_string& __str)	1881	void __copy_assign_alloc(const basic_string& __str)
1703	{__copy_assign_alloc(__str, integral_constant<bool,	1882	{__copy_assign_alloc(__str, integral_constant<bool,
1704	__alloc_traits::propagate_on_container_copy_assignment::value>());}	1883	__alloc_traits::propagate_on_container_copy_assignment::value>());}
1705		1884
1706	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1885	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1707	void __copy_assign_alloc(const basic_string& __str, true_type)	1886	void __copy_assign_alloc(const basic_string& __str, true_type)
1708	{	1887	{
1709	if (__alloc() == __str.__alloc())	1888	if (__alloc() == __str.__alloc())
...	@@ -1720,7 +1899,7 @@ private:	...	@@ -1720,7 +1899,7 @@ private:
1720	allocator_type __a = __str.__alloc();	1899	allocator_type __a = __str.__alloc();
1721	auto __allocation = std::__allocate_at_least(__a, __str.__get_long_cap());	1900	auto __allocation = std::__allocate_at_least(__a, __str.__get_long_cap());
1722	__begin_lifetime(__allocation.ptr, __allocation.count);	1901	__begin_lifetime(__allocation.ptr, __allocation.count);
1723	__clear_and_shrink();	1902	__alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
1724	__alloc() = std::move(__a);	1903	__alloc() = std::move(__a);
1725	__set_long_pointer(__allocation.ptr);	1904	__set_long_pointer(__allocation.ptr);
1726	__set_long_cap(__allocation.count);	1905	__set_long_cap(__allocation.count);
...	@@ -1729,15 +1908,15 @@ private:	...	@@ -1729,15 +1908,15 @@ private:
1729	}	1908	}
1730	}	1909	}
1731		1910
1732	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1911	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1733	void __copy_assign_alloc(const basic_string&, false_type) _NOEXCEPT	1912	void __copy_assign_alloc(const basic_string&, false_type) _NOEXCEPT
1734	{}	1913	{}
1735		1914
1736	#ifndef _LIBCPP_CXX03_LANG	1915	#ifndef _LIBCPP_CXX03_LANG
1737	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1916	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1738	void __move_assign(basic_string& __str, false_type)	1917	void __move_assign(basic_string& __str, false_type)
1739	_NOEXCEPT_(__alloc_traits::is_always_equal::value);	1918	_NOEXCEPT_(__alloc_traits::is_always_equal::value);
1740	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1919	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1741	void __move_assign(basic_string& __str, true_type)	1920	void __move_assign(basic_string& __str, true_type)
1742	#if _LIBCPP_STD_VER > 14	1921	#if _LIBCPP_STD_VER > 14
1743	_NOEXCEPT;	1922	_NOEXCEPT;
...	@@ -1746,7 +1925,7 @@ private:	...	@@ -1746,7 +1925,7 @@ private:
1746	#endif	1925	#endif
1747	#endif	1926	#endif
1748		1927
1749	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1928	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1750	void	1929	void
1751	__move_assign_alloc(basic_string& __str)	1930	__move_assign_alloc(basic_string& __str)
1752	_NOEXCEPT_(	1931	_NOEXCEPT_(
...	@@ -1755,20 +1934,20 @@ private:	...	@@ -1755,20 +1934,20 @@ private:
1755	{__move_assign_alloc(__str, integral_constant<bool,	1934	{__move_assign_alloc(__str, integral_constant<bool,
1756	__alloc_traits::propagate_on_container_move_assignment::value>());}	1935	__alloc_traits::propagate_on_container_move_assignment::value>());}
1757		1936
1758	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1937	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1759	void __move_assign_alloc(basic_string& __c, true_type)	1938	void __move_assign_alloc(basic_string& __c, true_type)
1760	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)	1939	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
1761	{	1940	{
1762	__alloc() = std::move(__c.__alloc());	1941	__alloc() = std::move(__c.__alloc());
1763	}	1942	}
1764		1943
1765	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1944	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1766	void __move_assign_alloc(basic_string&, false_type)	1945	void __move_assign_alloc(basic_string&, false_type)
1767	_NOEXCEPT	1946	_NOEXCEPT
1768	{}	1947	{}
1769		1948
1770	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& __assign_external(const value_type* __s);	1949	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& __assign_external(const value_type* __s);
1771	_LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string& __assign_external(const value_type* __s, size_type __n);	1950	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& __assign_external(const value_type* __s, size_type __n);
1772		1951
1773	// Assigns the value in __s, guaranteed to be __n < __min_cap in length.	1952	// Assigns the value in __s, guaranteed to be __n < __min_cap in length.
1774	inline basic_string& __assign_short(const value_type* __s, size_type __n) {	1953	inline basic_string& __assign_short(const value_type* __s, size_type __n) {
...	@@ -1780,7 +1959,7 @@ private:	...	@@ -1780,7 +1959,7 @@ private:
1780	return *this;	1959	return *this;
1781	}	1960	}
1782		1961
1783	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1962	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1784	basic_string& __null_terminate_at(value_type* __p, size_type __newsz) {	1963	basic_string& __null_terminate_at(value_type* __p, size_type __newsz) {
1785	__set_size(__newsz);	1964	__set_size(__newsz);
1786	__invalidate_iterators_past(__newsz);	1965	__invalidate_iterators_past(__newsz);
...	@@ -1788,10 +1967,10 @@ private:	...	@@ -1788,10 +1967,10 @@ private:
1788	return *this;	1967	return *this;
1789	}	1968	}
1790		1969
1791	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __invalidate_iterators_past(size_type);	1970	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __invalidate_iterators_past(size_type);
1792		1971
1793	template<class _Tp>	1972	template<class _Tp>
1794	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	1973	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1795	bool __addr_in_range(_Tp&& __t) const {	1974	bool __addr_in_range(_Tp&& __t) const {
1796	// assume that the ranges overlap, because we can't check during constant evaluation	1975	// assume that the ranges overlap, because we can't check during constant evaluation
1797	if (__libcpp_is_constant_evaluated())	1976	if (__libcpp_is_constant_evaluated())
...	@@ -1810,11 +1989,11 @@ private:	...	@@ -1810,11 +1989,11 @@ private:
1810	std::__throw_out_of_range("basic_string");	1989	std::__throw_out_of_range("basic_string");
1811	}	1990	}
1812		1991
1813	friend _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string operator+<>(const basic_string&, const basic_string&);	1992	friend _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string operator+<>(const basic_string&, const basic_string&);
1814	friend _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string operator+<>(const value_type*, const basic_string&);	1993	friend _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string operator+<>(const value_type*, const basic_string&);
1815	friend _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string operator+<>(value_type, const basic_string&);	1994	friend _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string operator+<>(value_type, const basic_string&);
1816	friend _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string operator+<>(const basic_string&, const value_type*);	1995	friend _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string operator+<>(const basic_string&, const value_type*);
1817	friend _LIBCPP_CONSTEXPR_AFTER_CXX17 basic_string operator+<>(const basic_string&, value_type);	1996	friend _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string operator+<>(const basic_string&, value_type);
1818	};	1997	};
1819		1998
1820	// These declarations must appear before any functions are implicitly used	1999	// These declarations must appear before any functions are implicitly used
...	@@ -1863,7 +2042,7 @@ basic_string(basic_string_view<_CharT, _Traits>, _Sz, _Sz, const _Allocator& = _	...	@@ -1863,7 +2042,7 @@ basic_string(basic_string_view<_CharT, _Traits>, _Sz, _Sz, const _Allocator& = _
1863	#endif	2042	#endif
1864		2043
1865	template <class _CharT, class _Traits, class _Allocator>	2044	template <class _CharT, class _Traits, class _Allocator>
1866	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2045	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
1867	void	2046	void
1868	basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type __pos)	2047	basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type __pos)
1869	{	2048	{
...	@@ -1893,37 +2072,13 @@ basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type	...	@@ -1893,37 +2072,13 @@ basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type
1893	}	2072	}
1894		2073
1895	template <class _CharT, class _Traits, class _Allocator>	2074	template <class _CharT, class _Traits, class _Allocator>
1896	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2075	_LIBCPP_CONSTEXPR_SINCE_CXX20
1897	basic_string<_CharT, _Traits, _Allocator>::basic_string()
1898	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
1899	: __r_(__default_init_tag(), __default_init_tag())
1900	{
1901	std::__debug_db_insert_c(this);
1902	__default_init();
1903	}
1904
1905	template <class _CharT, class _Traits, class _Allocator>
1906	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
1907	basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
1908	#if _LIBCPP_STD_VER <= 14
1909	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
1910	#else
1911	_NOEXCEPT
1912	#endif
1913	: __r_(__default_init_tag(), __a)
1914	{
1915	std::__debug_db_insert_c(this);
1916	__default_init();
1917	}
1918
1919	template <class _CharT, class _Traits, class _Allocator>
1920	_LIBCPP_CONSTEXPR_AFTER_CXX17
1921	void basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s,	2076	void basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s,
1922	size_type __sz,	2077	size_type __sz,
1923	size_type __reserve)	2078	size_type __reserve)
1924	{	2079	{
1925	if (__libcpp_is_constant_evaluated())	2080	if (__libcpp_is_constant_evaluated())
1926	__zero();	2081	__r_.first() = __rep();
1927	if (__reserve > max_size())	2082	if (__reserve > max_size())
1928	__throw_length_error();	2083	__throw_length_error();
1929	pointer __p;	2084	pointer __p;
...	@@ -1946,12 +2101,12 @@ void basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s,	...	@@ -1946,12 +2101,12 @@ void basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s,
1946	}	2101	}
1947		2102
1948	template <class _CharT, class _Traits, class _Allocator>	2103	template <class _CharT, class _Traits, class _Allocator>
1949	_LIBCPP_CONSTEXPR_AFTER_CXX17	2104	_LIBCPP_CONSTEXPR_SINCE_CXX20
1950	void	2105	void
1951	basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz)	2106	basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz)
1952	{	2107	{
1953	if (__libcpp_is_constant_evaluated())	2108	if (__libcpp_is_constant_evaluated())
1954	__zero();	2109	__r_.first() = __rep();
1955	if (__sz > max_size())	2110	if (__sz > max_size())
1956	__throw_length_error();	2111	__throw_length_error();
1957	pointer __p;	2112	pointer __p;
...	@@ -1975,7 +2130,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_ty	...	@@ -1975,7 +2130,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_ty
1975		2130
1976	template <class _CharT, class _Traits, class _Allocator>	2131	template <class _CharT, class _Traits, class _Allocator>
1977	template <class>	2132	template <class>
1978	_LIBCPP_CONSTEXPR_AFTER_CXX17	2133	_LIBCPP_CONSTEXPR_SINCE_CXX20
1979	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const _Allocator& __a)	2134	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const _Allocator& __a)
1980	: __r_(__default_init_tag(), __a)	2135	: __r_(__default_init_tag(), __a)
1981	{	2136	{
...	@@ -1985,32 +2140,12 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const	...	@@ -1985,32 +2140,12 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const
1985	}	2140	}
1986		2141
1987	template <class _CharT, class _Traits, class _Allocator>	2142	template <class _CharT, class _Traits, class _Allocator>
1988	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2143	_LIBCPP_CONSTEXPR_SINCE_CXX20
1989	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, size_type __n)
1990	: __r_(__default_init_tag(), __default_init_tag())
1991	{
1992	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n) detected nullptr");
1993	__init(__s, __n);
1994	std::__debug_db_insert_c(this);
1995	}
1996
1997	template <class _CharT, class _Traits, class _Allocator>
1998	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
1999	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, size_type __n, const _Allocator& __a)
2000	: __r_(__default_init_tag(), __a)
2001	{
2002	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");
2003	__init(__s, __n);
2004	std::__debug_db_insert_c(this);
2005	}
2006
2007	template <class _CharT, class _Traits, class _Allocator>
2008	_LIBCPP_CONSTEXPR_AFTER_CXX17
2009	basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str)	2144	basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str)
2010	: __r_(__default_init_tag(), __alloc_traits::select_on_container_copy_construction(__str.__alloc()))	2145	: __r_(__default_init_tag(), __alloc_traits::select_on_container_copy_construction(__str.__alloc()))
2011	{	2146	{
2012	if (!__str.__is_long())	2147	if (!__str.__is_long())
2013	__r_.first().__r = __str.__r_.first().__r;	2148	__r_.first() = __str.__r_.first();
2014	else	2149	else
2015	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()),	2150	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()),
2016	__str.__get_long_size());	2151	__str.__get_long_size());
...	@@ -2018,13 +2153,13 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st	...	@@ -2018,13 +2153,13 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st
2018	}	2153	}
2019		2154
2020	template <class _CharT, class _Traits, class _Allocator>	2155	template <class _CharT, class _Traits, class _Allocator>
2021	_LIBCPP_CONSTEXPR_AFTER_CXX17	2156	_LIBCPP_CONSTEXPR_SINCE_CXX20
2022	basic_string<_CharT, _Traits, _Allocator>::basic_string(	2157	basic_string<_CharT, _Traits, _Allocator>::basic_string(
2023	const basic_string& __str, const allocator_type& __a)	2158	const basic_string& __str, const allocator_type& __a)
2024	: __r_(__default_init_tag(), __a)	2159	: __r_(__default_init_tag(), __a)
2025	{	2160	{
2026	if (!__str.__is_long())	2161	if (!__str.__is_long())
2027	__r_.first().__r = __str.__r_.first().__r;	2162	__r_.first() = __str.__r_.first();
2028	else	2163	else
2029	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()),	2164	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()),
2030	__str.__get_long_size());	2165	__str.__get_long_size());
...	@@ -2032,11 +2167,12 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(	...	@@ -2032,11 +2167,12 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(
2032	}	2167	}
2033		2168
2034	template <class _CharT, class _Traits, class _Allocator>	2169	template <class _CharT, class _Traits, class _Allocator>
2035	_LIBCPP_CONSTEXPR_AFTER_CXX17	2170	_LIBCPP_CONSTEXPR_SINCE_CXX20
2036	void basic_string<_CharT, _Traits, _Allocator>::__init_copy_ctor_external(	2171	void basic_string<_CharT, _Traits, _Allocator>::__init_copy_ctor_external(
2037	const value_type* __s, size_type __sz) {	2172	const value_type* __s, size_type __sz) {
2038	if (__libcpp_is_constant_evaluated())	2173	if (__libcpp_is_constant_evaluated())
2039	__zero();	2174	__r_.first() = __rep();
		2175
2040	pointer __p;	2176	pointer __p;
2041	if (__fits_in_sso(__sz)) {	2177	if (__fits_in_sso(__sz)) {
2042	__p = __get_short_pointer();	2178	__p = __get_short_pointer();
...	@@ -2054,55 +2190,14 @@ void basic_string<_CharT, _Traits, _Allocator>::__init_copy_ctor_external(	...	@@ -2054,55 +2190,14 @@ void basic_string<_CharT, _Traits, _Allocator>::__init_copy_ctor_external(
2054	traits_type::copy(std::__to_address(__p), __s, __sz + 1);	2190	traits_type::copy(std::__to_address(__p), __s, __sz + 1);
2055	}	2191	}
2056		2192
2057	#ifndef _LIBCPP_CXX03_LANG
2058
2059	template <class _CharT, class _Traits, class _Allocator>
2060	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2061	basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str)
2062	#if _LIBCPP_STD_VER <= 14
2063	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
2064	#else
2065	_NOEXCEPT
2066	#endif
2067	: __r_(std::move(__str.__r_))
2068	{
2069	__str.__default_init();
2070	std::__debug_db_insert_c(this);
2071	if (__is_long())
2072	std::__debug_db_swap(this, &__str);
2073	}
2074
2075	template <class _CharT, class _Traits, class _Allocator>	2193	template <class _CharT, class _Traits, class _Allocator>
2076	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2194	_LIBCPP_CONSTEXPR_SINCE_CXX20
2077	basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str, const allocator_type& __a)
2078	: __r_(__default_init_tag(), __a)
2079	{
2080	if (__str.__is_long() && __a != __str.__alloc()) // copy, not move
2081	__init(std::__to_address(__str.__get_long_pointer()), __str.__get_long_size());
2082	else
2083	{
2084	if (__libcpp_is_constant_evaluated()) {
2085	__zero();
2086	__r_.first().__l = __str.__r_.first().__l;
2087	} else {
2088	__r_.first().__r = __str.__r_.first().__r;
2089	}
2090	__str.__default_init();
2091	}
2092	std::__debug_db_insert_c(this);
2093	if (__is_long())
2094	std::__debug_db_swap(this, &__str);
2095	}
2096
2097	#endif // _LIBCPP_CXX03_LANG
2098
2099	template <class _CharT, class _Traits, class _Allocator>
2100	_LIBCPP_CONSTEXPR_AFTER_CXX17
2101	void	2195	void
2102	basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)	2196	basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)
2103	{	2197	{
2104	if (__libcpp_is_constant_evaluated())	2198	if (__libcpp_is_constant_evaluated())
2105	__zero();	2199	__r_.first() = __rep();
		2200
2106	if (__n > max_size())	2201	if (__n > max_size())
2107	__throw_length_error();	2202	__throw_length_error();
2108	pointer __p;	2203	pointer __p;
...	@@ -2124,18 +2219,9 @@ basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)	...	@@ -2124,18 +2219,9 @@ basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)
2124	traits_type::assign(__p[__n], value_type());	2219	traits_type::assign(__p[__n], value_type());
2125	}	2220	}
2126		2221
2127	template <class _CharT, class _Traits, class _Allocator>
2128	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2129	basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __c)
2130	: __r_(__default_init_tag(), __default_init_tag())
2131	{
2132	__init(__n, __c);
2133	std::__debug_db_insert_c(this);
2134	}
2135
2136	template <class _CharT, class _Traits, class _Allocator>	2222	template <class _CharT, class _Traits, class _Allocator>
2137	template <class>	2223	template <class>
2138	_LIBCPP_CONSTEXPR_AFTER_CXX17	2224	_LIBCPP_CONSTEXPR_SINCE_CXX20
2139	basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __c, const _Allocator& __a)	2225	basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __c, const _Allocator& __a)
2140	: __r_(__default_init_tag(), __a)	2226	: __r_(__default_init_tag(), __a)
2141	{	2227	{
...	@@ -2144,7 +2230,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __	...	@@ -2144,7 +2230,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, _CharT __
2144	}	2230	}
2145		2231
2146	template <class _CharT, class _Traits, class _Allocator>	2232	template <class _CharT, class _Traits, class _Allocator>
2147	_LIBCPP_CONSTEXPR_AFTER_CXX17	2233	_LIBCPP_CONSTEXPR_SINCE_CXX20
2148	basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str,	2234	basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str,
2149	size_type __pos, size_type __n,	2235	size_type __pos, size_type __n,
2150	const _Allocator& __a)	2236	const _Allocator& __a)
...	@@ -2157,22 +2243,9 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st	...	@@ -2157,22 +2243,9 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st
2157	std::__debug_db_insert_c(this);	2243	std::__debug_db_insert_c(this);
2158	}	2244	}
2159		2245
2160	template <class _CharT, class _Traits, class _Allocator>
2161	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2162	basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, size_type __pos,
2163	const _Allocator& __a)
2164	: __r_(__default_init_tag(), __a)
2165	{
2166	size_type __str_sz = __str.size();
2167	if (__pos > __str_sz)
2168	__throw_out_of_range();
2169	__init(__str.data() + __pos, __str_sz - __pos);
2170	std::__debug_db_insert_c(this);
2171	}
2172
2173	template <class _CharT, class _Traits, class _Allocator>	2246	template <class _CharT, class _Traits, class _Allocator>
2174	template <class _Tp, class>	2247	template <class _Tp, class>
2175	_LIBCPP_CONSTEXPR_AFTER_CXX17	2248	_LIBCPP_CONSTEXPR_SINCE_CXX20
2176	basic_string<_CharT, _Traits, _Allocator>::basic_string(	2249	basic_string<_CharT, _Traits, _Allocator>::basic_string(
2177	const _Tp& __t, size_type __pos, size_type __n, const allocator_type& __a)	2250	const _Tp& __t, size_type __pos, size_type __n, const allocator_type& __a)
2178	: __r_(__default_init_tag(), __a)	2251	: __r_(__default_init_tag(), __a)
...	@@ -2185,7 +2258,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(	...	@@ -2185,7 +2258,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(
2185		2258
2186	template <class _CharT, class _Traits, class _Allocator>	2259	template <class _CharT, class _Traits, class _Allocator>
2187	template <class _Tp, class>	2260	template <class _Tp, class>
2188	_LIBCPP_CONSTEXPR_AFTER_CXX17	2261	_LIBCPP_CONSTEXPR_SINCE_CXX20
2189	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t)	2262	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t)
2190	: __r_(__default_init_tag(), __default_init_tag())	2263	: __r_(__default_init_tag(), __default_init_tag())
2191	{	2264	{
...	@@ -2196,7 +2269,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t)	...	@@ -2196,7 +2269,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t)
2196		2269
2197	template <class _CharT, class _Traits, class _Allocator>	2270	template <class _CharT, class _Traits, class _Allocator>
2198	template <class _Tp, class>	2271	template <class _Tp, class>
2199	_LIBCPP_CONSTEXPR_AFTER_CXX17	2272	_LIBCPP_CONSTEXPR_SINCE_CXX20
2200	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t, const _Allocator& __a)	2273	basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t, const _Allocator& __a)
2201	: __r_(__default_init_tag(), __a)	2274	: __r_(__default_init_tag(), __a)
2202	{	2275	{
...	@@ -2207,7 +2280,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t, const _	...	@@ -2207,7 +2280,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const _Tp & __t, const _
2207		2280
2208	template <class _CharT, class _Traits, class _Allocator>	2281	template <class _CharT, class _Traits, class _Allocator>
2209	template <class _InputIterator>	2282	template <class _InputIterator>
2210	_LIBCPP_CONSTEXPR_AFTER_CXX17	2283	_LIBCPP_CONSTEXPR_SINCE_CXX20
2211	__enable_if_t	2284	__enable_if_t
2212	<	2285	<
2213	__is_exactly_cpp17_input_iterator<_InputIterator>::value	2286	__is_exactly_cpp17_input_iterator<_InputIterator>::value
...	@@ -2234,7 +2307,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_InputIterator __first, _Input	...	@@ -2234,7 +2307,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_InputIterator __first, _Input
2234		2307
2235	template <class _CharT, class _Traits, class _Allocator>	2308	template <class _CharT, class _Traits, class _Allocator>
2236	template <class _ForwardIterator>	2309	template <class _ForwardIterator>
2237	_LIBCPP_CONSTEXPR_AFTER_CXX17	2310	_LIBCPP_CONSTEXPR_SINCE_CXX20
2238	__enable_if_t	2311	__enable_if_t
2239	<	2312	<
2240	__is_cpp17_forward_iterator<_ForwardIterator>::value	2313	__is_cpp17_forward_iterator<_ForwardIterator>::value
...	@@ -2242,7 +2315,7 @@ __enable_if_t	...	@@ -2242,7 +2315,7 @@ __enable_if_t
2242	basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _ForwardIterator __last)	2315	basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _ForwardIterator __last)
2243	{	2316	{
2244	if (__libcpp_is_constant_evaluated())	2317	if (__libcpp_is_constant_evaluated())
2245	__zero();	2318	__r_.first() = __rep();
2246	size_type __sz = static_cast<size_type>(std::distance(__first, __last));	2319	size_type __sz = static_cast<size_type>(std::distance(__first, __last));
2247	if (__sz > max_size())	2320	if (__sz > max_size())
2248	__throw_length_error();	2321	__throw_length_error();
...	@@ -2281,52 +2354,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _For	...	@@ -2281,52 +2354,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _For
2281	}	2354	}
2282		2355
2283	template <class _CharT, class _Traits, class _Allocator>	2356	template <class _CharT, class _Traits, class _Allocator>
2284	template<class _InputIterator, class>	2357	_LIBCPP_CONSTEXPR_SINCE_CXX20
2285	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2286	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last)
2287	: __r_(__default_init_tag(), __default_init_tag())
2288	{
2289	__init(__first, __last);
2290	std::__debug_db_insert_c(this);
2291	}
2292
2293	template <class _CharT, class _Traits, class _Allocator>
2294	template<class _InputIterator, class>
2295	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2296	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last,
2297	const allocator_type& __a)
2298	: __r_(__default_init_tag(), __a)
2299	{
2300	__init(__first, __last);
2301	std::__debug_db_insert_c(this);
2302	}
2303
2304	#ifndef _LIBCPP_CXX03_LANG
2305
2306	template <class _CharT, class _Traits, class _Allocator>
2307	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2308	basic_string<_CharT, _Traits, _Allocator>::basic_string(
2309	initializer_list<_CharT> __il)
2310	: __r_(__default_init_tag(), __default_init_tag())
2311	{
2312	__init(__il.begin(), __il.end());
2313	std::__debug_db_insert_c(this);
2314	}
2315
2316	template <class _CharT, class _Traits, class _Allocator>
2317	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2318	basic_string<_CharT, _Traits, _Allocator>::basic_string(
2319	initializer_list<_CharT> __il, const _Allocator& __a)
2320	: __r_(__default_init_tag(), __a)
2321	{
2322	__init(__il.begin(), __il.end());
2323	std::__debug_db_insert_c(this);
2324	}
2325
2326	#endif // _LIBCPP_CXX03_LANG
2327
2328	template <class _CharT, class _Traits, class _Allocator>
2329	_LIBCPP_CONSTEXPR_AFTER_CXX17
2330	basic_string<_CharT, _Traits, _Allocator>::~basic_string()	2358	basic_string<_CharT, _Traits, _Allocator>::~basic_string()
2331	{	2359	{
2332	std::__debug_db_erase_c(this);	2360	std::__debug_db_erase_c(this);
...	@@ -2335,7 +2363,7 @@ basic_string<_CharT, _Traits, _Allocator>::~basic_string()	...	@@ -2335,7 +2363,7 @@ basic_string<_CharT, _Traits, _Allocator>::~basic_string()
2335	}	2363	}
2336		2364
2337	template <class _CharT, class _Traits, class _Allocator>	2365	template <class _CharT, class _Traits, class _Allocator>
2338	_LIBCPP_CONSTEXPR_AFTER_CXX17	2366	_LIBCPP_CONSTEXPR_SINCE_CXX20
2339	void	2367	void
2340	basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace	2368	basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace
2341	(size_type __old_cap, size_type __delta_cap, size_type __old_sz,	2369	(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
...	@@ -2372,7 +2400,7 @@ basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace	...	@@ -2372,7 +2400,7 @@ basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace
2372		2400
2373	template <class _CharT, class _Traits, class _Allocator>	2401	template <class _CharT, class _Traits, class _Allocator>
2374	void	2402	void
2375	_LIBCPP_CONSTEXPR_AFTER_CXX17	2403	_LIBCPP_CONSTEXPR_SINCE_CXX20
2376	basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,	2404	basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
2377	size_type __n_copy, size_type __n_del, size_type __n_add)	2405	size_type __n_copy, size_type __n_del, size_type __n_add)
2378	{	2406	{
...	@@ -2405,7 +2433,7 @@ basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_t	...	@@ -2405,7 +2433,7 @@ basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_t
2405		2433
2406	template <class _CharT, class _Traits, class _Allocator>	2434	template <class _CharT, class _Traits, class _Allocator>
2407	template <bool __is_short>	2435	template <bool __is_short>
2408	_LIBCPP_CONSTEXPR_AFTER_CXX17	2436	_LIBCPP_CONSTEXPR_SINCE_CXX20
2409	basic_string<_CharT, _Traits, _Allocator>&	2437	basic_string<_CharT, _Traits, _Allocator>&
2410	basic_string<_CharT, _Traits, _Allocator>::__assign_no_alias(	2438	basic_string<_CharT, _Traits, _Allocator>::__assign_no_alias(
2411	const value_type* __s, size_type __n) {	2439	const value_type* __s, size_type __n) {
...	@@ -2424,7 +2452,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_no_alias(	...	@@ -2424,7 +2452,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_no_alias(
2424	}	2452	}
2425		2453
2426	template <class _CharT, class _Traits, class _Allocator>	2454	template <class _CharT, class _Traits, class _Allocator>
2427	_LIBCPP_CONSTEXPR_AFTER_CXX17	2455	_LIBCPP_CONSTEXPR_SINCE_CXX20
2428	basic_string<_CharT, _Traits, _Allocator>&	2456	basic_string<_CharT, _Traits, _Allocator>&
2429	basic_string<_CharT, _Traits, _Allocator>::__assign_external(	2457	basic_string<_CharT, _Traits, _Allocator>::__assign_external(
2430	const value_type* __s, size_type __n) {	2458	const value_type* __s, size_type __n) {
...	@@ -2441,7 +2469,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_external(	...	@@ -2441,7 +2469,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_external(
2441	}	2469	}
2442		2470
2443	template <class _CharT, class _Traits, class _Allocator>	2471	template <class _CharT, class _Traits, class _Allocator>
2444	_LIBCPP_CONSTEXPR_AFTER_CXX17	2472	_LIBCPP_CONSTEXPR_SINCE_CXX20
2445	basic_string<_CharT, _Traits, _Allocator>&	2473	basic_string<_CharT, _Traits, _Allocator>&
2446	basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_type __n)	2474	basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_type __n)
2447	{	2475	{
...	@@ -2452,7 +2480,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_ty	...	@@ -2452,7 +2480,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_ty
2452	}	2480	}
2453		2481
2454	template <class _CharT, class _Traits, class _Allocator>	2482	template <class _CharT, class _Traits, class _Allocator>
2455	_LIBCPP_CONSTEXPR_AFTER_CXX17	2483	_LIBCPP_CONSTEXPR_SINCE_CXX20
2456	basic_string<_CharT, _Traits, _Allocator>&	2484	basic_string<_CharT, _Traits, _Allocator>&
2457	basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)	2485	basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)
2458	{	2486	{
...	@@ -2468,7 +2496,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)	...	@@ -2468,7 +2496,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)
2468	}	2496	}
2469		2497
2470	template <class _CharT, class _Traits, class _Allocator>	2498	template <class _CharT, class _Traits, class _Allocator>
2471	_LIBCPP_CONSTEXPR_AFTER_CXX17	2499	_LIBCPP_CONSTEXPR_SINCE_CXX20
2472	basic_string<_CharT, _Traits, _Allocator>&	2500	basic_string<_CharT, _Traits, _Allocator>&
2473	basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)	2501	basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)
2474	{	2502	{
...	@@ -2490,7 +2518,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)	...	@@ -2490,7 +2518,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)
2490	}	2518	}
2491		2519
2492	template <class _CharT, class _Traits, class _Allocator>	2520	template <class _CharT, class _Traits, class _Allocator>
2493	_LIBCPP_CONSTEXPR_AFTER_CXX17	2521	_LIBCPP_CONSTEXPR_SINCE_CXX20
2494	basic_string<_CharT, _Traits, _Allocator>&	2522	basic_string<_CharT, _Traits, _Allocator>&
2495	basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)	2523	basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)
2496	{	2524	{
...	@@ -2498,7 +2526,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)	...	@@ -2498,7 +2526,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)
2498	__copy_assign_alloc(__str);	2526	__copy_assign_alloc(__str);
2499	if (!__is_long()) {	2527	if (!__is_long()) {
2500	if (!__str.__is_long()) {	2528	if (!__str.__is_long()) {
2501	__r_.first().__r = __str.__r_.first().__r;	2529	__r_.first() = __str.__r_.first();
2502	} else {	2530	} else {
2503	return __assign_no_alias<true>(__str.data(), __str.size());	2531	return __assign_no_alias<true>(__str.data(), __str.size());
2504	}	2532	}
...	@@ -2512,7 +2540,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)	...	@@ -2512,7 +2540,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)
2512	#ifndef _LIBCPP_CXX03_LANG	2540	#ifndef _LIBCPP_CXX03_LANG
2513		2541
2514	template <class _CharT, class _Traits, class _Allocator>	2542	template <class _CharT, class _Traits, class _Allocator>
2515	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2543	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
2516	void	2544	void
2517	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, false_type)	2545	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, false_type)
2518	_NOEXCEPT_(__alloc_traits::is_always_equal::value)	2546	_NOEXCEPT_(__alloc_traits::is_always_equal::value)
...	@@ -2524,7 +2552,7 @@ basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, fa	...	@@ -2524,7 +2552,7 @@ basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, fa
2524	}	2552	}
2525		2553
2526	template <class _CharT, class _Traits, class _Allocator>	2554	template <class _CharT, class _Traits, class _Allocator>
2527	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2555	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
2528	void	2556	void
2529	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)	2557	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)
2530	#if _LIBCPP_STD_VER > 14	2558	#if _LIBCPP_STD_VER > 14
...	@@ -2553,22 +2581,11 @@ basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, tr	...	@@ -2553,22 +2581,11 @@ basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, tr
2553	}	2581	}
2554	}	2582	}
2555		2583
2556	template <class _CharT, class _Traits, class _Allocator>
2557	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
2558	basic_string<_CharT, _Traits, _Allocator>&
2559	basic_string<_CharT, _Traits, _Allocator>::operator=(basic_string&& __str)
2560	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))
2561	{
2562	__move_assign(__str, integral_constant<bool,
2563	__alloc_traits::propagate_on_container_move_assignment::value>());
2564	return *this;
2565	}
2566
2567	#endif	2584	#endif
2568		2585
2569	template <class _CharT, class _Traits, class _Allocator>	2586	template <class _CharT, class _Traits, class _Allocator>
2570	template<class _InputIterator>	2587	template<class _InputIterator>
2571	_LIBCPP_CONSTEXPR_AFTER_CXX17	2588	_LIBCPP_CONSTEXPR_SINCE_CXX20
2572	__enable_if_t	2589	__enable_if_t
2573	<	2590	<
2574	__is_exactly_cpp17_input_iterator<_InputIterator>::value,	2591	__is_exactly_cpp17_input_iterator<_InputIterator>::value,
...	@@ -2583,7 +2600,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(_InputIterator __first, _Input	...	@@ -2583,7 +2600,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(_InputIterator __first, _Input
2583		2600
2584	template <class _CharT, class _Traits, class _Allocator>	2601	template <class _CharT, class _Traits, class _Allocator>
2585	template<class _ForwardIterator>	2602	template<class _ForwardIterator>
2586	_LIBCPP_CONSTEXPR_AFTER_CXX17	2603	_LIBCPP_CONSTEXPR_SINCE_CXX20
2587	__enable_if_t	2604	__enable_if_t
2588	<	2605	<
2589	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2606	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -2619,7 +2636,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(_ForwardIterator __first, _For	...	@@ -2619,7 +2636,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(_ForwardIterator __first, _For
2619	}	2636	}
2620		2637
2621	template <class _CharT, class _Traits, class _Allocator>	2638	template <class _CharT, class _Traits, class _Allocator>
2622	_LIBCPP_CONSTEXPR_AFTER_CXX17	2639	_LIBCPP_CONSTEXPR_SINCE_CXX20
2623	basic_string<_CharT, _Traits, _Allocator>&	2640	basic_string<_CharT, _Traits, _Allocator>&
2624	basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, size_type __pos, size_type __n)	2641	basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, size_type __pos, size_type __n)
2625	{	2642	{
...	@@ -2631,7 +2648,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, siz	...	@@ -2631,7 +2648,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, siz
2631		2648
2632	template <class _CharT, class _Traits, class _Allocator>	2649	template <class _CharT, class _Traits, class _Allocator>
2633	template <class _Tp>	2650	template <class _Tp>
2634	_LIBCPP_CONSTEXPR_AFTER_CXX17	2651	_LIBCPP_CONSTEXPR_SINCE_CXX20
2635	__enable_if_t	2652	__enable_if_t
2636	<	2653	<
2637	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	2654	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
...	@@ -2649,14 +2666,14 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const _Tp & __t, size_type __p	...	@@ -2649,14 +2666,14 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const _Tp & __t, size_type __p
2649		2666
2650		2667
2651	template <class _CharT, class _Traits, class _Allocator>	2668	template <class _CharT, class _Traits, class _Allocator>
2652	_LIBCPP_CONSTEXPR_AFTER_CXX17	2669	_LIBCPP_CONSTEXPR_SINCE_CXX20
2653	basic_string<_CharT, _Traits, _Allocator>&	2670	basic_string<_CharT, _Traits, _Allocator>&
2654	basic_string<_CharT, _Traits, _Allocator>::__assign_external(const value_type* __s) {	2671	basic_string<_CharT, _Traits, _Allocator>::__assign_external(const value_type* __s) {
2655	return __assign_external(__s, traits_type::length(__s));	2672	return __assign_external(__s, traits_type::length(__s));
2656	}	2673	}
2657		2674
2658	template <class _CharT, class _Traits, class _Allocator>	2675	template <class _CharT, class _Traits, class _Allocator>
2659	_LIBCPP_CONSTEXPR_AFTER_CXX17	2676	_LIBCPP_CONSTEXPR_SINCE_CXX20
2660	basic_string<_CharT, _Traits, _Allocator>&	2677	basic_string<_CharT, _Traits, _Allocator>&
2661	basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)	2678	basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)
2662	{	2679	{
...	@@ -2670,7 +2687,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)	...	@@ -2670,7 +2687,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)
2670	// append	2687	// append
2671		2688
2672	template <class _CharT, class _Traits, class _Allocator>	2689	template <class _CharT, class _Traits, class _Allocator>
2673	_LIBCPP_CONSTEXPR_AFTER_CXX17	2690	_LIBCPP_CONSTEXPR_SINCE_CXX20
2674	basic_string<_CharT, _Traits, _Allocator>&	2691	basic_string<_CharT, _Traits, _Allocator>&
2675	basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_type __n)	2692	basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_type __n)
2676	{	2693	{
...	@@ -2694,7 +2711,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_ty	...	@@ -2694,7 +2711,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_ty
2694	}	2711	}
2695		2712
2696	template <class _CharT, class _Traits, class _Allocator>	2713	template <class _CharT, class _Traits, class _Allocator>
2697	_LIBCPP_CONSTEXPR_AFTER_CXX17	2714	_LIBCPP_CONSTEXPR_SINCE_CXX20
2698	basic_string<_CharT, _Traits, _Allocator>&	2715	basic_string<_CharT, _Traits, _Allocator>&
2699	basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)	2716	basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)
2700	{	2717	{
...	@@ -2714,7 +2731,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)	...	@@ -2714,7 +2731,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)
2714	}	2731	}
2715		2732
2716	template <class _CharT, class _Traits, class _Allocator>	2733	template <class _CharT, class _Traits, class _Allocator>
2717	_LIBCPP_CONSTEXPR_AFTER_CXX17 inline void	2734	_LIBCPP_CONSTEXPR_SINCE_CXX20 inline void
2718	basic_string<_CharT, _Traits, _Allocator>::__append_default_init(size_type __n)	2735	basic_string<_CharT, _Traits, _Allocator>::__append_default_init(size_type __n)
2719	{	2736	{
2720	if (__n)	2737	if (__n)
...	@@ -2731,7 +2748,7 @@ basic_string<_CharT, _Traits, _Allocator>::__append_default_init(size_type __n)	...	@@ -2731,7 +2748,7 @@ basic_string<_CharT, _Traits, _Allocator>::__append_default_init(size_type __n)
2731	}	2748	}
2732		2749
2733	template <class _CharT, class _Traits, class _Allocator>	2750	template <class _CharT, class _Traits, class _Allocator>
2734	_LIBCPP_CONSTEXPR_AFTER_CXX17	2751	_LIBCPP_CONSTEXPR_SINCE_CXX20
2735	void	2752	void
2736	basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)	2753	basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)
2737	{	2754	{
...	@@ -2770,7 +2787,7 @@ basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)	...	@@ -2770,7 +2787,7 @@ basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)
2770		2787
2771	template <class _CharT, class _Traits, class _Allocator>	2788	template <class _CharT, class _Traits, class _Allocator>
2772	template<class _ForwardIterator>	2789	template<class _ForwardIterator>
2773	_LIBCPP_CONSTEXPR_AFTER_CXX17	2790	_LIBCPP_CONSTEXPR_SINCE_CXX20
2774	__enable_if_t	2791	__enable_if_t
2775	<	2792	<
2776	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2793	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -2805,15 +2822,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(	...	@@ -2805,15 +2822,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(
2805	}	2822	}
2806		2823
2807	template <class _CharT, class _Traits, class _Allocator>	2824	template <class _CharT, class _Traits, class _Allocator>
2808	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2825	_LIBCPP_CONSTEXPR_SINCE_CXX20
2809	basic_string<_CharT, _Traits, _Allocator>&
2810	basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str)
2811	{
2812	return append(__str.data(), __str.size());
2813	}
2814
2815	template <class _CharT, class _Traits, class _Allocator>
2816	_LIBCPP_CONSTEXPR_AFTER_CXX17
2817	basic_string<_CharT, _Traits, _Allocator>&	2826	basic_string<_CharT, _Traits, _Allocator>&
2818	basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, size_type __pos, size_type __n)	2827	basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, size_type __pos, size_type __n)
2819	{	2828	{
...	@@ -2825,7 +2834,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, siz	...	@@ -2825,7 +2834,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, siz
2825		2834
2826	template <class _CharT, class _Traits, class _Allocator>	2835	template <class _CharT, class _Traits, class _Allocator>
2827	template <class _Tp>	2836	template <class _Tp>
2828	_LIBCPP_CONSTEXPR_AFTER_CXX17	2837	_LIBCPP_CONSTEXPR_SINCE_CXX20
2829	__enable_if_t	2838	__enable_if_t
2830	<	2839	<
2831	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,	2840	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,
...	@@ -2841,7 +2850,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const _Tp & __t, size_type __p	...	@@ -2841,7 +2850,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const _Tp & __t, size_type __p
2841	}	2850	}
2842		2851
2843	template <class _CharT, class _Traits, class _Allocator>	2852	template <class _CharT, class _Traits, class _Allocator>
2844	_LIBCPP_CONSTEXPR_AFTER_CXX17	2853	_LIBCPP_CONSTEXPR_SINCE_CXX20
2845	basic_string<_CharT, _Traits, _Allocator>&	2854	basic_string<_CharT, _Traits, _Allocator>&
2846	basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)	2855	basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)
2847	{	2856	{
...	@@ -2852,7 +2861,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)	...	@@ -2852,7 +2861,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)
2852	// insert	2861	// insert
2853		2862
2854	template <class _CharT, class _Traits, class _Allocator>	2863	template <class _CharT, class _Traits, class _Allocator>
2855	_LIBCPP_CONSTEXPR_AFTER_CXX17	2864	_LIBCPP_CONSTEXPR_SINCE_CXX20
2856	basic_string<_CharT, _Traits, _Allocator>&	2865	basic_string<_CharT, _Traits, _Allocator>&
2857	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s, size_type __n)	2866	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s, size_type __n)
2858	{	2867	{
...	@@ -2892,7 +2901,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t	...	@@ -2892,7 +2901,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t
2892	}	2901	}
2893		2902
2894	template <class _CharT, class _Traits, class _Allocator>	2903	template <class _CharT, class _Traits, class _Allocator>
2895	_LIBCPP_CONSTEXPR_AFTER_CXX17	2904	_LIBCPP_CONSTEXPR_SINCE_CXX20
2896	basic_string<_CharT, _Traits, _Allocator>&	2905	basic_string<_CharT, _Traits, _Allocator>&
2897	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n, value_type __c)	2906	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n, value_type __c)
2898	{	2907	{
...	@@ -2925,7 +2934,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n	...	@@ -2925,7 +2934,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n
2925		2934
2926	template <class _CharT, class _Traits, class _Allocator>	2935	template <class _CharT, class _Traits, class _Allocator>
2927	template<class _InputIterator>	2936	template<class _InputIterator>
2928	_LIBCPP_CONSTEXPR_AFTER_CXX17	2937	_LIBCPP_CONSTEXPR_SINCE_CXX20
2929	__enable_if_t	2938	__enable_if_t
2930	<	2939	<
2931	__is_exactly_cpp17_input_iterator<_InputIterator>::value,	2940	__is_exactly_cpp17_input_iterator<_InputIterator>::value,
...	@@ -2942,7 +2951,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _InputIt	...	@@ -2942,7 +2951,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _InputIt
2942		2951
2943	template <class _CharT, class _Traits, class _Allocator>	2952	template <class _CharT, class _Traits, class _Allocator>
2944	template<class _ForwardIterator>	2953	template<class _ForwardIterator>
2945	_LIBCPP_CONSTEXPR_AFTER_CXX17	2954	_LIBCPP_CONSTEXPR_SINCE_CXX20
2946	__enable_if_t	2955	__enable_if_t
2947	<	2956	<
2948	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2957	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -2970,15 +2979,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _Forward	...	@@ -2970,15 +2979,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _Forward
2970	}	2979	}
2971		2980
2972	template <class _CharT, class _Traits, class _Allocator>	2981	template <class _CharT, class _Traits, class _Allocator>
2973	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	2982	_LIBCPP_CONSTEXPR_SINCE_CXX20
2974	basic_string<_CharT, _Traits, _Allocator>&
2975	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str)
2976	{
2977	return insert(__pos1, __str.data(), __str.size());
2978	}
2979
2980	template <class _CharT, class _Traits, class _Allocator>
2981	_LIBCPP_CONSTEXPR_AFTER_CXX17
2982	basic_string<_CharT, _Traits, _Allocator>&	2983	basic_string<_CharT, _Traits, _Allocator>&
2983	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str,	2984	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str,
2984	size_type __pos2, size_type __n)	2985	size_type __pos2, size_type __n)
...	@@ -2991,7 +2992,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_	...	@@ -2991,7 +2992,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_
2991		2992
2992	template <class _CharT, class _Traits, class _Allocator>	2993	template <class _CharT, class _Traits, class _Allocator>
2993	template <class _Tp>	2994	template <class _Tp>
2994	_LIBCPP_CONSTEXPR_AFTER_CXX17	2995	_LIBCPP_CONSTEXPR_SINCE_CXX20
2995	__enable_if_t	2996	__enable_if_t
2996	<	2997	<
2997	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,	2998	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,
...	@@ -3008,7 +3009,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const _Tp& _	...	@@ -3008,7 +3009,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const _Tp& _
3008	}	3009	}
3009		3010
3010	template <class _CharT, class _Traits, class _Allocator>	3011	template <class _CharT, class _Traits, class _Allocator>
3011	_LIBCPP_CONSTEXPR_AFTER_CXX17	3012	_LIBCPP_CONSTEXPR_SINCE_CXX20
3012	basic_string<_CharT, _Traits, _Allocator>&	3013	basic_string<_CharT, _Traits, _Allocator>&
3013	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s)	3014	basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s)
3014	{	3015	{
...	@@ -3017,7 +3018,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t	...	@@ -3017,7 +3018,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t
3017	}	3018	}
3018		3019
3019	template <class _CharT, class _Traits, class _Allocator>	3020	template <class _CharT, class _Traits, class _Allocator>
3020	_LIBCPP_CONSTEXPR_AFTER_CXX17	3021	_LIBCPP_CONSTEXPR_SINCE_CXX20
3021	typename basic_string<_CharT, _Traits, _Allocator>::iterator	3022	typename basic_string<_CharT, _Traits, _Allocator>::iterator
3022	basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_type __c)	3023	basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_type __c)
3023	{	3024	{
...	@@ -3047,23 +3048,10 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_ty	...	@@ -3047,23 +3048,10 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_ty
3047	return begin() + static_cast<difference_type>(__ip);	3048	return begin() + static_cast<difference_type>(__ip);
3048	}	3049	}
3049		3050
3050	template <class _CharT, class _Traits, class _Allocator>
3051	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3052	typename basic_string<_CharT, _Traits, _Allocator>::iterator
3053	basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, size_type __n, value_type __c)
3054	{
3055	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
3056	"string::insert(iterator, n, value) called with an iterator not"
3057	" referring to this string");
3058	difference_type __p = __pos - begin();
3059	insert(static_cast<size_type>(__p), __n, __c);
3060	return begin() + __p;
3061	}
3062
3063	// replace	3051	// replace
3064		3052
3065	template <class _CharT, class _Traits, class _Allocator>	3053	template <class _CharT, class _Traits, class _Allocator>
3066	_LIBCPP_CONSTEXPR_AFTER_CXX17	3054	_LIBCPP_CONSTEXPR_SINCE_CXX20
3067	basic_string<_CharT, _Traits, _Allocator>&	3055	basic_string<_CharT, _Traits, _Allocator>&
3068	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2)	3056	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2)
3069	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK	3057	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
...	@@ -3117,7 +3105,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __	...	@@ -3117,7 +3105,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __
3117	}	3105	}
3118		3106
3119	template <class _CharT, class _Traits, class _Allocator>	3107	template <class _CharT, class _Traits, class _Allocator>
3120	_LIBCPP_CONSTEXPR_AFTER_CXX17	3108	_LIBCPP_CONSTEXPR_SINCE_CXX20
3121	basic_string<_CharT, _Traits, _Allocator>&	3109	basic_string<_CharT, _Traits, _Allocator>&
3122	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, size_type __n2, value_type __c)	3110	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, size_type __n2, value_type __c)
3123	{	3111	{
...	@@ -3148,7 +3136,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __	...	@@ -3148,7 +3136,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __
3148		3136
3149	template <class _CharT, class _Traits, class _Allocator>	3137	template <class _CharT, class _Traits, class _Allocator>
3150	template<class _InputIterator>	3138	template<class _InputIterator>
3151	_LIBCPP_CONSTEXPR_AFTER_CXX17	3139	_LIBCPP_CONSTEXPR_SINCE_CXX20
3152	__enable_if_t	3140	__enable_if_t
3153	<	3141	<
3154	__is_cpp17_input_iterator<_InputIterator>::value,	3142	__is_cpp17_input_iterator<_InputIterator>::value,
...	@@ -3162,15 +3150,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_it	...	@@ -3162,15 +3150,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_it
3162	}	3150	}
3163		3151
3164	template <class _CharT, class _Traits, class _Allocator>	3152	template <class _CharT, class _Traits, class _Allocator>
3165	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3153	_LIBCPP_CONSTEXPR_SINCE_CXX20
3166	basic_string<_CharT, _Traits, _Allocator>&
3167	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str)
3168	{
3169	return replace(__pos1, __n1, __str.data(), __str.size());
3170	}
3171
3172	template <class _CharT, class _Traits, class _Allocator>
3173	_LIBCPP_CONSTEXPR_AFTER_CXX17
3174	basic_string<_CharT, _Traits, _Allocator>&	3154	basic_string<_CharT, _Traits, _Allocator>&
3175	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str,	3155	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str,
3176	size_type __pos2, size_type __n2)	3156	size_type __pos2, size_type __n2)
...	@@ -3183,7 +3163,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type _	...	@@ -3183,7 +3163,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type _
3183		3163
3184	template <class _CharT, class _Traits, class _Allocator>	3164	template <class _CharT, class _Traits, class _Allocator>
3185	template <class _Tp>	3165	template <class _Tp>
3186	_LIBCPP_CONSTEXPR_AFTER_CXX17	3166	_LIBCPP_CONSTEXPR_SINCE_CXX20
3187	__enable_if_t	3167	__enable_if_t
3188	<	3168	<
3189	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,	3169	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string<_CharT, _Traits, _Allocator> >::value,
...	@@ -3200,7 +3180,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type _	...	@@ -3200,7 +3180,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type _
3200	}	3180	}
3201		3181
3202	template <class _CharT, class _Traits, class _Allocator>	3182	template <class _CharT, class _Traits, class _Allocator>
3203	_LIBCPP_CONSTEXPR_AFTER_CXX17	3183	_LIBCPP_CONSTEXPR_SINCE_CXX20
3204	basic_string<_CharT, _Traits, _Allocator>&	3184	basic_string<_CharT, _Traits, _Allocator>&
3205	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s)	3185	basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s)
3206	{	3186	{
...	@@ -3208,45 +3188,12 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __	...	@@ -3208,45 +3188,12 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __
3208	return replace(__pos, __n1, __s, traits_type::length(__s));	3188	return replace(__pos, __n1, __s, traits_type::length(__s));
3209	}	3189	}
3210		3190
3211	template <class _CharT, class _Traits, class _Allocator>
3212	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3213	basic_string<_CharT, _Traits, _Allocator>&
3214	basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const basic_string& __str)
3215	{
3216	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1),
3217	__str.data(), __str.size());
3218	}
3219
3220	template <class _CharT, class _Traits, class _Allocator>
3221	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3222	basic_string<_CharT, _Traits, _Allocator>&
3223	basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n)
3224	{
3225	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s, __n);
3226	}
3227
3228	template <class _CharT, class _Traits, class _Allocator>
3229	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3230	basic_string<_CharT, _Traits, _Allocator>&
3231	basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s)
3232	{
3233	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s);
3234	}
3235
3236	template <class _CharT, class _Traits, class _Allocator>
3237	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3238	basic_string<_CharT, _Traits, _Allocator>&
3239	basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c)
3240	{
3241	return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __n, __c);
3242	}
3243
3244	// erase	3191	// erase
3245		3192
3246	// 'externally instantiated' erase() implementation, called when __n != npos.	3193	// 'externally instantiated' erase() implementation, called when __n != npos.
3247	// Does not check __pos against size()	3194	// Does not check __pos against size()
3248	template <class _CharT, class _Traits, class _Allocator>	3195	template <class _CharT, class _Traits, class _Allocator>
3249	_LIBCPP_CONSTEXPR_AFTER_CXX17	3196	_LIBCPP_CONSTEXPR_SINCE_CXX20
3250	void	3197	void
3251	basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(	3198	basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(
3252	size_type __pos, size_type __n)	3199	size_type __pos, size_type __n)
...	@@ -3264,7 +3211,7 @@ basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(	...	@@ -3264,7 +3211,7 @@ basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(
3264	}	3211	}
3265		3212
3266	template <class _CharT, class _Traits, class _Allocator>	3213	template <class _CharT, class _Traits, class _Allocator>
3267	_LIBCPP_CONSTEXPR_AFTER_CXX17	3214	_LIBCPP_CONSTEXPR_SINCE_CXX20
3268	basic_string<_CharT, _Traits, _Allocator>&	3215	basic_string<_CharT, _Traits, _Allocator>&
3269	basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos,	3216	basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos,
3270	size_type __n) {	3217	size_type __n) {
...	@@ -3279,7 +3226,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos,	...	@@ -3279,7 +3226,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos,
3279	}	3226	}
3280		3227
3281	template <class _CharT, class _Traits, class _Allocator>	3228	template <class _CharT, class _Traits, class _Allocator>
3282	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3229	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3283	typename basic_string<_CharT, _Traits, _Allocator>::iterator	3230	typename basic_string<_CharT, _Traits, _Allocator>::iterator
3284	basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)	3231	basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)
3285	{	3232	{
...	@@ -3295,7 +3242,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)	...	@@ -3295,7 +3242,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)
3295	}	3242	}
3296		3243
3297	template <class _CharT, class _Traits, class _Allocator>	3244	template <class _CharT, class _Traits, class _Allocator>
3298	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3245	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3299	typename basic_string<_CharT, _Traits, _Allocator>::iterator	3246	typename basic_string<_CharT, _Traits, _Allocator>::iterator
3300	basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_iterator __last)	3247	basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_iterator __last)
3301	{	3248	{
...	@@ -3311,7 +3258,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_i	...	@@ -3311,7 +3258,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_i
3311	}	3258	}
3312		3259
3313	template <class _CharT, class _Traits, class _Allocator>	3260	template <class _CharT, class _Traits, class _Allocator>
3314	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3261	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3315	void	3262	void
3316	basic_string<_CharT, _Traits, _Allocator>::pop_back()	3263	basic_string<_CharT, _Traits, _Allocator>::pop_back()
3317	{	3264	{
...	@@ -3320,7 +3267,7 @@ basic_string<_CharT, _Traits, _Allocator>::pop_back()	...	@@ -3320,7 +3267,7 @@ basic_string<_CharT, _Traits, _Allocator>::pop_back()
3320	}	3267	}
3321		3268
3322	template <class _CharT, class _Traits, class _Allocator>	3269	template <class _CharT, class _Traits, class _Allocator>
3323	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3270	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3324	void	3271	void
3325	basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT	3272	basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT
3326	{	3273	{
...	@@ -3338,15 +3285,7 @@ basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT	...	@@ -3338,15 +3285,7 @@ basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT
3338	}	3285	}
3339		3286
3340	template <class _CharT, class _Traits, class _Allocator>	3287	template <class _CharT, class _Traits, class _Allocator>
3341	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3288	_LIBCPP_CONSTEXPR_SINCE_CXX20
3342	void
3343	basic_string<_CharT, _Traits, _Allocator>::__erase_to_end(size_type __pos)
3344	{
3345	__null_terminate_at(std::__to_address(__get_pointer()), __pos);
3346	}
3347
3348	template <class _CharT, class _Traits, class _Allocator>
3349	_LIBCPP_CONSTEXPR_AFTER_CXX17
3350	void	3289	void
3351	basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)	3290	basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)
3352	{	3291	{
...	@@ -3358,7 +3297,7 @@ basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)	...	@@ -3358,7 +3297,7 @@ basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)
3358	}	3297	}
3359		3298
3360	template <class _CharT, class _Traits, class _Allocator>	3299	template <class _CharT, class _Traits, class _Allocator>
3361	_LIBCPP_CONSTEXPR_AFTER_CXX17 inline void	3300	_LIBCPP_CONSTEXPR_SINCE_CXX20 inline void
3362	basic_string<_CharT, _Traits, _Allocator>::__resize_default_init(size_type __n)	3301	basic_string<_CharT, _Traits, _Allocator>::__resize_default_init(size_type __n)
3363	{	3302	{
3364	size_type __sz = size();	3303	size_type __sz = size();
...	@@ -3369,21 +3308,7 @@ basic_string<_CharT, _Traits, _Allocator>::__resize_default_init(size_type __n)	...	@@ -3369,21 +3308,7 @@ basic_string<_CharT, _Traits, _Allocator>::__resize_default_init(size_type __n)
3369	}	3308	}
3370		3309
3371	template <class _CharT, class _Traits, class _Allocator>	3310	template <class _CharT, class _Traits, class _Allocator>
3372	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3311	_LIBCPP_CONSTEXPR_SINCE_CXX20
3373	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3374	basic_string<_CharT, _Traits, _Allocator>::max_size() const _NOEXCEPT
3375	{
3376	size_type __m = __alloc_traits::max_size(__alloc());
3377	if (__m <= std::numeric_limits<size_type>::max() / 2) {
3378	return __m - __alignment;
3379	} else {
3380	bool __uses_lsb = __endian_factor == 2;
3381	return __uses_lsb ? __m - __alignment : (__m / 2) - __alignment;
3382	}
3383	}
3384
3385	template <class _CharT, class _Traits, class _Allocator>
3386	_LIBCPP_CONSTEXPR_AFTER_CXX17
3387	void	3312	void
3388	basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __requested_capacity)	3313	basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __requested_capacity)
3389	{	3314	{
...	@@ -3404,7 +3329,7 @@ basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __requested_capacit	...	@@ -3404,7 +3329,7 @@ basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __requested_capacit
3404	}	3329	}
3405		3330
3406	template <class _CharT, class _Traits, class _Allocator>	3331	template <class _CharT, class _Traits, class _Allocator>
3407	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3332	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3408	void	3333	void
3409	basic_string<_CharT, _Traits, _Allocator>::shrink_to_fit() _NOEXCEPT	3334	basic_string<_CharT, _Traits, _Allocator>::shrink_to_fit() _NOEXCEPT
3410	{	3335	{
...	@@ -3415,7 +3340,7 @@ basic_string<_CharT, _Traits, _Allocator>::shrink_to_fit() _NOEXCEPT	...	@@ -3415,7 +3340,7 @@ basic_string<_CharT, _Traits, _Allocator>::shrink_to_fit() _NOEXCEPT
3415	}	3340	}
3416		3341
3417	template <class _CharT, class _Traits, class _Allocator>	3342	template <class _CharT, class _Traits, class _Allocator>
3418	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3343	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3419	void	3344	void
3420	basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target_capacity)	3345	basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target_capacity)
3421	{	3346	{
...	@@ -3479,25 +3404,7 @@ basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target	...	@@ -3479,25 +3404,7 @@ basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target
3479	}	3404	}
3480		3405
3481	template <class _CharT, class _Traits, class _Allocator>	3406	template <class _CharT, class _Traits, class _Allocator>
3482	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3407	_LIBCPP_CONSTEXPR_SINCE_CXX20
3483	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3484	basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos) const _NOEXCEPT
3485	{
3486	_LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
3487	return *(data() + __pos);
3488	}
3489
3490	template <class _CharT, class _Traits, class _Allocator>
3491	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3492	typename basic_string<_CharT, _Traits, _Allocator>::reference
3493	basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos) _NOEXCEPT
3494	{
3495	_LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
3496	return *(__get_pointer() + __pos);
3497	}
3498
3499	template <class _CharT, class _Traits, class _Allocator>
3500	_LIBCPP_CONSTEXPR_AFTER_CXX17
3501	typename basic_string<_CharT, _Traits, _Allocator>::const_reference	3408	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3502	basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const	3409	basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const
3503	{	3410	{
...	@@ -3507,7 +3414,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const	...	@@ -3507,7 +3414,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const
3507	}	3414	}
3508		3415
3509	template <class _CharT, class _Traits, class _Allocator>	3416	template <class _CharT, class _Traits, class _Allocator>
3510	_LIBCPP_CONSTEXPR_AFTER_CXX17	3417	_LIBCPP_CONSTEXPR_SINCE_CXX20
3511	typename basic_string<_CharT, _Traits, _Allocator>::reference	3418	typename basic_string<_CharT, _Traits, _Allocator>::reference
3512	basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)	3419	basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)
3513	{	3420	{
...	@@ -3517,43 +3424,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)	...	@@ -3517,43 +3424,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)
3517	}	3424	}
3518		3425
3519	template <class _CharT, class _Traits, class _Allocator>	3426	template <class _CharT, class _Traits, class _Allocator>
3520	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3427	_LIBCPP_CONSTEXPR_SINCE_CXX20
3521	typename basic_string<_CharT, _Traits, _Allocator>::reference
3522	basic_string<_CharT, _Traits, _Allocator>::front() _NOEXCEPT
3523	{
3524	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
3525	return *__get_pointer();
3526	}
3527
3528	template <class _CharT, class _Traits, class _Allocator>
3529	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3530	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3531	basic_string<_CharT, _Traits, _Allocator>::front() const _NOEXCEPT
3532	{
3533	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
3534	return *data();
3535	}
3536
3537	template <class _CharT, class _Traits, class _Allocator>
3538	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3539	typename basic_string<_CharT, _Traits, _Allocator>::reference
3540	basic_string<_CharT, _Traits, _Allocator>::back() _NOEXCEPT
3541	{
3542	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
3543	return *(__get_pointer() + size() - 1);
3544	}
3545
3546	template <class _CharT, class _Traits, class _Allocator>
3547	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3548	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3549	basic_string<_CharT, _Traits, _Allocator>::back() const _NOEXCEPT
3550	{
3551	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
3552	return *(data() + size() - 1);
3553	}
3554
3555	template <class _CharT, class _Traits, class _Allocator>
3556	_LIBCPP_CONSTEXPR_AFTER_CXX17
3557	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3428	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3558	basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n, size_type __pos) const	3429	basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n, size_type __pos) const
3559	{	3430	{
...	@@ -3566,15 +3437,7 @@ basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n,	...	@@ -3566,15 +3437,7 @@ basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n,
3566	}	3437	}
3567		3438
3568	template <class _CharT, class _Traits, class _Allocator>	3439	template <class _CharT, class _Traits, class _Allocator>
3569	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3440	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3570	basic_string<_CharT, _Traits, _Allocator>
3571	basic_string<_CharT, _Traits, _Allocator>::substr(size_type __pos, size_type __n) const
3572	{
3573	return basic_string(*this, __pos, __n, __alloc());
3574	}
3575
3576	template <class _CharT, class _Traits, class _Allocator>
3577	inline _LIBCPP_CONSTEXPR_AFTER_CXX17
3578	void	3441	void
3579	basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)	3442	basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)
3580	#if _LIBCPP_STD_VER >= 14	3443	#if _LIBCPP_STD_VER >= 14
...	@@ -3610,30 +3473,30 @@ struct _LIBCPP_HIDDEN __traits_eq	...	@@ -3610,30 +3473,30 @@ struct _LIBCPP_HIDDEN __traits_eq
3610	};	3473	};
3611		3474
3612	template<class _CharT, class _Traits, class _Allocator>	3475	template<class _CharT, class _Traits, class _Allocator>
3613	_LIBCPP_CONSTEXPR_AFTER_CXX17	3476	_LIBCPP_CONSTEXPR_SINCE_CXX20
3614	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3477	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3615	basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,	3478	basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
3616	size_type __pos,	3479	size_type __pos,
3617	size_type __n) const _NOEXCEPT	3480	size_type __n) const _NOEXCEPT
3618	{	3481	{
3619	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find(): received nullptr");	3482	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find(): received nullptr");
3620	return __str_find<value_type, size_type, traits_type, npos>	3483	return std::__str_find<value_type, size_type, traits_type, npos>
3621	(data(), size(), __s, __pos, __n);	3484	(data(), size(), __s, __pos, __n);
3622	}	3485	}
3623		3486
3624	template<class _CharT, class _Traits, class _Allocator>	3487	template<class _CharT, class _Traits, class _Allocator>
3625	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3488	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3626	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3489	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3627	basic_string<_CharT, _Traits, _Allocator>::find(const basic_string& __str,	3490	basic_string<_CharT, _Traits, _Allocator>::find(const basic_string& __str,
3628	size_type __pos) const _NOEXCEPT	3491	size_type __pos) const _NOEXCEPT
3629	{	3492	{
3630	return __str_find<value_type, size_type, traits_type, npos>	3493	return std::__str_find<value_type, size_type, traits_type, npos>
3631	(data(), size(), __str.data(), __pos, __str.size());	3494	(data(), size(), __str.data(), __pos, __str.size());
3632	}	3495	}
3633		3496
3634	template<class _CharT, class _Traits, class _Allocator>	3497	template<class _CharT, class _Traits, class _Allocator>
3635	template <class _Tp>	3498	template <class _Tp>
3636	_LIBCPP_CONSTEXPR_AFTER_CXX17	3499	_LIBCPP_CONSTEXPR_SINCE_CXX20
3637	__enable_if_t	3500	__enable_if_t
3638	<	3501	<
3639	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3502	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3643,58 +3506,58 @@ basic_string<_CharT, _Traits, _Allocator>::find(const _Tp &__t,	...	@@ -3643,58 +3506,58 @@ basic_string<_CharT, _Traits, _Allocator>::find(const _Tp &__t,
3643	size_type __pos) const _NOEXCEPT	3506	size_type __pos) const _NOEXCEPT
3644	{	3507	{
3645	__self_view __sv = __t;	3508	__self_view __sv = __t;
3646	return __str_find<value_type, size_type, traits_type, npos>	3509	return std::__str_find<value_type, size_type, traits_type, npos>
3647	(data(), size(), __sv.data(), __pos, __sv.size());	3510	(data(), size(), __sv.data(), __pos, __sv.size());
3648	}	3511	}
3649		3512
3650	template<class _CharT, class _Traits, class _Allocator>	3513	template<class _CharT, class _Traits, class _Allocator>
3651	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3514	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3652	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3515	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3653	basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,	3516	basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
3654	size_type __pos) const _NOEXCEPT	3517	size_type __pos) const _NOEXCEPT
3655	{	3518	{
3656	_LIBCPP_ASSERT(__s != nullptr, "string::find(): received nullptr");	3519	_LIBCPP_ASSERT(__s != nullptr, "string::find(): received nullptr");
3657	return __str_find<value_type, size_type, traits_type, npos>	3520	return std::__str_find<value_type, size_type, traits_type, npos>
3658	(data(), size(), __s, __pos, traits_type::length(__s));	3521	(data(), size(), __s, __pos, traits_type::length(__s));
3659	}	3522	}
3660		3523
3661	template<class _CharT, class _Traits, class _Allocator>	3524	template<class _CharT, class _Traits, class _Allocator>
3662	_LIBCPP_CONSTEXPR_AFTER_CXX17	3525	_LIBCPP_CONSTEXPR_SINCE_CXX20
3663	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3526	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3664	basic_string<_CharT, _Traits, _Allocator>::find(value_type __c,	3527	basic_string<_CharT, _Traits, _Allocator>::find(value_type __c,
3665	size_type __pos) const _NOEXCEPT	3528	size_type __pos) const _NOEXCEPT
3666	{	3529	{
3667	return __str_find<value_type, size_type, traits_type, npos>	3530	return std::__str_find<value_type, size_type, traits_type, npos>
3668	(data(), size(), __c, __pos);	3531	(data(), size(), __c, __pos);
3669	}	3532	}
3670		3533
3671	// rfind	3534	// rfind
3672		3535
3673	template<class _CharT, class _Traits, class _Allocator>	3536	template<class _CharT, class _Traits, class _Allocator>
3674	_LIBCPP_CONSTEXPR_AFTER_CXX17	3537	_LIBCPP_CONSTEXPR_SINCE_CXX20
3675	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3538	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3676	basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,	3539	basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
3677	size_type __pos,	3540	size_type __pos,
3678	size_type __n) const _NOEXCEPT	3541	size_type __n) const _NOEXCEPT
3679	{	3542	{
3680	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::rfind(): received nullptr");	3543	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::rfind(): received nullptr");
3681	return __str_rfind<value_type, size_type, traits_type, npos>	3544	return std::__str_rfind<value_type, size_type, traits_type, npos>
3682	(data(), size(), __s, __pos, __n);	3545	(data(), size(), __s, __pos, __n);
3683	}	3546	}
3684		3547
3685	template<class _CharT, class _Traits, class _Allocator>	3548	template<class _CharT, class _Traits, class _Allocator>
3686	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3549	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3687	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3550	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3688	basic_string<_CharT, _Traits, _Allocator>::rfind(const basic_string& __str,	3551	basic_string<_CharT, _Traits, _Allocator>::rfind(const basic_string& __str,
3689	size_type __pos) const _NOEXCEPT	3552	size_type __pos) const _NOEXCEPT
3690	{	3553	{
3691	return __str_rfind<value_type, size_type, traits_type, npos>	3554	return std::__str_rfind<value_type, size_type, traits_type, npos>
3692	(data(), size(), __str.data(), __pos, __str.size());	3555	(data(), size(), __str.data(), __pos, __str.size());
3693	}	3556	}
3694		3557
3695	template<class _CharT, class _Traits, class _Allocator>	3558	template<class _CharT, class _Traits, class _Allocator>
3696	template <class _Tp>	3559	template <class _Tp>
3697	_LIBCPP_CONSTEXPR_AFTER_CXX17	3560	_LIBCPP_CONSTEXPR_SINCE_CXX20
3698	__enable_if_t	3561	__enable_if_t
3699	<	3562	<
3700	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3563	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3704,58 +3567,58 @@ basic_string<_CharT, _Traits, _Allocator>::rfind(const _Tp& __t,	...	@@ -3704,58 +3567,58 @@ basic_string<_CharT, _Traits, _Allocator>::rfind(const _Tp& __t,
3704	size_type __pos) const _NOEXCEPT	3567	size_type __pos) const _NOEXCEPT
3705	{	3568	{
3706	__self_view __sv = __t;	3569	__self_view __sv = __t;
3707	return __str_rfind<value_type, size_type, traits_type, npos>	3570	return std::__str_rfind<value_type, size_type, traits_type, npos>
3708	(data(), size(), __sv.data(), __pos, __sv.size());	3571	(data(), size(), __sv.data(), __pos, __sv.size());
3709	}	3572	}
3710		3573
3711	template<class _CharT, class _Traits, class _Allocator>	3574	template<class _CharT, class _Traits, class _Allocator>
3712	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3575	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3713	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3576	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3714	basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,	3577	basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
3715	size_type __pos) const _NOEXCEPT	3578	size_type __pos) const _NOEXCEPT
3716	{	3579	{
3717	_LIBCPP_ASSERT(__s != nullptr, "string::rfind(): received nullptr");	3580	_LIBCPP_ASSERT(__s != nullptr, "string::rfind(): received nullptr");
3718	return __str_rfind<value_type, size_type, traits_type, npos>	3581	return std::__str_rfind<value_type, size_type, traits_type, npos>
3719	(data(), size(), __s, __pos, traits_type::length(__s));	3582	(data(), size(), __s, __pos, traits_type::length(__s));
3720	}	3583	}
3721		3584
3722	template<class _CharT, class _Traits, class _Allocator>	3585	template<class _CharT, class _Traits, class _Allocator>
3723	_LIBCPP_CONSTEXPR_AFTER_CXX17	3586	_LIBCPP_CONSTEXPR_SINCE_CXX20
3724	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3587	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3725	basic_string<_CharT, _Traits, _Allocator>::rfind(value_type __c,	3588	basic_string<_CharT, _Traits, _Allocator>::rfind(value_type __c,
3726	size_type __pos) const _NOEXCEPT	3589	size_type __pos) const _NOEXCEPT
3727	{	3590	{
3728	return __str_rfind<value_type, size_type, traits_type, npos>	3591	return std::__str_rfind<value_type, size_type, traits_type, npos>
3729	(data(), size(), __c, __pos);	3592	(data(), size(), __c, __pos);
3730	}	3593	}
3731		3594
3732	// find_first_of	3595	// find_first_of
3733		3596
3734	template<class _CharT, class _Traits, class _Allocator>	3597	template<class _CharT, class _Traits, class _Allocator>
3735	_LIBCPP_CONSTEXPR_AFTER_CXX17	3598	_LIBCPP_CONSTEXPR_SINCE_CXX20
3736	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3599	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3737	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,	3600	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
3738	size_type __pos,	3601	size_type __pos,
3739	size_type __n) const _NOEXCEPT	3602	size_type __n) const _NOEXCEPT
3740	{	3603	{
3741	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_first_of(): received nullptr");	3604	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_first_of(): received nullptr");
3742	return __str_find_first_of<value_type, size_type, traits_type, npos>	3605	return std::__str_find_first_of<value_type, size_type, traits_type, npos>
3743	(data(), size(), __s, __pos, __n);	3606	(data(), size(), __s, __pos, __n);
3744	}	3607	}
3745		3608
3746	template<class _CharT, class _Traits, class _Allocator>	3609	template<class _CharT, class _Traits, class _Allocator>
3747	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3610	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3748	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3611	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3749	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const basic_string& __str,	3612	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const basic_string& __str,
3750	size_type __pos) const _NOEXCEPT	3613	size_type __pos) const _NOEXCEPT
3751	{	3614	{
3752	return __str_find_first_of<value_type, size_type, traits_type, npos>	3615	return std::__str_find_first_of<value_type, size_type, traits_type, npos>
3753	(data(), size(), __str.data(), __pos, __str.size());	3616	(data(), size(), __str.data(), __pos, __str.size());
3754	}	3617	}
3755		3618
3756	template<class _CharT, class _Traits, class _Allocator>	3619	template<class _CharT, class _Traits, class _Allocator>
3757	template <class _Tp>	3620	template <class _Tp>
3758	_LIBCPP_CONSTEXPR_AFTER_CXX17	3621	_LIBCPP_CONSTEXPR_SINCE_CXX20
3759	__enable_if_t	3622	__enable_if_t
3760	<	3623	<
3761	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3624	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3765,23 +3628,23 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_of(const _Tp& __t,	...	@@ -3765,23 +3628,23 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_of(const _Tp& __t,
3765	size_type __pos) const _NOEXCEPT	3628	size_type __pos) const _NOEXCEPT
3766	{	3629	{
3767	__self_view __sv = __t;	3630	__self_view __sv = __t;
3768	return __str_find_first_of<value_type, size_type, traits_type, npos>	3631	return std::__str_find_first_of<value_type, size_type, traits_type, npos>
3769	(data(), size(), __sv.data(), __pos, __sv.size());	3632	(data(), size(), __sv.data(), __pos, __sv.size());
3770	}	3633	}
3771		3634
3772	template<class _CharT, class _Traits, class _Allocator>	3635	template<class _CharT, class _Traits, class _Allocator>
3773	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3636	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3774	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3637	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3775	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,	3638	basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
3776	size_type __pos) const _NOEXCEPT	3639	size_type __pos) const _NOEXCEPT
3777	{	3640	{
3778	_LIBCPP_ASSERT(__s != nullptr, "string::find_first_of(): received nullptr");	3641	_LIBCPP_ASSERT(__s != nullptr, "string::find_first_of(): received nullptr");
3779	return __str_find_first_of<value_type, size_type, traits_type, npos>	3642	return std::__str_find_first_of<value_type, size_type, traits_type, npos>
3780	(data(), size(), __s, __pos, traits_type::length(__s));	3643	(data(), size(), __s, __pos, traits_type::length(__s));
3781	}	3644	}
3782		3645
3783	template<class _CharT, class _Traits, class _Allocator>	3646	template<class _CharT, class _Traits, class _Allocator>
3784	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3647	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3785	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3648	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3786	basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,	3649	basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,
3787	size_type __pos) const _NOEXCEPT	3650	size_type __pos) const _NOEXCEPT
...	@@ -3792,30 +3655,30 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,	...	@@ -3792,30 +3655,30 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,
3792	// find_last_of	3655	// find_last_of
3793		3656
3794	template<class _CharT, class _Traits, class _Allocator>	3657	template<class _CharT, class _Traits, class _Allocator>
3795	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3658	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3796	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3659	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3797	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,	3660	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
3798	size_type __pos,	3661	size_type __pos,
3799	size_type __n) const _NOEXCEPT	3662	size_type __n) const _NOEXCEPT
3800	{	3663	{
3801	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_last_of(): received nullptr");	3664	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_last_of(): received nullptr");
3802	return __str_find_last_of<value_type, size_type, traits_type, npos>	3665	return std::__str_find_last_of<value_type, size_type, traits_type, npos>
3803	(data(), size(), __s, __pos, __n);	3666	(data(), size(), __s, __pos, __n);
3804	}	3667	}
3805		3668
3806	template<class _CharT, class _Traits, class _Allocator>	3669	template<class _CharT, class _Traits, class _Allocator>
3807	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3670	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3808	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3671	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3809	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const basic_string& __str,	3672	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const basic_string& __str,
3810	size_type __pos) const _NOEXCEPT	3673	size_type __pos) const _NOEXCEPT
3811	{	3674	{
3812	return __str_find_last_of<value_type, size_type, traits_type, npos>	3675	return std::__str_find_last_of<value_type, size_type, traits_type, npos>
3813	(data(), size(), __str.data(), __pos, __str.size());	3676	(data(), size(), __str.data(), __pos, __str.size());
3814	}	3677	}
3815		3678
3816	template<class _CharT, class _Traits, class _Allocator>	3679	template<class _CharT, class _Traits, class _Allocator>
3817	template <class _Tp>	3680	template <class _Tp>
3818	_LIBCPP_CONSTEXPR_AFTER_CXX17	3681	_LIBCPP_CONSTEXPR_SINCE_CXX20
3819	__enable_if_t	3682	__enable_if_t
3820	<	3683	<
3821	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3684	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3825,23 +3688,23 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_of(const _Tp& __t,	...	@@ -3825,23 +3688,23 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_of(const _Tp& __t,
3825	size_type __pos) const _NOEXCEPT	3688	size_type __pos) const _NOEXCEPT
3826	{	3689	{
3827	__self_view __sv = __t;	3690	__self_view __sv = __t;
3828	return __str_find_last_of<value_type, size_type, traits_type, npos>	3691	return std::__str_find_last_of<value_type, size_type, traits_type, npos>
3829	(data(), size(), __sv.data(), __pos, __sv.size());	3692	(data(), size(), __sv.data(), __pos, __sv.size());
3830	}	3693	}
3831		3694
3832	template<class _CharT, class _Traits, class _Allocator>	3695	template<class _CharT, class _Traits, class _Allocator>
3833	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3696	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3834	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3697	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3835	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,	3698	basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
3836	size_type __pos) const _NOEXCEPT	3699	size_type __pos) const _NOEXCEPT
3837	{	3700	{
3838	_LIBCPP_ASSERT(__s != nullptr, "string::find_last_of(): received nullptr");	3701	_LIBCPP_ASSERT(__s != nullptr, "string::find_last_of(): received nullptr");
3839	return __str_find_last_of<value_type, size_type, traits_type, npos>	3702	return std::__str_find_last_of<value_type, size_type, traits_type, npos>
3840	(data(), size(), __s, __pos, traits_type::length(__s));	3703	(data(), size(), __s, __pos, traits_type::length(__s));
3841	}	3704	}
3842		3705
3843	template<class _CharT, class _Traits, class _Allocator>	3706	template<class _CharT, class _Traits, class _Allocator>
3844	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3707	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3845	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3708	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3846	basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,	3709	basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,
3847	size_type __pos) const _NOEXCEPT	3710	size_type __pos) const _NOEXCEPT
...	@@ -3852,30 +3715,30 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,	...	@@ -3852,30 +3715,30 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,
3852	// find_first_not_of	3715	// find_first_not_of
3853		3716
3854	template<class _CharT, class _Traits, class _Allocator>	3717	template<class _CharT, class _Traits, class _Allocator>
3855	_LIBCPP_CONSTEXPR_AFTER_CXX17	3718	_LIBCPP_CONSTEXPR_SINCE_CXX20
3856	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3719	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3857	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,	3720	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
3858	size_type __pos,	3721	size_type __pos,
3859	size_type __n) const _NOEXCEPT	3722	size_type __n) const _NOEXCEPT
3860	{	3723	{
3861	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_first_not_of(): received nullptr");	3724	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_first_not_of(): received nullptr");
3862	return __str_find_first_not_of<value_type, size_type, traits_type, npos>	3725	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
3863	(data(), size(), __s, __pos, __n);	3726	(data(), size(), __s, __pos, __n);
3864	}	3727	}
3865		3728
3866	template<class _CharT, class _Traits, class _Allocator>	3729	template<class _CharT, class _Traits, class _Allocator>
3867	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3730	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3868	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3731	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3869	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const basic_string& __str,	3732	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const basic_string& __str,
3870	size_type __pos) const _NOEXCEPT	3733	size_type __pos) const _NOEXCEPT
3871	{	3734	{
3872	return __str_find_first_not_of<value_type, size_type, traits_type, npos>	3735	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
3873	(data(), size(), __str.data(), __pos, __str.size());	3736	(data(), size(), __str.data(), __pos, __str.size());
3874	}	3737	}
3875		3738
3876	template<class _CharT, class _Traits, class _Allocator>	3739	template<class _CharT, class _Traits, class _Allocator>
3877	template <class _Tp>	3740	template <class _Tp>
3878	_LIBCPP_CONSTEXPR_AFTER_CXX17	3741	_LIBCPP_CONSTEXPR_SINCE_CXX20
3879	__enable_if_t	3742	__enable_if_t
3880	<	3743	<
3881	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3744	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3885,58 +3748,58 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const _Tp& __t,	...	@@ -3885,58 +3748,58 @@ basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const _Tp& __t,
3885	size_type __pos) const _NOEXCEPT	3748	size_type __pos) const _NOEXCEPT
3886	{	3749	{
3887	__self_view __sv = __t;	3750	__self_view __sv = __t;
3888	return __str_find_first_not_of<value_type, size_type, traits_type, npos>	3751	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
3889	(data(), size(), __sv.data(), __pos, __sv.size());	3752	(data(), size(), __sv.data(), __pos, __sv.size());
3890	}	3753	}
3891		3754
3892	template<class _CharT, class _Traits, class _Allocator>	3755	template<class _CharT, class _Traits, class _Allocator>
3893	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3756	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3894	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3757	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3895	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,	3758	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
3896	size_type __pos) const _NOEXCEPT	3759	size_type __pos) const _NOEXCEPT
3897	{	3760	{
3898	_LIBCPP_ASSERT(__s != nullptr, "string::find_first_not_of(): received nullptr");	3761	_LIBCPP_ASSERT(__s != nullptr, "string::find_first_not_of(): received nullptr");
3899	return __str_find_first_not_of<value_type, size_type, traits_type, npos>	3762	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
3900	(data(), size(), __s, __pos, traits_type::length(__s));	3763	(data(), size(), __s, __pos, traits_type::length(__s));
3901	}	3764	}
3902		3765
3903	template<class _CharT, class _Traits, class _Allocator>	3766	template<class _CharT, class _Traits, class _Allocator>
3904	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3767	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3905	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3768	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3906	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(value_type __c,	3769	basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(value_type __c,
3907	size_type __pos) const _NOEXCEPT	3770	size_type __pos) const _NOEXCEPT
3908	{	3771	{
3909	return __str_find_first_not_of<value_type, size_type, traits_type, npos>	3772	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
3910	(data(), size(), __c, __pos);	3773	(data(), size(), __c, __pos);
3911	}	3774	}
3912		3775
3913	// find_last_not_of	3776	// find_last_not_of
3914		3777
3915	template<class _CharT, class _Traits, class _Allocator>	3778	template<class _CharT, class _Traits, class _Allocator>
3916	_LIBCPP_CONSTEXPR_AFTER_CXX17	3779	_LIBCPP_CONSTEXPR_SINCE_CXX20
3917	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3780	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3918	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,	3781	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
3919	size_type __pos,	3782	size_type __pos,
3920	size_type __n) const _NOEXCEPT	3783	size_type __n) const _NOEXCEPT
3921	{	3784	{
3922	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_last_not_of(): received nullptr");	3785	_LIBCPP_ASSERT(__n == 0 \|\| __s != nullptr, "string::find_last_not_of(): received nullptr");
3923	return __str_find_last_not_of<value_type, size_type, traits_type, npos>	3786	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
3924	(data(), size(), __s, __pos, __n);	3787	(data(), size(), __s, __pos, __n);
3925	}	3788	}
3926		3789
3927	template<class _CharT, class _Traits, class _Allocator>	3790	template<class _CharT, class _Traits, class _Allocator>
3928	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3791	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3929	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3792	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3930	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const basic_string& __str,	3793	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const basic_string& __str,
3931	size_type __pos) const _NOEXCEPT	3794	size_type __pos) const _NOEXCEPT
3932	{	3795	{
3933	return __str_find_last_not_of<value_type, size_type, traits_type, npos>	3796	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
3934	(data(), size(), __str.data(), __pos, __str.size());	3797	(data(), size(), __str.data(), __pos, __str.size());
3935	}	3798	}
3936		3799
3937	template<class _CharT, class _Traits, class _Allocator>	3800	template<class _CharT, class _Traits, class _Allocator>
3938	template <class _Tp>	3801	template <class _Tp>
3939	_LIBCPP_CONSTEXPR_AFTER_CXX17	3802	_LIBCPP_CONSTEXPR_SINCE_CXX20
3940	__enable_if_t	3803	__enable_if_t
3941	<	3804	<
3942	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3805	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3946,28 +3809,28 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const _Tp& __t,	...	@@ -3946,28 +3809,28 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const _Tp& __t,
3946	size_type __pos) const _NOEXCEPT	3809	size_type __pos) const _NOEXCEPT
3947	{	3810	{
3948	__self_view __sv = __t;	3811	__self_view __sv = __t;
3949	return __str_find_last_not_of<value_type, size_type, traits_type, npos>	3812	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
3950	(data(), size(), __sv.data(), __pos, __sv.size());	3813	(data(), size(), __sv.data(), __pos, __sv.size());
3951	}	3814	}
3952		3815
3953	template<class _CharT, class _Traits, class _Allocator>	3816	template<class _CharT, class _Traits, class _Allocator>
3954	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3817	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3955	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3818	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3956	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,	3819	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
3957	size_type __pos) const _NOEXCEPT	3820	size_type __pos) const _NOEXCEPT
3958	{	3821	{
3959	_LIBCPP_ASSERT(__s != nullptr, "string::find_last_not_of(): received nullptr");	3822	_LIBCPP_ASSERT(__s != nullptr, "string::find_last_not_of(): received nullptr");
3960	return __str_find_last_not_of<value_type, size_type, traits_type, npos>	3823	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
3961	(data(), size(), __s, __pos, traits_type::length(__s));	3824	(data(), size(), __s, __pos, traits_type::length(__s));
3962	}	3825	}
3963		3826
3964	template<class _CharT, class _Traits, class _Allocator>	3827	template<class _CharT, class _Traits, class _Allocator>
3965	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3828	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
3966	typename basic_string<_CharT, _Traits, _Allocator>::size_type	3829	typename basic_string<_CharT, _Traits, _Allocator>::size_type
3967	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,	3830	basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,
3968	size_type __pos) const _NOEXCEPT	3831	size_type __pos) const _NOEXCEPT
3969	{	3832	{
3970	return __str_find_last_not_of<value_type, size_type, traits_type, npos>	3833	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
3971	(data(), size(), __c, __pos);	3834	(data(), size(), __c, __pos);
3972	}	3835	}
3973		3836
...	@@ -3975,7 +3838,7 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,	...	@@ -3975,7 +3838,7 @@ basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,
3975		3838
3976	template <class _CharT, class _Traits, class _Allocator>	3839	template <class _CharT, class _Traits, class _Allocator>
3977	template <class _Tp>	3840	template <class _Tp>
3978	_LIBCPP_CONSTEXPR_AFTER_CXX17	3841	_LIBCPP_CONSTEXPR_SINCE_CXX20
3979	__enable_if_t	3842	__enable_if_t
3980	<	3843	<
3981	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3844	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -3998,7 +3861,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const _Tp& __t) const _NOEXCE	...	@@ -3998,7 +3861,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const _Tp& __t) const _NOEXCE
3998	}	3861	}
3999		3862
4000	template <class _CharT, class _Traits, class _Allocator>	3863	template <class _CharT, class _Traits, class _Allocator>
4001	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3864	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4002	int	3865	int
4003	basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) const _NOEXCEPT	3866	basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) const _NOEXCEPT
4004	{	3867	{
...	@@ -4006,7 +3869,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) co	...	@@ -4006,7 +3869,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) co
4006	}	3869	}
4007		3870
4008	template <class _CharT, class _Traits, class _Allocator>	3871	template <class _CharT, class _Traits, class _Allocator>
4009	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3872	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4010	int	3873	int
4011	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	3874	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4012	size_type __n1,	3875	size_type __n1,
...	@@ -4031,7 +3894,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4031,7 +3894,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4031		3894
4032	template <class _CharT, class _Traits, class _Allocator>	3895	template <class _CharT, class _Traits, class _Allocator>
4033	template <class _Tp>	3896	template <class _Tp>
4034	_LIBCPP_CONSTEXPR_AFTER_CXX17	3897	_LIBCPP_CONSTEXPR_SINCE_CXX20
4035	__enable_if_t	3898	__enable_if_t
4036	<	3899	<
4037	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,	3900	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value,
...	@@ -4046,7 +3909,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4046,7 +3909,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4046	}	3909	}
4047		3910
4048	template <class _CharT, class _Traits, class _Allocator>	3911	template <class _CharT, class _Traits, class _Allocator>
4049	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3912	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4050	int	3913	int
4051	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	3914	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4052	size_type __n1,	3915	size_type __n1,
...	@@ -4057,7 +3920,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4057,7 +3920,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4057		3920
4058	template <class _CharT, class _Traits, class _Allocator>	3921	template <class _CharT, class _Traits, class _Allocator>
4059	template <class _Tp>	3922	template <class _Tp>
4060	_LIBCPP_CONSTEXPR_AFTER_CXX17	3923	_LIBCPP_CONSTEXPR_SINCE_CXX20
4061	__enable_if_t	3924	__enable_if_t
4062	<	3925	<
4063	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value	3926	__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value
...	@@ -4075,7 +3938,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4075,7 +3938,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4075	}	3938	}
4076		3939
4077	template <class _CharT, class _Traits, class _Allocator>	3940	template <class _CharT, class _Traits, class _Allocator>
4078	_LIBCPP_CONSTEXPR_AFTER_CXX17	3941	_LIBCPP_CONSTEXPR_SINCE_CXX20
4079	int	3942	int
4080	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	3943	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4081	size_type __n1,	3944	size_type __n1,
...	@@ -4087,7 +3950,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4087,7 +3950,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4087	}	3950	}
4088		3951
4089	template <class _CharT, class _Traits, class _Allocator>	3952	template <class _CharT, class _Traits, class _Allocator>
4090	_LIBCPP_CONSTEXPR_AFTER_CXX17	3953	_LIBCPP_CONSTEXPR_SINCE_CXX20
4091	int	3954	int
4092	basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const _NOEXCEPT	3955	basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const _NOEXCEPT
4093	{	3956	{
...	@@ -4096,7 +3959,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const	...	@@ -4096,7 +3959,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const
4096	}	3959	}
4097		3960
4098	template <class _CharT, class _Traits, class _Allocator>	3961	template <class _CharT, class _Traits, class _Allocator>
4099	_LIBCPP_CONSTEXPR_AFTER_CXX17	3962	_LIBCPP_CONSTEXPR_SINCE_CXX20
4100	int	3963	int
4101	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	3964	basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4102	size_type __n1,	3965	size_type __n1,
...	@@ -4109,7 +3972,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,	...	@@ -4109,7 +3972,7 @@ basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
4109	// __invariants	3972	// __invariants
4110		3973
4111	template<class _CharT, class _Traits, class _Allocator>	3974	template<class _CharT, class _Traits, class _Allocator>
4112	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3975	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4113	bool	3976	bool
4114	basic_string<_CharT, _Traits, _Allocator>::__invariants() const	3977	basic_string<_CharT, _Traits, _Allocator>::__invariants() const
4115	{	3978	{
...	@@ -4127,7 +3990,7 @@ basic_string<_CharT, _Traits, _Allocator>::__invariants() const	...	@@ -4127,7 +3990,7 @@ basic_string<_CharT, _Traits, _Allocator>::__invariants() const
4127	// __clear_and_shrink	3990	// __clear_and_shrink
4128		3991
4129	template<class _CharT, class _Traits, class _Allocator>	3992	template<class _CharT, class _Traits, class _Allocator>
4130	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	3993	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4131	void	3994	void
4132	basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT	3995	basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT
4133	{	3996	{
...	@@ -4135,28 +3998,30 @@ basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT	...	@@ -4135,28 +3998,30 @@ basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT
4135	if(__is_long())	3998	if(__is_long())
4136	{	3999	{
4137	__alloc_traits::deallocate(__alloc(), __get_long_pointer(), capacity() + 1);	4000	__alloc_traits::deallocate(__alloc(), __get_long_pointer(), capacity() + 1);
4138	__set_long_cap(0);	4001	__default_init();
4139	__set_short_size(0);
4140	traits_type::assign(*__get_short_pointer(), value_type());
4141	}	4002	}
4142	}	4003	}
4143		4004
4144	// operator==	4005	// operator==
4145		4006
4146	template<class _CharT, class _Traits, class _Allocator>	4007	template<class _CharT, class _Traits, class _Allocator>
4147	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4008	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
4148	bool	4009	bool
4149	operator==(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4010	operator==(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4150	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4011	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
4151	{	4012	{
		4013	#if _LIBCPP_STD_VER > 17
		4014	return basic_string_view<_CharT, _Traits>(__lhs) == basic_string_view<_CharT, _Traits>(__rhs);
		4015	#else
4152	size_t __lhs_sz = __lhs.size();	4016	size_t __lhs_sz = __lhs.size();
4153	return __lhs_sz == __rhs.size() && _Traits::compare(__lhs.data(),	4017	return __lhs_sz == __rhs.size() && _Traits::compare(__lhs.data(),
4154	__rhs.data(),	4018	__rhs.data(),
4155	__lhs_sz) == 0;	4019	__lhs_sz) == 0;
		4020	#endif
4156	}	4021	}
4157		4022
4158	template<class _Allocator>	4023	template<class _Allocator>
4159	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4024	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
4160	bool	4025	bool
4161	operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,	4026	operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
4162	const basic_string<char, char_traits<char>, _Allocator>& __rhs) _NOEXCEPT	4027	const basic_string<char, char_traits<char>, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4174,8 +4039,9 @@ operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,	...	@@ -4174,8 +4039,9 @@ operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
4174	return true;	4039	return true;
4175	}	4040	}
4176		4041
		4042	#if _LIBCPP_STD_VER <= 17
4177	template<class _CharT, class _Traits, class _Allocator>	4043	template<class _CharT, class _Traits, class _Allocator>
4178	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4044	inline _LIBCPP_HIDE_FROM_ABI
4179	bool	4045	bool
4180	operator==(const _CharT* __lhs,	4046	operator==(const _CharT* __lhs,
4181	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4047	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4186,22 +4052,44 @@ operator==(const _CharT* __lhs,	...	@@ -4186,22 +4052,44 @@ operator==(const _CharT* __lhs,
4186	if (__lhs_len != __rhs.size()) return false;	4052	if (__lhs_len != __rhs.size()) return false;
4187	return __rhs.compare(0, _String::npos, __lhs, __lhs_len) == 0;	4053	return __rhs.compare(0, _String::npos, __lhs, __lhs_len) == 0;
4188	}	4054	}
		4055	#endif // _LIBCPP_STD_VER <= 17
4189		4056
4190	template<class _CharT, class _Traits, class _Allocator>	4057	template<class _CharT, class _Traits, class _Allocator>
4191	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4058	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
4192	bool	4059	bool
4193	operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,	4060	operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
4194	const _CharT* __rhs) _NOEXCEPT	4061	const _CharT* __rhs) _NOEXCEPT
4195	{	4062	{
		4063	#if _LIBCPP_STD_VER > 17
		4064	return basic_string_view<_CharT, _Traits>(__lhs) == basic_string_view<_CharT, _Traits>(__rhs);
		4065	#else
4196	typedef basic_string<_CharT, _Traits, _Allocator> _String;	4066	typedef basic_string<_CharT, _Traits, _Allocator> _String;
4197	_LIBCPP_ASSERT(__rhs != nullptr, "operator==(basic_string, char*): received nullptr");	4067	_LIBCPP_ASSERT(__rhs != nullptr, "operator==(basic_string, char*): received nullptr");
4198	size_t __rhs_len = _Traits::length(__rhs);	4068	size_t __rhs_len = _Traits::length(__rhs);
4199	if (__rhs_len != __lhs.size()) return false;	4069	if (__rhs_len != __lhs.size()) return false;
4200	return __lhs.compare(0, _String::npos, __rhs, __rhs_len) == 0;	4070	return __lhs.compare(0, _String::npos, __rhs, __rhs_len) == 0;
		4071	#endif
4201	}	4072	}
4202		4073
		4074	#if _LIBCPP_STD_VER > 17
		4075
		4076	template <class _CharT, class _Traits, class _Allocator>
		4077	_LIBCPP_HIDE_FROM_ABI constexpr auto operator<=>(
		4078	const basic_string<_CharT, _Traits, _Allocator>& __lhs,
		4079	const basic_string<_CharT, _Traits, _Allocator>& __rhs) noexcept {
		4080	return basic_string_view<_CharT, _Traits>(__lhs) <=> basic_string_view<_CharT, _Traits>(__rhs);
		4081	}
		4082
		4083	template <class _CharT, class _Traits, class _Allocator>
		4084	_LIBCPP_HIDE_FROM_ABI constexpr auto
		4085	operator<=>(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs) {
		4086	return basic_string_view<_CharT, _Traits>(__lhs) <=> basic_string_view<_CharT, _Traits>(__rhs);
		4087	}
		4088
		4089	#else // _LIBCPP_STD_VER > 17
		4090
4203	template<class _CharT, class _Traits, class _Allocator>	4091	template<class _CharT, class _Traits, class _Allocator>
4204	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4092	inline _LIBCPP_HIDE_FROM_ABI
4205	bool	4093	bool
4206	operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,	4094	operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
4207	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4095	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4210,7 +4098,7 @@ operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,	...	@@ -4210,7 +4098,7 @@ operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
4210	}	4098	}
4211		4099
4212	template<class _CharT, class _Traits, class _Allocator>	4100	template<class _CharT, class _Traits, class _Allocator>
4213	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4101	inline _LIBCPP_HIDE_FROM_ABI
4214	bool	4102	bool
4215	operator!=(const _CharT* __lhs,	4103	operator!=(const _CharT* __lhs,
4216	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4104	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4219,7 +4107,7 @@ operator!=(const _CharT* __lhs,	...	@@ -4219,7 +4107,7 @@ operator!=(const _CharT* __lhs,
4219	}	4107	}
4220		4108
4221	template<class _CharT, class _Traits, class _Allocator>	4109	template<class _CharT, class _Traits, class _Allocator>
4222	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4110	inline _LIBCPP_HIDE_FROM_ABI
4223	bool	4111	bool
4224	operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4112	operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4225	const _CharT* __rhs) _NOEXCEPT	4113	const _CharT* __rhs) _NOEXCEPT
...	@@ -4230,7 +4118,7 @@ operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4230,7 +4118,7 @@ operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4230	// operator<	4118	// operator<
4231		4119
4232	template<class _CharT, class _Traits, class _Allocator>	4120	template<class _CharT, class _Traits, class _Allocator>
4233	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4121	inline _LIBCPP_HIDE_FROM_ABI
4234	bool	4122	bool
4235	operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4123	operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4236	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4124	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4239,7 +4127,7 @@ operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4239,7 +4127,7 @@ operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4239	}	4127	}
4240		4128
4241	template<class _CharT, class _Traits, class _Allocator>	4129	template<class _CharT, class _Traits, class _Allocator>
4242	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4130	inline _LIBCPP_HIDE_FROM_ABI
4243	bool	4131	bool
4244	operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4132	operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4245	const _CharT* __rhs) _NOEXCEPT	4133	const _CharT* __rhs) _NOEXCEPT
...	@@ -4248,7 +4136,7 @@ operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4248,7 +4136,7 @@ operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4248	}	4136	}
4249		4137
4250	template<class _CharT, class _Traits, class _Allocator>	4138	template<class _CharT, class _Traits, class _Allocator>
4251	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4139	inline _LIBCPP_HIDE_FROM_ABI
4252	bool	4140	bool
4253	operator< (const _CharT* __lhs,	4141	operator< (const _CharT* __lhs,
4254	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4142	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4259,7 +4147,7 @@ operator< (const _CharT* __lhs,	...	@@ -4259,7 +4147,7 @@ operator< (const _CharT* __lhs,
4259	// operator>	4147	// operator>
4260		4148
4261	template<class _CharT, class _Traits, class _Allocator>	4149	template<class _CharT, class _Traits, class _Allocator>
4262	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4150	inline _LIBCPP_HIDE_FROM_ABI
4263	bool	4151	bool
4264	operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4152	operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4265	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4153	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4268,7 +4156,7 @@ operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4268,7 +4156,7 @@ operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4268	}	4156	}
4269		4157
4270	template<class _CharT, class _Traits, class _Allocator>	4158	template<class _CharT, class _Traits, class _Allocator>
4271	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4159	inline _LIBCPP_HIDE_FROM_ABI
4272	bool	4160	bool
4273	operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4161	operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4274	const _CharT* __rhs) _NOEXCEPT	4162	const _CharT* __rhs) _NOEXCEPT
...	@@ -4277,7 +4165,7 @@ operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4277,7 +4165,7 @@ operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4277	}	4165	}
4278		4166
4279	template<class _CharT, class _Traits, class _Allocator>	4167	template<class _CharT, class _Traits, class _Allocator>
4280	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4168	inline _LIBCPP_HIDE_FROM_ABI
4281	bool	4169	bool
4282	operator> (const _CharT* __lhs,	4170	operator> (const _CharT* __lhs,
4283	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4171	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4288,7 +4176,7 @@ operator> (const _CharT* __lhs,	...	@@ -4288,7 +4176,7 @@ operator> (const _CharT* __lhs,
4288	// operator<=	4176	// operator<=
4289		4177
4290	template<class _CharT, class _Traits, class _Allocator>	4178	template<class _CharT, class _Traits, class _Allocator>
4291	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4179	inline _LIBCPP_HIDE_FROM_ABI
4292	bool	4180	bool
4293	operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4181	operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4294	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4182	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4297,7 +4185,7 @@ operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4297,7 +4185,7 @@ operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4297	}	4185	}
4298		4186
4299	template<class _CharT, class _Traits, class _Allocator>	4187	template<class _CharT, class _Traits, class _Allocator>
4300	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4188	inline _LIBCPP_HIDE_FROM_ABI
4301	bool	4189	bool
4302	operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4190	operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4303	const _CharT* __rhs) _NOEXCEPT	4191	const _CharT* __rhs) _NOEXCEPT
...	@@ -4306,7 +4194,7 @@ operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4306,7 +4194,7 @@ operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4306	}	4194	}
4307		4195
4308	template<class _CharT, class _Traits, class _Allocator>	4196	template<class _CharT, class _Traits, class _Allocator>
4309	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4197	inline _LIBCPP_HIDE_FROM_ABI
4310	bool	4198	bool
4311	operator<=(const _CharT* __lhs,	4199	operator<=(const _CharT* __lhs,
4312	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4200	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4317,7 +4205,7 @@ operator<=(const _CharT* __lhs,	...	@@ -4317,7 +4205,7 @@ operator<=(const _CharT* __lhs,
4317	// operator>=	4205	// operator>=
4318		4206
4319	template<class _CharT, class _Traits, class _Allocator>	4207	template<class _CharT, class _Traits, class _Allocator>
4320	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4208	inline _LIBCPP_HIDE_FROM_ABI
4321	bool	4209	bool
4322	operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4210	operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4323	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4211	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
...	@@ -4326,7 +4214,7 @@ operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4326,7 +4214,7 @@ operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4326	}	4214	}
4327		4215
4328	template<class _CharT, class _Traits, class _Allocator>	4216	template<class _CharT, class _Traits, class _Allocator>
4329	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4217	inline _LIBCPP_HIDE_FROM_ABI
4330	bool	4218	bool
4331	operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4219	operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4332	const _CharT* __rhs) _NOEXCEPT	4220	const _CharT* __rhs) _NOEXCEPT
...	@@ -4335,18 +4223,19 @@ operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4335,18 +4223,19 @@ operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4335	}	4223	}
4336		4224
4337	template<class _CharT, class _Traits, class _Allocator>	4225	template<class _CharT, class _Traits, class _Allocator>
4338	inline _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI	4226	inline _LIBCPP_HIDE_FROM_ABI
4339	bool	4227	bool
4340	operator>=(const _CharT* __lhs,	4228	operator>=(const _CharT* __lhs,
4341	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT	4229	const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
4342	{	4230	{
4343	return !(__lhs < __rhs);	4231	return !(__lhs < __rhs);
4344	}	4232	}
		4233	#endif // _LIBCPP_STD_VER > 17
4345		4234
4346	// operator +	4235	// operator +
4347		4236
4348	template<class _CharT, class _Traits, class _Allocator>	4237	template<class _CharT, class _Traits, class _Allocator>
4349	_LIBCPP_CONSTEXPR_AFTER_CXX17	4238	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4350	basic_string<_CharT, _Traits, _Allocator>	4239	basic_string<_CharT, _Traits, _Allocator>
4351	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	4240	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4352	const basic_string<_CharT, _Traits, _Allocator>& __rhs)	4241	const basic_string<_CharT, _Traits, _Allocator>& __rhs)
...	@@ -4365,7 +4254,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,	...	@@ -4365,7 +4254,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
4365	}	4254	}
4366		4255
4367	template<class _CharT, class _Traits, class _Allocator>	4256	template<class _CharT, class _Traits, class _Allocator>
4368	_LIBCPP_CONSTEXPR_AFTER_CXX17	4257	_LIBCPP_HIDDEN _LIBCPP_CONSTEXPR_SINCE_CXX20
4369	basic_string<_CharT, _Traits, _Allocator>	4258	basic_string<_CharT, _Traits, _Allocator>
4370	operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& __rhs)	4259	operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& __rhs)
4371	{	4260	{
...	@@ -4383,7 +4272,7 @@ operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& _	...	@@ -4383,7 +4272,7 @@ operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& _
4383	}	4272	}
4384		4273
4385	template<class _CharT, class _Traits, class _Allocator>	4274	template<class _CharT, class _Traits, class _Allocator>
4386	_LIBCPP_CONSTEXPR_AFTER_CXX17	4275	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4387	basic_string<_CharT, _Traits, _Allocator>	4276	basic_string<_CharT, _Traits, _Allocator>
4388	operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)	4277	operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)
4389	{	4278	{
...	@@ -4400,7 +4289,7 @@ operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)	...	@@ -4400,7 +4289,7 @@ operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)
4400	}	4289	}
4401		4290
4402	template<class _CharT, class _Traits, class _Allocator>	4291	template<class _CharT, class _Traits, class _Allocator>
4403	inline _LIBCPP_CONSTEXPR_AFTER_CXX17	4292	inline _LIBCPP_CONSTEXPR_SINCE_CXX20
4404	basic_string<_CharT, _Traits, _Allocator>	4293	basic_string<_CharT, _Traits, _Allocator>
4405	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs)	4294	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs)
4406	{	4295	{
...	@@ -4418,7 +4307,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT*	...	@@ -4418,7 +4307,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT*
4418	}	4307	}
4419		4308
4420	template<class _CharT, class _Traits, class _Allocator>	4309	template<class _CharT, class _Traits, class _Allocator>
4421	_LIBCPP_CONSTEXPR_AFTER_CXX17	4310	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4422	basic_string<_CharT, _Traits, _Allocator>	4311	basic_string<_CharT, _Traits, _Allocator>
4423	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)	4312	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)
4424	{	4313	{
...	@@ -4437,7 +4326,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)	...	@@ -4437,7 +4326,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)
4437	#ifndef _LIBCPP_CXX03_LANG	4326	#ifndef _LIBCPP_CXX03_LANG
4438		4327
4439	template<class _CharT, class _Traits, class _Allocator>	4328	template<class _CharT, class _Traits, class _Allocator>
4440	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4329	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4441	basic_string<_CharT, _Traits, _Allocator>	4330	basic_string<_CharT, _Traits, _Allocator>
4442	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<_CharT, _Traits, _Allocator>& __rhs)	4331	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<_CharT, _Traits, _Allocator>& __rhs)
4443	{	4332	{
...	@@ -4445,7 +4334,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<	...	@@ -4445,7 +4334,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<
4445	}	4334	}
4446		4335
4447	template<class _CharT, class _Traits, class _Allocator>	4336	template<class _CharT, class _Traits, class _Allocator>
4448	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4337	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4449	basic_string<_CharT, _Traits, _Allocator>	4338	basic_string<_CharT, _Traits, _Allocator>
4450	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)	4339	operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
4451	{	4340	{
...	@@ -4453,7 +4342,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_	...	@@ -4453,7 +4342,7 @@ operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_
4453	}	4342	}
4454		4343
4455	template<class _CharT, class _Traits, class _Allocator>	4344	template<class _CharT, class _Traits, class _Allocator>
4456	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4345	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4457	basic_string<_CharT, _Traits, _Allocator>	4346	basic_string<_CharT, _Traits, _Allocator>
4458	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)	4347	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
4459	{	4348	{
...	@@ -4461,7 +4350,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT	...	@@ -4461,7 +4350,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT
4461	}	4350	}
4462		4351
4463	template<class _CharT, class _Traits, class _Allocator>	4352	template<class _CharT, class _Traits, class _Allocator>
4464	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4353	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4465	basic_string<_CharT, _Traits, _Allocator>	4354	basic_string<_CharT, _Traits, _Allocator>
4466	operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)	4355	operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)
4467	{	4356	{
...	@@ -4469,7 +4358,7 @@ operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)	...	@@ -4469,7 +4358,7 @@ operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)
4469	}	4358	}
4470		4359
4471	template<class _CharT, class _Traits, class _Allocator>	4360	template<class _CharT, class _Traits, class _Allocator>
4472	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4361	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4473	basic_string<_CharT, _Traits, _Allocator>	4362	basic_string<_CharT, _Traits, _Allocator>
4474	operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)	4363	operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)
4475	{	4364	{
...	@@ -4478,7 +4367,7 @@ operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)	...	@@ -4478,7 +4367,7 @@ operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)
4478	}	4367	}
4479		4368
4480	template<class _CharT, class _Traits, class _Allocator>	4369	template<class _CharT, class _Traits, class _Allocator>
4481	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4370	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4482	basic_string<_CharT, _Traits, _Allocator>	4371	basic_string<_CharT, _Traits, _Allocator>
4483	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs)	4372	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs)
4484	{	4373	{
...	@@ -4486,7 +4375,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs	...	@@ -4486,7 +4375,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs
4486	}	4375	}
4487		4376
4488	template<class _CharT, class _Traits, class _Allocator>	4377	template<class _CharT, class _Traits, class _Allocator>
4489	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4378	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4490	basic_string<_CharT, _Traits, _Allocator>	4379	basic_string<_CharT, _Traits, _Allocator>
4491	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)	4380	operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)
4492	{	4381	{
...	@@ -4499,7 +4388,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)	...	@@ -4499,7 +4388,7 @@ operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)
4499	// swap	4388	// swap
4500		4389
4501	template<class _CharT, class _Traits, class _Allocator>	4390	template<class _CharT, class _Traits, class _Allocator>
4502	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4391	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4503	void	4392	void
4504	swap(basic_string<_CharT, _Traits, _Allocator>& __lhs,	4393	swap(basic_string<_CharT, _Traits, _Allocator>& __lhs,
4505	basic_string<_CharT, _Traits, _Allocator>& __rhs)	4394	basic_string<_CharT, _Traits, _Allocator>& __rhs)
...	@@ -4556,27 +4445,44 @@ const typename basic_string<_CharT, _Traits, _Allocator>::size_type	...	@@ -4556,27 +4445,44 @@ const typename basic_string<_CharT, _Traits, _Allocator>::size_type
4556	basic_string<_CharT, _Traits, _Allocator>::npos;	4445	basic_string<_CharT, _Traits, _Allocator>::npos;
4557		4446
4558	template <class _CharT, class _Allocator>	4447	template <class _CharT, class _Allocator>
4559	struct _LIBCPP_TEMPLATE_VIS	4448	struct __string_hash : public __unary_function<basic_string<_CharT, char_traits<_CharT>, _Allocator>, size_t>
4560	hash<basic_string<_CharT, char_traits<_CharT>, _Allocator> >
4561	: public __unary_function<basic_string<_CharT, char_traits<_CharT>, _Allocator>, size_t>
4562	{	4449	{
4563	size_t	4450	size_t
4564	operator()(const basic_string<_CharT, char_traits<_CharT>, _Allocator>& __val) const _NOEXCEPT	4451	operator()(const basic_string<_CharT, char_traits<_CharT>, _Allocator>& __val) const _NOEXCEPT
4565	{ return __do_string_hash(__val.data(), __val.data() + __val.size()); }	4452	{ return std::__do_string_hash(__val.data(), __val.data() + __val.size()); }
4566	};	4453	};
4567		4454
		4455	template <class _Allocator>
		4456	struct hash<basic_string<char, char_traits<char>, _Allocator> > : __string_hash<char, _Allocator> {};
		4457
		4458	#ifndef _LIBCPP_HAS_NO_CHAR8_T
		4459	template <class _Allocator>
		4460	struct hash<basic_string<char8_t, char_traits<char8_t>, _Allocator> > : __string_hash<char8_t, _Allocator> {};
		4461	#endif
		4462
		4463	template <class _Allocator>
		4464	struct hash<basic_string<char16_t, char_traits<char16_t>, _Allocator> > : __string_hash<char16_t, _Allocator> {};
		4465
		4466	template <class _Allocator>
		4467	struct hash<basic_string<char32_t, char_traits<char32_t>, _Allocator> > : __string_hash<char32_t, _Allocator> {};
		4468
		4469	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
		4470	template <class _Allocator>
		4471	struct hash<basic_string<wchar_t, char_traits<wchar_t>, _Allocator> > : __string_hash<wchar_t, _Allocator> {};
		4472	#endif
		4473
4568	template<class _CharT, class _Traits, class _Allocator>	4474	template<class _CharT, class _Traits, class _Allocator>
4569	basic_ostream<_CharT, _Traits>&	4475	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
4570	operator<<(basic_ostream<_CharT, _Traits>& __os,	4476	operator<<(basic_ostream<_CharT, _Traits>& __os,
4571	const basic_string<_CharT, _Traits, _Allocator>& __str);	4477	const basic_string<_CharT, _Traits, _Allocator>& __str);
4572		4478
4573	template<class _CharT, class _Traits, class _Allocator>	4479	template<class _CharT, class _Traits, class _Allocator>
4574	basic_istream<_CharT, _Traits>&	4480	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
4575	operator>>(basic_istream<_CharT, _Traits>& __is,	4481	operator>>(basic_istream<_CharT, _Traits>& __is,
4576	basic_string<_CharT, _Traits, _Allocator>& __str);	4482	basic_string<_CharT, _Traits, _Allocator>& __str);
4577		4483
4578	template<class _CharT, class _Traits, class _Allocator>	4484	template<class _CharT, class _Traits, class _Allocator>
4579	basic_istream<_CharT, _Traits>&	4485	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
4580	getline(basic_istream<_CharT, _Traits>& __is,	4486	getline(basic_istream<_CharT, _Traits>& __is,
4581	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);	4487	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);
4582		4488
...	@@ -4662,14 +4568,14 @@ inline namespace literals	...	@@ -4662,14 +4568,14 @@ inline namespace literals
4662	{	4568	{
4663	inline namespace string_literals	4569	inline namespace string_literals
4664	{	4570	{
4665	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4571	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4666	basic_string<char> operator "" s( const char *__str, size_t __len )	4572	basic_string<char> operator "" s( const char *__str, size_t __len )
4667	{	4573	{
4668	return basic_string<char> (__str, __len);	4574	return basic_string<char> (__str, __len);
4669	}	4575	}
4670		4576
4671	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	4577	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
4672	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4578	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4673	basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )	4579	basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
4674	{	4580	{
4675	return basic_string<wchar_t> (__str, __len);	4581	return basic_string<wchar_t> (__str, __len);
...	@@ -4678,19 +4584,19 @@ inline namespace literals	...	@@ -4678,19 +4584,19 @@ inline namespace literals
4678		4584
4679	#ifndef _LIBCPP_HAS_NO_CHAR8_T	4585	#ifndef _LIBCPP_HAS_NO_CHAR8_T
4680	inline _LIBCPP_HIDE_FROM_ABI constexpr	4586	inline _LIBCPP_HIDE_FROM_ABI constexpr
4681	basic_string<char8_t> operator "" s(const char8_t *__str, size_t __len) _NOEXCEPT	4587	basic_string<char8_t> operator "" s(const char8_t *__str, size_t __len)
4682	{	4588	{
4683	return basic_string<char8_t> (__str, __len);	4589	return basic_string<char8_t> (__str, __len);
4684	}	4590	}
4685	#endif	4591	#endif
4686		4592
4687	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4593	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4688	basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )	4594	basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
4689	{	4595	{
4690	return basic_string<char16_t> (__str, __len);	4596	return basic_string<char16_t> (__str, __len);
4691	}	4597	}
4692		4598
4693	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	4599	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4694	basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )	4600	basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
4695	{	4601	{
4696	return basic_string<char32_t> (__str, __len);	4602	return basic_string<char32_t> (__str, __len);
...	@@ -4713,4 +4619,15 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -4713,4 +4619,15 @@ _LIBCPP_END_NAMESPACE_STD
4713		4619
4714	_LIBCPP_POP_MACROS	4620	_LIBCPP_POP_MACROS
4715		4621
		4622	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		4623	# include <algorithm>
		4624	# include <concepts>
		4625	# include <functional>
		4626	# include <iterator>
		4627	# include <new>
		4628	# include <typeinfo>
		4629	# include <utility>
		4630	# include <vector>
		4631	#endif
		4632
4716	#endif // _LIBCPP_STRING	4633	#endif // _LIBCPP_STRING

lib/libcxx/include/string.h+37-35

...	@@ -57,7 +57,9 @@ size_t strlen(const char* s);	...	@@ -57,7 +57,9 @@ size_t strlen(const char* s);
57	# pragma GCC system_header	57	# pragma GCC system_header
58	#endif	58	#endif
59		59
60	#include_next <string.h>	60	#if __has_include_next(<string.h>)
		61	# include_next <string.h>
		62	#endif
61		63
62	// MSVCRT, GNU libc and its derivates may already have the correct prototype in	64	// MSVCRT, GNU libc and its derivates may already have the correct prototype in
63	// <string.h>. This macro can be defined by users if their C library provides	65	// <string.h>. This macro can be defined by users if their C library provides
...	@@ -69,41 +71,41 @@ size_t strlen(const char* s);	...	@@ -69,41 +71,41 @@ size_t strlen(const char* s);
69		71
70	#if defined(__cplusplus) && !defined(_LIBCPP_STRING_H_HAS_CONST_OVERLOADS) && defined(_LIBCPP_PREFERRED_OVERLOAD)	72	#if defined(__cplusplus) && !defined(_LIBCPP_STRING_H_HAS_CONST_OVERLOADS) && defined(_LIBCPP_PREFERRED_OVERLOAD)
71	extern "C++" {	73	extern "C++" {
72	inline _LIBCPP_INLINE_VISIBILITY	74	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const char* strchr(const char* __s, int __c) {
73	char* __libcpp_strchr(const char* __s, int __c) {return (char*)strchr(__s, __c);}	75	return __builtin_strchr(__s, __c);
74	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	76	}
75	const char* strchr(const char* __s, int __c) {return __libcpp_strchr(__s, __c);}	77	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD char* strchr(char* __s, int __c) {
76	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	78	return __builtin_strchr(__s, __c);
77	char* strchr( char* __s, int __c) {return __libcpp_strchr(__s, __c);}	79	}
78		80
79	inline _LIBCPP_INLINE_VISIBILITY	81	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const char* strpbrk(const char* __s1, const char* __s2) {
80	char* __libcpp_strpbrk(const char* __s1, const char* __s2) {return (char*)strpbrk(__s1, __s2);}	82	return __builtin_strpbrk(__s1, __s2);
81	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	83	}
82	const char* strpbrk(const char* __s1, const char* __s2) {return __libcpp_strpbrk(__s1, __s2);}	84	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD char* strpbrk(char* __s1, const char* __s2) {
83	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	85	return __builtin_strpbrk(__s1, __s2);
84	char* strpbrk( char* __s1, const char* __s2) {return __libcpp_strpbrk(__s1, __s2);}	86	}
85		87
86	inline _LIBCPP_INLINE_VISIBILITY	88	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const char* strrchr(const char* __s, int __c) {
87	char* __libcpp_strrchr(const char* __s, int __c) {return (char*)strrchr(__s, __c);}	89	return __builtin_strrchr(__s, __c);
88	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	90	}
89	const char* strrchr(const char* __s, int __c) {return __libcpp_strrchr(__s, __c);}	91	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD char* strrchr(char* __s, int __c) {
90	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	92	return __builtin_strrchr(__s, __c);
91	char* strrchr( char* __s, int __c) {return __libcpp_strrchr(__s, __c);}	93	}
92		94
93	inline _LIBCPP_INLINE_VISIBILITY	95	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const void* memchr(const void* __s, int __c, size_t __n) {
94	void* __libcpp_memchr(const void* __s, int __c, size_t __n) {return (void*)memchr(__s, __c, __n);}	96	return __builtin_memchr(__s, __c, __n);
95	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	97	}
96	const void* memchr(const void* __s, int __c, size_t __n) {return __libcpp_memchr(__s, __c, __n);}	98	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD void* memchr(void* __s, int __c, size_t __n) {
97	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	99	return __builtin_memchr(__s, __c, __n);
98	void* memchr( void* __s, int __c, size_t __n) {return __libcpp_memchr(__s, __c, __n);}	100	}
99		101
100	inline _LIBCPP_INLINE_VISIBILITY	102	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const char* strstr(const char* __s1, const char* __s2) {
101	char* __libcpp_strstr(const char* __s1, const char* __s2) {return (char*)strstr(__s1, __s2);}	103	return __builtin_strstr(__s1, __s2);
102	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	104	}
103	const char* strstr(const char* __s1, const char* __s2) {return __libcpp_strstr(__s1, __s2);}	105	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD char* strstr(char* __s1, const char* __s2) {
104	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_PREFERRED_OVERLOAD	106	return __builtin_strstr(__s1, __s2);
105	char* strstr( char* __s1, const char* __s2) {return __libcpp_strstr(__s1, __s2);}
106	}	107	}
		108	} // extern "C++"
107	#endif	109	#endif
108		110
109	#endif // _LIBCPP_STRING_H	111	#endif // _LIBCPP_STRING_H

lib/libcxx/include/string_view+227-172

 @@ -14,6 +14,8 @@
     string_view synopsis
+#include <compare>
 namespace std {
     // 7.2, Class template basic_string_view
 @@ -30,21 +32,25 @@ namespace std {
     template<class charT, class traits>
     constexpr bool operator==(basic_string_view<charT, traits> x,
                               basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
+    template<class charT, class traits>                                                            // Removed in C++20
     constexpr bool operator!=(basic_string_view<charT, traits> x,
                               basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
+    template<class charT, class traits>                                                            // Removed in C++20
     constexpr bool operator< (basic_string_view<charT, traits> x,
                                  basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
+    template<class charT, class traits>                                                            // Removed in C++20
     constexpr bool operator> (basic_string_view<charT, traits> x,
                               basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
+    template<class charT, class traits>                                                            // Removed in C++20
     constexpr bool operator<=(basic_string_view<charT, traits> x,
                                  basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
+    template<class charT, class traits>                                                            // Removed in C++20
     constexpr bool operator>=(basic_string_view<charT, traits> x,
                               basic_string_view<charT, traits> y) noexcept;
+    template<class charT, class traits>                                                            // Since C++20
+    constexpr see below operator<=>(basic_string_view<charT, traits> x,
+                                    basic_string_view<charT, traits> y) noexcept;
     // see below, sufficient additional overloads of comparison functions
     // 7.10, Inserters and extractors
 @@ -185,11 +191,11 @@ namespace std {
   template <> struct hash<u32string_view>;
   template <> struct hash<wstring_view>;
-  constexpr basic_string_view<char>     operator "" sv( const char *str,     size_t len ) noexcept;
+  constexpr basic_string_view<char>     operator "" sv(const char *str,     size_t len) noexcept;
-  constexpr basic_string_view<wchar_t>  operator "" sv( const wchar_t *str,  size_t len ) noexcept;
+  constexpr basic_string_view<wchar_t>  operator "" sv(const wchar_t *str,  size_t len) noexcept;
-  constexpr basic_string_view<char8_t>  operator "" sv( const char8_t *str,  size_t len ) noexcept; // C++20
+  constexpr basic_string_view<char8_t>  operator "" sv(const char8_t *str,  size_t len) noexcept; // C++20
-  constexpr basic_string_view<char16_t> operator "" sv( const char16_t *str, size_t len ) noexcept;
+  constexpr basic_string_view<char16_t> operator "" sv(const char16_t *str, size_t len) noexcept;
-  constexpr basic_string_view<char32_t> operator "" sv( const char32_t *str, size_t len ) noexcept;
+  constexpr basic_string_view<char32_t> operator "" sv(const char32_t *str, size_t len) noexcept;
 }  // namespace std
 @@ -218,12 +224,6 @@ namespace std {
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <algorithm>
-#  include <functional>
-#  include <iterator>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -256,29 +256,21 @@ inline size_t __char_traits_length_checked(const typename _Traits::char_type* __
 }
 template<class _CharT, class _Traits>
-class
+class basic_string_view {
-    _LIBCPP_PREFERRED_NAME(string_view)
-#ifndef _LIBCPP_HAS_NO_CHAR8_T
-    _LIBCPP_PREFERRED_NAME(u8string_view)
-#endif
-    _LIBCPP_PREFERRED_NAME(u16string_view)
-    _LIBCPP_PREFERRED_NAME(u32string_view)
-    _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wstring_view))
-    basic_string_view {
 public:
     // types
-    typedef _Traits                                    traits_type;
+    using traits_type            = _Traits;
-    typedef _CharT                                     value_type;
+    using value_type             = _CharT;
-    typedef _CharT*                                    pointer;
+    using pointer                = _CharT*;
-    typedef const _CharT*                              const_pointer;
+    using const_pointer          = const _CharT*;
-    typedef _CharT&                                    reference;
+    using reference              = _CharT&;
-    typedef const _CharT&                              const_reference;
+    using const_reference        = const _CharT&;
-    typedef const_pointer                              const_iterator; // See [string.view.iterators]
+    using const_iterator         = const_pointer; // See [string.view.iterators]
-    typedef const_iterator                             iterator;
+    using iterator               = const_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>    const_reverse_iterator;
+    using const_reverse_iterator = _VSTD::reverse_iterator<const_iterator>;
-    typedef const_reverse_iterator                     reverse_iterator;
+    using reverse_iterator       = const_reverse_iterator;
-    typedef size_t                                     size_type;
+    using size_type              = size_t;
-    typedef ptrdiff_t                                  difference_type;
+    using difference_type        = ptrdiff_t;
     static _LIBCPP_CONSTEXPR const size_type npos = -1; // size_type(-1);
     static_assert((!is_array<value_type>::value), "Character type of basic_string_view must not be an array");
 @@ -289,7 +281,7 @@ public:
     // [string.view.cons], construct/copy
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    basic_string_view() _NOEXCEPT : __data (nullptr), __size(0) {}
+    basic_string_view() _NOEXCEPT : __data_(nullptr), __size_(0) {}
     _LIBCPP_INLINE_VISIBILITY
     basic_string_view(const basic_string_view&) _NOEXCEPT = default;
 @@ -299,7 +291,7 @@ public:
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT
-        : __data(__s), __size(__len)
+        : __data_(__s), __size_(__len)
     {
 #if _LIBCPP_STD_VER > 11
     _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr");
 @@ -310,13 +302,13 @@ public:
     template <contiguous_iterator _It, sized_sentinel_for<_It> _End>
       requires (is_same_v<iter_value_t<_It>, _CharT> && !is_convertible_v<_End, size_type>)
     constexpr _LIBCPP_HIDE_FROM_ABI basic_string_view(_It __begin, _End __end)
-       : __data(_VSTD::to_address(__begin)), __size(__end - __begin)
+       : __data_(_VSTD::to_address(__begin)), __size_(__end - __begin)
     {
       _LIBCPP_ASSERT((__end - __begin) >= 0, "std::string_view::string_view(iterator, sentinel) received invalid range");
     }
 #endif // _LIBCPP_STD_VER > 17
-#if _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 20
     template <class _Range>
       requires (
         !is_same_v<remove_cvref_t<_Range>, basic_string_view> &&
 @@ -331,13 +323,13 @@ public:
          typename remove_reference_t<_Range>::traits_type;
         } || is_same_v<typename remove_reference_t<_Range>::traits_type, _Traits>)
       )
-    constexpr _LIBCPP_HIDE_FROM_ABI
+    constexpr explicit _LIBCPP_HIDE_FROM_ABI
-    basic_string_view(_Range&& __r) : __data(ranges::data(__r)), __size(ranges::size(__r)) {}
+    basic_string_view(_Range&& __r) : __data_(ranges::data(__r)), __size_(ranges::size(__r)) {}
-#endif // _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif // _LIBCPP_STD_VER > 20
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     basic_string_view(const _CharT* __s)
-        : __data(__s), __size(_VSTD::__char_traits_length_checked<_Traits>(__s)) {}
+        : __data_(__s), __size_(_VSTD::__char_traits_length_checked<_Traits>(__s)) {}
 #if _LIBCPP_STD_VER > 20
     basic_string_view(nullptr_t) = delete;
 @@ -351,94 +343,94 @@ public:
     const_iterator end()    const _NOEXCEPT { return cend(); }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT { return __data; }
+    const_iterator cbegin() const _NOEXCEPT { return __data_; }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT { return __data + __size; }
+    const_iterator cend()   const _NOEXCEPT { return __data_ + __size_; }
-    _LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX17 _LIBCPP_INLINE_VISIBILITY
     const_reverse_iterator rbegin()   const _NOEXCEPT { return const_reverse_iterator(cend()); }
-    _LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX17 _LIBCPP_INLINE_VISIBILITY
     const_reverse_iterator rend()     const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
-    _LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX17 _LIBCPP_INLINE_VISIBILITY
     const_reverse_iterator crbegin()  const _NOEXCEPT { return const_reverse_iterator(cend()); }
-    _LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX17 _LIBCPP_INLINE_VISIBILITY
     const_reverse_iterator crend()    const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
     // [string.view.capacity], capacity
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    size_type size()     const _NOEXCEPT { return __size; }
+    size_type size()     const _NOEXCEPT { return __size_; }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    size_type length()   const _NOEXCEPT { return __size; }
+    size_type length()   const _NOEXCEPT { return __size_; }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     size_type max_size() const _NOEXCEPT { return numeric_limits<size_type>::max() / sizeof(value_type); }
     _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool empty()         const _NOEXCEPT { return __size == 0; }
+    bool empty()         const _NOEXCEPT { return __size_ == 0; }
     // [string.view.access], element access
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     const_reference operator[](size_type __pos) const _NOEXCEPT {
-      return _LIBCPP_ASSERT(__pos < size(), "string_view[] index out of bounds"), __data[__pos];
+      return _LIBCPP_ASSERT(__pos < size(), "string_view[] index out of bounds"), __data_[__pos];
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     const_reference at(size_type __pos) const
     {
         return __pos >= size()
-            ? (__throw_out_of_range("string_view::at"), __data[0])
+            ? (__throw_out_of_range("string_view::at"), __data_[0])
-            : __data[__pos];
+            : __data_[__pos];
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     const_reference front() const _NOEXCEPT
     {
-        return _LIBCPP_ASSERT(!empty(), "string_view::front(): string is empty"), __data[0];
+        return _LIBCPP_ASSERT(!empty(), "string_view::front(): string is empty"), __data_[0];
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     const_reference back() const _NOEXCEPT
     {
-        return _LIBCPP_ASSERT(!empty(), "string_view::back(): string is empty"), __data[__size-1];
+        return _LIBCPP_ASSERT(!empty(), "string_view::back(): string is empty"), __data_[__size_-1];
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    const_pointer data() const _NOEXCEPT { return __data; }
+    const_pointer data() const _NOEXCEPT { return __data_; }
     // [string.view.modifiers], modifiers:
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     void remove_prefix(size_type __n) _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n <= size(), "remove_prefix() can't remove more than size()");
-        __data += __n;
+        __data_ += __n;
-        __size -= __n;
+        __size_ -= __n;
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     void remove_suffix(size_type __n) _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n <= size(), "remove_suffix() can't remove more than size()");
-        __size -= __n;
+        __size_ -= __n;
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     void swap(basic_string_view& __other) _NOEXCEPT
     {
-        const value_type *__p = __data;
+        const value_type *__p = __data_;
-        __data = __other.__data;
+        __data_ = __other.__data_;
-        __other.__data = __p;
+        __other.__data_ = __p;
-        size_type __sz = __size;
+        size_type __sz = __size_;
-        __size = __other.__size;
+        __size_ = __other.__size_;
-        __other.__size = __sz;
+        __other.__size_ = __sz;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20
     size_type copy(_CharT* __s, size_type __n, size_type __pos = 0) const
     {
         if (__pos > size())
 @@ -456,229 +448,229 @@ public:
             : basic_string_view(data() + __pos, _VSTD::min(__n, size() - __pos));
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 int compare(basic_string_view __sv) const _NOEXCEPT
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 int compare(basic_string_view __sv) const _NOEXCEPT
     {
-        size_type __rlen = _VSTD::min( size(), __sv.size());
+        size_type __rlen = _VSTD::min(size(), __sv.size());
         int __retval = _Traits::compare(data(), __sv.data(), __rlen);
-        if ( __retval == 0 ) // first __rlen chars matched
+        if (__retval == 0) // first __rlen chars matched
-            __retval = size() == __sv.size() ? 0 : ( size() < __sv.size() ? -1 : 1 );
+            __retval = size() == __sv.size() ? 0 : (size() < __sv.size() ? -1 : 1);
         return __retval;
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     int compare(size_type __pos1, size_type __n1, basic_string_view __sv) const
     {
         return substr(__pos1, __n1).compare(__sv);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     int compare(                       size_type __pos1, size_type __n1,
                 basic_string_view __sv, size_type __pos2, size_type __n2) const
     {
         return substr(__pos1, __n1).compare(__sv.substr(__pos2, __n2));
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     int compare(const _CharT* __s) const _NOEXCEPT
     {
         return compare(basic_string_view(__s));
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     int compare(size_type __pos1, size_type __n1, const _CharT* __s) const
     {
         return substr(__pos1, __n1).compare(basic_string_view(__s));
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     int compare(size_type __pos1, size_type __n1, const _CharT* __s, size_type __n2) const
     {
         return substr(__pos1, __n1).compare(basic_string_view(__s, __n2));
     }
     // find
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): received nullptr");
-        return __str_find<value_type, size_type, traits_type, npos>
+        return std::__str_find<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find(_CharT __c, size_type __pos = 0) const _NOEXCEPT
     {
-        return __str_find<value_type, size_type, traits_type, npos>
+        return std::__str_find<value_type, size_type, traits_type, npos>
             (data(), size(), __c, __pos);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find(): received nullptr");
-        return __str_find<value_type, size_type, traits_type, npos>
+        return std::__str_find<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find(const _CharT* __s, size_type __pos = 0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::find(): received nullptr");
-        return __str_find<value_type, size_type, traits_type, npos>
+        return std::__str_find<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
     // rfind
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type rfind(basic_string_view __s, size_type __pos = npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): received nullptr");
-        return __str_rfind<value_type, size_type, traits_type, npos>
+        return std::__str_rfind<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type rfind(_CharT __c, size_type __pos = npos) const _NOEXCEPT
     {
-        return __str_rfind<value_type, size_type, traits_type, npos>
+        return std::__str_rfind<value_type, size_type, traits_type, npos>
             (data(), size(), __c, __pos);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::rfind(): received nullptr");
-        return __str_rfind<value_type, size_type, traits_type, npos>
+        return std::__str_rfind<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type rfind(const _CharT* __s, size_type __pos=npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::rfind(): received nullptr");
-        return __str_rfind<value_type, size_type, traits_type, npos>
+        return std::__str_rfind<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
     // find_first_of
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_of(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_of(): received nullptr");
-        return __str_find_first_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_of(_CharT __c, size_type __pos = 0) const _NOEXCEPT
     { return find(__c, __pos); }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_of(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_first_of(): received nullptr");
-        return __str_find_first_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_of(const _CharT* __s, size_type __pos=0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::find_first_of(): received nullptr");
-        return __str_find_first_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
     // find_last_of
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_of(basic_string_view __s, size_type __pos=npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_of(): received nullptr");
-        return __str_find_last_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_of(_CharT __c, size_type __pos = npos) const _NOEXCEPT
     { return rfind(__c, __pos); }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_of(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_last_of(): received nullptr");
-        return __str_find_last_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_of(const _CharT* __s, size_type __pos=npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_of(): received nullptr");
-        return __str_find_last_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
     // find_first_not_of
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_not_of(basic_string_view __s, size_type __pos=0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_not_of(): received nullptr");
-        return __str_find_first_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_not_of(_CharT __c, size_type __pos=0) const _NOEXCEPT
     {
-        return __str_find_first_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __c, __pos);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_first_not_of(): received nullptr");
-        return __str_find_first_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_first_not_of(const _CharT* __s, size_type __pos=0) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::find_first_not_of(): received nullptr");
-        return __str_find_first_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
     // find_last_not_of
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_not_of(basic_string_view __s, size_type __pos=npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_not_of(): received nullptr");
-        return __str_find_last_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s.data(), __pos, __s.size());
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_not_of(_CharT __c, size_type __pos=npos) const _NOEXCEPT
     {
-        return __str_find_last_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __c, __pos);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_last_not_of(): received nullptr");
-        return __str_find_last_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, __n);
     }
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
     size_type find_last_not_of(const _CharT* __s, size_type __pos=npos) const _NOEXCEPT
     {
         _LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_not_of(): received nullptr");
-        return __str_find_last_not_of<value_type, size_type, traits_type, npos>
+        return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>
             (data(), size(), __s, __pos, traits_type::length(__s));
     }
 @@ -723,9 +715,10 @@ public:
 #endif
 private:
-    const   value_type* __data;
+    const   value_type* __data_;
-    size_type           __size;
+    size_type           __size_;
 };
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_string_view);
 #if _LIBCPP_STD_VER > 17
 template <class _CharT, class _Traits>
 @@ -743,69 +736,105 @@ template <contiguous_iterator _It, sized_sentinel_for<_It> _End>
 #endif // _LIBCPP_STD_VER > 17
-#if _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#if _LIBCPP_STD_VER > 20
 template <ranges::contiguous_range _Range>
   basic_string_view(_Range) -> basic_string_view<ranges::range_value_t<_Range>>;
-#endif // _LIBCPP_STD_VER > 20 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+#endif
 // [string.view.comparison]
 // operator ==
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator==(basic_string_view<_CharT, _Traits> __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size()) return false;
+    if (__lhs.size() != __rhs.size()) return false;
     return __lhs.compare(__rhs) == 0;
 }
 // The dummy default template parameters are used to work around a MSVC issue with mangling, see VSO-409326 for details.
 // This applies to the other sufficient overloads below for the other comparison operators.
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator==(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size()) return false;
+    if (__lhs.size() != __rhs.size()) return false;
     return __lhs.compare(__rhs) == 0;
 }
+#if _LIBCPP_STD_VER < 20
+// This overload is automatically generated in C++20.
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator==(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator==(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size()) return false;
+    if (__lhs.size() != __rhs.size()) return false;
     return __lhs.compare(__rhs) == 0;
 }
+#endif // _LIBCPP_STD_VER > 17
+// operator <=>
+#if _LIBCPP_STD_VER > 17
+template <class _CharT, class _Traits>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+operator<=>(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) noexcept {
+    if constexpr (requires { typename _Traits::comparison_category; }) {
+        // [string.view]/4
+        static_assert(
+            __comparison_category<typename _Traits::comparison_category>,
+            "return type is not a comparison category type");
+        return static_cast<typename _Traits::comparison_category>(__lhs.compare(__rhs) <=> 0);
+    } else {
+        return static_cast<weak_ordering>(__lhs.compare(__rhs) <=> 0);
+    }
+}
+template <class _CharT, class _Traits, int = 1>
+_LIBCPP_HIDE_FROM_ABI constexpr auto operator<=>(
+    basic_string_view<_CharT, _Traits> __lhs, type_identity_t<basic_string_view<_CharT, _Traits>> __rhs) noexcept {
+    if constexpr (requires { typename _Traits::comparison_category; }) {
+        // [string.view]/4
+        static_assert(
+            __comparison_category<typename _Traits::comparison_category>,
+            "return type is not a comparison category type");
+        return static_cast<typename _Traits::comparison_category>(__lhs.compare(__rhs) <=> 0);
+    } else {
+        return static_cast<weak_ordering>(__lhs.compare(__rhs) <=> 0);
+    }
+}
+#else //  _LIBCPP_STD_VER > 17
 // operator !=
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator!=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size())
+    if (__lhs.size() != __rhs.size())
         return true;
     return __lhs.compare(__rhs) != 0;
 }
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator!=(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size())
+    if (__lhs.size() != __rhs.size())
         return true;
     return __lhs.compare(__rhs) != 0;
 }
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator!=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator!=(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
-    if ( __lhs.size() != __rhs.size())
+    if (__lhs.size() != __rhs.size())
         return true;
     return __lhs.compare(__rhs) != 0;
 }
 @@ -813,23 +842,23 @@ bool operator!=(typename common_type<basic_string_view<_CharT, _Traits> >::type
 // operator <
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator<(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) < 0;
 }
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator<(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) < 0;
 }
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator<(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator<(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) < 0;
 @@ -838,23 +867,23 @@ bool operator<(typename common_type<basic_string_view<_CharT, _Traits> >::type _
 // operator >
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator> (basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) > 0;
 }
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator>(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) > 0;
 }
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator>(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator>(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) > 0;
 @@ -863,23 +892,23 @@ bool operator>(typename common_type<basic_string_view<_CharT, _Traits> >::type _
 // operator <=
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator<=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) <= 0;
 }
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator<=(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) <= 0;
 }
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator<=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator<=(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) <= 0;
 @@ -888,7 +917,7 @@ bool operator<=(typename common_type<basic_string_view<_CharT, _Traits> >::type
 // operator >=
 template<class _CharT, class _Traits>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator>=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) >= 0;
 @@ -896,38 +925,57 @@ bool operator>=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_Cha
 template<class _CharT, class _Traits, int = 1>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
 bool operator>=(basic_string_view<_CharT, _Traits> __lhs,
-                typename common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
+                __type_identity_t<basic_string_view<_CharT, _Traits> > __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) >= 0;
 }
 template<class _CharT, class _Traits, int = 2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
-bool operator>=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
+bool operator>=(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) >= 0;
 }
+#endif //  _LIBCPP_STD_VER > 17
 template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
+_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
 operator<<(basic_ostream<_CharT, _Traits>& __os,
            basic_string_view<_CharT, _Traits> __str);
 // [string.view.hash]
 template<class _CharT>
-struct _LIBCPP_TEMPLATE_VIS hash<basic_string_view<_CharT, char_traits<_CharT> > >
+struct __string_view_hash : public __unary_function<basic_string_view<_CharT, char_traits<_CharT> >, size_t>
-    : public __unary_function<basic_string_view<_CharT, char_traits<_CharT> >, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(const basic_string_view<_CharT, char_traits<_CharT> > __val) const _NOEXCEPT {
-        return __do_string_hash(__val.data(), __val.data() + __val.size());
+        return std::__do_string_hash(__val.data(), __val.data() + __val.size());
     }
 };
+template <>
+struct hash<basic_string_view<char, char_traits<char> > > : __string_view_hash<char> {};
+#ifndef _LIBCPP_HAS_NO_CHAR8_T
+template <>
+struct hash<basic_string_view<char8_t, char_traits<char8_t> > > : __string_view_hash<char8_t> {};
+#endif
+template <>
+struct hash<basic_string_view<char16_t, char_traits<char16_t> > > : __string_view_hash<char16_t> {};
+template <>
+struct hash<basic_string_view<char32_t, char_traits<char32_t> > > : __string_view_hash<char32_t> {};
+#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+template <>
+struct hash<basic_string_view<wchar_t, char_traits<wchar_t> > > : __string_view_hash<wchar_t> {};
+#endif
 #if _LIBCPP_STD_VER > 11
 inline namespace literals
 {
 @@ -973,4 +1021,11 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <algorithm>
+#  include <concepts>
+#  include <functional>
+#  include <iterator>
+#endif
 #endif // _LIBCPP_STRING_VIEW

lib/libcxx/include/strstream+11-11

...	@@ -167,7 +167,7 @@ public:	...	@@ -167,7 +167,7 @@ public:
167	strstreambuf& operator=(strstreambuf&& __rhs);	167	strstreambuf& operator=(strstreambuf&& __rhs);
168	#endif // _LIBCPP_CXX03_LANG	168	#endif // _LIBCPP_CXX03_LANG
169		169
170	virtual ~strstreambuf();	170	~strstreambuf() override;
171		171
172	void swap(strstreambuf& __rhs);	172	void swap(strstreambuf& __rhs);
173		173
...	@@ -176,13 +176,13 @@ public:	...	@@ -176,13 +176,13 @@ public:
176	int pcount() const;	176	int pcount() const;
177		177
178	protected:	178	protected:
179	virtual int_type overflow (int_type __c = EOF);	179	int_type overflow (int_type __c = EOF) override;
180	virtual int_type pbackfail(int_type __c = EOF);	180	int_type pbackfail(int_type __c = EOF) override;
181	virtual int_type underflow();	181	int_type underflow() override;
182	virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,	182	pos_type seekoff(off_type __off, ios_base::seekdir __way,
183	ios_base::openmode __which = ios_base::in \| ios_base::out);	183	ios_base::openmode __which = ios_base::in \| ios_base::out) override;
184	virtual pos_type seekpos(pos_type __sp,	184	pos_type seekpos(pos_type __sp,
185	ios_base::openmode __which = ios_base::in \| ios_base::out);	185	ios_base::openmode __which = ios_base::in \| ios_base::out) override;
186		186
187	private:	187	private:
188	typedef unsigned __mode_type;	188	typedef unsigned __mode_type;
...	@@ -272,7 +272,7 @@ public:	...	@@ -272,7 +272,7 @@ public:
272	}	272	}
273	#endif // _LIBCPP_CXX03_LANG	273	#endif // _LIBCPP_CXX03_LANG
274		274
275	virtual ~istrstream();	275	~istrstream() override;
276		276
277	_LIBCPP_INLINE_VISIBILITY	277	_LIBCPP_INLINE_VISIBILITY
278	void swap(istrstream& __rhs)	278	void swap(istrstream& __rhs)
...	@@ -321,7 +321,7 @@ public:	...	@@ -321,7 +321,7 @@ public:
321	}	321	}
322	#endif // _LIBCPP_CXX03_LANG	322	#endif // _LIBCPP_CXX03_LANG
323		323
324	virtual ~ostrstream();	324	~ostrstream() override;
325		325
326	_LIBCPP_INLINE_VISIBILITY	326	_LIBCPP_INLINE_VISIBILITY
327	void swap(ostrstream& __rhs)	327	void swap(ostrstream& __rhs)
...	@@ -381,7 +381,7 @@ public:	...	@@ -381,7 +381,7 @@ public:
381	}	381	}
382	#endif // _LIBCPP_CXX03_LANG	382	#endif // _LIBCPP_CXX03_LANG
383		383
384	virtual ~strstream();	384	~strstream() override;
385		385
386	_LIBCPP_INLINE_VISIBILITY	386	_LIBCPP_INLINE_VISIBILITY
387	void swap(strstream& __rhs)	387	void swap(strstream& __rhs)

lib/libcxx/include/system_error+92-33

 @@ -32,8 +32,9 @@ public:
     virtual string message(int ev) const = 0;
     bool operator==(const error_category& rhs) const noexcept;
-    bool operator!=(const error_category& rhs) const noexcept;
+    bool operator!=(const error_category& rhs) const noexcept;              // removed in C++20
-    bool operator<(const error_category& rhs) const noexcept;
+    bool operator<(const error_category& rhs) const noexcept;               // removed in C++20
+    strong_ordering operator<=>(const error_category& rhs) const noexcept;  // C++20
 };
 const error_category& generic_category() noexcept;
 @@ -75,7 +76,6 @@ public:
 };
 // non-member functions:
-bool operator<(const error_code& lhs, const error_code& rhs) noexcept;
 template <class charT, class traits>
     basic_ostream<charT,traits>&
     operator<<(basic_ostream<charT,traits>& os, const error_code& ec);
 @@ -102,8 +102,6 @@ public:
     explicit operator bool() const noexcept;
 };
-bool operator<(const error_condition& lhs, const error_condition& rhs) noexcept;
 class system_error
     : public runtime_error
 {
 @@ -128,12 +126,16 @@ error_condition make_error_condition(errc e) noexcept;
 // Comparison operators:
 bool operator==(const error_code& lhs, const error_code& rhs) noexcept;
 bool operator==(const error_code& lhs, const error_condition& rhs) noexcept;
-bool operator==(const error_condition& lhs, const error_code& rhs) noexcept;
+bool operator==(const error_condition& lhs, const error_code& rhs) noexcept;                  // removed in C++20
 bool operator==(const error_condition& lhs, const error_condition& rhs) noexcept;
-bool operator!=(const error_code& lhs, const error_code& rhs) noexcept;
+bool operator!=(const error_code& lhs, const error_code& rhs) noexcept;                       // removed in C++20
-bool operator!=(const error_code& lhs, const error_condition& rhs) noexcept;
+bool operator!=(const error_code& lhs, const error_condition& rhs) noexcept;                  // removed in C++20
-bool operator!=(const error_condition& lhs, const error_code& rhs) noexcept;
+bool operator!=(const error_condition& lhs, const error_code& rhs) noexcept;                  // removed in C++20
-bool operator!=(const error_condition& lhs, const error_condition& rhs) noexcept;
+bool operator!=(const error_condition& lhs, const error_condition& rhs) noexcept;             // removed in C++20
+bool operator<(const error_condition& lhs, const error_condition& rhs) noexcept;              // removed in C++20
+bool operator<(const error_code& lhs, const error_code& rhs) noexcept;                        // removed in C++20
+strong_ordering operator<=>(const error_code& lhs, const error_code& rhs) noexcept;           // C++20
+strong_ordering operator<=>(const error_condition& lhs, const error_condition& rhs) noexcept; // C++20
 template <> struct hash<std::error_code>;
 template <> struct hash<std::error_condition>;
 @@ -147,12 +149,15 @@ template <> struct hash<std::error_condition>;
 #include <__errc>
 #include <__functional/hash.h>
 #include <__functional/unary_function.h>
+#include <__memory/addressof.h>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <version>
 // standard-mandated includes
+// [system.error.syn]
 #include <compare>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -209,7 +214,7 @@ public:
     error_category() noexcept;
 #else
     _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT = default;
+    _LIBCPP_CONSTEXPR_SINCE_CXX14 error_category() _NOEXCEPT = default;
 #endif
     error_category(const error_category&) = delete;
     error_category& operator=(const error_category&) = delete;
 @@ -223,12 +228,21 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     bool operator==(const error_category& __rhs) const _NOEXCEPT {return this == &__rhs;}
+#if _LIBCPP_STD_VER > 17
+    _LIBCPP_HIDE_FROM_ABI
+    strong_ordering operator<=>(const error_category& __rhs) const noexcept {return compare_three_way()(this, std::addressof(__rhs));}
+#else // _LIBCPP_STD_VER > 17
     _LIBCPP_INLINE_VISIBILITY
     bool operator!=(const error_category& __rhs) const _NOEXCEPT {return !(*this == __rhs);}
     _LIBCPP_INLINE_VISIBILITY
     bool operator< (const error_category& __rhs) const _NOEXCEPT {return this < &__rhs;}
+#endif // _LIBCPP_STD_VER > 17
     friend class _LIBCPP_HIDDEN __do_message;
 };
 @@ -236,12 +250,19 @@ class _LIBCPP_HIDDEN __do_message
     : public error_category
 {
 public:
-    virtual string message(int __ev) const;
+    string message(int __ev) const override;
 };
 _LIBCPP_FUNC_VIS const error_category& generic_category() _NOEXCEPT;
 _LIBCPP_FUNC_VIS const error_category& system_category() _NOEXCEPT;
+namespace __adl_only {
+    // Those cause ADL to trigger but they are not viable candidates,
+    // so they are never actually selected.
+    void make_error_condition() = delete;
+    void make_error_code() = delete;
+} // namespace __adl_only
 class _LIBCPP_TYPE_VIS error_condition
 {
     int __val_;
 @@ -259,7 +280,10 @@ public:
         error_condition(_Ep __e,
               typename enable_if<is_error_condition_enum<_Ep>::value>::type* = nullptr
                                                                      ) _NOEXCEPT
-            {*this = make_error_condition(__e);}
+            {
+                using __adl_only::make_error_condition;
+                *this = make_error_condition(__e);
+            }
     _LIBCPP_INLINE_VISIBILITY
     void assign(int __val, const error_category& __cat) _NOEXCEPT
 @@ -276,7 +300,11 @@ public:
             error_condition&
         >::type
         operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_condition(__e); return *this;}
+            {
+                using __adl_only::make_error_condition;
+                *this = make_error_condition(__e);
+                return *this;
+            }
     _LIBCPP_INLINE_VISIBILITY
     void clear() _NOEXCEPT
 @@ -303,14 +331,6 @@ make_error_condition(errc __e) _NOEXCEPT
     return error_condition(static_cast<int>(__e), generic_category());
 }
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
 // error_code
 class _LIBCPP_TYPE_VIS error_code
 @@ -330,7 +350,10 @@ public:
         error_code(_Ep __e,
                    typename enable_if<is_error_code_enum<_Ep>::value>::type* = nullptr
                                                                      ) _NOEXCEPT
-            {*this = make_error_code(__e);}
+            {
+                using __adl_only::make_error_code;
+                *this = make_error_code(__e);
+            }
     _LIBCPP_INLINE_VISIBILITY
     void assign(int __val, const error_category& __cat) _NOEXCEPT
 @@ -347,7 +370,11 @@ public:
             error_code&
         >::type
         operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_code(__e); return *this;}
+            {
+                using __adl_only::make_error_code;
+                *this = make_error_code(__e);
+                return *this;
+            }
     _LIBCPP_INLINE_VISIBILITY
     void clear() _NOEXCEPT
 @@ -379,14 +406,6 @@ make_error_code(errc __e) _NOEXCEPT
     return error_code(static_cast<int>(__e), generic_category());
 }
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_code& __x, const error_code& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 operator==(const error_code& __x, const error_code& __y) _NOEXCEPT
 @@ -402,12 +421,14 @@ operator==(const error_code& __x, const error_condition& __y) _NOEXCEPT
         || __y.category().equivalent(__x, __y.value());
 }
+#if _LIBCPP_STD_VER <= 17
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 operator==(const error_condition& __x, const error_code& __y) _NOEXCEPT
 {
     return __y == __x;
 }
+#endif
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 @@ -416,6 +437,8 @@ operator==(const error_condition& __x, const error_condition& __y) _NOEXCEPT
     return __x.category() == __y.category() && __x.value() == __y.value();
 }
+#if _LIBCPP_STD_VER <= 17
 inline _LIBCPP_INLINE_VISIBILITY
 bool
 operator!=(const error_code& __x, const error_code& __y) _NOEXCEPT
 @@ -436,6 +459,42 @@ bool
 operator!=(const error_condition& __x, const error_condition& __y) _NOEXCEPT
 {return !(__x == __y);}
+inline _LIBCPP_INLINE_VISIBILITY
+bool
+operator<(const error_condition& __x, const error_condition& __y) _NOEXCEPT
+{
+    return __x.category() < __y.category()
+        || (__x.category() == __y.category() && __x.value() < __y.value());
+}
+inline _LIBCPP_INLINE_VISIBILITY
+bool
+operator<(const error_code& __x, const error_code& __y) _NOEXCEPT
+{
+    return __x.category() < __y.category()
+        || (__x.category() == __y.category() && __x.value() < __y.value());
+}
+#else // _LIBCPP_STD_VER <= 17
+inline _LIBCPP_HIDE_FROM_ABI strong_ordering
+operator<=>(const error_code& __x, const error_code& __y) noexcept
+{
+    if (auto __c = __x.category() <=> __y.category(); __c != 0)
+        return __c;
+    return __x.value() <=> __y.value();
+}
+inline _LIBCPP_HIDE_FROM_ABI strong_ordering
+operator<=>(const error_condition& __x, const error_condition& __y) noexcept
+{
+    if (auto __c = __x.category() <=> __y.category(); __c != 0)
+       return __c;
+    return __x.value() <=> __y.value();
+}
+#endif // _LIBCPP_STD_VER <= 17
 template <>
 struct _LIBCPP_TEMPLATE_VIS hash<error_code>
     : public __unary_function<error_code, size_t>
 @@ -472,7 +531,7 @@ public:
     system_error(int __ev, const error_category& __ecat, const char* __what_arg);
     system_error(int __ev, const error_category& __ecat);
     system_error(const system_error&) _NOEXCEPT = default;
-    ~system_error() _NOEXCEPT;
+    ~system_error() _NOEXCEPT override;
     _LIBCPP_INLINE_VISIBILITY
     const error_code& code() const _NOEXCEPT {return __ec_;}

lib/libcxx/include/tgmath.h+6-8

...	@@ -24,13 +24,11 @@	...	@@ -24,13 +24,11 @@
24	#endif	24	#endif
25		25
26	#ifdef __cplusplus	26	#ifdef __cplusplus
27		27	# include <ctgmath>
28	#include <ctgmath>	28	#else
29		29	# if __has_include_next(<tgmath.h>)
30	#else // __cplusplus	30	# include_next <tgmath.h>
31		31	# endif
32	#include_next <tgmath.h>	32	#endif
33
34	#endif // __cplusplus
35		33
36	#endif // _LIBCPP_TGMATH_H	34	#endif // _LIBCPP_TGMATH_H

lib/libcxx/include/thread+22-16

 @@ -53,11 +53,12 @@ public:
 };
 bool operator==(thread::id x, thread::id y) noexcept;
-bool operator!=(thread::id x, thread::id y) noexcept;
+bool operator!=(thread::id x, thread::id y) noexcept;             // removed in C++20
-bool operator< (thread::id x, thread::id y) noexcept;
+bool operator< (thread::id x, thread::id y) noexcept;             // removed in C++20
-bool operator<=(thread::id x, thread::id y) noexcept;
+bool operator<=(thread::id x, thread::id y) noexcept;             // removed in C++20
-bool operator> (thread::id x, thread::id y) noexcept;
+bool operator> (thread::id x, thread::id y) noexcept;             // removed in C++20
-bool operator>=(thread::id x, thread::id y) noexcept;
+bool operator>=(thread::id x, thread::id y) noexcept;             // removed in C++20
+strong_ordering operator<=>(thread::id x, thread::id y) noexcept; // C++20
 template<class charT, class traits>
 basic_ostream<charT, traits>&
 @@ -85,6 +86,7 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <__functional/hash.h>
+#include <__memory/unique_ptr.h>
 #include <__mutex_base>
 #include <__thread/poll_with_backoff.h>
 #include <__thread/timed_backoff_policy.h>
 @@ -92,18 +94,14 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #include <__utility/forward.h>
 #include <cstddef>
 #include <iosfwd>
-#include <memory>
 #include <system_error>
 #include <tuple>
 #include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <chrono>
-#  include <functional>
-#endif
 // standard-mandated includes
+// [thread.syn]
 #include <compare>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -201,7 +199,7 @@ __thread_specific_ptr<_Tp>::set_pointer(pointer __p)
 {
     _LIBCPP_ASSERT(get() == nullptr,
                    "Attempting to overwrite thread local data");
-    __libcpp_tls_set(__key_, __p);
+    std::__libcpp_tls_set(__key_, __p);
 }
 template<>
 @@ -235,7 +233,7 @@ public:
     thread() _NOEXCEPT : __t_(_LIBCPP_NULL_THREAD) {}
 #ifndef _LIBCPP_CXX03_LANG
     template <class _Fp, class ..._Args,
-              class = __enable_if_t<!is_same<__uncvref_t<_Fp>, thread>::value> >
+              class = __enable_if_t<!is_same<__remove_cvref_t<_Fp>, thread>::value> >
         _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
         explicit thread(_Fp&& __f, _Args&&... __args);
 #else  // _LIBCPP_CXX03_LANG
 @@ -328,7 +326,7 @@ struct __thread_invoke_pair {
 };
 template <class _Fp>
-void* __thread_proxy_cxx03(void* __vp)
+_LIBCPP_HIDE_FROM_ABI void* __thread_proxy_cxx03(void* __vp)
 {
     unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
     __thread_local_data().set_pointer(__p->__tsp_.release());
 @@ -361,7 +359,7 @@ namespace this_thread
 _LIBCPP_FUNC_VIS void sleep_for(const chrono::nanoseconds& __ns);
 template <class _Rep, class _Period>
-void
+_LIBCPP_HIDE_FROM_ABI void
 sleep_for(const chrono::duration<_Rep, _Period>& __d)
 {
     if (__d > chrono::duration<_Rep, _Period>::zero())
 @@ -385,7 +383,7 @@ sleep_for(const chrono::duration<_Rep, _Period>& __d)
 }
 template <class _Clock, class _Duration>
-void
+_LIBCPP_HIDE_FROM_ABI void
 sleep_until(const chrono::time_point<_Clock, _Duration>& __t)
 {
     mutex __mut;
 @@ -412,4 +410,12 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  include <chrono>
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <functional>
+#endif
 #endif // _LIBCPP_THREAD

lib/libcxx/include/tuple+162-126

lib/libcxx/include/type_traits+13-278

...	@@ -158,8 +158,8 @@ namespace std	...	@@ -158,8 +158,8 @@ namespace std
158	// Alignment properties and transformations:	158	// Alignment properties and transformations:
159	template <class T> struct alignment_of;	159	template <class T> struct alignment_of;
160	template <size_t Len, size_t Align = most_stringent_alignment_requirement>	160	template <size_t Len, size_t Align = most_stringent_alignment_requirement>
161	struct aligned_storage;	161	struct aligned_storage; // deprecated in C++23
162	template <size_t Len, class... Types> struct aligned_union;	162	template <size_t Len, class... Types> struct aligned_union; // deprecated in C++23
163	template <class T> struct remove_cvref; // C++20	163	template <class T> struct remove_cvref; // C++20
164		164
165	template <class T> struct decay;	165	template <class T> struct decay;
...	@@ -419,6 +419,7 @@ namespace std	...	@@ -419,6 +419,7 @@ namespace std
419	#include <__assert> // all public C++ headers provide the assertion handler	419	#include <__assert> // all public C++ headers provide the assertion handler
420	#include <__config>	420	#include <__config>
421	#include <__functional/invoke.h>	421	#include <__functional/invoke.h>
		422	#include <__fwd/hash.h> // This is https://llvm.org/PR56938
422	#include <__type_traits/add_const.h>	423	#include <__type_traits/add_const.h>
423	#include <__type_traits/add_cv.h>	424	#include <__type_traits/add_cv.h>
424	#include <__type_traits/add_lvalue_reference.h>	425	#include <__type_traits/add_lvalue_reference.h>
...	@@ -429,11 +430,13 @@ namespace std	...	@@ -429,11 +430,13 @@ namespace std
429	#include <__type_traits/aligned_union.h>	430	#include <__type_traits/aligned_union.h>
430	#include <__type_traits/alignment_of.h>	431	#include <__type_traits/alignment_of.h>
431	#include <__type_traits/apply_cv.h>	432	#include <__type_traits/apply_cv.h>
		433	#include <__type_traits/can_extract_key.h>
432	#include <__type_traits/common_reference.h>	434	#include <__type_traits/common_reference.h>
433	#include <__type_traits/common_type.h>	435	#include <__type_traits/common_type.h>
434	#include <__type_traits/conditional.h>	436	#include <__type_traits/conditional.h>
435	#include <__type_traits/conjunction.h>	437	#include <__type_traits/conjunction.h>
436	#include <__type_traits/decay.h>	438	#include <__type_traits/decay.h>
		439	#include <__type_traits/dependent_type.h>
437	#include <__type_traits/disjunction.h>	440	#include <__type_traits/disjunction.h>
438	#include <__type_traits/enable_if.h>	441	#include <__type_traits/enable_if.h>
439	#include <__type_traits/extent.h>	442	#include <__type_traits/extent.h>
...	@@ -448,6 +451,7 @@ namespace std	...	@@ -448,6 +451,7 @@ namespace std
448	#include <__type_traits/is_base_of.h>	451	#include <__type_traits/is_base_of.h>
449	#include <__type_traits/is_bounded_array.h>	452	#include <__type_traits/is_bounded_array.h>
450	#include <__type_traits/is_callable.h>	453	#include <__type_traits/is_callable.h>
		454	#include <__type_traits/is_char_like_type.h>
451	#include <__type_traits/is_class.h>	455	#include <__type_traits/is_class.h>
452	#include <__type_traits/is_compound.h>	456	#include <__type_traits/is_compound.h>
453	#include <__type_traits/is_const.h>	457	#include <__type_traits/is_const.h>
...	@@ -464,6 +468,7 @@ namespace std	...	@@ -464,6 +468,7 @@ namespace std
464	#include <__type_traits/is_floating_point.h>	468	#include <__type_traits/is_floating_point.h>
465	#include <__type_traits/is_function.h>	469	#include <__type_traits/is_function.h>
466	#include <__type_traits/is_fundamental.h>	470	#include <__type_traits/is_fundamental.h>
		471	#include <__type_traits/is_implicitly_default_constructible.h>
467	#include <__type_traits/is_integral.h>	472	#include <__type_traits/is_integral.h>
468	#include <__type_traits/is_literal_type.h>	473	#include <__type_traits/is_literal_type.h>
469	#include <__type_traits/is_member_function_pointer.h>	474	#include <__type_traits/is_member_function_pointer.h>
...	@@ -492,7 +497,9 @@ namespace std	...	@@ -492,7 +497,9 @@ namespace std
492	#include <__type_traits/is_scalar.h>	497	#include <__type_traits/is_scalar.h>
493	#include <__type_traits/is_scoped_enum.h>	498	#include <__type_traits/is_scoped_enum.h>
494	#include <__type_traits/is_signed.h>	499	#include <__type_traits/is_signed.h>
		500	#include <__type_traits/is_specialization.h>
495	#include <__type_traits/is_standard_layout.h>	501	#include <__type_traits/is_standard_layout.h>
		502	#include <__type_traits/is_swappable.h>
496	#include <__type_traits/is_trivial.h>	503	#include <__type_traits/is_trivial.h>
497	#include <__type_traits/is_trivially_assignable.h>	504	#include <__type_traits/is_trivially_assignable.h>
498	#include <__type_traits/is_trivially_constructible.h>	505	#include <__type_traits/is_trivially_constructible.h>
...	@@ -508,17 +515,21 @@ namespace std	...	@@ -508,17 +515,21 @@ namespace std
508	#include <__type_traits/is_unsigned.h>	515	#include <__type_traits/is_unsigned.h>
509	#include <__type_traits/is_void.h>	516	#include <__type_traits/is_void.h>
510	#include <__type_traits/is_volatile.h>	517	#include <__type_traits/is_volatile.h>
		518	#include <__type_traits/make_const_lvalue_ref.h>
511	#include <__type_traits/make_signed.h>	519	#include <__type_traits/make_signed.h>
512	#include <__type_traits/make_unsigned.h>	520	#include <__type_traits/make_unsigned.h>
		521	#include <__type_traits/maybe_const.h>
513	#include <__type_traits/negation.h>	522	#include <__type_traits/negation.h>
514	#include <__type_traits/rank.h>	523	#include <__type_traits/rank.h>
515	#include <__type_traits/remove_all_extents.h>	524	#include <__type_traits/remove_all_extents.h>
516	#include <__type_traits/remove_const.h>	525	#include <__type_traits/remove_const.h>
		526	#include <__type_traits/remove_const_ref.h>
517	#include <__type_traits/remove_cv.h>	527	#include <__type_traits/remove_cv.h>
518	#include <__type_traits/remove_extent.h>	528	#include <__type_traits/remove_extent.h>
519	#include <__type_traits/remove_pointer.h>	529	#include <__type_traits/remove_pointer.h>
520	#include <__type_traits/remove_reference.h>	530	#include <__type_traits/remove_reference.h>
521	#include <__type_traits/remove_volatile.h>	531	#include <__type_traits/remove_volatile.h>
		532	#include <__type_traits/result_of.h>
522	#include <__type_traits/type_identity.h>	533	#include <__type_traits/type_identity.h>
523	#include <__type_traits/underlying_type.h>	534	#include <__type_traits/underlying_type.h>
524	#include <__type_traits/void_t.h>	535	#include <__type_traits/void_t.h>
...	@@ -531,280 +542,4 @@ namespace std	...	@@ -531,280 +542,4 @@ namespace std
531	# pragma GCC system_header	542	# pragma GCC system_header
532	#endif	543	#endif
533		544
534	_LIBCPP_BEGIN_NAMESPACE_STD
535
536	template <class _T1, class _T2> struct _LIBCPP_TEMPLATE_VIS pair;
537	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS hash;
538
539	// Member detector base
540
541	template <class _Tp, bool>
542	struct _LIBCPP_TEMPLATE_VIS __dependent_type : public _Tp {};
543
544	// is_integral
545
546	template <class _Tp>
547	struct __unconstref {
548	typedef _LIBCPP_NODEBUG typename remove_const<typename remove_reference<_Tp>::type>::type type;
549	};
550
551	#ifndef _LIBCPP_CXX03_LANG
552	// First of all, we can't implement this check in C++03 mode because the {}
553	// default initialization syntax isn't valid.
554	// Second, we implement the trait in a funny manner with two defaulted template
555	// arguments to workaround Clang's PR43454.
556	template <class _Tp>
557	void __test_implicit_default_constructible(_Tp);
558
559	template <class _Tp, class = void, class = typename is_default_constructible<_Tp>::type>
560	struct __is_implicitly_default_constructible
561	: false_type
562	{ };
563
564	template <class _Tp>
565	struct __is_implicitly_default_constructible<_Tp, decltype(__test_implicit_default_constructible<_Tp const&>({})), true_type>
566	: true_type
567	{ };
568
569	template <class _Tp>
570	struct __is_implicitly_default_constructible<_Tp, decltype(__test_implicit_default_constructible<_Tp const&>({})), false_type>
571	: false_type
572	{ };
573	#endif // !C++03
574
575	// result_of
576
577	#if _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
578	template <class _Callable> class _LIBCPP_DEPRECATED_IN_CXX17 result_of;
579
580	template <class _Fp, class ..._Args>
581	class _LIBCPP_TEMPLATE_VIS result_of<_Fp(_Args...)>
582	: public __invoke_of<_Fp, _Args...>
583	{
584	};
585
586	#if _LIBCPP_STD_VER > 11
587	template <class _Tp> using result_of_t _LIBCPP_DEPRECATED_IN_CXX17 = typename result_of<_Tp>::type;
588	#endif // _LIBCPP_STD_VER > 11
589	#endif // _LIBCPP_STD_VER <= 17 \|\| defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
590
591	// __swappable
592
593	template <class _Tp> struct __is_swappable;
594	template <class _Tp> struct __is_nothrow_swappable;
595
596
597	#ifndef _LIBCPP_CXX03_LANG
598	template <class _Tp>
599	using __swap_result_t = typename enable_if<is_move_constructible<_Tp>::value && is_move_assignable<_Tp>::value>::type;
600	#else
601	template <class>
602	using __swap_result_t = void;
603	#endif
604
605	template <class _Tp>
606	inline _LIBCPP_INLINE_VISIBILITY
607	_LIBCPP_CONSTEXPR_AFTER_CXX17 __swap_result_t<_Tp>
608	swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
609	is_nothrow_move_assignable<_Tp>::value);
610
611	template<class _Tp, size_t _Np>
612	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
613	typename enable_if<
614	__is_swappable<_Tp>::value
615	>::type
616	swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value);
617
618	namespace __detail
619	{
620	// ALL generic swap overloads MUST already have a declaration available at this point.
621
622	template <class _Tp, class _Up = _Tp,
623	bool _NotVoid = !is_void<_Tp>::value && !is_void<_Up>::value>
624	struct __swappable_with
625	{
626	template <class _LHS, class _RHS>
627	static decltype(swap(declval<_LHS>(), declval<_RHS>()))
628	__test_swap(int);
629	template <class, class>
630	static __nat __test_swap(long);
631
632	// Extra parens are needed for the C++03 definition of decltype.
633	typedef decltype((__test_swap<_Tp, _Up>(0))) __swap1;
634	typedef decltype((__test_swap<_Up, _Tp>(0))) __swap2;
635
636	static const bool value = _IsNotSame<__swap1, __nat>::value
637	&& _IsNotSame<__swap2, __nat>::value;
638	};
639
640	template <class _Tp, class _Up>
641	struct __swappable_with<_Tp, _Up, false> : false_type {};
642
643	template <class _Tp, class _Up = _Tp, bool _Swappable = __swappable_with<_Tp, _Up>::value>
644	struct __nothrow_swappable_with {
645	static const bool value =
646	#ifndef _LIBCPP_HAS_NO_NOEXCEPT
647	noexcept(swap(declval<_Tp>(), declval<_Up>()))
648	&& noexcept(swap(declval<_Up>(), declval<_Tp>()));
649	#else
650	false;
651	#endif
652	};
653
654	template <class _Tp, class _Up>
655	struct __nothrow_swappable_with<_Tp, _Up, false> : false_type {};
656
657	} // namespace __detail
658
659	template <class _Tp>
660	struct __is_swappable
661	: public integral_constant<bool, __detail::__swappable_with<_Tp&>::value>
662	{
663	};
664
665	template <class _Tp>
666	struct __is_nothrow_swappable
667	: public integral_constant<bool, __detail::__nothrow_swappable_with<_Tp&>::value>
668	{
669	};
670
671	#if _LIBCPP_STD_VER > 14
672
673	template <class _Tp, class _Up>
674	struct _LIBCPP_TEMPLATE_VIS is_swappable_with
675	: public integral_constant<bool, __detail::__swappable_with<_Tp, _Up>::value>
676	{
677	};
678
679	template <class _Tp>
680	struct _LIBCPP_TEMPLATE_VIS is_swappable
681	: public conditional<
682	__is_referenceable<_Tp>::value,
683	is_swappable_with<
684	typename add_lvalue_reference<_Tp>::type,
685	typename add_lvalue_reference<_Tp>::type>,
686	false_type
687	>::type
688	{
689	};
690
691	template <class _Tp, class _Up>
692	struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable_with
693	: public integral_constant<bool, __detail::__nothrow_swappable_with<_Tp, _Up>::value>
694	{
695	};
696
697	template <class _Tp>
698	struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable
699	: public conditional<
700	__is_referenceable<_Tp>::value,
701	is_nothrow_swappable_with<
702	typename add_lvalue_reference<_Tp>::type,
703	typename add_lvalue_reference<_Tp>::type>,
704	false_type
705	>::type
706	{
707	};
708
709	template <class _Tp, class _Up>
710	inline constexpr bool is_swappable_with_v = is_swappable_with<_Tp, _Up>::value;
711
712	template <class _Tp>
713	inline constexpr bool is_swappable_v = is_swappable<_Tp>::value;
714
715	template <class _Tp, class _Up>
716	inline constexpr bool is_nothrow_swappable_with_v = is_nothrow_swappable_with<_Tp, _Up>::value;
717
718	template <class _Tp>
719	inline constexpr bool is_nothrow_swappable_v = is_nothrow_swappable<_Tp>::value;
720
721	#endif // _LIBCPP_STD_VER > 14
722
723	template <class _Tp, bool = is_enum<_Tp>::value>
724	struct __sfinae_underlying_type
725	{
726	typedef typename underlying_type<_Tp>::type type;
727	typedef decltype(((type)1) + 0) __promoted_type;
728	};
729
730	template <class _Tp>
731	struct __sfinae_underlying_type<_Tp, false> {};
732
733	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
734	int __convert_to_integral(int __val) { return __val; }
735
736	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
737	unsigned __convert_to_integral(unsigned __val) { return __val; }
738
739	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
740	long __convert_to_integral(long __val) { return __val; }
741
742	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
743	unsigned long __convert_to_integral(unsigned long __val) { return __val; }
744
745	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
746	long long __convert_to_integral(long long __val) { return __val; }
747
748	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
749	unsigned long long __convert_to_integral(unsigned long long __val) {return __val; }
750
751	template<typename _Fp>
752	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
753	typename enable_if<is_floating_point<_Fp>::value, long long>::type
754	__convert_to_integral(_Fp __val) { return __val; }
755
756	#ifndef _LIBCPP_HAS_NO_INT128
757	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
758	__int128_t __convert_to_integral(__int128_t __val) { return __val; }
759
760	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
761	__uint128_t __convert_to_integral(__uint128_t __val) { return __val; }
762	#endif
763
764	template <class _Tp>
765	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
766	typename __sfinae_underlying_type<_Tp>::__promoted_type
767	__convert_to_integral(_Tp __val) { return __val; }
768
769	// These traits are used in __tree and __hash_table
770	struct __extract_key_fail_tag {};
771	struct __extract_key_self_tag {};
772	struct __extract_key_first_tag {};
773
774	template <class _ValTy, class _Key,
775	class _RawValTy = typename __unconstref<_ValTy>::type>
776	struct __can_extract_key
777	: conditional<_IsSame<_RawValTy, _Key>::value, __extract_key_self_tag,
778	__extract_key_fail_tag>::type {};
779
780	template <class _Pair, class _Key, class _First, class _Second>
781	struct __can_extract_key<_Pair, _Key, pair<_First, _Second> >
782	: conditional<_IsSame<typename remove_const<_First>::type, _Key>::value,
783	__extract_key_first_tag, __extract_key_fail_tag>::type {};
784
785	// __can_extract_map_key uses true_type/false_type instead of the tags.
786	// It returns true if _Key != _ContainerValueTy (the container is a map not a set)
787	// and _ValTy == _Key.
788	template <class _ValTy, class _Key, class _ContainerValueTy,
789	class _RawValTy = typename __unconstref<_ValTy>::type>
790	struct __can_extract_map_key
791	: integral_constant<bool, _IsSame<_RawValTy, _Key>::value> {};
792
793	// This specialization returns __extract_key_fail_tag for non-map containers
794	// because _Key == _ContainerValueTy
795	template <class _ValTy, class _Key, class _RawValTy>
796	struct __can_extract_map_key<_ValTy, _Key, _Key, _RawValTy>
797	: false_type {};
798
799	template <class _CharT>
800	using _IsCharLikeType = _And<is_standard_layout<_CharT>, is_trivial<_CharT> >;
801
802	template<class _Tp>
803	using __make_const_lvalue_ref = const typename remove_reference<_Tp>::type&;
804
805	template<bool _Const, class _Tp>
806	using __maybe_const = typename conditional<_Const, const _Tp, _Tp>::type;
807
808	_LIBCPP_END_NAMESPACE_STD
809
810	#endif // _LIBCPP_TYPE_TRAITS	545	#endif // _LIBCPP_TYPE_TRAITS

lib/libcxx/include/typeindex+20-7

 @@ -23,11 +23,12 @@ public:
     type_index(const type_info& rhs) noexcept;
     bool operator==(const type_index& rhs) const noexcept;
-    bool operator!=(const type_index& rhs) const noexcept;
+    bool operator!=(const type_index& rhs) const noexcept; // removed in C++20
     bool operator< (const type_index& rhs) const noexcept;
     bool operator<=(const type_index& rhs) const noexcept;
     bool operator> (const type_index& rhs) const noexcept;
     bool operator>=(const type_index& rhs) const noexcept;
+    strong_ordering operator<=>(const type_index& rhs) const noexcept; // C++20
     size_t hash_code() const noexcept;
     const char* name() const noexcept;
 @@ -50,12 +51,6 @@ struct hash<type_index>
 #include <typeinfo>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iosfwd>
-#  include <new>
-#  include <utility>
-#endif
 // standard-mandated includes
 #include <compare>
 @@ -76,8 +71,10 @@ public:
     bool operator==(const type_index& __y) const _NOEXCEPT
         {return *__t_ == *__y.__t_;}
     _LIBCPP_INLINE_VISIBILITY
+#if _LIBCPP_STD_VER <= 17
     bool operator!=(const type_index& __y) const _NOEXCEPT
         {return *__t_ != *__y.__t_;}
+#endif
     _LIBCPP_INLINE_VISIBILITY
     bool operator< (const type_index& __y) const _NOEXCEPT
         {return  __t_->before(*__y.__t_);}
 @@ -90,6 +87,16 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     bool operator>=(const type_index& __y) const _NOEXCEPT
         {return !__t_->before(*__y.__t_);}
+#if _LIBCPP_STD_VER > 17
+    _LIBCPP_HIDE_FROM_ABI
+    strong_ordering operator<=>(const type_index& __y) const noexcept {
+      if (*__t_ == *__y.__t_)
+        return strong_ordering::equal;
+      if (__t_->before(*__y.__t_))
+        return strong_ordering::less;
+      return strong_ordering::greater;
+    }
+#endif
     _LIBCPP_INLINE_VISIBILITY
     size_t hash_code() const _NOEXCEPT {return __t_->hash_code();}
 @@ -110,4 +117,10 @@ struct _LIBCPP_TEMPLATE_VIS hash<type_index>
 _LIBCPP_END_NAMESPACE_STD
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <iosfwd>
+#  include <new>
+#  include <utility>
+#endif
 #endif // _LIBCPP_TYPEINDEX

lib/libcxx/include/typeinfo+36-11

 @@ -22,7 +22,7 @@ public:
     virtual ~type_info();
     bool operator==(const type_info& rhs) const noexcept;
-    bool operator!=(const type_info& rhs) const noexcept;
+    bool operator!=(const type_info& rhs) const noexcept; // removed in C++20
     bool before(const type_info& rhs) const noexcept;
     size_t hash_code() const noexcept;
 @@ -61,13 +61,10 @@ public:
 #include <__config>
 #include <cstddef>
 #include <cstdint>
+#include <cstdlib>
 #include <exception>
 #include <type_traits>
-#ifdef _LIBCPP_NO_EXCEPTIONS
-#include <cstdlib>
-#endif
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 @@ -112,9 +109,11 @@ public:
       return __compare(__arg) == 0;
     }
+#if _LIBCPP_STD_VER <= 17
     _LIBCPP_INLINE_VISIBILITY
     bool operator!=(const type_info& __arg) const _NOEXCEPT
     { return !operator==(__arg); }
+#endif
 };
 #else // !defined(_LIBCPP_ABI_MICROSOFT)
 @@ -174,8 +173,8 @@ public:
 // we pick a default implementation based on the platform here.
 #ifndef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION
-  // Windows binaries can't merge typeinfos, so use the NonUnique implementation.
+  // Windows and AIX binaries can't merge typeinfos, so use the NonUnique implementation.
-# ifdef _LIBCPP_OBJECT_FORMAT_COFF
+# if defined(_LIBCPP_OBJECT_FORMAT_COFF) || defined(_LIBCPP_OBJECT_FORMAT_XCOFF)
 #   define _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION 2
   // On arm64 on Apple platforms, use the special NonUniqueARMRTTIBit implementation.
 @@ -337,9 +336,11 @@ public:
       return __impl::__eq(__type_name, __arg.__type_name);
     }
+#if _LIBCPP_STD_VER <= 17
     _LIBCPP_INLINE_VISIBILITY
     bool operator!=(const type_info& __arg) const _NOEXCEPT
     { return !operator==(__arg); }
+#endif
 };
 #endif // defined(_LIBCPP_ABI_MICROSOFT)
 @@ -349,8 +350,8 @@ class _LIBCPP_EXCEPTION_ABI bad_cast
  public:
   bad_cast() _NOEXCEPT;
   bad_cast(const bad_cast&) _NOEXCEPT = default;
-  virtual ~bad_cast() _NOEXCEPT;
+  ~bad_cast() _NOEXCEPT override;
-  virtual const char* what() const _NOEXCEPT;
+  const char* what() const _NOEXCEPT override;
 };
 class _LIBCPP_EXCEPTION_ABI bad_typeid
 @@ -358,14 +359,38 @@ class _LIBCPP_EXCEPTION_ABI bad_typeid
 {
  public:
   bad_typeid() _NOEXCEPT;
-  virtual ~bad_typeid() _NOEXCEPT;
+  ~bad_typeid() _NOEXCEPT override;
-  virtual const char* what() const _NOEXCEPT;
+  const char* what() const _NOEXCEPT override;
 };
 } // namespace std
 #endif // defined(_LIBCPP_ABI_VCRUNTIME)
+#if defined(_LIBCPP_ABI_VCRUNTIME) && _HAS_EXCEPTIONS == 0
+namespace std {
+class bad_cast : public exception {
+public:
+  bad_cast() _NOEXCEPT : exception("bad cast") {}
+private:
+  bad_cast(const char* const __message) _NOEXCEPT : exception(__message) {}
+};
+class bad_typeid : public exception {
+public:
+  bad_typeid() _NOEXCEPT : exception("bad typeid") {}
+private:
+  bad_typeid(const char* const __message) _NOEXCEPT : exception(__message) {}
+};
+} // namespace std
+#endif // defined(_LIBCPP_ABI_VCRUNTIME) && _HAS_EXCEPTIONS == 0
 _LIBCPP_BEGIN_NAMESPACE_STD
 _LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
 void __throw_bad_cast()

lib/libcxx/include/uchar.h+2

...	@@ -23,6 +23,8 @@ Types:	...	@@ -23,6 +23,8 @@ Types:
23	mbstate_t	23	mbstate_t
24	size_t	24	size_t
25		25
		26	size_t mbrtoc8(char8_t* pc8, const char* s, size_t n, mbstate_t* ps); // since C++20
		27	size_t c8rtomb(char* s, char8_t c8, mbstate_t* ps); // since C++20
26	size_t mbrtoc16(char16_t* pc16, const char* s, size_t n, mbstate_t* ps);	28	size_t mbrtoc16(char16_t* pc16, const char* s, size_t n, mbstate_t* ps);
27	size_t c16rtomb(char* s, char16_t c16, mbstate_t* ps);	29	size_t c16rtomb(char* s, char16_t c16, mbstate_t* ps);
28	size_t mbrtoc32(char32_t* pc32, const char* s, size_t n, mbstate_t* ps);	30	size_t mbrtoc32(char32_t* pc32, const char* s, size_t n, mbstate_t* ps);

lib/libcxx/include/unordered_map+48-23

...	@@ -525,18 +525,15 @@ template <class Key, class T, class Hash, class Pred, class Alloc>	...	@@ -525,18 +525,15 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
525	#include <__iterator/erase_if_container.h>	525	#include <__iterator/erase_if_container.h>
526	#include <__iterator/iterator_traits.h>	526	#include <__iterator/iterator_traits.h>
527	#include <__memory/addressof.h>	527	#include <__memory/addressof.h>
		528	#include <__memory/allocator.h>
		529	#include <__memory_resource/polymorphic_allocator.h>
528	#include <__node_handle>	530	#include <__node_handle>
		531	#include <__type_traits/is_allocator.h>
529	#include <__utility/forward.h>	532	#include <__utility/forward.h>
530	#include <stdexcept>	533	#include <stdexcept>
531	#include <tuple>	534	#include <tuple>
532	#include <version>	535	#include <version>
533		536
534	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
535	# include <algorithm>
536	# include <bit>
537	# include <iterator>
538	#endif
539
540	// standard-mandated includes	537	// standard-mandated includes
541		538
542	// [iterator.range]	539	// [iterator.range]
...	@@ -822,16 +819,16 @@ struct _LIBCPP_STANDALONE_DEBUG __hash_value_type	...	@@ -822,16 +819,16 @@ struct _LIBCPP_STANDALONE_DEBUG __hash_value_type
822	typedef pair<key_type&&, mapped_type&&> __nc_rref_pair_type;	819	typedef pair<key_type&&, mapped_type&&> __nc_rref_pair_type;
823		820
824	private:	821	private:
825	value_type __cc;	822	value_type __cc_;
826		823
827	public:	824	public:
828	_LIBCPP_INLINE_VISIBILITY	825	_LIBCPP_INLINE_VISIBILITY
829	value_type& __get_value()	826	value_type& __get_value()
830	{	827	{
831	#if _LIBCPP_STD_VER > 14	828	#if _LIBCPP_STD_VER > 14
832	return *_VSTD::launder(_VSTD::addressof(__cc));	829	return *_VSTD::launder(_VSTD::addressof(__cc_));
833	#else	830	#else
834	return __cc;	831	return __cc_;
835	#endif	832	#endif
836	}	833	}
837		834
...	@@ -839,9 +836,9 @@ public:	...	@@ -839,9 +836,9 @@ public:
839	const value_type& __get_value() const	836	const value_type& __get_value() const
840	{	837	{
841	#if _LIBCPP_STD_VER > 14	838	#if _LIBCPP_STD_VER > 14
842	return *_VSTD::launder(_VSTD::addressof(__cc));	839	return *_VSTD::launder(_VSTD::addressof(__cc_));
843	#else	840	#else
844	return __cc;	841	return __cc_;
845	#endif	842	#endif
846	}	843	}
847		844
...	@@ -904,13 +901,13 @@ struct __hash_value_type	...	@@ -904,13 +901,13 @@ struct __hash_value_type
904	typedef pair<const key_type, mapped_type> value_type;	901	typedef pair<const key_type, mapped_type> value_type;
905		902
906	private:	903	private:
907	value_type __cc;	904	value_type __cc_;
908		905
909	public:	906	public:
910	_LIBCPP_INLINE_VISIBILITY	907	_LIBCPP_INLINE_VISIBILITY
911	value_type& __get_value() { return __cc; }	908	value_type& __get_value() { return __cc_; }
912	_LIBCPP_INLINE_VISIBILITY	909	_LIBCPP_INLINE_VISIBILITY
913	const value_type& __get_value() const { return __cc; }	910	const value_type& __get_value() const { return __cc_; }
914		911
915	private:	912	private:
916	~__hash_value_type();	913	~__hash_value_type();
...	@@ -1044,8 +1041,7 @@ private:	...	@@ -1044,8 +1041,7 @@ private:
1044	typedef __hash_value_type<key_type, mapped_type> __value_type;	1041	typedef __hash_value_type<key_type, mapped_type> __value_type;
1045	typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher;	1042	typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher;
1046	typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal;	1043	typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal;
1047	typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>,	1044	typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
1048	__value_type>::type __allocator_type;
1049		1045
1050	typedef __hash_table<__value_type, __hasher,	1046	typedef __hash_table<__value_type, __hasher,
1051	__key_equal, __allocator_type> __table;	1047	__key_equal, __allocator_type> __table;
...	@@ -1062,6 +1058,10 @@ private:	...	@@ -1062,6 +1058,10 @@ private:
1062	typedef unique_ptr<__node, _Dp> __node_holder;	1058	typedef unique_ptr<__node, _Dp> __node_holder;
1063	typedef allocator_traits<allocator_type> __alloc_traits;	1059	typedef allocator_traits<allocator_type> __alloc_traits;
1064		1060
		1061	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		1062	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		1063	"original allocator");
		1064
1065	static_assert((is_same<typename __table::__container_value_type, value_type>::value), "");	1065	static_assert((is_same<typename __table::__container_value_type, value_type>::value), "");
1066	static_assert((is_same<typename __table::__node_value_type, __value_type>::value), "");	1066	static_assert((is_same<typename __table::__node_value_type, __value_type>::value), "");
1067	public:	1067	public:
...	@@ -1149,7 +1149,7 @@ public:	...	@@ -1149,7 +1149,7 @@ public:
1149	#endif	1149	#endif
1150	_LIBCPP_INLINE_VISIBILITY	1150	_LIBCPP_INLINE_VISIBILITY
1151	~unordered_map() {	1151	~unordered_map() {
1152	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");	1152	static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
1153	}	1153	}
1154		1154
1155	_LIBCPP_INLINE_VISIBILITY	1155	_LIBCPP_INLINE_VISIBILITY
...	@@ -1886,7 +1886,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -1886,7 +1886,7 @@ inline _LIBCPP_INLINE_VISIBILITY
1886	#endif	1886	#endif
1887		1887
1888	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	1888	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
1889	bool	1889	_LIBCPP_HIDE_FROM_ABI bool
1890	operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	1890	operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
1891	const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)	1891	const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
1892	{	1892	{
...	@@ -1934,8 +1934,7 @@ private:	...	@@ -1934,8 +1934,7 @@ private:
1934	typedef __hash_value_type<key_type, mapped_type> __value_type;	1934	typedef __hash_value_type<key_type, mapped_type> __value_type;
1935	typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher;	1935	typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher;
1936	typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal;	1936	typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal;
1937	typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>,	1937	typedef __rebind_alloc<allocator_traits<allocator_type>, __value_type> __allocator_type;
1938	__value_type>::type __allocator_type;
1939		1938
1940	typedef __hash_table<__value_type, __hasher,	1939	typedef __hash_table<__value_type, __hasher,
1941	__key_equal, __allocator_type> __table;	1940	__key_equal, __allocator_type> __table;
...	@@ -1952,7 +1951,12 @@ private:	...	@@ -1952,7 +1951,12 @@ private:
1952	static_assert((is_same<typename __node_traits::size_type,	1951	static_assert((is_same<typename __node_traits::size_type,
1953	typename __alloc_traits::size_type>::value),	1952	typename __alloc_traits::size_type>::value),
1954	"Allocator uses different size_type for different types");	1953	"Allocator uses different size_type for different types");
1955	public:	1954
		1955	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		1956	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		1957	"original allocator");
		1958
		1959	public:
1956	typedef typename __alloc_traits::pointer pointer;	1960	typedef typename __alloc_traits::pointer pointer;
1957	typedef typename __alloc_traits::const_pointer const_pointer;	1961	typedef typename __alloc_traits::const_pointer const_pointer;
1958	typedef typename __table::size_type size_type;	1962	typedef typename __table::size_type size_type;
...	@@ -2037,7 +2041,7 @@ public:	...	@@ -2037,7 +2041,7 @@ public:
2037	#endif	2041	#endif
2038	_LIBCPP_INLINE_VISIBILITY	2042	_LIBCPP_INLINE_VISIBILITY
2039	~unordered_multimap() {	2043	~unordered_multimap() {
2040	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");	2044	static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
2041	}	2045	}
2042		2046
2043	_LIBCPP_INLINE_VISIBILITY	2047	_LIBCPP_INLINE_VISIBILITY
...	@@ -2592,7 +2596,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -2592,7 +2596,7 @@ inline _LIBCPP_INLINE_VISIBILITY
2592	#endif	2596	#endif
2593		2597
2594	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	2598	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
2595	bool	2599	_LIBCPP_HIDE_FROM_ABI bool
2596	operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	2600	operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
2597	const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)	2601	const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
2598	{	2602	{
...	@@ -2625,4 +2629,25 @@ operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	...	@@ -2625,4 +2629,25 @@ operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
2625		2629
2626	_LIBCPP_END_NAMESPACE_STD	2630	_LIBCPP_END_NAMESPACE_STD
2627		2631
		2632	#if _LIBCPP_STD_VER > 14
		2633	_LIBCPP_BEGIN_NAMESPACE_STD
		2634	namespace pmr {
		2635	template <class _KeyT, class _ValueT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
		2636	using unordered_map =
		2637	std::unordered_map<_KeyT, _ValueT, _HashT, _PredT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
		2638
		2639	template <class _KeyT, class _ValueT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
		2640	using unordered_multimap =
		2641	std::unordered_multimap<_KeyT, _ValueT, _HashT, _PredT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
		2642	} // namespace pmr
		2643	_LIBCPP_END_NAMESPACE_STD
		2644	#endif
		2645
		2646	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		2647	# include <algorithm>
		2648	# include <bit>
		2649	# include <concepts>
		2650	# include <iterator>
		2651	#endif
		2652
2628	#endif // _LIBCPP_UNORDERED_MAP	2653	#endif // _LIBCPP_UNORDERED_MAP

lib/libcxx/include/unordered_set+30-10

 @@ -470,15 +470,13 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <__iterator/erase_if_container.h>
 #include <__iterator/iterator_traits.h>
 #include <__memory/addressof.h>
+#include <__memory/allocator.h>
+#include <__memory_resource/polymorphic_allocator.h>
 #include <__node_handle>
+#include <__type_traits/is_allocator.h>
 #include <__utility/forward.h>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <functional>
-#  include <iterator>
-#endif
 // standard-mandated includes
 // [iterator.range]
 @@ -517,7 +515,11 @@ public:
     static_assert((is_same<value_type, typename allocator_type::value_type>::value),
                   "Invalid allocator::value_type");
-private:
+    static_assert(is_same<allocator_type, __rebind_alloc<allocator_traits<allocator_type>, value_type> >::value,
+                  "[allocator.requirements] states that rebinding an allocator to the same type should result in the "
+                  "original allocator");
+  private:
     typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
     __table __table_;
 @@ -611,7 +613,7 @@ public:
 #endif // _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     ~unordered_set() {
-        static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
+        static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -1130,7 +1132,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 #endif
 template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
            const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
 {
 @@ -1265,7 +1267,7 @@ public:
 #endif // _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     ~unordered_multiset() {
-        static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
+        static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
     }
     _LIBCPP_INLINE_VISIBILITY
 @@ -1768,7 +1770,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 #endif
 template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
+_LIBCPP_HIDE_FROM_ABI bool
 operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
            const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
 {
 @@ -1801,4 +1803,22 @@ operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
 _LIBCPP_END_NAMESPACE_STD
+#if _LIBCPP_STD_VER > 14
+_LIBCPP_BEGIN_NAMESPACE_STD
+namespace pmr {
+template <class _KeyT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
+using unordered_set = std::unordered_set<_KeyT, _HashT, _PredT, polymorphic_allocator<_KeyT>>;
+template <class _KeyT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
+using unordered_multiset = std::unordered_multiset<_KeyT, _HashT, _PredT, polymorphic_allocator<_KeyT>>;
+} // namespace pmr
+_LIBCPP_END_NAMESPACE_STD
+#endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <concepts>
+#  include <functional>
+#  include <iterator>
+#endif
 #endif // _LIBCPP_UNORDERED_SET

lib/libcxx/include/utility+31-7

 @@ -42,6 +42,10 @@ swap(T (&a)[N], T (&b)[N]) noexcept(noexcept(swap(*a, *b)));
 template <class T> T&& forward(typename remove_reference<T>::type& t) noexcept;  // constexpr in C++14
 template <class T> T&& forward(typename remove_reference<T>::type&& t) noexcept; // constexpr in C++14
+template <typename T>
+[[nodiscard]] constexpr
+auto forward_like(auto&& x) noexcept -> see below;                               // since C++23
 template <class T> typename remove_reference<T>::type&& move(T&&) noexcept;      // constexpr in C++14
 template <class T>
 @@ -80,19 +84,29 @@ struct pair
     explicit(see-below) constexpr pair();
     explicit(see-below) pair(const T1& x, const T2& y);                          // constexpr in C++14
     template <class U = T1, class V = T2> explicit(see-below) pair(U&&, V&&);    // constexpr in C++14
+    template <class U, class V> constexpr explicit(see below) pair(pair<U, V>&); // since C++23
     template <class U, class V> explicit(see-below) pair(const pair<U, V>& p);   // constexpr in C++14
     template <class U, class V> explicit(see-below) pair(pair<U, V>&& p);        // constexpr in C++14
+    template <class U, class V>
+    constexpr explicit(see below) pair(const pair<U, V>&&);                      // since C++23
     template <class... Args1, class... Args2>
         pair(piecewise_construct_t, tuple<Args1...> first_args,
              tuple<Args2...> second_args);                                       // constexpr in C++20
+    constexpr const pair& operator=(const pair& p) const;                        // since C++23
     template <class U, class V> pair& operator=(const pair<U, V>& p);            // constexpr in C++20
+    template <class U, class V>
+    constexpr const pair& operator=(const pair<U, V>& p) const;                  // since C++23
     pair& operator=(pair&& p) noexcept(is_nothrow_move_assignable<T1>::value &&
                                        is_nothrow_move_assignable<T2>::value);   // constexpr in C++20
+    constexpr const pair& operator=(pair&& p) const;                             // since C++23
     template <class U, class V> pair& operator=(pair<U, V>&& p);                 // constexpr in C++20
+    template <class U, class V>
+    constexpr const pair& operator=(pair<U, V>&& p) const;                       // since C++23
     void swap(pair& p) noexcept(is_nothrow_swappable_v<T1> &&
                                 is_nothrow_swappable_v<T2>);                     // constexpr in C++20
+    constexpr void swap(const pair& p) const noexcept(see below);                // since C++23
 };
 template<class T1, class T2, class U1, class U2, template<class> class TQual, template<class> class UQual>
 @@ -119,6 +133,9 @@ template <class T1, class T2>
 void
 swap(pair<T1, T2>& x, pair<T1, T2>& y) noexcept(noexcept(x.swap(y)));            // constexpr in C++20
+template<class T1, class T2>
+constexpr void swap(const pair<T1, T2>& x, const pair<T1, T2>& y) noexcept(noexcept(x.swap(y)));    // since C++23
 struct piecewise_construct_t { explicit piecewise_construct_t() = default; };
 inline constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
 @@ -222,13 +239,14 @@ template <class T>
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
-#include <__tuple>
 #include <__utility/as_const.h>
 #include <__utility/auto_cast.h>
 #include <__utility/cmp.h>
 #include <__utility/declval.h>
+#include <__utility/exception_guard.h>
 #include <__utility/exchange.h>
 #include <__utility/forward.h>
+#include <__utility/forward_like.h>
 #include <__utility/in_place.h>
 #include <__utility/integer_sequence.h>
 #include <__utility/move.h>
 @@ -238,21 +256,27 @@ template <class T>
 #include <__utility/rel_ops.h>
 #include <__utility/swap.h>
 #include <__utility/to_underlying.h>
-#include <__utility/transaction.h>
 #include <__utility/unreachable.h>
-#include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <iosfwd>
-#endif
 // standard-mandated includes
+// [utility.syn]
 #include <compare>
 #include <initializer_list>
+// [tuple.helper]
+#include <__tuple_dir/tuple_element.h>
+#include <__tuple_dir/tuple_size.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <cstdlib>
+#  include <iosfwd>
+#  include <type_traits>
+#endif
 #endif // _LIBCPP_UTILITY

lib/libcxx/include/valarray+32-27

...	@@ -353,6 +353,7 @@ template <class T> unspecified2 end(const valarray<T>& v);	...	@@ -353,6 +353,7 @@ template <class T> unspecified2 end(const valarray<T>& v);
353	#include <__functional/operations.h>	353	#include <__functional/operations.h>
354	#include <__memory/allocator.h>	354	#include <__memory/allocator.h>
355	#include <__memory/uninitialized_algorithms.h>	355	#include <__memory/uninitialized_algorithms.h>
		356	#include <__type_traits/remove_reference.h>
356	#include <__utility/move.h>	357	#include <__utility/move.h>
357	#include <__utility/swap.h>	358	#include <__utility/swap.h>
358	#include <cmath>	359	#include <cmath>
...	@@ -360,12 +361,9 @@ template <class T> unspecified2 end(const valarray<T>& v);	...	@@ -360,12 +361,9 @@ template <class T> unspecified2 end(const valarray<T>& v);
360	#include <new>	361	#include <new>
361	#include <version>	362	#include <version>
362		363
363	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
364	# include <algorithm>
365	# include <functional>
366	#endif
367
368	// standard-mandated includes	364	// standard-mandated includes
		365
		366	// [valarray.syn]
369	#include <initializer_list>	367	#include <initializer_list>
370		368
371	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	369	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -548,7 +546,7 @@ struct __abs_expr	...	@@ -548,7 +546,7 @@ struct __abs_expr
548	typedef _Tp __result_type;	546	typedef _Tp __result_type;
549	_LIBCPP_INLINE_VISIBILITY	547	_LIBCPP_INLINE_VISIBILITY
550	_Tp operator()(const _Tp& __x) const	548	_Tp operator()(const _Tp& __x) const
551	{return abs(__x);}	549	{return std::abs(__x);}
552	};	550	};
553		551
554	template <class _Tp>	552	template <class _Tp>
...	@@ -557,7 +555,7 @@ struct __acos_expr	...	@@ -557,7 +555,7 @@ struct __acos_expr
557	typedef _Tp __result_type;	555	typedef _Tp __result_type;
558	_LIBCPP_INLINE_VISIBILITY	556	_LIBCPP_INLINE_VISIBILITY
559	_Tp operator()(const _Tp& __x) const	557	_Tp operator()(const _Tp& __x) const
560	{return acos(__x);}	558	{return std::acos(__x);}
561	};	559	};
562		560
563	template <class _Tp>	561	template <class _Tp>
...	@@ -566,7 +564,7 @@ struct __asin_expr	...	@@ -566,7 +564,7 @@ struct __asin_expr
566	typedef _Tp __result_type;	564	typedef _Tp __result_type;
567	_LIBCPP_INLINE_VISIBILITY	565	_LIBCPP_INLINE_VISIBILITY
568	_Tp operator()(const _Tp& __x) const	566	_Tp operator()(const _Tp& __x) const
569	{return asin(__x);}	567	{return std::asin(__x);}
570	};	568	};
571		569
572	template <class _Tp>	570	template <class _Tp>
...	@@ -575,7 +573,7 @@ struct __atan_expr	...	@@ -575,7 +573,7 @@ struct __atan_expr
575	typedef _Tp __result_type;	573	typedef _Tp __result_type;
576	_LIBCPP_INLINE_VISIBILITY	574	_LIBCPP_INLINE_VISIBILITY
577	_Tp operator()(const _Tp& __x) const	575	_Tp operator()(const _Tp& __x) const
578	{return atan(__x);}	576	{return std::atan(__x);}
579	};	577	};
580		578
581	template <class _Tp>	579	template <class _Tp>
...	@@ -584,7 +582,7 @@ struct __atan2_expr	...	@@ -584,7 +582,7 @@ struct __atan2_expr
584	typedef _Tp __result_type;	582	typedef _Tp __result_type;
585	_LIBCPP_INLINE_VISIBILITY	583	_LIBCPP_INLINE_VISIBILITY
586	_Tp operator()(const _Tp& __x, const _Tp& __y) const	584	_Tp operator()(const _Tp& __x, const _Tp& __y) const
587	{return atan2(__x, __y);}	585	{return std::atan2(__x, __y);}
588	};	586	};
589		587
590	template <class _Tp>	588	template <class _Tp>
...	@@ -593,7 +591,7 @@ struct __cos_expr	...	@@ -593,7 +591,7 @@ struct __cos_expr
593	typedef _Tp __result_type;	591	typedef _Tp __result_type;
594	_LIBCPP_INLINE_VISIBILITY	592	_LIBCPP_INLINE_VISIBILITY
595	_Tp operator()(const _Tp& __x) const	593	_Tp operator()(const _Tp& __x) const
596	{return cos(__x);}	594	{return std::cos(__x);}
597	};	595	};
598		596
599	template <class _Tp>	597	template <class _Tp>
...	@@ -602,7 +600,7 @@ struct __cosh_expr	...	@@ -602,7 +600,7 @@ struct __cosh_expr
602	typedef _Tp __result_type;	600	typedef _Tp __result_type;
603	_LIBCPP_INLINE_VISIBILITY	601	_LIBCPP_INLINE_VISIBILITY
604	_Tp operator()(const _Tp& __x) const	602	_Tp operator()(const _Tp& __x) const
605	{return cosh(__x);}	603	{return std::cosh(__x);}
606	};	604	};
607		605
608	template <class _Tp>	606	template <class _Tp>
...	@@ -611,7 +609,7 @@ struct __exp_expr	...	@@ -611,7 +609,7 @@ struct __exp_expr
611	typedef _Tp __result_type;	609	typedef _Tp __result_type;
612	_LIBCPP_INLINE_VISIBILITY	610	_LIBCPP_INLINE_VISIBILITY
613	_Tp operator()(const _Tp& __x) const	611	_Tp operator()(const _Tp& __x) const
614	{return exp(__x);}	612	{return std::exp(__x);}
615	};	613	};
616		614
617	template <class _Tp>	615	template <class _Tp>
...	@@ -620,7 +618,7 @@ struct __log_expr	...	@@ -620,7 +618,7 @@ struct __log_expr
620	typedef _Tp __result_type;	618	typedef _Tp __result_type;
621	_LIBCPP_INLINE_VISIBILITY	619	_LIBCPP_INLINE_VISIBILITY
622	_Tp operator()(const _Tp& __x) const	620	_Tp operator()(const _Tp& __x) const
623	{return log(__x);}	621	{return std::log(__x);}
624	};	622	};
625		623
626	template <class _Tp>	624	template <class _Tp>
...	@@ -629,7 +627,7 @@ struct __log10_expr	...	@@ -629,7 +627,7 @@ struct __log10_expr
629	typedef _Tp __result_type;	627	typedef _Tp __result_type;
630	_LIBCPP_INLINE_VISIBILITY	628	_LIBCPP_INLINE_VISIBILITY
631	_Tp operator()(const _Tp& __x) const	629	_Tp operator()(const _Tp& __x) const
632	{return log10(__x);}	630	{return std::log10(__x);}
633	};	631	};
634		632
635	template <class _Tp>	633	template <class _Tp>
...	@@ -638,7 +636,7 @@ struct __pow_expr	...	@@ -638,7 +636,7 @@ struct __pow_expr
638	typedef _Tp __result_type;	636	typedef _Tp __result_type;
639	_LIBCPP_INLINE_VISIBILITY	637	_LIBCPP_INLINE_VISIBILITY
640	_Tp operator()(const _Tp& __x, const _Tp& __y) const	638	_Tp operator()(const _Tp& __x, const _Tp& __y) const
641	{return pow(__x, __y);}	639	{return std::pow(__x, __y);}
642	};	640	};
643		641
644	template <class _Tp>	642	template <class _Tp>
...	@@ -647,7 +645,7 @@ struct __sin_expr	...	@@ -647,7 +645,7 @@ struct __sin_expr
647	typedef _Tp __result_type;	645	typedef _Tp __result_type;
648	_LIBCPP_INLINE_VISIBILITY	646	_LIBCPP_INLINE_VISIBILITY
649	_Tp operator()(const _Tp& __x) const	647	_Tp operator()(const _Tp& __x) const
650	{return sin(__x);}	648	{return std::sin(__x);}
651	};	649	};
652		650
653	template <class _Tp>	651	template <class _Tp>
...	@@ -656,7 +654,7 @@ struct __sinh_expr	...	@@ -656,7 +654,7 @@ struct __sinh_expr
656	typedef _Tp __result_type;	654	typedef _Tp __result_type;
657	_LIBCPP_INLINE_VISIBILITY	655	_LIBCPP_INLINE_VISIBILITY
658	_Tp operator()(const _Tp& __x) const	656	_Tp operator()(const _Tp& __x) const
659	{return sinh(__x);}	657	{return std::sinh(__x);}
660	};	658	};
661		659
662	template <class _Tp>	660	template <class _Tp>
...	@@ -665,7 +663,7 @@ struct __sqrt_expr	...	@@ -665,7 +663,7 @@ struct __sqrt_expr
665	typedef _Tp __result_type;	663	typedef _Tp __result_type;
666	_LIBCPP_INLINE_VISIBILITY	664	_LIBCPP_INLINE_VISIBILITY
667	_Tp operator()(const _Tp& __x) const	665	_Tp operator()(const _Tp& __x) const
668	{return sqrt(__x);}	666	{return std::sqrt(__x);}
669	};	667	};
670		668
671	template <class _Tp>	669	template <class _Tp>
...	@@ -674,7 +672,7 @@ struct __tan_expr	...	@@ -674,7 +672,7 @@ struct __tan_expr
674	typedef _Tp __result_type;	672	typedef _Tp __result_type;
675	_LIBCPP_INLINE_VISIBILITY	673	_LIBCPP_INLINE_VISIBILITY
676	_Tp operator()(const _Tp& __x) const	674	_Tp operator()(const _Tp& __x) const
677	{return tan(__x);}	675	{return std::tan(__x);}
678	};	676	};
679		677
680	template <class _Tp>	678	template <class _Tp>
...	@@ -683,13 +681,13 @@ struct __tanh_expr	...	@@ -683,13 +681,13 @@ struct __tanh_expr
683	typedef _Tp __result_type;	681	typedef _Tp __result_type;
684	_LIBCPP_INLINE_VISIBILITY	682	_LIBCPP_INLINE_VISIBILITY
685	_Tp operator()(const _Tp& __x) const	683	_Tp operator()(const _Tp& __x) const
686	{return tanh(__x);}	684	{return std::tanh(__x);}
687	};	685	};
688		686
689	template <class _ValExpr>	687	template <class _ValExpr>
690	class __slice_expr	688	class __slice_expr
691	{	689	{
692	typedef typename remove_reference<_ValExpr>::type _RmExpr;	690	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
693	public:	691	public:
694	typedef typename _RmExpr::value_type value_type;	692	typedef typename _RmExpr::value_type value_type;
695	typedef value_type __result_type;	693	typedef value_type __result_type;
...	@@ -729,7 +727,7 @@ class __indirect_expr;	...	@@ -729,7 +727,7 @@ class __indirect_expr;
729	template <class _ValExpr>	727	template <class _ValExpr>
730	class __shift_expr	728	class __shift_expr
731	{	729	{
732	typedef typename remove_reference<_ValExpr>::type _RmExpr;	730	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
733	public:	731	public:
734	typedef typename _RmExpr::value_type value_type;	732	typedef typename _RmExpr::value_type value_type;
735	typedef value_type __result_type;	733	typedef value_type __result_type;
...	@@ -772,7 +770,7 @@ public:	...	@@ -772,7 +770,7 @@ public:
772	template <class _ValExpr>	770	template <class _ValExpr>
773	class __cshift_expr	771	class __cshift_expr
774	{	772	{
775	typedef typename remove_reference<_ValExpr>::type _RmExpr;	773	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
776	public:	774	public:
777	typedef typename _RmExpr::value_type value_type;	775	typedef typename _RmExpr::value_type value_type;
778	typedef value_type __result_type;	776	typedef value_type __result_type;
...	@@ -2247,7 +2245,7 @@ mask_array<_Tp>::operator=(const value_type& __x) const	...	@@ -2247,7 +2245,7 @@ mask_array<_Tp>::operator=(const value_type& __x) const
2247	template <class _ValExpr>	2245	template <class _ValExpr>
2248	class __mask_expr	2246	class __mask_expr
2249	{	2247	{
2250	typedef typename remove_reference<_ValExpr>::type _RmExpr;	2248	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
2251	public:	2249	public:
2252	typedef typename _RmExpr::value_type value_type;	2250	typedef typename _RmExpr::value_type value_type;
2253	typedef value_type __result_type;	2251	typedef value_type __result_type;
...	@@ -2610,7 +2608,7 @@ indirect_array<_Tp>::operator=(const value_type& __x) const	...	@@ -2610,7 +2608,7 @@ indirect_array<_Tp>::operator=(const value_type& __x) const
2610	template <class _ValExpr>	2608	template <class _ValExpr>
2611	class __indirect_expr	2609	class __indirect_expr
2612	{	2610	{
2613	typedef typename remove_reference<_ValExpr>::type _RmExpr;	2611	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
2614	public:	2612	public:
2615	typedef typename _RmExpr::value_type value_type;	2613	typedef typename _RmExpr::value_type value_type;
2616	typedef value_type __result_type;	2614	typedef value_type __result_type;
...	@@ -2650,7 +2648,7 @@ public:	...	@@ -2650,7 +2648,7 @@ public:
2650	template<class _ValExpr>	2648	template<class _ValExpr>
2651	class __val_expr	2649	class __val_expr
2652	{	2650	{
2653	typedef typename remove_reference<_ValExpr>::type _RmExpr;	2651	typedef __libcpp_remove_reference_t<_ValExpr> _RmExpr;
2654		2652
2655	_ValExpr __expr_;	2653	_ValExpr __expr_;
2656	public:	2654	public:
...	@@ -4932,4 +4930,11 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -4932,4 +4930,11 @@ _LIBCPP_END_NAMESPACE_STD
4932		4930
4933	_LIBCPP_POP_MACROS	4931	_LIBCPP_POP_MACROS
4934		4932
		4933	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		4934	# include <algorithm>
		4935	# include <concepts>
		4936	# include <cstring>
		4937	# include <functional>
		4938	#endif
		4939
4935	#endif // _LIBCPP_VALARRAY	4940	#endif // _LIBCPP_VALARRAY

lib/libcxx/include/variant+227-178

 @@ -22,8 +22,8 @@ namespace std {
     // 20.7.2.1, constructors
     constexpr variant() noexcept(see below);
-    variant(const variant&);                // constexpr in C++20
+    constexpr variant(const variant&);
-    variant(variant&&) noexcept(see below); // constexpr in C++20
+    constexpr variant(variant&&) noexcept(see below);
     template <class T> constexpr variant(T&&) noexcept(see below);
 @@ -45,8 +45,8 @@ namespace std {
     ~variant();
     // 20.7.2.3, assignment
-    variant& operator=(const variant&);                // constexpr in C++20
+    constexpr variant& operator=(const variant&);
-    variant& operator=(variant&&) noexcept(see below); // constexpr in C++20
+    constexpr variant& operator=(variant&&) noexcept(see below);
     template <class T> variant& operator=(T&&) noexcept(see below);
 @@ -165,6 +165,10 @@ namespace std {
   template <class... Types>
   constexpr bool operator>=(const variant<Types...>&, const variant<Types...>&);
+  template <class... Types> requires (three_way_comparable<Types> && ...)
+  constexpr common_comparison_category_t<compare_three_way_result_t<Types>...>
+    operator<=>(const variant<Types...>&, const variant<Types...>&);           // since C++20
   // 20.7.6, visitation
   template <class Visitor, class... Variants>
   constexpr see below visit(Visitor&&, Variants&&...);
 @@ -176,12 +180,13 @@ namespace std {
   struct monostate;
   // 20.7.8, monostate relational operators
-  constexpr bool operator<(monostate, monostate) noexcept;
-  constexpr bool operator>(monostate, monostate) noexcept;
-  constexpr bool operator<=(monostate, monostate) noexcept;
-  constexpr bool operator>=(monostate, monostate) noexcept;
   constexpr bool operator==(monostate, monostate) noexcept;
-  constexpr bool operator!=(monostate, monostate) noexcept;
+  constexpr bool operator!=(monostate, monostate) noexcept;             // until C++20
+  constexpr bool operator<(monostate, monostate) noexcept;              // until C++20
+  constexpr bool operator>(monostate, monostate) noexcept;              // until C++20
+  constexpr bool operator<=(monostate, monostate) noexcept;             // until C++20
+  constexpr bool operator>=(monostate, monostate) noexcept;             // until C++20
+  constexpr strong_ordering operator<=>(monostate, monostate) noexcept; // since C++20
   // 20.7.9, specialized algorithms
   template <class... Types>
 @@ -201,11 +206,31 @@ namespace std {
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__availability>
+#include <__compare/common_comparison_category.h>
+#include <__compare/compare_three_way_result.h>
+#include <__compare/three_way_comparable.h>
 #include <__config>
 #include <__functional/hash.h>
+#include <__functional/invoke.h>
 #include <__functional/operations.h>
 #include <__functional/unary_function.h>
-#include <__tuple>
+#include <__type_traits/add_const.h>
+#include <__type_traits/add_cv.h>
+#include <__type_traits/add_pointer.h>
+#include <__type_traits/add_volatile.h>
+#include <__type_traits/dependent_type.h>
+#include <__type_traits/is_array.h>
+#include <__type_traits/is_destructible.h>
+#include <__type_traits/is_nothrow_move_constructible.h>
+#include <__type_traits/is_trivially_copy_assignable.h>
+#include <__type_traits/is_trivially_copy_constructible.h>
+#include <__type_traits/is_trivially_destructible.h>
+#include <__type_traits/is_trivially_move_assignable.h>
+#include <__type_traits/is_trivially_move_constructible.h>
+#include <__type_traits/is_void.h>
+#include <__type_traits/remove_const.h>
+#include <__type_traits/type_identity.h>
+#include <__type_traits/void_t.h>
 #include <__utility/forward.h>
 #include <__utility/in_place.h>
 #include <__utility/move.h>
 @@ -216,15 +241,11 @@ namespace std {
 #include <limits>
 #include <new>
 #include <tuple>
-#include <type_traits>
 #include <version>
-#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
-#  include <typeinfo>
-#  include <utility>
-#endif
 // standard-mandated includes
+// [variant.syn]
 #include <compare>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -238,7 +259,7 @@ namespace std { // explicitly not using versioning namespace
 class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_VARIANT_ACCESS bad_variant_access : public exception {
 public:
-  virtual const char* what() const _NOEXCEPT;
+   const char* what() const _NOEXCEPT override;
 };
 } // namespace std
 @@ -261,7 +282,7 @@ struct __farray {
 };
 _LIBCPP_NORETURN
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 void __throw_bad_variant_access() {
 #ifndef _LIBCPP_NO_EXCEPTIONS
 @@ -320,7 +341,7 @@ struct _LIBCPP_TEMPLATE_VIS variant_alternative<_Ip, variant<_Types...>> {
 inline constexpr size_t variant_npos = static_cast<size_t>(-1);
-constexpr int __choose_index_type(unsigned int __num_elem) {
+_LIBCPP_HIDE_FROM_ABI constexpr int __choose_index_type(unsigned int __num_elem) {
   if (__num_elem < numeric_limits<unsigned char>::max())
     return 0;
   if (__num_elem < numeric_limits<unsigned short>::max())
 @@ -372,7 +393,7 @@ __as_variant(const variant<_Types...>&& __vs) noexcept {
 namespace __find_detail {
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr size_t __find_index() {
   constexpr bool __matches[] = {is_same_v<_Tp, _Types>...};
   size_t __result = __not_found;
 @@ -417,7 +438,7 @@ constexpr _Trait __trait =
         ? _Trait::_TriviallyAvailable
         : _IsAvailable<_Tp>::value ? _Trait::_Available : _Trait::_Unavailable;
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr _Trait __common_trait(initializer_list<_Trait> __traits) {
   _Trait __result = _Trait::_TriviallyAvailable;
   for (_Trait __t : __traits) {
 @@ -431,24 +452,24 @@ constexpr _Trait __common_trait(initializer_list<_Trait> __traits) {
 template <typename... _Types>
 struct __traits {
   static constexpr _Trait __copy_constructible_trait =
-      __common_trait({__trait<_Types,
+      __variant_detail::__common_trait({__trait<_Types,
                               is_trivially_copy_constructible,
                               is_copy_constructible>...});
   static constexpr _Trait __move_constructible_trait =
-      __common_trait({__trait<_Types,
+      __variant_detail::__common_trait({__trait<_Types,
                               is_trivially_move_constructible,
                               is_move_constructible>...});
-  static constexpr _Trait __copy_assignable_trait = __common_trait(
+  static constexpr _Trait __copy_assignable_trait = __variant_detail::__common_trait(
       {__copy_constructible_trait,
        __trait<_Types, is_trivially_copy_assignable, is_copy_assignable>...});
-  static constexpr _Trait __move_assignable_trait = __common_trait(
+  static constexpr _Trait __move_assignable_trait = __variant_detail::__common_trait(
       {__move_constructible_trait,
        __trait<_Types, is_trivially_move_assignable, is_move_assignable>...});
-  static constexpr _Trait __destructible_trait = __common_trait(
+  static constexpr _Trait __destructible_trait = __variant_detail::__common_trait(
       {__trait<_Types, is_trivially_destructible, is_destructible>...});
 };
 @@ -456,13 +477,13 @@ namespace __access {
 struct __union {
   template <class _Vp>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto&& __get_alt(_Vp&& __v, in_place_index_t<0>) {
     return _VSTD::forward<_Vp>(__v).__head;
   }
   template <class _Vp, size_t _Ip>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto&& __get_alt(_Vp&& __v, in_place_index_t<_Ip>) {
     return __get_alt(_VSTD::forward<_Vp>(__v).__tail, in_place_index<_Ip - 1>);
   }
 @@ -470,7 +491,7 @@ struct __union {
 struct __base {
   template <size_t _Ip, class _Vp>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto&& __get_alt(_Vp&& __v) {
     return __union::__get_alt(_VSTD::forward<_Vp>(__v).__data,
                               in_place_index<_Ip>);
 @@ -479,9 +500,9 @@ struct __base {
 struct __variant {
   template <size_t _Ip, class _Vp>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto&& __get_alt(_Vp&& __v) {
-    return __base::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v).__impl);
+    return __base::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v).__impl_);
   }
 };
 @@ -491,7 +512,7 @@ namespace __visitation {
 struct __base {
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto)
   __visit_alt_at(size_t __index, _Visitor&& __visitor, _Vs&&... __vs) {
     constexpr auto __fdiagonal =
 @@ -502,7 +523,7 @@ struct __base {
   }
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto) __visit_alt(_Visitor&& __visitor,
                                               _Vs&&... __vs) {
     constexpr auto __fmatrix =
 @@ -515,11 +536,11 @@ struct __base {
 private:
   template <class _Tp>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr const _Tp& __at(const _Tp& __elem) { return __elem; }
   template <class _Tp, size_t _Np, typename... _Indices>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto&& __at(const __farray<_Tp, _Np>& __elems,
                                size_t __index, _Indices... __indices) {
     return __at(__elems[__index], __indices...);
 @@ -533,17 +554,17 @@ private:
   }
   template <class... _Fs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_farray(_Fs&&... __fs) {
-    __std_visit_visitor_return_type_check<__uncvref_t<_Fs>...>();
+    __std_visit_visitor_return_type_check<__remove_cvref_t<_Fs>...>();
-    using __result = __farray<common_type_t<__uncvref_t<_Fs>...>, sizeof...(_Fs)>;
+    using __result = __farray<common_type_t<__remove_cvref_t<_Fs>...>, sizeof...(_Fs)>;
     return __result{{_VSTD::forward<_Fs>(__fs)...}};
   }
   template <size_t... _Is>
   struct __dispatcher {
     template <class _Fp, class... _Vs>
-    inline _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI
     static constexpr decltype(auto) __dispatch(_Fp __f, _Vs... __vs) {
         return _VSTD::__invoke(
             static_cast<_Fp>(__f),
 @@ -552,40 +573,40 @@ private:
   };
   template <class _Fp, class... _Vs, size_t... _Is>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_dispatch(index_sequence<_Is...>) {
     return __dispatcher<_Is...>::template __dispatch<_Fp, _Vs...>;
   }
   template <size_t _Ip, class _Fp, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fdiagonal_impl() {
     return __make_dispatch<_Fp, _Vs...>(
         index_sequence<((void)__type_identity<_Vs>{}, _Ip)...>{});
   }
   template <class _Fp, class... _Vs, size_t... _Is>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fdiagonal_impl(index_sequence<_Is...>) {
     return __base::__make_farray(__make_fdiagonal_impl<_Is, _Fp, _Vs...>()...);
   }
   template <class _Fp, class _Vp, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fdiagonal() {
-    constexpr size_t _Np = __uncvref_t<_Vp>::__size();
+    constexpr size_t _Np = __remove_cvref_t<_Vp>::__size();
-    static_assert(__all<(_Np == __uncvref_t<_Vs>::__size())...>::value);
+    static_assert(__all<(_Np == __remove_cvref_t<_Vs>::__size())...>::value);
     return __make_fdiagonal_impl<_Fp, _Vp, _Vs...>(make_index_sequence<_Np>{});
   }
   template <class _Fp, class... _Vs, size_t... _Is>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fmatrix_impl(index_sequence<_Is...> __is) {
     return __make_dispatch<_Fp, _Vs...>(__is);
   }
   template <class _Fp, class... _Vs, size_t... _Is, size_t... _Js, class... _Ls>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fmatrix_impl(index_sequence<_Is...>,
                                             index_sequence<_Js...>,
                                             _Ls... __ls) {
 @@ -594,34 +615,34 @@ private:
   }
   template <class _Fp, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_fmatrix() {
     return __make_fmatrix_impl<_Fp, _Vs...>(
-        index_sequence<>{}, make_index_sequence<__uncvref_t<_Vs>::__size()>{}...);
+        index_sequence<>{}, make_index_sequence<__remove_cvref_t<_Vs>::__size()>{}...);
   }
 };
 struct __variant {
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto)
   __visit_alt_at(size_t __index, _Visitor&& __visitor, _Vs&&... __vs) {
     return __base::__visit_alt_at(__index,
                                   _VSTD::forward<_Visitor>(__visitor),
-                                  _VSTD::forward<_Vs>(__vs).__impl...);
+                                  _VSTD::forward<_Vs>(__vs).__impl_...);
   }
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto) __visit_alt(_Visitor&& __visitor,
                                               _Vs&&... __vs) {
     return __base::__visit_alt(
         _VSTD::forward<_Visitor>(__visitor),
-        _VSTD::__as_variant(_VSTD::forward<_Vs>(__vs)).__impl...);
+        _VSTD::__as_variant(_VSTD::forward<_Vs>(__vs)).__impl_...);
   }
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto)
   __visit_value_at(size_t __index, _Visitor&& __visitor, _Vs&&... __vs) {
     return __visit_alt_at(
 @@ -631,7 +652,7 @@ struct __variant {
   }
   template <class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr decltype(auto) __visit_value(_Visitor&& __visitor,
                                                 _Vs&&... __vs) {
     return __visit_alt(
 @@ -641,7 +662,7 @@ struct __variant {
 #if _LIBCPP_STD_VER > 17
   template <class _Rp, class _Visitor, class... _Vs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr _Rp __visit_value(_Visitor&& __visitor,
                                      _Vs&&... __vs) {
     return __visit_alt(
 @@ -660,7 +681,7 @@ private:
   template <class _Visitor>
   struct __value_visitor {
     template <class... _Alts>
-    inline _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI
     constexpr decltype(auto) operator()(_Alts&&... __alts) const {
       __std_visit_exhaustive_visitor_check<
           _Visitor,
 @@ -675,7 +696,7 @@ private:
   template <class _Rp, class _Visitor>
   struct __value_visitor_return_type {
     template <class... _Alts>
-    inline _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_HIDE_FROM_ABI
     constexpr _Rp operator()(_Alts&&... __alts) const {
       __std_visit_exhaustive_visitor_check<
           _Visitor,
 @@ -695,14 +716,14 @@ private:
 #endif
   template <class _Visitor>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_value_visitor(_Visitor&& __visitor) {
     return __value_visitor<_Visitor>{_VSTD::forward<_Visitor>(__visitor)};
   }
 #if _LIBCPP_STD_VER > 17
   template <class _Rp, class _Visitor>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr auto __make_value_visitor(_Visitor&& __visitor) {
     return __value_visitor_return_type<_Rp, _Visitor>{_VSTD::forward<_Visitor>(__visitor)};
   }
 @@ -716,7 +737,7 @@ struct _LIBCPP_TEMPLATE_VIS __alt {
   using __value_type = _Tp;
   template <class... _Args>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr __alt(in_place_t, _Args&&... __args)
       : __value(_VSTD::forward<_Args>(__args)...) {}
 @@ -731,21 +752,21 @@ union _LIBCPP_TEMPLATE_VIS __union<_DestructibleTrait, _Index> {};
 #define _LIBCPP_VARIANT_UNION(destructible_trait, destructor)                  \
   template <size_t _Index, class _Tp, class... _Types>                         \
-  union _LIBCPP_TEMPLATE_VIS __union<destructible_trait,                      \
+  union _LIBCPP_TEMPLATE_VIS __union<destructible_trait,                       \
                                       _Index,                                  \
                                       _Tp,                                     \
                                       _Types...> {                             \
   public:                                                                      \
-    inline _LIBCPP_INLINE_VISIBILITY                                           \
+    _LIBCPP_HIDE_FROM_ABI                                                      \
     explicit constexpr __union(__valueless_t) noexcept : __dummy{} {}          \
                                                                                \
     template <class... _Args>                                                  \
-    inline _LIBCPP_INLINE_VISIBILITY                                           \
+    _LIBCPP_HIDE_FROM_ABI                                                      \
     explicit constexpr __union(in_place_index_t<0>, _Args&&... __args)         \
         : __head(in_place, _VSTD::forward<_Args>(__args)...) {}                \
                                                                                \
     template <size_t _Ip, class... _Args>                                      \
-    inline _LIBCPP_INLINE_VISIBILITY                                           \
+    _LIBCPP_HIDE_FROM_ABI                                                      \
     explicit constexpr __union(in_place_index_t<_Ip>, _Args&&... __args)       \
         : __tail(in_place_index<_Ip - 1>, _VSTD::forward<_Args>(__args)...) {} \
                                                                                \
 @@ -776,41 +797,41 @@ class _LIBCPP_TEMPLATE_VIS __base {
 public:
   using __index_t = __variant_index_t<sizeof...(_Types)>;
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr __base(__valueless_t __tag) noexcept
       : __data(__tag), __index(__variant_npos<__index_t>) {}
   template <size_t _Ip, class... _Args>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr __base(in_place_index_t<_Ip>, _Args&&... __args)
       :
         __data(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...),
         __index(_Ip) {}
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr bool valueless_by_exception() const noexcept {
     return index() == variant_npos;
   }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr size_t index() const noexcept {
     return __index == __variant_npos<__index_t> ? variant_npos : __index;
   }
 protected:
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr auto&& __as_base() & { return *this; }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr auto&& __as_base() && { return _VSTD::move(*this); }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr auto&& __as_base() const & { return *this; }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr auto&& __as_base() const && { return _VSTD::move(*this); }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static constexpr size_t __size() { return sizeof...(_Types); }
   __union<_DestructibleTrait, 0, _Types...> __data;
 @@ -842,7 +863,7 @@ class _LIBCPP_TEMPLATE_VIS __dtor;
     __dtor& operator=(__dtor&&) = default;                                     \
                                                                                \
   protected:                                                                   \
-    inline _LIBCPP_INLINE_VISIBILITY                                           \
+    inline _LIBCPP_HIDE_FROM_ABI                                               \
     destroy                                                                    \
   }
 @@ -858,7 +879,7 @@ _LIBCPP_VARIANT_DESTRUCTOR(
       if (!this->valueless_by_exception()) {
         __visitation::__base::__visit_alt(
             [](auto& __alt) noexcept {
-              using __alt_type = __uncvref_t<decltype(__alt)>;
+              using __alt_type = __remove_cvref_t<decltype(__alt)>;
               __alt.~__alt_type();
             },
             *this);
 @@ -883,7 +904,7 @@ public:
 protected:
   template <size_t _Ip, class _Tp, class... _Args>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static _Tp& __construct_alt(__alt<_Ip, _Tp>& __a, _Args&&... __args) {
     ::new ((void*)_VSTD::addressof(__a))
         __alt<_Ip, _Tp>(in_place, _VSTD::forward<_Args>(__args)...);
 @@ -891,7 +912,7 @@ protected:
   }
   template <class _Rhs>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   static void __generic_construct(__ctor& __lhs, _Rhs&& __rhs) {
     __lhs.__destroy();
     if (!__rhs.valueless_by_exception()) {
 @@ -954,7 +975,7 @@ class _LIBCPP_TEMPLATE_VIS __copy_constructor;
 #define _LIBCPP_VARIANT_COPY_CONSTRUCTOR(copy_constructible_trait,             \
                                          copy_constructor)                     \
   template <class... _Types>                                                   \
-  class _LIBCPP_TEMPLATE_VIS __copy_constructor<__traits<_Types...>,          \
+  class _LIBCPP_TEMPLATE_VIS __copy_constructor<__traits<_Types...>,           \
                                                  copy_constructible_trait>     \
       : public __move_constructor<__traits<_Types...>> {                       \
     using __base_type = __move_constructor<__traits<_Types...>>;               \
 @@ -996,7 +1017,7 @@ public:
   using __base_type::operator=;
   template <size_t _Ip, class... _Args>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   auto& __emplace(_Args&&... __args) {
     this->__destroy();
     auto& __res = this->__construct_alt(__access::__base::__get_alt<_Ip>(*this),
 @@ -1007,7 +1028,7 @@ public:
 protected:
   template <size_t _Ip, class _Tp, class _Arg>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   void __assign_alt(__alt<_Ip, _Tp>& __a, _Arg&& __arg) {
     if (this->index() == _Ip) {
       __a.__value = _VSTD::forward<_Arg>(__arg);
 @@ -1028,7 +1049,7 @@ protected:
   }
   template <class _That>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   void __generic_assign(_That&& __that) {
     if (this->valueless_by_exception() && __that.valueless_by_exception()) {
       // do nothing.
 @@ -1053,7 +1074,7 @@ class _LIBCPP_TEMPLATE_VIS __move_assignment;
 #define _LIBCPP_VARIANT_MOVE_ASSIGNMENT(move_assignable_trait,                 \
                                         move_assignment)                       \
   template <class... _Types>                                                   \
-  class _LIBCPP_TEMPLATE_VIS __move_assignment<__traits<_Types...>,           \
+  class _LIBCPP_TEMPLATE_VIS __move_assignment<__traits<_Types...>,            \
                                                 move_assignable_trait>         \
       : public __assignment<__traits<_Types...>> {                             \
     using __base_type = __assignment<__traits<_Types...>>;                     \
 @@ -1094,7 +1115,7 @@ class _LIBCPP_TEMPLATE_VIS __copy_assignment;
 #define _LIBCPP_VARIANT_COPY_ASSIGNMENT(copy_assignable_trait,                 \
                                         copy_assignment)                       \
   template <class... _Types>                                                   \
-  class _LIBCPP_TEMPLATE_VIS __copy_assignment<__traits<_Types...>,           \
+  class _LIBCPP_TEMPLATE_VIS __copy_assignment<__traits<_Types...>,            \
                                                 copy_assignable_trait>         \
       : public __move_assignment<__traits<_Types...>> {                        \
     using __base_type = __move_assignment<__traits<_Types...>>;                \
 @@ -1140,13 +1161,13 @@ public:
   __impl& operator=(__impl&&) = default;
   template <size_t _Ip, class _Arg>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   void __assign(_Arg&& __arg) {
     this->__assign_alt(__access::__base::__get_alt<_Ip>(*this),
                        _VSTD::forward<_Arg>(__arg));
   }
-  inline _LIBCPP_INLINE_VISIBILITY
+  inline _LIBCPP_HIDE_FROM_ABI
   void __swap(__impl& __that)  {
     if (this->valueless_by_exception() && __that.valueless_by_exception()) {
       // do nothing.
 @@ -1192,7 +1213,7 @@ public:
   }
 private:
-  inline _LIBCPP_INLINE_VISIBILITY
+  inline _LIBCPP_HIDE_FROM_ABI
   bool __move_nothrow() const {
     constexpr bool __results[] = {is_nothrow_move_constructible_v<_Types>...};
     return this->valueless_by_exception() || __results[this->index()];
 @@ -1208,7 +1229,7 @@ struct __narrowing_check {
   template <class _Dest>
   static auto __test_impl(_Dest (&&)[1]) -> __type_identity<_Dest>;
   template <class _Dest, class _Source>
-  using _Apply _LIBCPP_NODEBUG = decltype(__test_impl<_Dest>({declval<_Source>()}));
+  using _Apply _LIBCPP_NODEBUG = decltype(__test_impl<_Dest>({std::declval<_Source>()}));
 };
 template <class _Dest, class _Source>
 @@ -1230,7 +1251,7 @@ struct __overload {
 template <class _Tp, size_t>
 struct __overload_bool  {
-  template <class _Up, class _Ap = __uncvref_t<_Up>>
+  template <class _Up, class _Ap = __remove_cvref_t<_Up>>
   auto operator()(bool, _Up&&) const
       -> enable_if_t<is_same_v<_Ap, bool>, __type_identity<_Tp>>;
 };
 @@ -1298,36 +1319,36 @@ public:
             enable_if_t<__dependent_type<is_default_constructible<__first_type>,
                                          _Dummy>::value,
                         int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr variant() noexcept(is_nothrow_default_constructible_v<__first_type>)
-      : __impl(in_place_index<0>) {}
+      : __impl_(in_place_index<0>) {}
-  variant(const variant&) = default;
+  constexpr variant(const variant&) = default;
-  variant(variant&&) = default;
+  constexpr variant(variant&&) = default;
   template <
       class _Arg,
-      enable_if_t<!is_same_v<__uncvref_t<_Arg>, variant>, int> = 0,
+      enable_if_t<!is_same_v<__remove_cvref_t<_Arg>, variant>, int> = 0,
-      enable_if_t<!__is_inplace_type<__uncvref_t<_Arg>>::value, int> = 0,
+      enable_if_t<!__is_inplace_type<__remove_cvref_t<_Arg>>::value, int> = 0,
-      enable_if_t<!__is_inplace_index<__uncvref_t<_Arg>>::value, int> = 0,
+      enable_if_t<!__is_inplace_index<__remove_cvref_t<_Arg>>::value, int> = 0,
       class _Tp = __variant_detail::__best_match_t<_Arg, _Types...>,
       size_t _Ip =
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_constructible_v<_Tp, _Arg>, int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr variant(_Arg&& __arg) noexcept(
       is_nothrow_constructible_v<_Tp, _Arg>)
-      : __impl(in_place_index<_Ip>, _VSTD::forward<_Arg>(__arg)) {}
+      : __impl_(in_place_index<_Ip>, _VSTD::forward<_Arg>(__arg)) {}
   template <size_t _Ip, class... _Args,
             class = enable_if_t<(_Ip < sizeof...(_Types)), int>,
             class _Tp = variant_alternative_t<_Ip, variant<_Types...>>,
             enable_if_t<is_constructible_v<_Tp, _Args...>, int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr variant(
       in_place_index_t<_Ip>,
       _Args&&... __args) noexcept(is_nothrow_constructible_v<_Tp, _Args...>)
-      : __impl(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...) {}
+      : __impl_(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...) {}
   template <
       size_t _Ip,
 @@ -1337,13 +1358,13 @@ public:
       class _Tp = variant_alternative_t<_Ip, variant<_Types...>>,
       enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>,
                   int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr variant(
       in_place_index_t<_Ip>,
       initializer_list<_Up> __il,
       _Args&&... __args) noexcept(
       is_nothrow_constructible_v<_Tp, initializer_list<_Up>&, _Args...>)
-      : __impl(in_place_index<_Ip>, __il, _VSTD::forward<_Args>(__args)...) {}
+      : __impl_(in_place_index<_Ip>, __il, _VSTD::forward<_Args>(__args)...) {}
   template <
       class _Tp,
 @@ -1351,10 +1372,10 @@ public:
       size_t _Ip =
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_constructible_v<_Tp, _Args...>, int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr variant(in_place_type_t<_Tp>, _Args&&... __args) noexcept(
       is_nothrow_constructible_v<_Tp, _Args...>)
-      : __impl(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...) {}
+      : __impl_(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...) {}
   template <
       class _Tp,
 @@ -1364,32 +1385,32 @@ public:
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>,
                   int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   explicit constexpr variant(
       in_place_type_t<_Tp>,
       initializer_list<_Up> __il,
       _Args&&... __args) noexcept(
       is_nothrow_constructible_v<_Tp, initializer_list< _Up>&, _Args...>)
-      : __impl(in_place_index<_Ip>, __il, _VSTD::forward<_Args>(__args)...) {}
+      : __impl_(in_place_index<_Ip>, __il, _VSTD::forward<_Args>(__args)...) {}
   ~variant() = default;
-  variant& operator=(const variant&) = default;
+  constexpr variant& operator=(const variant&) = default;
-  variant& operator=(variant&&) = default;
+  constexpr variant& operator=(variant&&) = default;
   template <
       class _Arg,
-      enable_if_t<!is_same_v<__uncvref_t<_Arg>, variant>, int> = 0,
+      enable_if_t<!is_same_v<__remove_cvref_t<_Arg>, variant>, int> = 0,
       class _Tp = __variant_detail::__best_match_t<_Arg, _Types...>,
       size_t _Ip =
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_assignable_v<_Tp&, _Arg> && is_constructible_v<_Tp, _Arg>,
                   int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   variant& operator=(_Arg&& __arg) noexcept(
       is_nothrow_assignable_v<_Tp&, _Arg> &&
       is_nothrow_constructible_v<_Tp, _Arg>) {
-    __impl.template __assign<_Ip>(_VSTD::forward<_Arg>(__arg));
+    __impl_.template __assign<_Ip>(_VSTD::forward<_Arg>(__arg));
     return *this;
   }
 @@ -1399,9 +1420,9 @@ public:
       enable_if_t<(_Ip < sizeof...(_Types)), int> = 0,
       class _Tp = variant_alternative_t<_Ip, variant<_Types...>>,
       enable_if_t<is_constructible_v<_Tp, _Args...>, int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   _Tp& emplace(_Args&&... __args) {
-    return __impl.template __emplace<_Ip>(_VSTD::forward<_Args>(__args)...);
+    return __impl_.template __emplace<_Ip>(_VSTD::forward<_Args>(__args)...);
   }
   template <
 @@ -1412,9 +1433,9 @@ public:
       class _Tp = variant_alternative_t<_Ip, variant<_Types...>>,
       enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>,
                   int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   _Tp& emplace(initializer_list<_Up> __il, _Args&&... __args) {
-    return __impl.template __emplace<_Ip>(__il, _VSTD::forward<_Args>(__args)...);
+    return __impl_.template __emplace<_Ip>(__il, _VSTD::forward<_Args>(__args)...);
   }
   template <
 @@ -1423,9 +1444,9 @@ public:
       size_t _Ip =
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_constructible_v<_Tp, _Args...>, int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   _Tp& emplace(_Args&&... __args) {
-    return __impl.template __emplace<_Ip>(_VSTD::forward<_Args>(__args)...);
+    return __impl_.template __emplace<_Ip>(_VSTD::forward<_Args>(__args)...);
   }
   template <
 @@ -1436,18 +1457,18 @@ public:
           __find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
       enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>,
                   int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   _Tp& emplace(initializer_list<_Up> __il, _Args&&... __args) {
-    return __impl.template __emplace<_Ip>(__il, _VSTD::forward<_Args>(__args)...);
+    return __impl_.template __emplace<_Ip>(__il, _VSTD::forward<_Args>(__args)...);
   }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   constexpr bool valueless_by_exception() const noexcept {
-    return __impl.valueless_by_exception();
+    return __impl_.valueless_by_exception();
   }
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
-  constexpr size_t index() const noexcept { return __impl.index(); }
+  constexpr size_t index() const noexcept { return __impl_.index(); }
   template <
       bool _Dummy = true,
 @@ -1456,85 +1477,85 @@ public:
               __dependent_type<is_move_constructible<_Types>, _Dummy>::value &&
               __dependent_type<is_swappable<_Types>, _Dummy>::value)...>::value,
           int> = 0>
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   void swap(variant& __that) noexcept(
       __all<(is_nothrow_move_constructible_v<_Types> &&
              is_nothrow_swappable_v<_Types>)...>::value) {
-    __impl.__swap(__that.__impl);
+    __impl_.__swap(__that.__impl_);
   }
 private:
-  __variant_detail::__impl<_Types...> __impl;
+  __variant_detail::__impl<_Types...> __impl_;
   friend struct __variant_detail::__access::__variant;
   friend struct __variant_detail::__visitation::__variant;
 };
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool __holds_alternative(const variant<_Types...>& __v) noexcept {
   return __v.index() == _Ip;
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool holds_alternative(const variant<_Types...>& __v) noexcept {
-  return __holds_alternative<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
+  return std::__holds_alternative<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
 }
 template <size_t _Ip, class _Vp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr auto&& __generic_get(_Vp&& __v) {
   using __variant_detail::__access::__variant;
-  if (!__holds_alternative<_Ip>(__v)) {
+  if (!std::__holds_alternative<_Ip>(__v)) {
     __throw_bad_variant_access();
   }
   return __variant::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v)).__value;
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr variant_alternative_t<_Ip, variant<_Types...>>& get(
     variant<_Types...>& __v) {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get<_Ip>(__v);
+  return std::__generic_get<_Ip>(__v);
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr variant_alternative_t<_Ip, variant<_Types...>>&& get(
     variant<_Types...>&& __v) {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get<_Ip>(_VSTD::move(__v));
+  return std::__generic_get<_Ip>(_VSTD::move(__v));
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr const variant_alternative_t<_Ip, variant<_Types...>>& get(
     const variant<_Types...>& __v) {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get<_Ip>(__v);
+  return std::__generic_get<_Ip>(__v);
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr const variant_alternative_t<_Ip, variant<_Types...>>&& get(
     const variant<_Types...>&& __v) {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get<_Ip>(_VSTD::move(__v));
+  return std::__generic_get<_Ip>(_VSTD::move(__v));
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr _Tp& get(variant<_Types...>& __v) {
   static_assert(!is_void_v<_Tp>);
 @@ -1542,7 +1563,7 @@ constexpr _Tp& get(variant<_Types...>& __v) {
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr _Tp&& get(variant<_Types...>&& __v) {
   static_assert(!is_void_v<_Tp>);
 @@ -1551,7 +1572,7 @@ constexpr _Tp&& get(variant<_Types...>&& __v) {
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr const _Tp& get(const variant<_Types...>& __v) {
   static_assert(!is_void_v<_Tp>);
 @@ -1559,7 +1580,7 @@ constexpr const _Tp& get(const variant<_Types...>& __v) {
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
 constexpr const _Tp&& get(const variant<_Types...>&& __v) {
   static_assert(!is_void_v<_Tp>);
 @@ -1568,34 +1589,34 @@ constexpr const _Tp&& get(const variant<_Types...>&& __v) {
 }
 template <size_t _Ip, class _Vp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr auto* __generic_get_if(_Vp* __v) noexcept {
   using __variant_detail::__access::__variant;
-  return __v && __holds_alternative<_Ip>(*__v)
+  return __v && std::__holds_alternative<_Ip>(*__v)
              ? _VSTD::addressof(__variant::__get_alt<_Ip>(*__v).__value)
              : nullptr;
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr add_pointer_t<variant_alternative_t<_Ip, variant<_Types...>>>
 get_if(variant<_Types...>* __v) noexcept {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get_if<_Ip>(__v);
+  return std::__generic_get_if<_Ip>(__v);
 }
 template <size_t _Ip, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr add_pointer_t<const variant_alternative_t<_Ip, variant<_Types...>>>
 get_if(const variant<_Types...>* __v) noexcept {
   static_assert(_Ip < sizeof...(_Types));
   static_assert(!is_void_v<variant_alternative_t<_Ip, variant<_Types...>>>);
-  return __generic_get_if<_Ip>(__v);
+  return std::__generic_get_if<_Ip>(__v);
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr add_pointer_t<_Tp>
 get_if(variant<_Types...>* __v) noexcept {
   static_assert(!is_void_v<_Tp>);
 @@ -1603,7 +1624,7 @@ get_if(variant<_Types...>* __v) noexcept {
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr add_pointer_t<const _Tp>
 get_if(const variant<_Types...>* __v) noexcept {
   static_assert(!is_void_v<_Tp>);
 @@ -1613,7 +1634,8 @@ get_if(const variant<_Types...>* __v) noexcept {
 template <class _Operator>
 struct __convert_to_bool {
   template <class _T1, class _T2>
-  _LIBCPP_INLINE_VISIBILITY constexpr bool operator()(_T1 && __t1, _T2&& __t2) const {
+  _LIBCPP_HIDE_FROM_ABI
+  constexpr bool operator()(_T1 && __t1, _T2&& __t2) const {
     static_assert(is_convertible<decltype(_Operator{}(_VSTD::forward<_T1>(__t1), _VSTD::forward<_T2>(__t2))), bool>::value,
         "the relational operator does not return a type which is implicitly convertible to bool");
     return _Operator{}(_VSTD::forward<_T1>(__t1), _VSTD::forward<_T2>(__t2));
 @@ -1621,7 +1643,7 @@ struct __convert_to_bool {
 };
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator==(const variant<_Types...>& __lhs,
                           const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1630,8 +1652,29 @@ constexpr bool operator==(const variant<_Types...>& __lhs,
   return __variant::__visit_value_at(__lhs.index(), __convert_to_bool<equal_to<>>{}, __lhs, __rhs);
 }
+#  if _LIBCPP_STD_VER > 17
+template <class... _Types> requires (three_way_comparable<_Types> && ...)
+_LIBCPP_HIDE_FROM_ABI constexpr common_comparison_category_t<compare_three_way_result_t<_Types>...>
+operator<=>(const variant<_Types...>& __lhs, const variant<_Types...>& __rhs) {
+  using __variant_detail::__visitation::__variant;
+  using __result_t = common_comparison_category_t<compare_three_way_result_t<_Types>...>;
+  if (__lhs.valueless_by_exception() && __rhs.valueless_by_exception())
+    return strong_ordering::equal;
+  if (__lhs.valueless_by_exception())
+    return strong_ordering::less;
+  if (__rhs.valueless_by_exception())
+    return strong_ordering::greater;
+  if (auto __c = __lhs.index() <=> __rhs.index(); __c != 0)
+    return __c;
+  auto __three_way = []<class _Type>(const _Type& __v, const _Type& __w) -> __result_t { return __v <=> __w; };
+  return __variant::__visit_value_at(__lhs.index(), __three_way, __lhs, __rhs);
+}
+#  endif // _LIBCPP_STD_VER > 17
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator!=(const variant<_Types...>& __lhs,
                           const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1642,7 +1685,7 @@ constexpr bool operator!=(const variant<_Types...>& __lhs,
 }
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator<(const variant<_Types...>& __lhs,
                          const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1654,7 +1697,7 @@ constexpr bool operator<(const variant<_Types...>& __lhs,
 }
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator>(const variant<_Types...>& __lhs,
                          const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1666,7 +1709,7 @@ constexpr bool operator>(const variant<_Types...>& __lhs,
 }
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator<=(const variant<_Types...>& __lhs,
                           const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1679,7 +1722,7 @@ constexpr bool operator<=(const variant<_Types...>& __lhs,
 }
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr bool operator>=(const variant<_Types...>& __lhs,
                           const variant<_Types...>& __rhs) {
   using __variant_detail::__visitation::__variant;
 @@ -1692,9 +1735,9 @@ constexpr bool operator>=(const variant<_Types...>& __lhs,
 }
 template <class... _Vs>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
-    _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS constexpr void
+_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
-    __throw_if_valueless(_Vs&&... __vs) {
+constexpr void __throw_if_valueless(_Vs&&... __vs) {
   const bool __valueless =
       (... || _VSTD::__as_variant(__vs).valueless_by_exception());
   if (__valueless) {
 @@ -1704,10 +1747,10 @@ inline _LIBCPP_INLINE_VISIBILITY
 template <
     class _Visitor, class... _Vs,
-    typename = void_t<decltype(_VSTD::__as_variant(declval<_Vs>()))...> >
+    typename = void_t<decltype(_VSTD::__as_variant(std::declval<_Vs>()))...> >
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
-    _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS constexpr
+_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
-    decltype(auto) visit(_Visitor&& __visitor, _Vs&&... __vs) {
+constexpr decltype(auto) visit(_Visitor&& __visitor, _Vs&&... __vs) {
   using __variant_detail::__visitation::__variant;
   _VSTD::__throw_if_valueless(_VSTD::forward<_Vs>(__vs)...);
   return __variant::__visit_value(_VSTD::forward<_Visitor>(__visitor),
 @@ -1717,10 +1760,10 @@ inline _LIBCPP_INLINE_VISIBILITY
 #if _LIBCPP_STD_VER > 17
 template <
     class _Rp, class _Visitor, class... _Vs,
-    typename = void_t<decltype(_VSTD::__as_variant(declval<_Vs>()))...> >
+    typename = void_t<decltype(_VSTD::__as_variant(std::declval<_Vs>()))...> >
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
-    _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS constexpr _Rp
+_LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS
-    visit(_Visitor&& __visitor, _Vs&&... __vs) {
+constexpr _Rp visit(_Visitor&& __visitor, _Vs&&... __vs) {
   using __variant_detail::__visitation::__variant;
   _VSTD::__throw_if_valueless(_VSTD::forward<_Vs>(__vs)...);
   return __variant::__visit_value<_Rp>(_VSTD::forward<_Visitor>(__visitor),
 @@ -1729,7 +1772,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 #endif
 template <class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 auto swap(variant<_Types...>& __lhs, variant<_Types...>& __rhs)
   noexcept(noexcept(__lhs.swap(__rhs)))
   -> decltype(      __lhs.swap(__rhs))
 @@ -1741,7 +1784,7 @@ struct _LIBCPP_TEMPLATE_VIS hash<
   using argument_type = variant<_Types...>;
   using result_type = size_t;
-  inline _LIBCPP_INLINE_VISIBILITY
+  _LIBCPP_HIDE_FROM_ABI
   result_type operator()(const argument_type& __v) const {
     using __variant_detail::__visitation::__variant;
     size_t __res =
 @@ -1749,13 +1792,13 @@ struct _LIBCPP_TEMPLATE_VIS hash<
                ? 299792458 // Random value chosen by the universe upon creation
                : __variant::__visit_alt(
                      [](const auto& __alt) {
-                       using __alt_type = __uncvref_t<decltype(__alt)>;
+                       using __alt_type = __remove_cvref_t<decltype(__alt)>;
                        using __value_type = remove_const_t<
                          typename __alt_type::__value_type>;
                        return hash<__value_type>{}(__alt.__value);
                      },
                      __v);
-    return __hash_combine(__res, hash<size_t>{}(__v.index()));
+    return std::__hash_combine(__res, hash<size_t>{}(__v.index()));
   }
 };
 @@ -1763,22 +1806,22 @@ struct _LIBCPP_TEMPLATE_VIS hash<
 // type whereas std::get will throw or returning nullptr. This makes it faster than
 // std::get.
 template <size_t _Ip, class _Vp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr auto&& __unchecked_get(_Vp&& __v) noexcept {
   using __variant_detail::__access::__variant;
   return __variant::__get_alt<_Ip>(_VSTD::forward<_Vp>(__v)).__value;
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr auto&& __unchecked_get(const variant<_Types...>& __v) noexcept {
-  return __unchecked_get<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
+  return std::__unchecked_get<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
 }
 template <class _Tp, class... _Types>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_HIDE_FROM_ABI
 constexpr auto&& __unchecked_get(variant<_Types...>& __v) noexcept {
-  return __unchecked_get<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
+  return std::__unchecked_get<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
 }
 #endif // _LIBCPP_STD_VER > 14
 @@ -1787,4 +1830,10 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#  include <typeinfo>
+#  include <utility>
+#endif
 #endif // _LIBCPP_VARIANT

lib/libcxx/include/vector+691-648

...	@@ -267,6 +267,13 @@ template <class T, class Allocator, class Predicate>	...	@@ -267,6 +267,13 @@ template <class T, class Allocator, class Predicate>
267	typename vector<T, Allocator>::size_type	267	typename vector<T, Allocator>::size_type
268	erase_if(vector<T, Allocator>& c, Predicate pred); // C++20	268	erase_if(vector<T, Allocator>& c, Predicate pred); // C++20
269		269
		270
		271	template<class T>
		272	inline constexpr bool is-vector-bool-reference = see below; // exposition only, since C++23
		273
		274	template<class T, class charT> requires is-vector-bool-reference<T> // Since C++23
		275	struct formatter<T, charT>;
		276
270	} // std	277	} // std
271		278
272	*/	279	*/
...	@@ -281,9 +288,11 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20	...	@@ -281,9 +288,11 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20
281	#include <__algorithm/unwrap_iter.h>	288	#include <__algorithm/unwrap_iter.h>
282	#include <__assert> // all public C++ headers provide the assertion handler	289	#include <__assert> // all public C++ headers provide the assertion handler
283	#include <__bit_reference>	290	#include <__bit_reference>
		291	#include <__concepts/same_as.h>
284	#include <__config>	292	#include <__config>
285	#include <__debug>	293	#include <__debug>
286	#include <__format/enable_insertable.h>	294	#include <__format/enable_insertable.h>
		295	#include <__format/formatter.h>
287	#include <__functional/hash.h>	296	#include <__functional/hash.h>
288	#include <__functional/unary_function.h>	297	#include <__functional/unary_function.h>
289	#include <__iterator/advance.h>	298	#include <__iterator/advance.h>
...	@@ -293,7 +302,13 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20	...	@@ -293,7 +302,13 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20
293	#include <__memory/allocate_at_least.h>	302	#include <__memory/allocate_at_least.h>
294	#include <__memory/pointer_traits.h>	303	#include <__memory/pointer_traits.h>
295	#include <__memory/swap_allocator.h>	304	#include <__memory/swap_allocator.h>
		305	#include <__memory/temp_value.h>
		306	#include <__memory/uninitialized_algorithms.h>
		307	#include <__memory_resource/polymorphic_allocator.h>
296	#include <__split_buffer>	308	#include <__split_buffer>
		309	#include <__type_traits/is_allocator.h>
		310	#include <__type_traits/noexcept_move_assign_container.h>
		311	#include <__utility/exception_guard.h>
297	#include <__utility/forward.h>	312	#include <__utility/forward.h>
298	#include <__utility/move.h>	313	#include <__utility/move.h>
299	#include <__utility/swap.h>	314	#include <__utility/swap.h>
...	@@ -302,17 +317,10 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20	...	@@ -302,17 +317,10 @@ erase_if(vector<T, Allocator>& c, Predicate pred); // C++20
302	#include <cstring>	317	#include <cstring>
303	#include <iosfwd> // for forward declaration of vector	318	#include <iosfwd> // for forward declaration of vector
304	#include <limits>	319	#include <limits>
305	#include <memory>
306	#include <stdexcept>	320	#include <stdexcept>
307	#include <type_traits>	321	#include <type_traits>
308	#include <version>	322	#include <version>
309		323
310	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
311	# include <algorithm>
312	# include <typeinfo>
313	# include <utility>
314	#endif
315
316	// standard-mandated includes	324	// standard-mandated includes
317		325
318	// [iterator.range]	326	// [iterator.range]
...	@@ -352,20 +360,25 @@ public:	...	@@ -352,20 +360,25 @@ public:
352	typedef typename __alloc_traits::difference_type difference_type;	360	typedef typename __alloc_traits::difference_type difference_type;
353	typedef typename __alloc_traits::pointer pointer;	361	typedef typename __alloc_traits::pointer pointer;
354	typedef typename __alloc_traits::const_pointer const_pointer;	362	typedef typename __alloc_traits::const_pointer const_pointer;
		363	// TODO: Implement iterator bounds checking without requiring the global database.
355	typedef __wrap_iter<pointer> iterator;	364	typedef __wrap_iter<pointer> iterator;
356	typedef __wrap_iter<const_pointer> const_iterator;	365	typedef __wrap_iter<const_pointer> const_iterator;
357	typedef _VSTD::reverse_iterator<iterator> reverse_iterator;	366	typedef std::reverse_iterator<iterator> reverse_iterator;
358	typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;	367	typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
359		368
360	static_assert((is_same<typename allocator_type::value_type, value_type>::value),	369	static_assert((is_same<typename allocator_type::value_type, value_type>::value),
361	"Allocator::value_type must be same type as value_type");	370	"Allocator::value_type must be same type as value_type");
362		371
363	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	372	static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value,
		373	"[allocator.requirements] states that rebinding an allocator to the same type should result in the "
		374	"original allocator");
		375
		376	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
364	vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)	377	vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
365	{	378	{
366	_VSTD::__debug_db_insert_c(this);	379	std::__debug_db_insert_c(this);
367	}	380	}
368	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a)	381	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit vector(const allocator_type& __a)
369	#if _LIBCPP_STD_VER <= 14	382	#if _LIBCPP_STD_VER <= 14
370	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)	383	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
371	#else	384	#else
...	@@ -373,20 +386,20 @@ public:	...	@@ -373,20 +386,20 @@ public:
373	#endif	386	#endif
374	: __end_cap_(nullptr, __a)	387	: __end_cap_(nullptr, __a)
375	{	388	{
376	_VSTD::__debug_db_insert_c(this);	389	std::__debug_db_insert_c(this);
377	}	390	}
378	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n);	391	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit vector(size_type __n);
379	#if _LIBCPP_STD_VER > 11	392	#if _LIBCPP_STD_VER > 11
380	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n, const allocator_type& __a);	393	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit vector(size_type __n, const allocator_type& __a);
381	#endif	394	#endif
382	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(size_type __n, const value_type& __x);	395	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(size_type __n, const value_type& __x);
383		396
384	template <class = __enable_if_t<__is_allocator<_Allocator>::value> >	397	template <class = __enable_if_t<__is_allocator<_Allocator>::value> >
385	_LIBCPP_CONSTEXPR_AFTER_CXX17	398	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
386	vector(size_type __n, const value_type& __x, const allocator_type& __a)	399	vector(size_type __n, const value_type& __x, const allocator_type& __a)
387	: __end_cap_(nullptr, __a)	400	: __end_cap_(nullptr, __a)
388	{	401	{
389	_VSTD::__debug_db_insert_c(this);	402	std::__debug_db_insert_c(this);
390	if (__n > 0)	403	if (__n > 0)
391	{	404	{
392	__vallocate(__n);	405	__vallocate(__n);
...	@@ -394,68 +407,72 @@ public:	...	@@ -394,68 +407,72 @@ public:
394	}	407	}
395	}	408	}
396		409
397	template <class _InputIterator>	410	template <class _InputIterator,
398	_LIBCPP_CONSTEXPR_AFTER_CXX17	411	__enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
399	vector(_InputIterator __first,	412	is_constructible<value_type, typename iterator_traits<_InputIterator>::reference>::value,
400	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	413	int> = 0>
401	is_constructible<	414	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(_InputIterator __first, _InputIterator __last);
402	value_type,	415	template <class _InputIterator,
403	typename iterator_traits<_InputIterator>::reference>::value,	416	__enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
404	_InputIterator>::type __last);	417	is_constructible<value_type, typename iterator_traits<_InputIterator>::reference>::value,
405	template <class _InputIterator>	418	int> = 0>
406	_LIBCPP_CONSTEXPR_AFTER_CXX17	419	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
407	vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,	420	vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a);
408	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	421
409	is_constructible<	422	template <
410	value_type,	423	class _ForwardIterator,
411	typename iterator_traits<_InputIterator>::reference>::value>::type* = 0);	424	__enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
412	template <class _ForwardIterator>	425	is_constructible<value_type, typename iterator_traits<_ForwardIterator>::reference>::value,
413	_LIBCPP_CONSTEXPR_AFTER_CXX17	426	int> = 0>
414	vector(_ForwardIterator __first,	427	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(_ForwardIterator __first, _ForwardIterator __last);
415	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value &&	428
416	is_constructible<	429	template <class _ForwardIterator,
417	value_type,	430	__enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
418	typename iterator_traits<_ForwardIterator>::reference>::value,	431	is_constructible<value_type, typename iterator_traits<_ForwardIterator>::reference>::value,
419	_ForwardIterator>::type __last);	432	int> = 0>
420	template <class _ForwardIterator>	433	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
421	_LIBCPP_CONSTEXPR_AFTER_CXX17	434	vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a);
422	vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
423	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
424	is_constructible<
425	value_type,
426	typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0);
427		435
428	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	436	private:
429	~vector()	437	class __destroy_vector {
430	{	438	public:
431	__annotate_delete();	439	_LIBCPP_CONSTEXPR __destroy_vector(vector& __vec) : __vec_(__vec) {}
432	std::__debug_db_erase_c(this);
433		440
434	if (this->__begin_ != nullptr)	441	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void operator()() {
435	{	442	__vec_.__annotate_delete();
436	__clear();	443	std::__debug_db_erase_c(std::addressof(__vec_));
437	__alloc_traits::deallocate(__alloc(), this->__begin_, capacity());	444
		445	if (__vec_.__begin_ != nullptr) {
		446	__vec_.__clear();
		447	__alloc_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.capacity());
		448	}
438	}	449	}
439	}
440		450
441	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __x);	451	private:
442	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __x, const __type_identity_t<allocator_type>& __a);	452	vector& __vec_;
443	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	453	};
		454
		455	public:
		456	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~vector() { __destroy_vector(*this)(); }
		457
		458	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(const vector& __x);
		459	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(const vector& __x, const __type_identity_t<allocator_type>& __a);
		460	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
444	vector& operator=(const vector& __x);	461	vector& operator=(const vector& __x);
445		462
446	#ifndef _LIBCPP_CXX03_LANG	463	#ifndef _LIBCPP_CXX03_LANG
447	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	464	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
448	vector(initializer_list<value_type> __il);	465	vector(initializer_list<value_type> __il);
449		466
450	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	467	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
451	vector(initializer_list<value_type> __il, const allocator_type& __a);	468	vector(initializer_list<value_type> __il, const allocator_type& __a);
452		469
453	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	470	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
454	vector& operator=(initializer_list<value_type> __il)	471	vector& operator=(initializer_list<value_type> __il)
455	{assign(__il.begin(), __il.end()); return *this;}	472	{assign(__il.begin(), __il.end()); return *this;}
456	#endif // !_LIBCPP_CXX03_LANG	473	#endif // !_LIBCPP_CXX03_LANG
457		474
458	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	475	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
459	vector(vector&& __x)	476	vector(vector&& __x)
460	#if _LIBCPP_STD_VER > 14	477	#if _LIBCPP_STD_VER > 14
461	noexcept;	478	noexcept;
...	@@ -463,174 +480,163 @@ public:	...	@@ -463,174 +480,163 @@ public:
463	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);	480	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
464	#endif	481	#endif
465		482
466	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	483	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
467	vector(vector&& __x, const __type_identity_t<allocator_type>& __a);	484	vector(vector&& __x, const __type_identity_t<allocator_type>& __a);
468	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	485	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
469	vector& operator=(vector&& __x)	486	vector& operator=(vector&& __x)
470	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value));	487	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value));
471		488
472	template <class _InputIterator>	489	template <class _InputIterator,
473	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	490	__enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
474	is_constructible<	491	is_constructible<value_type, typename iterator_traits<_InputIterator>::reference>::value,
475	value_type,	492	int> = 0>
476	typename iterator_traits<_InputIterator>::reference>::value,	493	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void assign(_InputIterator __first, _InputIterator __last);
477	void	494	template <
478	>::type	495	class _ForwardIterator,
479	assign(_InputIterator __first, _InputIterator __last);	496	__enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
480	template <class _ForwardIterator>	497	is_constructible<value_type, typename iterator_traits<_ForwardIterator>::reference>::value,
481	_LIBCPP_CONSTEXPR_AFTER_CXX17	498	int> = 0>
482	typename enable_if	499	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void assign(_ForwardIterator __first, _ForwardIterator __last);
483	<
484	__is_cpp17_forward_iterator<_ForwardIterator>::value &&
485	is_constructible<
486	value_type,
487	typename iterator_traits<_ForwardIterator>::reference>::value,
488	void
489	>::type
490	assign(_ForwardIterator __first, _ForwardIterator __last);
491		500
492	_LIBCPP_CONSTEXPR_AFTER_CXX17 void assign(size_type __n, const_reference __u);	501	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void assign(size_type __n, const_reference __u);
493		502
494	#ifndef _LIBCPP_CXX03_LANG	503	#ifndef _LIBCPP_CXX03_LANG
495	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	504	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
496	void assign(initializer_list<value_type> __il)	505	void assign(initializer_list<value_type> __il)
497	{assign(__il.begin(), __il.end());}	506	{assign(__il.begin(), __il.end());}
498	#endif	507	#endif
499		508
500	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	509	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
501	allocator_type get_allocator() const _NOEXCEPT	510	allocator_type get_allocator() const _NOEXCEPT
502	{return this->__alloc();}	511	{return this->__alloc();}
503		512
504	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY iterator begin() _NOEXCEPT;	513	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT;
505	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_iterator begin() const _NOEXCEPT;	514	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT;
506	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY iterator end() _NOEXCEPT;	515	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT;
507	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_iterator end() const _NOEXCEPT;	516	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT;
508		517
509	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	518	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
510	reverse_iterator rbegin() _NOEXCEPT	519	reverse_iterator rbegin() _NOEXCEPT
511	{return reverse_iterator(end());}	520	{return reverse_iterator(end());}
512	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	521	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
513	const_reverse_iterator rbegin() const _NOEXCEPT	522	const_reverse_iterator rbegin() const _NOEXCEPT
514	{return const_reverse_iterator(end());}	523	{return const_reverse_iterator(end());}
515	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	524	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
516	reverse_iterator rend() _NOEXCEPT	525	reverse_iterator rend() _NOEXCEPT
517	{return reverse_iterator(begin());}	526	{return reverse_iterator(begin());}
518	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	527	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
519	const_reverse_iterator rend() const _NOEXCEPT	528	const_reverse_iterator rend() const _NOEXCEPT
520	{return const_reverse_iterator(begin());}	529	{return const_reverse_iterator(begin());}
521		530
522	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	531	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
523	const_iterator cbegin() const _NOEXCEPT	532	const_iterator cbegin() const _NOEXCEPT
524	{return begin();}	533	{return begin();}
525	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	534	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
526	const_iterator cend() const _NOEXCEPT	535	const_iterator cend() const _NOEXCEPT
527	{return end();}	536	{return end();}
528	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	537	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
529	const_reverse_iterator crbegin() const _NOEXCEPT	538	const_reverse_iterator crbegin() const _NOEXCEPT
530	{return rbegin();}	539	{return rbegin();}
531	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	540	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
532	const_reverse_iterator crend() const _NOEXCEPT	541	const_reverse_iterator crend() const _NOEXCEPT
533	{return rend();}	542	{return rend();}
534		543
535	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	544	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
536	size_type size() const _NOEXCEPT	545	size_type size() const _NOEXCEPT
537	{return static_cast<size_type>(this->__end_ - this->__begin_);}	546	{return static_cast<size_type>(this->__end_ - this->__begin_);}
538	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	547	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
539	size_type capacity() const _NOEXCEPT	548	size_type capacity() const _NOEXCEPT
540	{return static_cast<size_type>(__end_cap() - this->__begin_);}	549	{return static_cast<size_type>(__end_cap() - this->__begin_);}
541	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	550	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
542	bool empty() const _NOEXCEPT	551	bool empty() const _NOEXCEPT
543	{return this->__begin_ == this->__end_;}	552	{return this->__begin_ == this->__end_;}
544	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_type max_size() const _NOEXCEPT;	553	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT;
545	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reserve(size_type __n);	554	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void reserve(size_type __n);
546	_LIBCPP_CONSTEXPR_AFTER_CXX17 void shrink_to_fit() _NOEXCEPT;	555	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void shrink_to_fit() _NOEXCEPT;
547		556
548	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n) _NOEXCEPT;	557	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference operator[](size_type __n) _NOEXCEPT;
549	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const _NOEXCEPT;	558	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference operator[](size_type __n) const _NOEXCEPT;
550	_LIBCPP_CONSTEXPR_AFTER_CXX17 reference at(size_type __n);	559	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference at(size_type __n);
551	_LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference at(size_type __n) const;	560	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference at(size_type __n) const;
552		561
553	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY reference front() _NOEXCEPT	562	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference front() _NOEXCEPT
554	{	563	{
555	_LIBCPP_ASSERT(!empty(), "front() called on an empty vector");	564	_LIBCPP_ASSERT(!empty(), "front() called on an empty vector");
556	return *this->__begin_;	565	return *this->__begin_;
557	}	566	}
558	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_reference front() const _NOEXCEPT	567	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference front() const _NOEXCEPT
559	{	568	{
560	_LIBCPP_ASSERT(!empty(), "front() called on an empty vector");	569	_LIBCPP_ASSERT(!empty(), "front() called on an empty vector");
561	return *this->__begin_;	570	return *this->__begin_;
562	}	571	}
563	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY reference back() _NOEXCEPT	572	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference back() _NOEXCEPT
564	{	573	{
565	_LIBCPP_ASSERT(!empty(), "back() called on an empty vector");	574	_LIBCPP_ASSERT(!empty(), "back() called on an empty vector");
566	return *(this->__end_ - 1);	575	return *(this->__end_ - 1);
567	}	576	}
568	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY const_reference back() const _NOEXCEPT	577	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const _NOEXCEPT
569	{	578	{
570	_LIBCPP_ASSERT(!empty(), "back() called on an empty vector");	579	_LIBCPP_ASSERT(!empty(), "back() called on an empty vector");
571	return *(this->__end_ - 1);	580	return *(this->__end_ - 1);
572	}	581	}
573		582
574	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	583	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
575	value_type* data() _NOEXCEPT	584	value_type* data() _NOEXCEPT
576	{return _VSTD::__to_address(this->__begin_);}	585	{return std::__to_address(this->__begin_);}
577		586
578	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	587	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
579	const value_type* data() const _NOEXCEPT	588	const value_type* data() const _NOEXCEPT
580	{return _VSTD::__to_address(this->__begin_);}	589	{return std::__to_address(this->__begin_);}
581		590
582	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);	591	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_back(const_reference __x);
583		592
584	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY void push_back(value_type&& __x);	593	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_back(value_type&& __x);
585		594
586	template <class... _Args>	595	template <class... _Args>
587	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	596	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
588	#if _LIBCPP_STD_VER > 14	597	#if _LIBCPP_STD_VER > 14
589	reference emplace_back(_Args&&... __args);	598	reference emplace_back(_Args&&... __args);
590	#else	599	#else
591	void emplace_back(_Args&&... __args);	600	void emplace_back(_Args&&... __args);
592	#endif	601	#endif
593		602
594	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	603	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
595	void pop_back();	604	void pop_back();
596		605
597	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __position, const_reference __x);	606	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __position, const_reference __x);
598		607
599	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __position, value_type&& __x);	608	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __position, value_type&& __x);
600	template <class... _Args>	609	template <class... _Args>
601	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator emplace(const_iterator __position, _Args&&... __args);	610	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator emplace(const_iterator __position, _Args&&... __args);
602		611
603	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __position, size_type __n, const_reference __x);	612	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
604	template <class _InputIterator>	613	iterator insert(const_iterator __position, size_type __n, const_reference __x);
605	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	614
606	is_constructible<	615	template <class _InputIterator,
607	value_type,	616	__enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
608	typename iterator_traits<_InputIterator>::reference>::value,	617	is_constructible< value_type, typename iterator_traits<_InputIterator>::reference>::value,
609	iterator	618	int> = 0>
610	>::type	619	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator
611	insert(const_iterator __position, _InputIterator __first, _InputIterator __last);	620	insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
612	template <class _ForwardIterator>	621
613	_LIBCPP_CONSTEXPR_AFTER_CXX17	622	template <
614	typename enable_if	623	class _ForwardIterator,
615	<	624	__enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
616	__is_cpp17_forward_iterator<_ForwardIterator>::value &&	625	is_constructible< value_type, typename iterator_traits<_ForwardIterator>::reference>::value,
617	is_constructible<	626	int> = 0>
618	value_type,	627	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator
619	typename iterator_traits<_ForwardIterator>::reference>::value,	628	insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
620	iterator
621	>::type
622	insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
623		629
624	#ifndef _LIBCPP_CXX03_LANG	630	#ifndef _LIBCPP_CXX03_LANG
625	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	631	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
626	iterator insert(const_iterator __position, initializer_list<value_type> __il)	632	iterator insert(const_iterator __position, initializer_list<value_type> __il)
627	{return insert(__position, __il.begin(), __il.end());}	633	{return insert(__position, __il.begin(), __il.end());}
628	#endif	634	#endif
629		635
630	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position);	636	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __position);
631	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator erase(const_iterator __first, const_iterator __last);	637	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __first, const_iterator __last);
632		638
633	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	639	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
634	void clear() _NOEXCEPT	640	void clear() _NOEXCEPT
635	{	641	{
636	size_type __old_size = size();	642	size_type __old_size = size();
...	@@ -639,10 +645,10 @@ public:	...	@@ -639,10 +645,10 @@ public:
639	std::__debug_db_invalidate_all(this);	645	std::__debug_db_invalidate_all(this);
640	}	646	}
641		647
642	_LIBCPP_CONSTEXPR_AFTER_CXX17 void resize(size_type __sz);	648	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void resize(size_type __sz);
643	_LIBCPP_CONSTEXPR_AFTER_CXX17 void resize(size_type __sz, const_reference __x);	649	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void resize(size_type __sz, const_reference __x);
644		650
645	_LIBCPP_CONSTEXPR_AFTER_CXX17 void swap(vector&)	651	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void swap(vector&)
646	#if _LIBCPP_STD_VER >= 14	652	#if _LIBCPP_STD_VER >= 14
647	_NOEXCEPT;	653	_NOEXCEPT;
648	#else	654	#else
...	@@ -650,7 +656,7 @@ public:	...	@@ -650,7 +656,7 @@ public:
650	__is_nothrow_swappable<allocator_type>::value);	656	__is_nothrow_swappable<allocator_type>::value);
651	#endif	657	#endif
652		658
653	_LIBCPP_CONSTEXPR_AFTER_CXX17 bool __invariants() const;	659	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const;
654		660
655	#ifdef _LIBCPP_ENABLE_DEBUG_MODE	661	#ifdef _LIBCPP_ENABLE_DEBUG_MODE
656		662
...	@@ -667,7 +673,7 @@ private:	...	@@ -667,7 +673,7 @@ private:
667	__compressed_pair<pointer, allocator_type> __end_cap_ =	673	__compressed_pair<pointer, allocator_type> __end_cap_ =
668	__compressed_pair<pointer, allocator_type>(nullptr, __default_init_tag());	674	__compressed_pair<pointer, allocator_type>(nullptr, __default_init_tag());
669		675
670	_LIBCPP_INLINE_VISIBILITY void __invalidate_iterators_past(pointer __new_last);	676	_LIBCPP_HIDE_FROM_ABI void __invalidate_iterators_past(pointer __new_last);
671		677
672	// Allocate space for __n objects	678	// Allocate space for __n objects
673	// throws length_error if __n > max_size()	679	// throws length_error if __n > max_size()
...	@@ -676,7 +682,7 @@ private:	...	@@ -676,7 +682,7 @@ private:
676	// Precondition: __n > 0	682	// Precondition: __n > 0
677	// Postcondition: capacity() >= __n	683	// Postcondition: capacity() >= __n
678	// Postcondition: size() == 0	684	// Postcondition: size() == 0
679	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI void __vallocate(size_type __n) {	685	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __vallocate(size_type __n) {
680	if (__n > max_size())	686	if (__n > max_size())
681	__throw_length_error();	687	__throw_length_error();
682	auto __allocation = std::__allocate_at_least(__alloc(), __n);	688	auto __allocation = std::__allocate_at_least(__alloc(), __n);
...	@@ -686,33 +692,30 @@ private:	...	@@ -686,33 +692,30 @@ private:
686	__annotate_new(0);	692	__annotate_new(0);
687	}	693	}
688		694
689	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __vdeallocate() _NOEXCEPT;	695	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __vdeallocate() _NOEXCEPT;
690	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const;	696	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __recommend(size_type __new_size) const;
691	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_at_end(size_type __n);	697	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __construct_at_end(size_type __n);
692	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	698	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
693	void __construct_at_end(size_type __n, const_reference __x);	699	void __construct_at_end(size_type __n, const_reference __x);
694	template <class _ForwardIterator>	700
695	_LIBCPP_CONSTEXPR_AFTER_CXX17	701	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value, int> = 0>
696	typename enable_if	702	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
697	<	703	__construct_at_end(_ForwardIterator __first, _ForwardIterator __last, size_type __n);
698	__is_cpp17_forward_iterator<_ForwardIterator>::value,	704
699	void	705	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __append(size_type __n);
700	>::type	706	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __append(size_type __n, const_reference __x);
701	__construct_at_end(_ForwardIterator __first, _ForwardIterator __last, size_type __n);	707	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
702	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __append(size_type __n);	708	iterator __make_iter(pointer __p) _NOEXCEPT { return iterator(this, __p); }
703	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __append(size_type __n, const_reference __x);	709	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
704	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	710	const_iterator __make_iter(const_pointer __p) const _NOEXCEPT { return const_iterator(this, __p); }
705	iterator __make_iter(pointer __p) _NOEXCEPT;	711	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v);
706	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	712	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p);
707	const_iterator __make_iter(const_pointer __p) const _NOEXCEPT;	713	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_range(pointer __from_s, pointer __from_e, pointer __to);
708	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v);	714	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign(vector& __c, true_type)
709	_LIBCPP_CONSTEXPR_AFTER_CXX17 pointer __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p);
710	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __move_range(pointer __from_s, pointer __from_e, pointer __to);
711	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __move_assign(vector& __c, true_type)
712	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);	715	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
713	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __move_assign(vector& __c, false_type)	716	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign(vector& __c, false_type)
714	_NOEXCEPT_(__alloc_traits::is_always_equal::value);	717	_NOEXCEPT_(__alloc_traits::is_always_equal::value);
715	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	718	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
716	void __destruct_at_end(pointer __new_last) _NOEXCEPT	719	void __destruct_at_end(pointer __new_last) _NOEXCEPT
717	{	720	{
718	if (!__libcpp_is_constant_evaluated())	721	if (!__libcpp_is_constant_evaluated())
...	@@ -723,11 +726,11 @@ private:	...	@@ -723,11 +726,11 @@ private:
723	}	726	}
724		727
725	template <class _Up>	728	template <class _Up>
726	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	729	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
727	inline void __push_back_slow_path(_Up&& __x);	730	inline void __push_back_slow_path(_Up&& __x);
728		731
729	template <class... _Args>	732	template <class... _Args>
730	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	733	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
731	inline void __emplace_back_slow_path(_Args&&... __args);	734	inline void __emplace_back_slow_path(_Args&&... __args);
732		735
733	// The following functions are no-ops outside of AddressSanitizer mode.	736	// The following functions are no-ops outside of AddressSanitizer mode.
...	@@ -735,7 +738,7 @@ private:	...	@@ -735,7 +738,7 @@ private:
735	// may not meet the AddressSanitizer alignment constraints.	738	// may not meet the AddressSanitizer alignment constraints.
736	// See the documentation for __sanitizer_annotate_contiguous_container for more details.	739	// See the documentation for __sanitizer_annotate_contiguous_container for more details.
737	#ifndef _LIBCPP_HAS_NO_ASAN	740	#ifndef _LIBCPP_HAS_NO_ASAN
738	_LIBCPP_CONSTEXPR_AFTER_CXX17	741	_LIBCPP_CONSTEXPR_SINCE_CXX20
739	void __annotate_contiguous_container(const void __beg, const void __end,	742	void __annotate_contiguous_container(const void __beg, const void __end,
740	const void *__old_mid,	743	const void *__old_mid,
741	const void *__new_mid) const	744	const void *__new_mid) const
...	@@ -745,30 +748,30 @@ private:	...	@@ -745,30 +748,30 @@ private:
745	__sanitizer_annotate_contiguous_container(__beg, __end, __old_mid, __new_mid);	748	__sanitizer_annotate_contiguous_container(__beg, __end, __old_mid, __new_mid);
746	}	749	}
747	#else	750	#else
748	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	751	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
749	void __annotate_contiguous_container(const void, const void, const void*,	752	void __annotate_contiguous_container(const void, const void, const void*,
750	const void*) const _NOEXCEPT {}	753	const void*) const _NOEXCEPT {}
751	#endif	754	#endif
752	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	755	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
753	void __annotate_new(size_type __current_size) const _NOEXCEPT {	756	void __annotate_new(size_type __current_size) const _NOEXCEPT {
754	__annotate_contiguous_container(data(), data() + capacity(),	757	__annotate_contiguous_container(data(), data() + capacity(),
755	data() + capacity(), data() + __current_size);	758	data() + capacity(), data() + __current_size);
756	}	759	}
757		760
758	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	761	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
759	void __annotate_delete() const _NOEXCEPT {	762	void __annotate_delete() const _NOEXCEPT {
760	__annotate_contiguous_container(data(), data() + capacity(),	763	__annotate_contiguous_container(data(), data() + capacity(),
761	data() + size(), data() + capacity());	764	data() + size(), data() + capacity());
762	}	765	}
763		766
764	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	767	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
765	void __annotate_increase(size_type __n) const _NOEXCEPT	768	void __annotate_increase(size_type __n) const _NOEXCEPT
766	{	769	{
767	__annotate_contiguous_container(data(), data() + capacity(),	770	__annotate_contiguous_container(data(), data() + capacity(),
768	data() + size(), data() + size() + __n);	771	data() + size(), data() + size() + __n);
769	}	772	}
770		773
771	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	774	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
772	void __annotate_shrink(size_type __old_size) const _NOEXCEPT	775	void __annotate_shrink(size_type __old_size) const _NOEXCEPT
773	{	776	{
774	__annotate_contiguous_container(data(), data() + capacity(),	777	__annotate_contiguous_container(data(), data() + capacity(),
...	@@ -776,14 +779,14 @@ private:	...	@@ -776,14 +779,14 @@ private:
776	}	779	}
777		780
778	struct _ConstructTransaction {	781	struct _ConstructTransaction {
779	_LIBCPP_CONSTEXPR_AFTER_CXX17	782	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
780	explicit _ConstructTransaction(vector &__v, size_type __n)	783	explicit _ConstructTransaction(vector &__v, size_type __n)
781	: __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) {	784	: __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) {
782	#ifndef _LIBCPP_HAS_NO_ASAN	785	#ifndef _LIBCPP_HAS_NO_ASAN
783	__v_.__annotate_increase(__n);	786	__v_.__annotate_increase(__n);
784	#endif	787	#endif
785	}	788	}
786	_LIBCPP_CONSTEXPR_AFTER_CXX17 ~_ConstructTransaction() {	789	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~_ConstructTransaction() {
787	__v_.__end_ = __pos_;	790	__v_.__end_ = __pos_;
788	#ifndef _LIBCPP_HAS_NO_ASAN	791	#ifndef _LIBCPP_HAS_NO_ASAN
789	if (__pos_ != __new_end_) {	792	if (__pos_ != __new_end_) {
...	@@ -802,44 +805,44 @@ private:	...	@@ -802,44 +805,44 @@ private:
802	};	805	};
803		806
804	template <class ..._Args>	807	template <class ..._Args>
805	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	808	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
806	void __construct_one_at_end(_Args&& ...__args) {	809	void __construct_one_at_end(_Args&& ...__args) {
807	_ConstructTransaction __tx(*this, 1);	810	_ConstructTransaction __tx(*this, 1);
808	__alloc_traits::construct(this->__alloc(), _VSTD::__to_address(__tx.__pos_),	811	__alloc_traits::construct(this->__alloc(), std::__to_address(__tx.__pos_),
809	_VSTD::forward<_Args>(__args)...);	812	std::forward<_Args>(__args)...);
810	++__tx.__pos_;	813	++__tx.__pos_;
811	}	814	}
812		815
813	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	816	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
814	allocator_type& __alloc() _NOEXCEPT	817	allocator_type& __alloc() _NOEXCEPT
815	{return this->__end_cap_.second();}	818	{return this->__end_cap_.second();}
816	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	819	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
817	const allocator_type& __alloc() const _NOEXCEPT	820	const allocator_type& __alloc() const _NOEXCEPT
818	{return this->__end_cap_.second();}	821	{return this->__end_cap_.second();}
819	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	822	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
820	pointer& __end_cap() _NOEXCEPT	823	pointer& __end_cap() _NOEXCEPT
821	{return this->__end_cap_.first();}	824	{return this->__end_cap_.first();}
822	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	825	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
823	const pointer& __end_cap() const _NOEXCEPT	826	const pointer& __end_cap() const _NOEXCEPT
824	{return this->__end_cap_.first();}	827	{return this->__end_cap_.first();}
825		828
826	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	829	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
827	void __clear() _NOEXCEPT {__base_destruct_at_end(this->__begin_);}	830	void __clear() _NOEXCEPT {__base_destruct_at_end(this->__begin_);}
828		831
829	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	832	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
830	void __base_destruct_at_end(pointer __new_last) _NOEXCEPT {	833	void __base_destruct_at_end(pointer __new_last) _NOEXCEPT {
831	pointer __soon_to_be_end = this->__end_;	834	pointer __soon_to_be_end = this->__end_;
832	while (__new_last != __soon_to_be_end)	835	while (__new_last != __soon_to_be_end)
833	__alloc_traits::destroy(__alloc(), _VSTD::__to_address(--__soon_to_be_end));	836	__alloc_traits::destroy(__alloc(), std::__to_address(--__soon_to_be_end));
834	this->__end_ = __new_last;	837	this->__end_ = __new_last;
835	}	838	}
836		839
837	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	840	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
838	void __copy_assign_alloc(const vector& __c)	841	void __copy_assign_alloc(const vector& __c)
839	{__copy_assign_alloc(__c, integral_constant<bool,	842	{__copy_assign_alloc(__c, integral_constant<bool,
840	__alloc_traits::propagate_on_container_copy_assignment::value>());}	843	__alloc_traits::propagate_on_container_copy_assignment::value>());}
841		844
842	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	845	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
843	void __move_assign_alloc(vector& __c)	846	void __move_assign_alloc(vector& __c)
844	_NOEXCEPT_(	847	_NOEXCEPT_(
845	!__alloc_traits::propagate_on_container_move_assignment::value \|\|	848	!__alloc_traits::propagate_on_container_move_assignment::value \|\|
...	@@ -849,15 +852,15 @@ private:	...	@@ -849,15 +852,15 @@ private:
849		852
850	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI	853	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI
851	void __throw_length_error() const {	854	void __throw_length_error() const {
852	_VSTD::__throw_length_error("vector");	855	std::__throw_length_error("vector");
853	}	856	}
854		857
855	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI	858	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI
856	void __throw_out_of_range() const {	859	void __throw_out_of_range() const {
857	_VSTD::__throw_out_of_range("vector");	860	std::__throw_out_of_range("vector");
858	}	861	}
859		862
860	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	863	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
861	void __copy_assign_alloc(const vector& __c, true_type)	864	void __copy_assign_alloc(const vector& __c, true_type)
862	{	865	{
863	if (__alloc() != __c.__alloc())	866	if (__alloc() != __c.__alloc())
...	@@ -869,18 +872,18 @@ private:	...	@@ -869,18 +872,18 @@ private:
869	__alloc() = __c.__alloc();	872	__alloc() = __c.__alloc();
870	}	873	}
871		874
872	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	875	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
873	void __copy_assign_alloc(const vector&, false_type)	876	void __copy_assign_alloc(const vector&, false_type)
874	{}	877	{}
875		878
876	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	879	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
877	void __move_assign_alloc(vector& __c, true_type)	880	void __move_assign_alloc(vector& __c, true_type)
878	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)	881	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
879	{	882	{
880	__alloc() = _VSTD::move(__c.__alloc());	883	__alloc() = std::move(__c.__alloc());
881	}	884	}
882		885
883	_LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY	886	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
884	void __move_assign_alloc(vector&, false_type)	887	void __move_assign_alloc(vector&, false_type)
885	_NOEXCEPT	888	_NOEXCEPT
886	{}	889	{}
...	@@ -905,7 +908,7 @@ vector(_InputIterator, _InputIterator, _Alloc)	...	@@ -905,7 +908,7 @@ vector(_InputIterator, _InputIterator, _Alloc)
905	#endif	908	#endif
906		909
907	template <class _Tp, class _Allocator>	910	template <class _Tp, class _Allocator>
908	_LIBCPP_CONSTEXPR_AFTER_CXX17	911	_LIBCPP_CONSTEXPR_SINCE_CXX20
909	void	912	void
910	vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v)	913	vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v)
911	{	914	{
...	@@ -914,16 +917,16 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a	...	@@ -914,16 +917,16 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a
914	__v.__begin_ = std::__uninitialized_allocator_move_if_noexcept(	917	__v.__begin_ = std::__uninitialized_allocator_move_if_noexcept(
915	__alloc(), _RevIter(__end_), _RevIter(__begin_), _RevIter(__v.__begin_))	918	__alloc(), _RevIter(__end_), _RevIter(__begin_), _RevIter(__v.__begin_))
916	.base();	919	.base();
917	_VSTD::swap(this->__begin_, __v.__begin_);	920	std::swap(this->__begin_, __v.__begin_);
918	_VSTD::swap(this->__end_, __v.__end_);	921	std::swap(this->__end_, __v.__end_);
919	_VSTD::swap(this->__end_cap(), __v.__end_cap());	922	std::swap(this->__end_cap(), __v.__end_cap());
920	__v.__first_ = __v.__begin_;	923	__v.__first_ = __v.__begin_;
921	__annotate_new(size());	924	__annotate_new(size());
922	std::__debug_db_invalidate_all(this);	925	std::__debug_db_invalidate_all(this);
923	}	926	}
924		927
925	template <class _Tp, class _Allocator>	928	template <class _Tp, class _Allocator>
926	_LIBCPP_CONSTEXPR_AFTER_CXX17	929	_LIBCPP_CONSTEXPR_SINCE_CXX20
927	typename vector<_Tp, _Allocator>::pointer	930	typename vector<_Tp, _Allocator>::pointer
928	vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p)	931	vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p)
929	{	932	{
...	@@ -934,9 +937,9 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a	...	@@ -934,9 +937,9 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a
934	__alloc(), _RevIter(__p), _RevIter(__begin_), _RevIter(__v.__begin_))	937	__alloc(), _RevIter(__p), _RevIter(__begin_), _RevIter(__v.__begin_))
935	.base();	938	.base();
936	__v.__end_ = std::__uninitialized_allocator_move_if_noexcept(__alloc(), __p, __end_, __v.__end_);	939	__v.__end_ = std::__uninitialized_allocator_move_if_noexcept(__alloc(), __p, __end_, __v.__end_);
937	_VSTD::swap(this->__begin_, __v.__begin_);	940	std::swap(this->__begin_, __v.__begin_);
938	_VSTD::swap(this->__end_, __v.__end_);	941	std::swap(this->__end_, __v.__end_);
939	_VSTD::swap(this->__end_cap(), __v.__end_cap());	942	std::swap(this->__end_cap(), __v.__end_cap());
940	__v.__first_ = __v.__begin_;	943	__v.__first_ = __v.__begin_;
941	__annotate_new(size());	944	__annotate_new(size());
942	std::__debug_db_invalidate_all(this);	945	std::__debug_db_invalidate_all(this);
...	@@ -944,7 +947,7 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a	...	@@ -944,7 +947,7 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, a
944	}	947	}
945		948
946	template <class _Tp, class _Allocator>	949	template <class _Tp, class _Allocator>
947	_LIBCPP_CONSTEXPR_AFTER_CXX17	950	_LIBCPP_CONSTEXPR_SINCE_CXX20
948	void	951	void
949	vector<_Tp, _Allocator>::__vdeallocate() _NOEXCEPT	952	vector<_Tp, _Allocator>::__vdeallocate() _NOEXCEPT
950	{	953	{
...	@@ -957,18 +960,18 @@ vector<_Tp, _Allocator>::__vdeallocate() _NOEXCEPT	...	@@ -957,18 +960,18 @@ vector<_Tp, _Allocator>::__vdeallocate() _NOEXCEPT
957	}	960	}
958		961
959	template <class _Tp, class _Allocator>	962	template <class _Tp, class _Allocator>
960	_LIBCPP_CONSTEXPR_AFTER_CXX17	963	_LIBCPP_CONSTEXPR_SINCE_CXX20
961	typename vector<_Tp, _Allocator>::size_type	964	typename vector<_Tp, _Allocator>::size_type
962	vector<_Tp, _Allocator>::max_size() const _NOEXCEPT	965	vector<_Tp, _Allocator>::max_size() const _NOEXCEPT
963	{	966	{
964	return _VSTD::min<size_type>(__alloc_traits::max_size(this->__alloc()),	967	return std::min<size_type>(__alloc_traits::max_size(this->__alloc()),
965	numeric_limits<difference_type>::max());	968	numeric_limits<difference_type>::max());
966	}	969	}
967		970
968	// Precondition: __new_size > capacity()	971	// Precondition: __new_size > capacity()
969	template <class _Tp, class _Allocator>	972	template <class _Tp, class _Allocator>
970	_LIBCPP_CONSTEXPR_AFTER_CXX17	973	_LIBCPP_CONSTEXPR_SINCE_CXX20
971	inline _LIBCPP_INLINE_VISIBILITY	974	inline _LIBCPP_HIDE_FROM_ABI
972	typename vector<_Tp, _Allocator>::size_type	975	typename vector<_Tp, _Allocator>::size_type
973	vector<_Tp, _Allocator>::__recommend(size_type __new_size) const	976	vector<_Tp, _Allocator>::__recommend(size_type __new_size) const
974	{	977	{
...	@@ -978,7 +981,7 @@ vector<_Tp, _Allocator>::__recommend(size_type __new_size) const	...	@@ -978,7 +981,7 @@ vector<_Tp, _Allocator>::__recommend(size_type __new_size) const
978	const size_type __cap = capacity();	981	const size_type __cap = capacity();
979	if (__cap >= __ms / 2)	982	if (__cap >= __ms / 2)
980	return __ms;	983	return __ms;
981	return _VSTD::max<size_type>(2 * __cap, __new_size);	984	return std::max<size_type>(2 * __cap, __new_size);
982	}	985	}
983		986
984	// Default constructs __n objects starting at __end_	987	// Default constructs __n objects starting at __end_
...	@@ -987,14 +990,14 @@ vector<_Tp, _Allocator>::__recommend(size_type __new_size) const	...	@@ -987,14 +990,14 @@ vector<_Tp, _Allocator>::__recommend(size_type __new_size) const
987	// Precondition: size() + __n <= capacity()	990	// Precondition: size() + __n <= capacity()
988	// Postcondition: size() == size() + __n	991	// Postcondition: size() == size() + __n
989	template <class _Tp, class _Allocator>	992	template <class _Tp, class _Allocator>
990	_LIBCPP_CONSTEXPR_AFTER_CXX17	993	_LIBCPP_CONSTEXPR_SINCE_CXX20
991	void	994	void
992	vector<_Tp, _Allocator>::__construct_at_end(size_type __n)	995	vector<_Tp, _Allocator>::__construct_at_end(size_type __n)
993	{	996	{
994	_ConstructTransaction __tx(*this, __n);	997	_ConstructTransaction __tx(*this, __n);
995	const_pointer __new_end = __tx.__new_end_;	998	const_pointer __new_end = __tx.__new_end_;
996	for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {	999	for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {
997	__alloc_traits::construct(this->__alloc(), _VSTD::__to_address(__pos));	1000	__alloc_traits::construct(this->__alloc(), std::__to_address(__pos));
998	}	1001	}
999	}	1002	}
1000		1003
...	@@ -1005,7 +1008,7 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n)	...	@@ -1005,7 +1008,7 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n)
1005	// Postcondition: size() == old size() + __n	1008	// Postcondition: size() == old size() + __n
1006	// Postcondition: [i] == __x for all i in [size() - __n, __n)	1009	// Postcondition: [i] == __x for all i in [size() - __n, __n)
1007	template <class _Tp, class _Allocator>	1010	template <class _Tp, class _Allocator>
1008	_LIBCPP_CONSTEXPR_AFTER_CXX17	1011	_LIBCPP_CONSTEXPR_SINCE_CXX20
1009	inline	1012	inline
1010	void	1013	void
1011	vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)	1014	vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
...	@@ -1013,18 +1016,13 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)	...	@@ -1013,18 +1016,13 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
1013	_ConstructTransaction __tx(*this, __n);	1016	_ConstructTransaction __tx(*this, __n);
1014	const_pointer __new_end = __tx.__new_end_;	1017	const_pointer __new_end = __tx.__new_end_;
1015	for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {	1018	for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {
1016	__alloc_traits::construct(this->__alloc(), _VSTD::__to_address(__pos), __x);	1019	__alloc_traits::construct(this->__alloc(), std::__to_address(__pos), __x);
1017	}	1020	}
1018	}	1021	}
1019		1022
1020	template <class _Tp, class _Allocator>	1023	template <class _Tp, class _Allocator>
1021	template <class _ForwardIterator>	1024	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value, int> >
1022	_LIBCPP_CONSTEXPR_AFTER_CXX17	1025	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
1023	typename enable_if
1024	<
1025	__is_cpp17_forward_iterator<_ForwardIterator>::value,
1026	void
1027	>::type
1028	vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last, size_type __n)	1026	vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last, size_type __n)
1029	{	1027	{
1030	_ConstructTransaction __tx(*this, __n);	1028	_ConstructTransaction __tx(*this, __n);
...	@@ -1036,7 +1034,7 @@ vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIt	...	@@ -1036,7 +1034,7 @@ vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIt
1036	// Postcondition: size() == size() + __n	1034	// Postcondition: size() == size() + __n
1037	// Exception safety: strong.	1035	// Exception safety: strong.
1038	template <class _Tp, class _Allocator>	1036	template <class _Tp, class _Allocator>
1039	_LIBCPP_CONSTEXPR_AFTER_CXX17	1037	_LIBCPP_CONSTEXPR_SINCE_CXX20
1040	void	1038	void
1041	vector<_Tp, _Allocator>::__append(size_type __n)	1039	vector<_Tp, _Allocator>::__append(size_type __n)
1042	{	1040	{
...	@@ -1056,7 +1054,7 @@ vector<_Tp, _Allocator>::__append(size_type __n)	...	@@ -1056,7 +1054,7 @@ vector<_Tp, _Allocator>::__append(size_type __n)
1056	// Postcondition: size() == size() + __n	1054	// Postcondition: size() == size() + __n
1057	// Exception safety: strong.	1055	// Exception safety: strong.
1058	template <class _Tp, class _Allocator>	1056	template <class _Tp, class _Allocator>
1059	_LIBCPP_CONSTEXPR_AFTER_CXX17	1057	_LIBCPP_CONSTEXPR_SINCE_CXX20
1060	void	1058	void
1061	vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)	1059	vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)
1062	{	1060	{
...	@@ -1072,152 +1070,160 @@ vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)	...	@@ -1072,152 +1070,160 @@ vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)
1072	}	1070	}
1073		1071
1074	template <class _Tp, class _Allocator>	1072	template <class _Tp, class _Allocator>
1075	_LIBCPP_CONSTEXPR_AFTER_CXX17	1073	_LIBCPP_CONSTEXPR_SINCE_CXX20
1076	vector<_Tp, _Allocator>::vector(size_type __n)	1074	vector<_Tp, _Allocator>::vector(size_type __n)
1077	{	1075	{
1078	_VSTD::__debug_db_insert_c(this);	1076	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1077	std::__debug_db_insert_c(this);
1079	if (__n > 0)	1078	if (__n > 0)
1080	{	1079	{
1081	__vallocate(__n);	1080	__vallocate(__n);
1082	__construct_at_end(__n);	1081	__construct_at_end(__n);
1083	}	1082	}
		1083	__guard.__complete();
1084	}	1084	}
1085		1085
1086	#if _LIBCPP_STD_VER > 11	1086	#if _LIBCPP_STD_VER > 11
1087	template <class _Tp, class _Allocator>	1087	template <class _Tp, class _Allocator>
1088	_LIBCPP_CONSTEXPR_AFTER_CXX17	1088	_LIBCPP_CONSTEXPR_SINCE_CXX20
1089	vector<_Tp, _Allocator>::vector(size_type __n, const allocator_type& __a)	1089	vector<_Tp, _Allocator>::vector(size_type __n, const allocator_type& __a)
1090	: __end_cap_(nullptr, __a)	1090	: __end_cap_(nullptr, __a)
1091	{	1091	{
1092	_VSTD::__debug_db_insert_c(this);	1092	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1093	std::__debug_db_insert_c(this);
1093	if (__n > 0)	1094	if (__n > 0)
1094	{	1095	{
1095	__vallocate(__n);	1096	__vallocate(__n);
1096	__construct_at_end(__n);	1097	__construct_at_end(__n);
1097	}	1098	}
		1099	__guard.__complete();
1098	}	1100	}
1099	#endif	1101	#endif
1100		1102
1101	template <class _Tp, class _Allocator>	1103	template <class _Tp, class _Allocator>
1102	_LIBCPP_CONSTEXPR_AFTER_CXX17	1104	_LIBCPP_CONSTEXPR_SINCE_CXX20
1103	vector<_Tp, _Allocator>::vector(size_type __n, const value_type& __x)	1105	vector<_Tp, _Allocator>::vector(size_type __n, const value_type& __x)
1104	{	1106	{
1105	_VSTD::__debug_db_insert_c(this);	1107	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1108	std::__debug_db_insert_c(this);
1106	if (__n > 0)	1109	if (__n > 0)
1107	{	1110	{
1108	__vallocate(__n);	1111	__vallocate(__n);
1109	__construct_at_end(__n, __x);	1112	__construct_at_end(__n, __x);
1110	}	1113	}
		1114	__guard.__complete();
1111	}	1115	}
1112		1116
1113	template <class _Tp, class _Allocator>	1117	template <class _Tp, class _Allocator>
1114	template <class _InputIterator>	1118	template <class _InputIterator, __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
1115	_LIBCPP_CONSTEXPR_AFTER_CXX17	1119	is_constructible<_Tp, typename iterator_traits<_InputIterator>::reference>::value,
1116	vector<_Tp, _Allocator>::vector(_InputIterator __first,	1120	int> >
1117	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	1121	_LIBCPP_CONSTEXPR_SINCE_CXX20
1118	is_constructible<	1122	vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last)
1119	value_type,	1123	{
1120	typename iterator_traits<_InputIterator>::reference>::value,	1124	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
1121	_InputIterator>::type __last)	1125	std::__debug_db_insert_c(this);
1122	{
1123	_VSTD::__debug_db_insert_c(this);
1124	for (; __first != __last; ++__first)	1126	for (; __first != __last; ++__first)
1125	emplace_back(*__first);	1127	emplace_back(*__first);
		1128	__guard.__complete();
1126	}	1129	}
1127		1130
1128	template <class _Tp, class _Allocator>	1131	template <class _Tp, class _Allocator>
1129	template <class _InputIterator>	1132	template <class _InputIterator, __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
1130	_LIBCPP_CONSTEXPR_AFTER_CXX17	1133	is_constructible<_Tp, typename iterator_traits<_InputIterator>::reference>::value,
1131	vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,	1134	int> >
1132	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	1135	_LIBCPP_CONSTEXPR_SINCE_CXX20
1133	is_constructible<	1136	vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a)
1134	value_type,
1135	typename iterator_traits<_InputIterator>::reference>::value>::type*)
1136	: __end_cap_(nullptr, __a)	1137	: __end_cap_(nullptr, __a)
1137	{	1138	{
1138	_VSTD::__debug_db_insert_c(this);	1139	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1140	std::__debug_db_insert_c(this);
1139	for (; __first != __last; ++__first)	1141	for (; __first != __last; ++__first)
1140	emplace_back(*__first);	1142	emplace_back(*__first);
		1143	__guard.__complete();
1141	}	1144	}
1142		1145
1143	template <class _Tp, class _Allocator>	1146	template <class _Tp, class _Allocator>
1144	template <class _ForwardIterator>	1147	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1145	_LIBCPP_CONSTEXPR_AFTER_CXX17	1148	is_constructible<_Tp, typename iterator_traits<_ForwardIterator>::reference>::value,
1146	vector<_Tp, _Allocator>::vector(_ForwardIterator __first,	1149	int> >
1147	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value &&	1150	_LIBCPP_CONSTEXPR_SINCE_CXX20
1148	is_constructible<	1151	vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last)
1149	value_type,	1152	{
1150	typename iterator_traits<_ForwardIterator>::reference>::value,	1153	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
1151	_ForwardIterator>::type __last)	1154	std::__debug_db_insert_c(this);
1152	{	1155	size_type __n = static_cast<size_type>(std::distance(__first, __last));
1153	_VSTD::__debug_db_insert_c(this);
1154	size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
1155	if (__n > 0)	1156	if (__n > 0)
1156	{	1157	{
1157	__vallocate(__n);	1158	__vallocate(__n);
1158	__construct_at_end(__first, __last, __n);	1159	__construct_at_end(__first, __last, __n);
1159	}	1160	}
		1161	__guard.__complete();
1160	}	1162	}
1161		1163
1162	template <class _Tp, class _Allocator>	1164	template <class _Tp, class _Allocator>
1163	template <class _ForwardIterator>	1165	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1164	_LIBCPP_CONSTEXPR_AFTER_CXX17	1166	is_constructible<_Tp, typename iterator_traits<_ForwardIterator>::reference>::value,
1165	vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,	1167	int> >
1166	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value &&	1168	_LIBCPP_CONSTEXPR_SINCE_CXX20
1167	is_constructible<	1169	vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a)
1168	value_type,
1169	typename iterator_traits<_ForwardIterator>::reference>::value>::type*)
1170	: __end_cap_(nullptr, __a)	1170	: __end_cap_(nullptr, __a)
1171	{	1171	{
1172	_VSTD::__debug_db_insert_c(this);	1172	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
1173	size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));	1173	std::__debug_db_insert_c(this);
		1174	size_type __n = static_cast<size_type>(std::distance(__first, __last));
1174	if (__n > 0)	1175	if (__n > 0)
1175	{	1176	{
1176	__vallocate(__n);	1177	__vallocate(__n);
1177	__construct_at_end(__first, __last, __n);	1178	__construct_at_end(__first, __last, __n);
1178	}	1179	}
		1180	__guard.__complete();
1179	}	1181	}
1180		1182
1181	template <class _Tp, class _Allocator>	1183	template <class _Tp, class _Allocator>
1182	_LIBCPP_CONSTEXPR_AFTER_CXX17	1184	_LIBCPP_CONSTEXPR_SINCE_CXX20
1183	vector<_Tp, _Allocator>::vector(const vector& __x)	1185	vector<_Tp, _Allocator>::vector(const vector& __x)
1184	: __end_cap_(nullptr, __alloc_traits::select_on_container_copy_construction(__x.__alloc()))	1186	: __end_cap_(nullptr, __alloc_traits::select_on_container_copy_construction(__x.__alloc()))
1185	{	1187	{
1186	_VSTD::__debug_db_insert_c(this);	1188	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1189	std::__debug_db_insert_c(this);
1187	size_type __n = __x.size();	1190	size_type __n = __x.size();
1188	if (__n > 0)	1191	if (__n > 0)
1189	{	1192	{
1190	__vallocate(__n);	1193	__vallocate(__n);
1191	__construct_at_end(__x.__begin_, __x.__end_, __n);	1194	__construct_at_end(__x.__begin_, __x.__end_, __n);
1192	}	1195	}
		1196	__guard.__complete();
1193	}	1197	}
1194		1198
1195	template <class _Tp, class _Allocator>	1199	template <class _Tp, class _Allocator>
1196	_LIBCPP_CONSTEXPR_AFTER_CXX17	1200	_LIBCPP_CONSTEXPR_SINCE_CXX20
1197	vector<_Tp, _Allocator>::vector(const vector& __x, const __type_identity_t<allocator_type>& __a)	1201	vector<_Tp, _Allocator>::vector(const vector& __x, const __type_identity_t<allocator_type>& __a)
1198	: __end_cap_(nullptr, __a)	1202	: __end_cap_(nullptr, __a)
1199	{	1203	{
1200	_VSTD::__debug_db_insert_c(this);	1204	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1205	std::__debug_db_insert_c(this);
1201	size_type __n = __x.size();	1206	size_type __n = __x.size();
1202	if (__n > 0)	1207	if (__n > 0)
1203	{	1208	{
1204	__vallocate(__n);	1209	__vallocate(__n);
1205	__construct_at_end(__x.__begin_, __x.__end_, __n);	1210	__construct_at_end(__x.__begin_, __x.__end_, __n);
1206	}	1211	}
		1212	__guard.__complete();
1207	}	1213	}
1208		1214
1209	template <class _Tp, class _Allocator>	1215	template <class _Tp, class _Allocator>
1210	_LIBCPP_CONSTEXPR_AFTER_CXX17	1216	_LIBCPP_CONSTEXPR_SINCE_CXX20
1211	inline _LIBCPP_INLINE_VISIBILITY	1217	inline _LIBCPP_HIDE_FROM_ABI
1212	vector<_Tp, _Allocator>::vector(vector&& __x)	1218	vector<_Tp, _Allocator>::vector(vector&& __x)
1213	#if _LIBCPP_STD_VER > 14	1219	#if _LIBCPP_STD_VER > 14
1214	noexcept	1220	noexcept
1215	#else	1221	#else
1216	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)	1222	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
1217	#endif	1223	#endif
1218	: __end_cap_(nullptr, _VSTD::move(__x.__alloc()))	1224	: __end_cap_(nullptr, std::move(__x.__alloc()))
1219	{	1225	{
1220	_VSTD::__debug_db_insert_c(this);	1226	std::__debug_db_insert_c(this);
1221	std::__debug_db_swap(this, std::addressof(__x));	1227	std::__debug_db_swap(this, std::addressof(__x));
1222	this->__begin_ = __x.__begin_;	1228	this->__begin_ = __x.__begin_;
1223	this->__end_ = __x.__end_;	1229	this->__end_ = __x.__end_;
...	@@ -1226,12 +1232,12 @@ vector<_Tp, _Allocator>::vector(vector&& __x)	...	@@ -1226,12 +1232,12 @@ vector<_Tp, _Allocator>::vector(vector&& __x)
1226	}	1232	}
1227		1233
1228	template <class _Tp, class _Allocator>	1234	template <class _Tp, class _Allocator>
1229	_LIBCPP_CONSTEXPR_AFTER_CXX17	1235	_LIBCPP_CONSTEXPR_SINCE_CXX20
1230	inline _LIBCPP_INLINE_VISIBILITY	1236	inline _LIBCPP_HIDE_FROM_ABI
1231	vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_type>& __a)	1237	vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_type>& __a)
1232	: __end_cap_(nullptr, __a)	1238	: __end_cap_(nullptr, __a)
1233	{	1239	{
1234	_VSTD::__debug_db_insert_c(this);	1240	std::__debug_db_insert_c(this);
1235	if (__a == __x.__alloc())	1241	if (__a == __x.__alloc())
1236	{	1242	{
1237	this->__begin_ = __x.__begin_;	1243	this->__begin_ = __x.__begin_;
...	@@ -1243,44 +1249,50 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_	...	@@ -1243,44 +1249,50 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_
1243	else	1249	else
1244	{	1250	{
1245	typedef move_iterator<iterator> _Ip;	1251	typedef move_iterator<iterator> _Ip;
		1252	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
1246	assign(_Ip(__x.begin()), _Ip(__x.end()));	1253	assign(_Ip(__x.begin()), _Ip(__x.end()));
		1254	__guard.__complete();
1247	}	1255	}
1248	}	1256	}
1249		1257
1250	#ifndef _LIBCPP_CXX03_LANG	1258	#ifndef _LIBCPP_CXX03_LANG
1251		1259
1252	template <class _Tp, class _Allocator>	1260	template <class _Tp, class _Allocator>
1253	_LIBCPP_CONSTEXPR_AFTER_CXX17	1261	_LIBCPP_CONSTEXPR_SINCE_CXX20
1254	inline _LIBCPP_INLINE_VISIBILITY	1262	inline _LIBCPP_HIDE_FROM_ABI
1255	vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il)	1263	vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il)
1256	{	1264	{
1257	_VSTD::__debug_db_insert_c(this);	1265	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1266	std::__debug_db_insert_c(this);
1258	if (__il.size() > 0)	1267	if (__il.size() > 0)
1259	{	1268	{
1260	__vallocate(__il.size());	1269	__vallocate(__il.size());
1261	__construct_at_end(__il.begin(), __il.end(), __il.size());	1270	__construct_at_end(__il.begin(), __il.end(), __il.size());
1262	}	1271	}
		1272	__guard.__complete();
1263	}	1273	}
1264		1274
1265	template <class _Tp, class _Allocator>	1275	template <class _Tp, class _Allocator>
1266	_LIBCPP_CONSTEXPR_AFTER_CXX17	1276	_LIBCPP_CONSTEXPR_SINCE_CXX20
1267	inline _LIBCPP_INLINE_VISIBILITY	1277	inline _LIBCPP_HIDE_FROM_ABI
1268	vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)	1278	vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
1269	: __end_cap_(nullptr, __a)	1279	: __end_cap_(nullptr, __a)
1270	{	1280	{
1271	_VSTD::__debug_db_insert_c(this);	1281	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		1282	std::__debug_db_insert_c(this);
1272	if (__il.size() > 0)	1283	if (__il.size() > 0)
1273	{	1284	{
1274	__vallocate(__il.size());	1285	__vallocate(__il.size());
1275	__construct_at_end(__il.begin(), __il.end(), __il.size());	1286	__construct_at_end(__il.begin(), __il.end(), __il.size());
1276	}	1287	}
		1288	__guard.__complete();
1277	}	1289	}
1278		1290
1279	#endif // _LIBCPP_CXX03_LANG	1291	#endif // _LIBCPP_CXX03_LANG
1280		1292
1281	template <class _Tp, class _Allocator>	1293	template <class _Tp, class _Allocator>
1282	_LIBCPP_CONSTEXPR_AFTER_CXX17	1294	_LIBCPP_CONSTEXPR_SINCE_CXX20
1283	inline _LIBCPP_INLINE_VISIBILITY	1295	inline _LIBCPP_HIDE_FROM_ABI
1284	vector<_Tp, _Allocator>&	1296	vector<_Tp, _Allocator>&
1285	vector<_Tp, _Allocator>::operator=(vector&& __x)	1297	vector<_Tp, _Allocator>::operator=(vector&& __x)
1286	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))	1298	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))
...	@@ -1291,7 +1303,7 @@ vector<_Tp, _Allocator>::operator=(vector&& __x)	...	@@ -1291,7 +1303,7 @@ vector<_Tp, _Allocator>::operator=(vector&& __x)
1291	}	1303	}
1292		1304
1293	template <class _Tp, class _Allocator>	1305	template <class _Tp, class _Allocator>
1294	_LIBCPP_CONSTEXPR_AFTER_CXX17	1306	_LIBCPP_CONSTEXPR_SINCE_CXX20
1295	void	1307	void
1296	vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)	1308	vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
1297	_NOEXCEPT_(__alloc_traits::is_always_equal::value)	1309	_NOEXCEPT_(__alloc_traits::is_always_equal::value)
...	@@ -1306,7 +1318,7 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)	...	@@ -1306,7 +1318,7 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
1306	}	1318	}
1307		1319
1308	template <class _Tp, class _Allocator>	1320	template <class _Tp, class _Allocator>
1309	_LIBCPP_CONSTEXPR_AFTER_CXX17	1321	_LIBCPP_CONSTEXPR_SINCE_CXX20
1310	void	1322	void
1311	vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)	1323	vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)
1312	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)	1324	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
...	@@ -1321,12 +1333,12 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)	...	@@ -1321,12 +1333,12 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)
1321	}	1333	}
1322		1334
1323	template <class _Tp, class _Allocator>	1335	template <class _Tp, class _Allocator>
1324	_LIBCPP_CONSTEXPR_AFTER_CXX17	1336	_LIBCPP_CONSTEXPR_SINCE_CXX20
1325	inline _LIBCPP_INLINE_VISIBILITY	1337	inline _LIBCPP_HIDE_FROM_ABI
1326	vector<_Tp, _Allocator>&	1338	vector<_Tp, _Allocator>&
1327	vector<_Tp, _Allocator>::operator=(const vector& __x)	1339	vector<_Tp, _Allocator>::operator=(const vector& __x)
1328	{	1340	{
1329	if (this != _VSTD::addressof(__x))	1341	if (this != std::addressof(__x))
1330	{	1342	{
1331	__copy_assign_alloc(__x);	1343	__copy_assign_alloc(__x);
1332	assign(__x.__begin_, __x.__end_);	1344	assign(__x.__begin_, __x.__end_);
...	@@ -1335,13 +1347,10 @@ vector<_Tp, _Allocator>::operator=(const vector& __x)	...	@@ -1335,13 +1347,10 @@ vector<_Tp, _Allocator>::operator=(const vector& __x)
1335	}	1347	}
1336		1348
1337	template <class _Tp, class _Allocator>	1349	template <class _Tp, class _Allocator>
1338	template <class _InputIterator>	1350	template <class _InputIterator, __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
1339	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	1351	is_constructible<_Tp, typename iterator_traits<_InputIterator>::reference>::value,
1340	is_constructible<	1352	int> >
1341	_Tp,	1353	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
1342	typename iterator_traits<_InputIterator>::reference>::value,
1343	void
1344	>::type
1345	vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)	1354	vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
1346	{	1355	{
1347	clear();	1356	clear();
...	@@ -1350,19 +1359,13 @@ vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)	...	@@ -1350,19 +1359,13 @@ vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
1350	}	1359	}
1351		1360
1352	template <class _Tp, class _Allocator>	1361	template <class _Tp, class _Allocator>
1353	template <class _ForwardIterator>	1362	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1354	_LIBCPP_CONSTEXPR_AFTER_CXX17	1363	is_constructible<_Tp, typename iterator_traits<_ForwardIterator>::reference>::value,
1355	typename enable_if	1364	int> >
1356	<	1365	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
1357	__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1358	is_constructible<
1359	_Tp,
1360	typename iterator_traits<_ForwardIterator>::reference>::value,
1361	void
1362	>::type
1363	vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)	1366	vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
1364	{	1367	{
1365	size_type __new_size = static_cast<size_type>(_VSTD::distance(__first, __last));	1368	size_type __new_size = static_cast<size_type>(std::distance(__first, __last));
1366	if (__new_size <= capacity())	1369	if (__new_size <= capacity())
1367	{	1370	{
1368	_ForwardIterator __mid = __last;	1371	_ForwardIterator __mid = __last;
...	@@ -1371,9 +1374,9 @@ vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __las	...	@@ -1371,9 +1374,9 @@ vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __las
1371	{	1374	{
1372	__growing = true;	1375	__growing = true;
1373	__mid = __first;	1376	__mid = __first;
1374	_VSTD::advance(__mid, size());	1377	std::advance(__mid, size());
1375	}	1378	}
1376	pointer __m = _VSTD::copy(__first, __mid, this->__begin_);	1379	pointer __m = std::copy(__first, __mid, this->__begin_);
1377	if (__growing)	1380	if (__growing)
1378	__construct_at_end(__mid, __last, __new_size - size());	1381	__construct_at_end(__mid, __last, __new_size - size());
1379	else	1382	else
...	@@ -1389,14 +1392,14 @@ vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __las	...	@@ -1389,14 +1392,14 @@ vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __las
1389	}	1392	}
1390		1393
1391	template <class _Tp, class _Allocator>	1394	template <class _Tp, class _Allocator>
1392	_LIBCPP_CONSTEXPR_AFTER_CXX17	1395	_LIBCPP_CONSTEXPR_SINCE_CXX20
1393	void	1396	void
1394	vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)	1397	vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)
1395	{	1398	{
1396	if (__n <= capacity())	1399	if (__n <= capacity())
1397	{	1400	{
1398	size_type __s = size();	1401	size_type __s = size();
1399	_VSTD::fill_n(this->__begin_, _VSTD::min(__n, __s), __u);	1402	std::fill_n(this->__begin_, std::min(__n, __s), __u);
1400	if (__n > __s)	1403	if (__n > __s)
1401	__construct_at_end(__n - __s, __u);	1404	__construct_at_end(__n - __s, __u);
1402	else	1405	else
...	@@ -1412,44 +1415,44 @@ vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)	...	@@ -1412,44 +1415,44 @@ vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)
1412	}	1415	}
1413		1416
1414	template <class _Tp, class _Allocator>	1417	template <class _Tp, class _Allocator>
1415	_LIBCPP_CONSTEXPR_AFTER_CXX17	1418	_LIBCPP_CONSTEXPR_SINCE_CXX20
1416	inline _LIBCPP_INLINE_VISIBILITY	1419	inline _LIBCPP_HIDE_FROM_ABI
1417	typename vector<_Tp, _Allocator>::iterator	1420	typename vector<_Tp, _Allocator>::iterator
1418	vector<_Tp, _Allocator>::begin() _NOEXCEPT	1421	vector<_Tp, _Allocator>::begin() _NOEXCEPT
1419	{	1422	{
1420	return iterator(this, this->__begin_);	1423	return __make_iter(this->__begin_);
1421	}	1424	}
1422		1425
1423	template <class _Tp, class _Allocator>	1426	template <class _Tp, class _Allocator>
1424	_LIBCPP_CONSTEXPR_AFTER_CXX17	1427	_LIBCPP_CONSTEXPR_SINCE_CXX20
1425	inline _LIBCPP_INLINE_VISIBILITY	1428	inline _LIBCPP_HIDE_FROM_ABI
1426	typename vector<_Tp, _Allocator>::const_iterator	1429	typename vector<_Tp, _Allocator>::const_iterator
1427	vector<_Tp, _Allocator>::begin() const _NOEXCEPT	1430	vector<_Tp, _Allocator>::begin() const _NOEXCEPT
1428	{	1431	{
1429	return const_iterator(this, this->__begin_);	1432	return __make_iter(this->__begin_);
1430	}	1433	}
1431		1434
1432	template <class _Tp, class _Allocator>	1435	template <class _Tp, class _Allocator>
1433	_LIBCPP_CONSTEXPR_AFTER_CXX17	1436	_LIBCPP_CONSTEXPR_SINCE_CXX20
1434	inline _LIBCPP_INLINE_VISIBILITY	1437	inline _LIBCPP_HIDE_FROM_ABI
1435	typename vector<_Tp, _Allocator>::iterator	1438	typename vector<_Tp, _Allocator>::iterator
1436	vector<_Tp, _Allocator>::end() _NOEXCEPT	1439	vector<_Tp, _Allocator>::end() _NOEXCEPT
1437	{	1440	{
1438	return iterator(this, this->__end_);	1441	return __make_iter(this->__end_);
1439	}	1442	}
1440		1443
1441	template <class _Tp, class _Allocator>	1444	template <class _Tp, class _Allocator>
1442	_LIBCPP_CONSTEXPR_AFTER_CXX17	1445	_LIBCPP_CONSTEXPR_SINCE_CXX20
1443	inline _LIBCPP_INLINE_VISIBILITY	1446	inline _LIBCPP_HIDE_FROM_ABI
1444	typename vector<_Tp, _Allocator>::const_iterator	1447	typename vector<_Tp, _Allocator>::const_iterator
1445	vector<_Tp, _Allocator>::end() const _NOEXCEPT	1448	vector<_Tp, _Allocator>::end() const _NOEXCEPT
1446	{	1449	{
1447	return const_iterator(this, this->__end_);	1450	return __make_iter(this->__end_);
1448	}	1451	}
1449		1452
1450	template <class _Tp, class _Allocator>	1453	template <class _Tp, class _Allocator>
1451	_LIBCPP_CONSTEXPR_AFTER_CXX17	1454	_LIBCPP_CONSTEXPR_SINCE_CXX20
1452	inline _LIBCPP_INLINE_VISIBILITY	1455	inline _LIBCPP_HIDE_FROM_ABI
1453	typename vector<_Tp, _Allocator>::reference	1456	typename vector<_Tp, _Allocator>::reference
1454	vector<_Tp, _Allocator>::operator[](size_type __n) _NOEXCEPT	1457	vector<_Tp, _Allocator>::operator[](size_type __n) _NOEXCEPT
1455	{	1458	{
...	@@ -1458,8 +1461,8 @@ vector<_Tp, _Allocator>::operator[](size_type __n) _NOEXCEPT	...	@@ -1458,8 +1461,8 @@ vector<_Tp, _Allocator>::operator[](size_type __n) _NOEXCEPT
1458	}	1461	}
1459		1462
1460	template <class _Tp, class _Allocator>	1463	template <class _Tp, class _Allocator>
1461	_LIBCPP_CONSTEXPR_AFTER_CXX17	1464	_LIBCPP_CONSTEXPR_SINCE_CXX20
1462	inline _LIBCPP_INLINE_VISIBILITY	1465	inline _LIBCPP_HIDE_FROM_ABI
1463	typename vector<_Tp, _Allocator>::const_reference	1466	typename vector<_Tp, _Allocator>::const_reference
1464	vector<_Tp, _Allocator>::operator[](size_type __n) const _NOEXCEPT	1467	vector<_Tp, _Allocator>::operator[](size_type __n) const _NOEXCEPT
1465	{	1468	{
...	@@ -1468,7 +1471,7 @@ vector<_Tp, _Allocator>::operator[](size_type __n) const _NOEXCEPT	...	@@ -1468,7 +1471,7 @@ vector<_Tp, _Allocator>::operator[](size_type __n) const _NOEXCEPT
1468	}	1471	}
1469		1472
1470	template <class _Tp, class _Allocator>	1473	template <class _Tp, class _Allocator>
1471	_LIBCPP_CONSTEXPR_AFTER_CXX17	1474	_LIBCPP_CONSTEXPR_SINCE_CXX20
1472	typename vector<_Tp, _Allocator>::reference	1475	typename vector<_Tp, _Allocator>::reference
1473	vector<_Tp, _Allocator>::at(size_type __n)	1476	vector<_Tp, _Allocator>::at(size_type __n)
1474	{	1477	{
...	@@ -1478,7 +1481,7 @@ vector<_Tp, _Allocator>::at(size_type __n)	...	@@ -1478,7 +1481,7 @@ vector<_Tp, _Allocator>::at(size_type __n)
1478	}	1481	}
1479		1482
1480	template <class _Tp, class _Allocator>	1483	template <class _Tp, class _Allocator>
1481	_LIBCPP_CONSTEXPR_AFTER_CXX17	1484	_LIBCPP_CONSTEXPR_SINCE_CXX20
1482	typename vector<_Tp, _Allocator>::const_reference	1485	typename vector<_Tp, _Allocator>::const_reference
1483	vector<_Tp, _Allocator>::at(size_type __n) const	1486	vector<_Tp, _Allocator>::at(size_type __n) const
1484	{	1487	{
...	@@ -1488,7 +1491,7 @@ vector<_Tp, _Allocator>::at(size_type __n) const	...	@@ -1488,7 +1491,7 @@ vector<_Tp, _Allocator>::at(size_type __n) const
1488	}	1491	}
1489		1492
1490	template <class _Tp, class _Allocator>	1493	template <class _Tp, class _Allocator>
1491	_LIBCPP_CONSTEXPR_AFTER_CXX17	1494	_LIBCPP_CONSTEXPR_SINCE_CXX20
1492	void	1495	void
1493	vector<_Tp, _Allocator>::reserve(size_type __n)	1496	vector<_Tp, _Allocator>::reserve(size_type __n)
1494	{	1497	{
...	@@ -1503,7 +1506,7 @@ vector<_Tp, _Allocator>::reserve(size_type __n)	...	@@ -1503,7 +1506,7 @@ vector<_Tp, _Allocator>::reserve(size_type __n)
1503	}	1506	}
1504		1507
1505	template <class _Tp, class _Allocator>	1508	template <class _Tp, class _Allocator>
1506	_LIBCPP_CONSTEXPR_AFTER_CXX17	1509	_LIBCPP_CONSTEXPR_SINCE_CXX20
1507	void	1510	void
1508	vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT	1511	vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
1509	{	1512	{
...	@@ -1527,21 +1530,21 @@ vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT	...	@@ -1527,21 +1530,21 @@ vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
1527		1530
1528	template <class _Tp, class _Allocator>	1531	template <class _Tp, class _Allocator>
1529	template <class _Up>	1532	template <class _Up>
1530	_LIBCPP_CONSTEXPR_AFTER_CXX17	1533	_LIBCPP_CONSTEXPR_SINCE_CXX20
1531	void	1534	void
1532	vector<_Tp, _Allocator>::__push_back_slow_path(_Up&& __x)	1535	vector<_Tp, _Allocator>::__push_back_slow_path(_Up&& __x)
1533	{	1536	{
1534	allocator_type& __a = this->__alloc();	1537	allocator_type& __a = this->__alloc();
1535	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);	1538	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
1536	// __v.push_back(_VSTD::forward<_Up>(__x));	1539	// __v.push_back(std::forward<_Up>(__x));
1537	__alloc_traits::construct(__a, _VSTD::__to_address(__v.__end_), _VSTD::forward<_Up>(__x));	1540	__alloc_traits::construct(__a, std::__to_address(__v.__end_), std::forward<_Up>(__x));
1538	__v.__end_++;	1541	__v.__end_++;
1539	__swap_out_circular_buffer(__v);	1542	__swap_out_circular_buffer(__v);
1540	}	1543	}
1541		1544
1542	template <class _Tp, class _Allocator>	1545	template <class _Tp, class _Allocator>
1543	_LIBCPP_CONSTEXPR_AFTER_CXX17	1546	_LIBCPP_CONSTEXPR_SINCE_CXX20
1544	inline _LIBCPP_INLINE_VISIBILITY	1547	inline _LIBCPP_HIDE_FROM_ABI
1545	void	1548	void
1546	vector<_Tp, _Allocator>::push_back(const_reference __x)	1549	vector<_Tp, _Allocator>::push_back(const_reference __x)
1547	{	1550	{
...	@@ -1554,36 +1557,36 @@ vector<_Tp, _Allocator>::push_back(const_reference __x)	...	@@ -1554,36 +1557,36 @@ vector<_Tp, _Allocator>::push_back(const_reference __x)
1554	}	1557	}
1555		1558
1556	template <class _Tp, class _Allocator>	1559	template <class _Tp, class _Allocator>
1557	_LIBCPP_CONSTEXPR_AFTER_CXX17	1560	_LIBCPP_CONSTEXPR_SINCE_CXX20
1558	inline _LIBCPP_INLINE_VISIBILITY	1561	inline _LIBCPP_HIDE_FROM_ABI
1559	void	1562	void
1560	vector<_Tp, _Allocator>::push_back(value_type&& __x)	1563	vector<_Tp, _Allocator>::push_back(value_type&& __x)
1561	{	1564	{
1562	if (this->__end_ < this->__end_cap())	1565	if (this->__end_ < this->__end_cap())
1563	{	1566	{
1564	__construct_one_at_end(_VSTD::move(__x));	1567	__construct_one_at_end(std::move(__x));
1565	}	1568	}
1566	else	1569	else
1567	__push_back_slow_path(_VSTD::move(__x));	1570	__push_back_slow_path(std::move(__x));
1568	}	1571	}
1569		1572
1570	template <class _Tp, class _Allocator>	1573	template <class _Tp, class _Allocator>
1571	template <class... _Args>	1574	template <class... _Args>
1572	_LIBCPP_CONSTEXPR_AFTER_CXX17	1575	_LIBCPP_CONSTEXPR_SINCE_CXX20
1573	void	1576	void
1574	vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args)	1577	vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args)
1575	{	1578	{
1576	allocator_type& __a = this->__alloc();	1579	allocator_type& __a = this->__alloc();
1577	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);	1580	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
1578	// __v.emplace_back(_VSTD::forward<_Args>(__args)...);	1581	// __v.emplace_back(std::forward<_Args>(__args)...);
1579	__alloc_traits::construct(__a, _VSTD::__to_address(__v.__end_), _VSTD::forward<_Args>(__args)...);	1582	__alloc_traits::construct(__a, std::__to_address(__v.__end_), std::forward<_Args>(__args)...);
1580	__v.__end_++;	1583	__v.__end_++;
1581	__swap_out_circular_buffer(__v);	1584	__swap_out_circular_buffer(__v);
1582	}	1585	}
1583		1586
1584	template <class _Tp, class _Allocator>	1587	template <class _Tp, class _Allocator>
1585	template <class... _Args>	1588	template <class... _Args>
1586	_LIBCPP_CONSTEXPR_AFTER_CXX17	1589	_LIBCPP_CONSTEXPR_SINCE_CXX20
1587	inline	1590	inline
1588	#if _LIBCPP_STD_VER > 14	1591	#if _LIBCPP_STD_VER > 14
1589	typename vector<_Tp, _Allocator>::reference	1592	typename vector<_Tp, _Allocator>::reference
...	@@ -1594,17 +1597,17 @@ vector<_Tp, _Allocator>::emplace_back(_Args&&... __args)	...	@@ -1594,17 +1597,17 @@ vector<_Tp, _Allocator>::emplace_back(_Args&&... __args)
1594	{	1597	{
1595	if (this->__end_ < this->__end_cap())	1598	if (this->__end_ < this->__end_cap())
1596	{	1599	{
1597	__construct_one_at_end(_VSTD::forward<_Args>(__args)...);	1600	__construct_one_at_end(std::forward<_Args>(__args)...);
1598	}	1601	}
1599	else	1602	else
1600	__emplace_back_slow_path(_VSTD::forward<_Args>(__args)...);	1603	__emplace_back_slow_path(std::forward<_Args>(__args)...);
1601	#if _LIBCPP_STD_VER > 14	1604	#if _LIBCPP_STD_VER > 14
1602	return this->back();	1605	return this->back();
1603	#endif	1606	#endif
1604	}	1607	}
1605		1608
1606	template <class _Tp, class _Allocator>	1609	template <class _Tp, class _Allocator>
1607	_LIBCPP_CONSTEXPR_AFTER_CXX17	1610	_LIBCPP_CONSTEXPR_SINCE_CXX20
1608	inline	1611	inline
1609	void	1612	void
1610	vector<_Tp, _Allocator>::pop_back()	1613	vector<_Tp, _Allocator>::pop_back()
...	@@ -1614,47 +1617,45 @@ vector<_Tp, _Allocator>::pop_back()	...	@@ -1614,47 +1617,45 @@ vector<_Tp, _Allocator>::pop_back()
1614	}	1617	}
1615		1618
1616	template <class _Tp, class _Allocator>	1619	template <class _Tp, class _Allocator>
1617	_LIBCPP_CONSTEXPR_AFTER_CXX17	1620	_LIBCPP_CONSTEXPR_SINCE_CXX20
1618	inline _LIBCPP_INLINE_VISIBILITY	1621	inline _LIBCPP_HIDE_FROM_ABI
1619	typename vector<_Tp, _Allocator>::iterator	1622	typename vector<_Tp, _Allocator>::iterator
1620	vector<_Tp, _Allocator>::erase(const_iterator __position)	1623	vector<_Tp, _Allocator>::erase(const_iterator __position)
1621	{	1624	{
1622	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1625	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1623	"vector::erase(iterator) called with an iterator not referring to this vector");	1626	"vector::erase(iterator) called with an iterator not referring to this vector");
1624	_LIBCPP_ASSERT(__position != end(),	1627	_LIBCPP_ASSERT(__position != end(),
1625	"vector::erase(iterator) called with a non-dereferenceable iterator");	1628	"vector::erase(iterator) called with a non-dereferenceable iterator");
1626	difference_type __ps = __position - cbegin();	1629	difference_type __ps = __position - cbegin();
1627	pointer __p = this->__begin_ + __ps;	1630	pointer __p = this->__begin_ + __ps;
1628	this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p));	1631	this->__destruct_at_end(std::move(__p + 1, this->__end_, __p));
1629	if (!__libcpp_is_constant_evaluated())	1632	if (!__libcpp_is_constant_evaluated())
1630	this->__invalidate_iterators_past(__p - 1);	1633	this->__invalidate_iterators_past(__p - 1);
1631	iterator __r = iterator(this, __p);	1634	return __make_iter(__p);
1632	return __r;
1633	}	1635	}
1634		1636
1635	template <class _Tp, class _Allocator>	1637	template <class _Tp, class _Allocator>
1636	_LIBCPP_CONSTEXPR_AFTER_CXX17	1638	_LIBCPP_CONSTEXPR_SINCE_CXX20
1637	typename vector<_Tp, _Allocator>::iterator	1639	typename vector<_Tp, _Allocator>::iterator
1638	vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last)	1640	vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last)
1639	{	1641	{
1640	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__first)) == this,	1642	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__first)) == this,
1641	"vector::erase(iterator, iterator) called with an iterator not referring to this vector");	1643	"vector::erase(iterator, iterator) called with an iterator not referring to this vector");
1642	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__last)) == this,	1644	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__last)) == this,
1643	"vector::erase(iterator, iterator) called with an iterator not referring to this vector");	1645	"vector::erase(iterator, iterator) called with an iterator not referring to this vector");
1644		1646
1645	_LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");	1647	_LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");
1646	pointer __p = this->__begin_ + (__first - begin());	1648	pointer __p = this->__begin_ + (__first - begin());
1647	if (__first != __last) {	1649	if (__first != __last) {
1648	this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));	1650	this->__destruct_at_end(std::move(__p + (__last - __first), this->__end_, __p));
1649	if (!__libcpp_is_constant_evaluated())	1651	if (!__libcpp_is_constant_evaluated())
1650	this->__invalidate_iterators_past(__p - 1);	1652	this->__invalidate_iterators_past(__p - 1);
1651	}	1653	}
1652	iterator __r = iterator(this, __p);	1654	return __make_iter(__p);
1653	return __r;
1654	}	1655	}
1655		1656
1656	template <class _Tp, class _Allocator>	1657	template <class _Tp, class _Allocator>
1657	_LIBCPP_CONSTEXPR_AFTER_CXX17	1658	_LIBCPP_CONSTEXPR_SINCE_CXX20
1658	void	1659	void
1659	vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to)	1660	vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to)
1660	{	1661	{
...	@@ -1666,19 +1667,19 @@ vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointe	...	@@ -1666,19 +1667,19 @@ vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointe
1666	for (pointer __pos = __tx.__pos_; __i < __from_e;	1667	for (pointer __pos = __tx.__pos_; __i < __from_e;
1667	++__i, (void) ++__pos, __tx.__pos_ = __pos) {	1668	++__i, (void) ++__pos, __tx.__pos_ = __pos) {
1668	__alloc_traits::construct(this->__alloc(),	1669	__alloc_traits::construct(this->__alloc(),
1669	_VSTD::__to_address(__pos),	1670	std::__to_address(__pos),
1670	_VSTD::move(*__i));	1671	std::move(*__i));
1671	}	1672	}
1672	}	1673	}
1673	_VSTD::move_backward(__from_s, __from_s + __n, __old_last);	1674	std::move_backward(__from_s, __from_s + __n, __old_last);
1674	}	1675	}
1675		1676
1676	template <class _Tp, class _Allocator>	1677	template <class _Tp, class _Allocator>
1677	_LIBCPP_CONSTEXPR_AFTER_CXX17	1678	_LIBCPP_CONSTEXPR_SINCE_CXX20
1678	typename vector<_Tp, _Allocator>::iterator	1679	typename vector<_Tp, _Allocator>::iterator
1679	vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)	1680	vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
1680	{	1681	{
1681	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1682	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1682	"vector::insert(iterator, x) called with an iterator not referring to this vector");	1683	"vector::insert(iterator, x) called with an iterator not referring to this vector");
1683	pointer __p = this->__begin_ + (__position - begin());	1684	pointer __p = this->__begin_ + (__position - begin());
1684	// We can't compare unrelated pointers inside constant expressions	1685	// We can't compare unrelated pointers inside constant expressions
...	@@ -1704,77 +1705,77 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)	...	@@ -1704,77 +1705,77 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
1704	__v.push_back(__x);	1705	__v.push_back(__x);
1705	__p = __swap_out_circular_buffer(__v, __p);	1706	__p = __swap_out_circular_buffer(__v, __p);
1706	}	1707	}
1707	return iterator(this, __p);	1708	return __make_iter(__p);
1708	}	1709	}
1709		1710
1710	template <class _Tp, class _Allocator>	1711	template <class _Tp, class _Allocator>
1711	_LIBCPP_CONSTEXPR_AFTER_CXX17	1712	_LIBCPP_CONSTEXPR_SINCE_CXX20
1712	typename vector<_Tp, _Allocator>::iterator	1713	typename vector<_Tp, _Allocator>::iterator
1713	vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)	1714	vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)
1714	{	1715	{
1715	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1716	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1716	"vector::insert(iterator, x) called with an iterator not referring to this vector");	1717	"vector::insert(iterator, x) called with an iterator not referring to this vector");
1717	pointer __p = this->__begin_ + (__position - begin());	1718	pointer __p = this->__begin_ + (__position - begin());
1718	if (this->__end_ < this->__end_cap())	1719	if (this->__end_ < this->__end_cap())
1719	{	1720	{
1720	if (__p == this->__end_)	1721	if (__p == this->__end_)
1721	{	1722	{
1722	__construct_one_at_end(_VSTD::move(__x));	1723	__construct_one_at_end(std::move(__x));
1723	}	1724	}
1724	else	1725	else
1725	{	1726	{
1726	__move_range(__p, this->__end_, __p + 1);	1727	__move_range(__p, this->__end_, __p + 1);
1727	*__p = _VSTD::move(__x);	1728	*__p = std::move(__x);
1728	}	1729	}
1729	}	1730	}
1730	else	1731	else
1731	{	1732	{
1732	allocator_type& __a = this->__alloc();	1733	allocator_type& __a = this->__alloc();
1733	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);	1734	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
1734	__v.push_back(_VSTD::move(__x));	1735	__v.push_back(std::move(__x));
1735	__p = __swap_out_circular_buffer(__v, __p);	1736	__p = __swap_out_circular_buffer(__v, __p);
1736	}	1737	}
1737	return iterator(this, __p);	1738	return __make_iter(__p);
1738	}	1739	}
1739		1740
1740	template <class _Tp, class _Allocator>	1741	template <class _Tp, class _Allocator>
1741	template <class... _Args>	1742	template <class... _Args>
1742	_LIBCPP_CONSTEXPR_AFTER_CXX17	1743	_LIBCPP_CONSTEXPR_SINCE_CXX20
1743	typename vector<_Tp, _Allocator>::iterator	1744	typename vector<_Tp, _Allocator>::iterator
1744	vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args)	1745	vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args)
1745	{	1746	{
1746	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1747	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1747	"vector::emplace(iterator, x) called with an iterator not referring to this vector");	1748	"vector::emplace(iterator, x) called with an iterator not referring to this vector");
1748	pointer __p = this->__begin_ + (__position - begin());	1749	pointer __p = this->__begin_ + (__position - begin());
1749	if (this->__end_ < this->__end_cap())	1750	if (this->__end_ < this->__end_cap())
1750	{	1751	{
1751	if (__p == this->__end_)	1752	if (__p == this->__end_)
1752	{	1753	{
1753	__construct_one_at_end(_VSTD::forward<_Args>(__args)...);	1754	__construct_one_at_end(std::forward<_Args>(__args)...);
1754	}	1755	}
1755	else	1756	else
1756	{	1757	{
1757	__temp_value<value_type, _Allocator> __tmp(this->__alloc(), _VSTD::forward<_Args>(__args)...);	1758	__temp_value<value_type, _Allocator> __tmp(this->__alloc(), std::forward<_Args>(__args)...);
1758	__move_range(__p, this->__end_, __p + 1);	1759	__move_range(__p, this->__end_, __p + 1);
1759	*__p = _VSTD::move(__tmp.get());	1760	*__p = std::move(__tmp.get());
1760	}	1761	}
1761	}	1762	}
1762	else	1763	else
1763	{	1764	{
1764	allocator_type& __a = this->__alloc();	1765	allocator_type& __a = this->__alloc();
1765	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);	1766	__split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
1766	__v.emplace_back(_VSTD::forward<_Args>(__args)...);	1767	__v.emplace_back(std::forward<_Args>(__args)...);
1767	__p = __swap_out_circular_buffer(__v, __p);	1768	__p = __swap_out_circular_buffer(__v, __p);
1768	}	1769	}
1769	return iterator(this, __p);	1770	return __make_iter(__p);
1770	}	1771	}
1771		1772
1772	template <class _Tp, class _Allocator>	1773	template <class _Tp, class _Allocator>
1773	_LIBCPP_CONSTEXPR_AFTER_CXX17	1774	_LIBCPP_CONSTEXPR_SINCE_CXX20
1774	typename vector<_Tp, _Allocator>::iterator	1775	typename vector<_Tp, _Allocator>::iterator
1775	vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x)	1776	vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x)
1776	{	1777	{
1777	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1778	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1778	"vector::insert(iterator, n, x) called with an iterator not referring to this vector");	1779	"vector::insert(iterator, n, x) called with an iterator not referring to this vector");
1779	pointer __p = this->__begin_ + (__position - begin());	1780	pointer __p = this->__begin_ + (__position - begin());
1780	if (__n > 0)	1781	if (__n > 0)
...	@@ -1796,7 +1797,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_	...	@@ -1796,7 +1797,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_
1796	const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);	1797	const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
1797	if (__p <= __xr && __xr < this->__end_)	1798	if (__p <= __xr && __xr < this->__end_)
1798	__xr += __old_n;	1799	__xr += __old_n;
1799	_VSTD::fill_n(__p, __n, *__xr);	1800	std::fill_n(__p, __n, *__xr);
1800	}	1801	}
1801	}	1802	}
1802	else	1803	else
...	@@ -1807,20 +1808,17 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_	...	@@ -1807,20 +1808,17 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_
1807	__p = __swap_out_circular_buffer(__v, __p);	1808	__p = __swap_out_circular_buffer(__v, __p);
1808	}	1809	}
1809	}	1810	}
1810	return iterator(this, __p);	1811	return __make_iter(__p);
1811	}	1812	}
1812		1813
1813	template <class _Tp, class _Allocator>	1814	template <class _Tp, class _Allocator>
1814	template <class _InputIterator>	1815	template <class _InputIterator, __enable_if_t<__is_exactly_cpp17_input_iterator<_InputIterator>::value &&
1815	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value &&	1816	is_constructible<_Tp, typename iterator_traits<_InputIterator>::reference>::value,
1816	is_constructible<	1817	int> >
1817	_Tp,	1818	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
1818	typename iterator_traits<_InputIterator>::reference>::value,
1819	typename vector<_Tp, _Allocator>::iterator
1820	>::type
1821	vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)	1819	vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
1822	{	1820	{
1823	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1821	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1824	"vector::insert(iterator, range) called with an iterator not referring to this vector");	1822	"vector::insert(iterator, range) called with an iterator not referring to this vector");
1825	difference_type __off = __position - begin();	1823	difference_type __off = __position - begin();
1826	pointer __p = this->__begin_ + __off;	1824	pointer __p = this->__begin_ + __off;
...	@@ -1847,34 +1845,28 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __firs	...	@@ -1847,34 +1845,28 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __firs
1847	}	1845	}
1848	catch (...)	1846	catch (...)
1849	{	1847	{
1850	erase(iterator(this, __old_last), end());	1848	erase(__make_iter(__old_last), end());
1851	throw;	1849	throw;
1852	}	1850	}
1853	#endif // _LIBCPP_NO_EXCEPTIONS	1851	#endif // _LIBCPP_NO_EXCEPTIONS
1854	}	1852	}
1855	__p = _VSTD::rotate(__p, __old_last, this->__end_);	1853	__p = std::rotate(__p, __old_last, this->__end_);
1856	insert(iterator(this, __p), _VSTD::make_move_iterator(__v.begin()),	1854	insert(__make_iter(__p), std::make_move_iterator(__v.begin()),
1857	_VSTD::make_move_iterator(__v.end()));	1855	std::make_move_iterator(__v.end()));
1858	return begin() + __off;	1856	return begin() + __off;
1859	}	1857	}
1860		1858
1861	template <class _Tp, class _Allocator>	1859	template <class _Tp, class _Allocator>
1862	template <class _ForwardIterator>	1860	template <class _ForwardIterator, __enable_if_t<__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1863	_LIBCPP_CONSTEXPR_AFTER_CXX17	1861	is_constructible<_Tp, typename iterator_traits<_ForwardIterator>::reference>::value,
1864	typename enable_if	1862	int> >
1865	<	1863	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
1866	__is_cpp17_forward_iterator<_ForwardIterator>::value &&
1867	is_constructible<
1868	_Tp,
1869	typename iterator_traits<_ForwardIterator>::reference>::value,
1870	typename vector<_Tp, _Allocator>::iterator
1871	>::type
1872	vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)	1864	vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
1873	{	1865	{
1874	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,	1866	_LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(std::addressof(__position)) == this,
1875	"vector::insert(iterator, range) called with an iterator not referring to this vector");	1867	"vector::insert(iterator, range) called with an iterator not referring to this vector");
1876	pointer __p = this->__begin_ + (__position - begin());	1868	pointer __p = this->__begin_ + (__position - begin());
1877	difference_type __n = _VSTD::distance(__first, __last);	1869	difference_type __n = std::distance(__first, __last);
1878	if (__n > 0)	1870	if (__n > 0)
1879	{	1871	{
1880	if (__n <= this->__end_cap() - this->__end_)	1872	if (__n <= this->__end_cap() - this->__end_)
...	@@ -1887,14 +1879,14 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __fi	...	@@ -1887,14 +1879,14 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __fi
1887	{	1879	{
1888	__m = __first;	1880	__m = __first;
1889	difference_type __diff = this->__end_ - __p;	1881	difference_type __diff = this->__end_ - __p;
1890	_VSTD::advance(__m, __diff);	1882	std::advance(__m, __diff);
1891	__construct_at_end(__m, __last, __n - __diff);	1883	__construct_at_end(__m, __last, __n - __diff);
1892	__n = __dx;	1884	__n = __dx;
1893	}	1885	}
1894	if (__n > 0)	1886	if (__n > 0)
1895	{	1887	{
1896	__move_range(__p, __old_last, __p + __old_n);	1888	__move_range(__p, __old_last, __p + __old_n);
1897	_VSTD::copy(__first, __m, __p);	1889	std::copy(__first, __m, __p);
1898	}	1890	}
1899	}	1891	}
1900	else	1892	else
...	@@ -1905,11 +1897,11 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __fi	...	@@ -1905,11 +1897,11 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __fi
1905	__p = __swap_out_circular_buffer(__v, __p);	1897	__p = __swap_out_circular_buffer(__v, __p);
1906	}	1898	}
1907	}	1899	}
1908	return iterator(this, __p);	1900	return __make_iter(__p);
1909	}	1901	}
1910		1902
1911	template <class _Tp, class _Allocator>	1903	template <class _Tp, class _Allocator>
1912	_LIBCPP_CONSTEXPR_AFTER_CXX17	1904	_LIBCPP_CONSTEXPR_SINCE_CXX20
1913	void	1905	void
1914	vector<_Tp, _Allocator>::resize(size_type __sz)	1906	vector<_Tp, _Allocator>::resize(size_type __sz)
1915	{	1907	{
...	@@ -1921,7 +1913,7 @@ vector<_Tp, _Allocator>::resize(size_type __sz)	...	@@ -1921,7 +1913,7 @@ vector<_Tp, _Allocator>::resize(size_type __sz)
1921	}	1913	}
1922		1914
1923	template <class _Tp, class _Allocator>	1915	template <class _Tp, class _Allocator>
1924	_LIBCPP_CONSTEXPR_AFTER_CXX17	1916	_LIBCPP_CONSTEXPR_SINCE_CXX20
1925	void	1917	void
1926	vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)	1918	vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)
1927	{	1919	{
...	@@ -1933,7 +1925,7 @@ vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)	...	@@ -1933,7 +1925,7 @@ vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)
1933	}	1925	}
1934		1926
1935	template <class _Tp, class _Allocator>	1927	template <class _Tp, class _Allocator>
1936	_LIBCPP_CONSTEXPR_AFTER_CXX17	1928	_LIBCPP_CONSTEXPR_SINCE_CXX20
1937	void	1929	void
1938	vector<_Tp, _Allocator>::swap(vector& __x)	1930	vector<_Tp, _Allocator>::swap(vector& __x)
1939	#if _LIBCPP_STD_VER >= 14	1931	#if _LIBCPP_STD_VER >= 14
...	@@ -1947,16 +1939,16 @@ vector<_Tp, _Allocator>::swap(vector& __x)	...	@@ -1947,16 +1939,16 @@ vector<_Tp, _Allocator>::swap(vector& __x)
1947	this->__alloc() == __x.__alloc(),	1939	this->__alloc() == __x.__alloc(),
1948	"vector::swap: Either propagate_on_container_swap must be true"	1940	"vector::swap: Either propagate_on_container_swap must be true"
1949	" or the allocators must compare equal");	1941	" or the allocators must compare equal");
1950	_VSTD::swap(this->__begin_, __x.__begin_);	1942	std::swap(this->__begin_, __x.__begin_);
1951	_VSTD::swap(this->__end_, __x.__end_);	1943	std::swap(this->__end_, __x.__end_);
1952	_VSTD::swap(this->__end_cap(), __x.__end_cap());	1944	std::swap(this->__end_cap(), __x.__end_cap());
1953	_VSTD::__swap_allocator(this->__alloc(), __x.__alloc(),	1945	std::__swap_allocator(this->__alloc(), __x.__alloc(),
1954	integral_constant<bool,__alloc_traits::propagate_on_container_swap::value>());	1946	integral_constant<bool,__alloc_traits::propagate_on_container_swap::value>());
1955	std::__debug_db_swap(this, std::addressof(__x));	1947	std::__debug_db_swap(this, std::addressof(__x));
1956	}	1948	}
1957		1949
1958	template <class _Tp, class _Allocator>	1950	template <class _Tp, class _Allocator>
1959	_LIBCPP_CONSTEXPR_AFTER_CXX17	1951	_LIBCPP_CONSTEXPR_SINCE_CXX20
1960	bool	1952	bool
1961	vector<_Tp, _Allocator>::__invariants() const	1953	vector<_Tp, _Allocator>::__invariants() const
1962	{	1954	{
...	@@ -2012,7 +2004,7 @@ vector<_Tp, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __	...	@@ -2012,7 +2004,7 @@ vector<_Tp, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __
2012	#endif // _LIBCPP_ENABLE_DEBUG_MODE	2004	#endif // _LIBCPP_ENABLE_DEBUG_MODE
2013		2005
2014	template <class _Tp, class _Allocator>	2006	template <class _Tp, class _Allocator>
2015	inline _LIBCPP_INLINE_VISIBILITY	2007	inline _LIBCPP_HIDE_FROM_ABI
2016	void	2008	void
2017	vector<_Tp, _Allocator>::__invalidate_iterators_past(pointer __new_last) {	2009	vector<_Tp, _Allocator>::__invalidate_iterators_past(pointer __new_last) {
2018	#ifdef _LIBCPP_ENABLE_DEBUG_MODE	2010	#ifdef _LIBCPP_ENABLE_DEBUG_MODE
...	@@ -2023,7 +2015,7 @@ vector<_Tp, _Allocator>::__invalidate_iterators_past(pointer __new_last) {	...	@@ -2023,7 +2015,7 @@ vector<_Tp, _Allocator>::__invalidate_iterators_past(pointer __new_last) {
2023	if (__i->base() > __new_last) {	2015	if (__i->base() > __new_last) {
2024	(*__p)->__c_ = nullptr;	2016	(*__p)->__c_ = nullptr;
2025	if (--__c->end_ != __p)	2017	if (--__c->end_ != __p)
2026	_VSTD::memmove(__p, __p+1, (__c->end_ - __p)sizeof(__i_node));	2018	std::memmove(__p, __p+1, (__c->end_ - __p)sizeof(__i_node));
2027	}	2019	}
2028	}	2020	}
2029	__get_db()->unlock();	2021	__get_db()->unlock();
...	@@ -2059,11 +2051,11 @@ public:	...	@@ -2059,11 +2051,11 @@ public:
2059	typedef __bit_iterator<vector, true> const_pointer;	2051	typedef __bit_iterator<vector, true> const_pointer;
2060	typedef pointer iterator;	2052	typedef pointer iterator;
2061	typedef const_pointer const_iterator;	2053	typedef const_pointer const_iterator;
2062	typedef _VSTD::reverse_iterator<iterator> reverse_iterator;	2054	typedef std::reverse_iterator<iterator> reverse_iterator;
2063	typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;	2055	typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
2064		2056
2065	private:	2057	private:
2066	typedef typename __rebind_alloc_helper<__alloc_traits, __storage_type>::type __storage_allocator;	2058	typedef __rebind_alloc<__alloc_traits, __storage_type> __storage_allocator;
2067	typedef allocator_traits<__storage_allocator> __storage_traits;	2059	typedef allocator_traits<__storage_allocator> __storage_traits;
2068	typedef typename __storage_traits::pointer __storage_pointer;	2060	typedef typename __storage_traits::pointer __storage_pointer;
2069	typedef typename __storage_traits::const_pointer __const_storage_pointer;	2061	typedef typename __storage_traits::const_pointer __const_storage_pointer;
...	@@ -2079,81 +2071,99 @@ public:	...	@@ -2079,81 +2071,99 @@ public:
2079	typedef __bit_const_reference<vector> const_reference;	2071	typedef __bit_const_reference<vector> const_reference;
2080	#endif	2072	#endif
2081	private:	2073	private:
2082	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2074	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2083	size_type& __cap() _NOEXCEPT	2075	size_type& __cap() _NOEXCEPT
2084	{return __cap_alloc_.first();}	2076	{return __cap_alloc_.first();}
2085	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2077	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2086	const size_type& __cap() const _NOEXCEPT	2078	const size_type& __cap() const _NOEXCEPT
2087	{return __cap_alloc_.first();}	2079	{return __cap_alloc_.first();}
2088	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2080	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2089	__storage_allocator& __alloc() _NOEXCEPT	2081	__storage_allocator& __alloc() _NOEXCEPT
2090	{return __cap_alloc_.second();}	2082	{return __cap_alloc_.second();}
2091	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2083	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2092	const __storage_allocator& __alloc() const _NOEXCEPT	2084	const __storage_allocator& __alloc() const _NOEXCEPT
2093	{return __cap_alloc_.second();}	2085	{return __cap_alloc_.second();}
2094		2086
2095	static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);	2087	static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
2096		2088
2097	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2089	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2098	static size_type __internal_cap_to_external(size_type __n) _NOEXCEPT	2090	static size_type __internal_cap_to_external(size_type __n) _NOEXCEPT
2099	{return __n * __bits_per_word;}	2091	{return __n * __bits_per_word;}
2100	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2092	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2101	static size_type __external_cap_to_internal(size_type __n) _NOEXCEPT	2093	static size_type __external_cap_to_internal(size_type __n) _NOEXCEPT
2102	{return (__n - 1) / __bits_per_word + 1;}	2094	{return (__n - 1) / __bits_per_word + 1;}
2103		2095
2104	public:	2096	public:
2105	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2097	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2106	vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);	2098	vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
2107		2099
2108	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(const allocator_type& __a)	2100	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit vector(const allocator_type& __a)
2109	#if _LIBCPP_STD_VER <= 14	2101	#if _LIBCPP_STD_VER <= 14
2110	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value);	2102	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value);
2111	#else	2103	#else
2112	_NOEXCEPT;	2104	_NOEXCEPT;
2113	#endif	2105	#endif
2114	_LIBCPP_CONSTEXPR_AFTER_CXX17 ~vector();	2106
2115	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n);	2107	private:
		2108	class __destroy_vector {
		2109	public:
		2110	_LIBCPP_CONSTEXPR __destroy_vector(vector& __vec) : __vec_(__vec) {}
		2111
		2112	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void operator()() {
		2113	if (__vec_.__begin_ != nullptr)
		2114	__storage_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.__cap());
		2115	std::__debug_db_invalidate_all(this);
		2116	}
		2117
		2118	private:
		2119	vector& __vec_;
		2120	};
		2121
		2122	public:
		2123	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 ~vector() { __destroy_vector(*this)(); }
		2124
		2125	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit vector(size_type __n);
2116	#if _LIBCPP_STD_VER > 11	2126	#if _LIBCPP_STD_VER > 11
2117	_LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n, const allocator_type& __a);	2127	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit vector(size_type __n, const allocator_type& __a);
2118	#endif	2128	#endif
2119	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(size_type __n, const value_type& __v);	2129	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(size_type __n, const value_type& __v);
2120	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(size_type __n, const value_type& __v, const allocator_type& __a);	2130	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(size_type __n, const value_type& __v, const allocator_type& __a);
2121	template <class _InputIterator>	2131	template <class _InputIterator>
2122	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(_InputIterator __first, _InputIterator __last,	2132	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(_InputIterator __first, _InputIterator __last,
2123	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type* = 0);	2133	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type* = 0);
2124	template <class _InputIterator>	2134	template <class _InputIterator>
2125	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,	2135	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
2126	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type* = 0);	2136	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type* = 0);
2127	template <class _ForwardIterator>	2137	template <class _ForwardIterator>
2128	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(_ForwardIterator __first, _ForwardIterator __last,	2138	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(_ForwardIterator __first, _ForwardIterator __last,
2129	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);	2139	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);
2130	template <class _ForwardIterator>	2140	template <class _ForwardIterator>
2131	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,	2141	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
2132	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);	2142	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type* = 0);
2133		2143
2134	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __v);	2144	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(const vector& __v);
2135	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __v, const allocator_type& __a);	2145	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(const vector& __v, const allocator_type& __a);
2136	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector& operator=(const vector& __v);	2146	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector& operator=(const vector& __v);
2137		2147
2138	#ifndef _LIBCPP_CXX03_LANG	2148	#ifndef _LIBCPP_CXX03_LANG
2139	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(initializer_list<value_type> __il);	2149	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(initializer_list<value_type> __il);
2140	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(initializer_list<value_type> __il, const allocator_type& __a);	2150	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(initializer_list<value_type> __il, const allocator_type& __a);
2141		2151
2142	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2152	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2143	vector& operator=(initializer_list<value_type> __il)	2153	vector& operator=(initializer_list<value_type> __il)
2144	{assign(__il.begin(), __il.end()); return *this;}	2154	{assign(__il.begin(), __il.end()); return *this;}
2145		2155
2146	#endif // !_LIBCPP_CXX03_LANG	2156	#endif // !_LIBCPP_CXX03_LANG
2147		2157
2148	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2158	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2149	vector(vector&& __v)	2159	vector(vector&& __v)
2150	#if _LIBCPP_STD_VER > 14	2160	#if _LIBCPP_STD_VER > 14
2151	noexcept;	2161	noexcept;
2152	#else	2162	#else
2153	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);	2163	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
2154	#endif	2164	#endif
2155	_LIBCPP_CONSTEXPR_AFTER_CXX17 vector(vector&& __v, const __type_identity_t<allocator_type>& __a);	2165	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(vector&& __v, const __type_identity_t<allocator_type>& __a);
2156	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2166	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2157	vector& operator=(vector&& __v)	2167	vector& operator=(vector&& __v)
2158	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value));	2168	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value));
2159		2169
...	@@ -2161,162 +2171,162 @@ public:	...	@@ -2161,162 +2171,162 @@ public:
2161	typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,	2171	typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,
2162	void	2172	void
2163	>::type	2173	>::type
2164	_LIBCPP_CONSTEXPR_AFTER_CXX17 assign(_InputIterator __first, _InputIterator __last);	2174	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 assign(_InputIterator __first, _InputIterator __last);
2165	template <class _ForwardIterator>	2175	template <class _ForwardIterator>
2166	typename enable_if	2176	typename enable_if
2167	<	2177	<
2168	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2178	__is_cpp17_forward_iterator<_ForwardIterator>::value,
2169	void	2179	void
2170	>::type	2180	>::type
2171	_LIBCPP_CONSTEXPR_AFTER_CXX17 assign(_ForwardIterator __first, _ForwardIterator __last);	2181	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 assign(_ForwardIterator __first, _ForwardIterator __last);
2172		2182
2173	_LIBCPP_CONSTEXPR_AFTER_CXX17 void assign(size_type __n, const value_type& __x);	2183	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void assign(size_type __n, const value_type& __x);
2174		2184
2175	#ifndef _LIBCPP_CXX03_LANG	2185	#ifndef _LIBCPP_CXX03_LANG
2176	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2186	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2177	void assign(initializer_list<value_type> __il)	2187	void assign(initializer_list<value_type> __il)
2178	{assign(__il.begin(), __il.end());}	2188	{assign(__il.begin(), __il.end());}
2179	#endif	2189	#endif
2180		2190
2181	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 allocator_type get_allocator() const _NOEXCEPT	2191	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 allocator_type get_allocator() const _NOEXCEPT
2182	{return allocator_type(this->__alloc());}	2192	{return allocator_type(this->__alloc());}
2183		2193
2184	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_type max_size() const _NOEXCEPT;	2194	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type max_size() const _NOEXCEPT;
2185	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2195	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2186	size_type capacity() const _NOEXCEPT	2196	size_type capacity() const _NOEXCEPT
2187	{return __internal_cap_to_external(__cap());}	2197	{return __internal_cap_to_external(__cap());}
2188	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2198	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2189	size_type size() const _NOEXCEPT	2199	size_type size() const _NOEXCEPT
2190	{return __size_;}	2200	{return __size_;}
2191	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2201	_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2192	bool empty() const _NOEXCEPT	2202	bool empty() const _NOEXCEPT
2193	{return __size_ == 0;}	2203	{return __size_ == 0;}
2194	_LIBCPP_CONSTEXPR_AFTER_CXX17 void reserve(size_type __n);	2204	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void reserve(size_type __n);
2195	_LIBCPP_CONSTEXPR_AFTER_CXX17 void shrink_to_fit() _NOEXCEPT;	2205	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void shrink_to_fit() _NOEXCEPT;
2196		2206
2197	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2207	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2198	iterator begin() _NOEXCEPT	2208	iterator begin() _NOEXCEPT
2199	{return __make_iter(0);}	2209	{return __make_iter(0);}
2200	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2210	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2201	const_iterator begin() const _NOEXCEPT	2211	const_iterator begin() const _NOEXCEPT
2202	{return __make_iter(0);}	2212	{return __make_iter(0);}
2203	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2213	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2204	iterator end() _NOEXCEPT	2214	iterator end() _NOEXCEPT
2205	{return __make_iter(__size_);}	2215	{return __make_iter(__size_);}
2206	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2216	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2207	const_iterator end() const _NOEXCEPT	2217	const_iterator end() const _NOEXCEPT
2208	{return __make_iter(__size_);}	2218	{return __make_iter(__size_);}
2209		2219
2210	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2220	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2211	reverse_iterator rbegin() _NOEXCEPT	2221	reverse_iterator rbegin() _NOEXCEPT
2212	{return reverse_iterator(end());}	2222	{return reverse_iterator(end());}
2213	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2223	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2214	const_reverse_iterator rbegin() const _NOEXCEPT	2224	const_reverse_iterator rbegin() const _NOEXCEPT
2215	{return const_reverse_iterator(end());}	2225	{return const_reverse_iterator(end());}
2216	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2226	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2217	reverse_iterator rend() _NOEXCEPT	2227	reverse_iterator rend() _NOEXCEPT
2218	{return reverse_iterator(begin());}	2228	{return reverse_iterator(begin());}
2219	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2229	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2220	const_reverse_iterator rend() const _NOEXCEPT	2230	const_reverse_iterator rend() const _NOEXCEPT
2221	{return const_reverse_iterator(begin());}	2231	{return const_reverse_iterator(begin());}
2222		2232
2223	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2233	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2224	const_iterator cbegin() const _NOEXCEPT	2234	const_iterator cbegin() const _NOEXCEPT
2225	{return __make_iter(0);}	2235	{return __make_iter(0);}
2226	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2236	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2227	const_iterator cend() const _NOEXCEPT	2237	const_iterator cend() const _NOEXCEPT
2228	{return __make_iter(__size_);}	2238	{return __make_iter(__size_);}
2229	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2239	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2230	const_reverse_iterator crbegin() const _NOEXCEPT	2240	const_reverse_iterator crbegin() const _NOEXCEPT
2231	{return rbegin();}	2241	{return rbegin();}
2232	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2242	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2233	const_reverse_iterator crend() const _NOEXCEPT	2243	const_reverse_iterator crend() const _NOEXCEPT
2234	{return rend();}	2244	{return rend();}
2235		2245
2236	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference operator[](size_type __n) {return __make_ref(__n);}	2246	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator[](size_type __n) {return __make_ref(__n);}
2237	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference operator[](size_type __n) const {return __make_ref(__n);}	2247	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference operator[](size_type __n) const {return __make_ref(__n);}
2238	reference at(size_type __n);	2248	_LIBCPP_HIDE_FROM_ABI reference at(size_type __n);
2239	const_reference at(size_type __n) const;	2249	_LIBCPP_HIDE_FROM_ABI const_reference at(size_type __n) const;
2240		2250
2241	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference front() {return __make_ref(0);}	2251	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference front() {return __make_ref(0);}
2242	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference front() const {return __make_ref(0);}	2252	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference front() const {return __make_ref(0);}
2243	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference back() {return __make_ref(__size_ - 1);}	2253	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference back() {return __make_ref(__size_ - 1);}
2244	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 const_reference back() const {return __make_ref(__size_ - 1);}	2254	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_reference back() const {return __make_ref(__size_ - 1);}
2245		2255
2246	_LIBCPP_CONSTEXPR_AFTER_CXX17 void push_back(const value_type& __x);	2256	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void push_back(const value_type& __x);
2247	#if _LIBCPP_STD_VER > 11	2257	#if _LIBCPP_STD_VER > 11
2248	template <class... _Args>	2258	template <class... _Args>
2249	#if _LIBCPP_STD_VER > 14	2259	#if _LIBCPP_STD_VER > 14
2250	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 reference emplace_back(_Args&&... __args)	2260	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference emplace_back(_Args&&... __args)
2251	#else	2261	#else
2252	_LIBCPP_INLINE_VISIBILITY void emplace_back(_Args&&... __args)	2262	_LIBCPP_HIDE_FROM_ABI void emplace_back(_Args&&... __args)
2253	#endif	2263	#endif
2254	{	2264	{
2255	push_back ( value_type ( _VSTD::forward<_Args>(__args)... ));	2265	push_back ( value_type ( std::forward<_Args>(__args)... ));
2256	#if _LIBCPP_STD_VER > 14	2266	#if _LIBCPP_STD_VER > 14
2257	return this->back();	2267	return this->back();
2258	#endif	2268	#endif
2259	}	2269	}
2260	#endif	2270	#endif
2261		2271
2262	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 void pop_back() {--__size_;}	2272	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void pop_back() {--__size_;}
2263		2273
2264	#if _LIBCPP_STD_VER > 11	2274	#if _LIBCPP_STD_VER > 11
2265	template <class... _Args>	2275	template <class... _Args>
2266	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 iterator emplace(const_iterator __position, _Args&&... __args)	2276	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator emplace(const_iterator __position, _Args&&... __args)
2267	{ return insert ( __position, value_type ( _VSTD::forward<_Args>(__args)... )); }	2277	{ return insert ( __position, value_type ( std::forward<_Args>(__args)... )); }
2268	#endif	2278	#endif
2269		2279
2270	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __position, const value_type& __x);	2280	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator insert(const_iterator __position, const value_type& __x);
2271	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator insert(const_iterator __position, size_type __n, const value_type& __x);	2281	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator insert(const_iterator __position, size_type __n, const value_type& __x);
2272	template <class _InputIterator>	2282	template <class _InputIterator>
2273	typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,	2283	typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,
2274	iterator	2284	iterator
2275	>::type	2285	>::type
2276	_LIBCPP_CONSTEXPR_AFTER_CXX17 insert(const_iterator __position, _InputIterator __first, _InputIterator __last);	2286	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
2277	template <class _ForwardIterator>	2287	template <class _ForwardIterator>
2278	typename enable_if	2288	typename enable_if
2279	<	2289	<
2280	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2290	__is_cpp17_forward_iterator<_ForwardIterator>::value,
2281	iterator	2291	iterator
2282	>::type	2292	>::type
2283	_LIBCPP_CONSTEXPR_AFTER_CXX17 insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);	2293	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
2284		2294
2285	#ifndef _LIBCPP_CXX03_LANG	2295	#ifndef _LIBCPP_CXX03_LANG
2286	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2296	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2287	iterator insert(const_iterator __position, initializer_list<value_type> __il)	2297	iterator insert(const_iterator __position, initializer_list<value_type> __il)
2288	{return insert(__position, __il.begin(), __il.end());}	2298	{return insert(__position, __il.begin(), __il.end());}
2289	#endif	2299	#endif
2290		2300
2291	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 iterator erase(const_iterator __position);	2301	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator erase(const_iterator __position);
2292	_LIBCPP_CONSTEXPR_AFTER_CXX17 iterator erase(const_iterator __first, const_iterator __last);	2302	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 iterator erase(const_iterator __first, const_iterator __last);
2293		2303
2294	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2304	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2295	void clear() _NOEXCEPT {__size_ = 0;}	2305	void clear() _NOEXCEPT {__size_ = 0;}
2296		2306
2297	_LIBCPP_CONSTEXPR_AFTER_CXX17 void swap(vector&)	2307	_LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(vector&)
2298	#if _LIBCPP_STD_VER >= 14	2308	#if _LIBCPP_STD_VER >= 14
2299	_NOEXCEPT;	2309	_NOEXCEPT;
2300	#else	2310	#else
2301	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|	2311	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
2302	__is_nothrow_swappable<allocator_type>::value);	2312	__is_nothrow_swappable<allocator_type>::value);
2303	#endif	2313	#endif
2304	_LIBCPP_CONSTEXPR_AFTER_CXX17 static void swap(reference __x, reference __y) _NOEXCEPT { _VSTD::swap(__x, __y); }	2314	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static void swap(reference __x, reference __y) _NOEXCEPT { std::swap(__x, __y); }
2305		2315
2306	_LIBCPP_CONSTEXPR_AFTER_CXX17 void resize(size_type __sz, value_type __x = false);	2316	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void resize(size_type __sz, value_type __x = false);
2307	_LIBCPP_CONSTEXPR_AFTER_CXX17 void flip() _NOEXCEPT;	2317	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void flip() _NOEXCEPT;
2308		2318
2309	_LIBCPP_CONSTEXPR_AFTER_CXX17 bool __invariants() const;	2319	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __invariants() const;
2310		2320
2311	private:	2321	private:
2312	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI	2322	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI
2313	void __throw_length_error() const {	2323	void __throw_length_error() const {
2314	_VSTD::__throw_length_error("vector");	2324	std::__throw_length_error("vector");
2315	}	2325	}
2316		2326
2317	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI	2327	_LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI
2318	void __throw_out_of_range() const {	2328	void __throw_out_of_range() const {
2319	_VSTD::__throw_out_of_range("vector");	2329	std::__throw_out_of_range("vector");
2320	}	2330	}
2321		2331
2322	// Allocate space for __n objects	2332	// Allocate space for __n objects
...	@@ -2326,7 +2336,7 @@ private:	...	@@ -2326,7 +2336,7 @@ private:
2326	// Precondition: __n > 0	2336	// Precondition: __n > 0
2327	// Postcondition: capacity() >= __n	2337	// Postcondition: capacity() >= __n
2328	// Postcondition: size() == 0	2338	// Postcondition: size() == 0
2329	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 void __vallocate(size_type __n) {	2339	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __vallocate(size_type __n) {
2330	if (__n > max_size())	2340	if (__n > max_size())
2331	__throw_length_error();	2341	__throw_length_error();
2332	auto __allocation = std::__allocate_at_least(__alloc(), __external_cap_to_internal(__n));	2342	auto __allocation = std::__allocate_at_least(__alloc(), __external_cap_to_internal(__n));
...	@@ -2339,43 +2349,43 @@ private:	...	@@ -2339,43 +2349,43 @@ private:
2339	}	2349	}
2340	}	2350	}
2341		2351
2342	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __vdeallocate() _NOEXCEPT;	2352	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __vdeallocate() _NOEXCEPT;
2343	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2353	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2344	static size_type __align_it(size_type __new_size) _NOEXCEPT	2354	static size_type __align_it(size_type __new_size) _NOEXCEPT
2345	{return (__new_size + (__bits_per_word-1)) & ~((size_type)__bits_per_word-1);}	2355	{return (__new_size + (__bits_per_word-1)) & ~((size_type)__bits_per_word-1);}
2346	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 size_type __recommend(size_type __new_size) const;	2356	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type __recommend(size_type __new_size) const;
2347	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 void __construct_at_end(size_type __n, bool __x);	2357	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct_at_end(size_type __n, bool __x);
2348	template <class _ForwardIterator>	2358	template <class _ForwardIterator>
2349	typename enable_if	2359	typename enable_if
2350	<	2360	<
2351	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2361	__is_cpp17_forward_iterator<_ForwardIterator>::value,
2352	void	2362	void
2353	>::type	2363	>::type
2354	_LIBCPP_CONSTEXPR_AFTER_CXX17 __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);	2364	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
2355	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __append(size_type __n, const_reference __x);	2365	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __append(size_type __n, const_reference __x);
2356	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2366	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2357	reference __make_ref(size_type __pos) _NOEXCEPT	2367	reference __make_ref(size_type __pos) _NOEXCEPT
2358	{return reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}	2368	{return reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
2359	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2369	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2360	const_reference __make_ref(size_type __pos) const _NOEXCEPT {	2370	const_reference __make_ref(size_type __pos) const _NOEXCEPT {
2361	return __bit_const_reference<vector>(__begin_ + __pos / __bits_per_word,	2371	return __bit_const_reference<vector>(__begin_ + __pos / __bits_per_word,
2362	__storage_type(1) << __pos % __bits_per_word);	2372	__storage_type(1) << __pos % __bits_per_word);
2363	}	2373	}
2364	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2374	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2365	iterator __make_iter(size_type __pos) _NOEXCEPT	2375	iterator __make_iter(size_type __pos) _NOEXCEPT
2366	{return iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}	2376	{return iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
2367	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2377	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2368	const_iterator __make_iter(size_type __pos) const _NOEXCEPT	2378	const_iterator __make_iter(size_type __pos) const _NOEXCEPT
2369	{return const_iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}	2379	{return const_iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
2370	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2380	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2371	iterator __const_iterator_cast(const_iterator __p) _NOEXCEPT	2381	iterator __const_iterator_cast(const_iterator __p) _NOEXCEPT
2372	{return begin() + (__p - cbegin());}	2382	{return begin() + (__p - cbegin());}
2373		2383
2374	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2384	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2375	void __copy_assign_alloc(const vector& __v)	2385	void __copy_assign_alloc(const vector& __v)
2376	{__copy_assign_alloc(__v, integral_constant<bool,	2386	{__copy_assign_alloc(__v, integral_constant<bool,
2377	__storage_traits::propagate_on_container_copy_assignment::value>());}	2387	__storage_traits::propagate_on_container_copy_assignment::value>());}
2378	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2388	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2379	void __copy_assign_alloc(const vector& __c, true_type)	2389	void __copy_assign_alloc(const vector& __c, true_type)
2380	{	2390	{
2381	if (__alloc() != __c.__alloc())	2391	if (__alloc() != __c.__alloc())
...	@@ -2383,33 +2393,33 @@ private:	...	@@ -2383,33 +2393,33 @@ private:
2383	__alloc() = __c.__alloc();	2393	__alloc() = __c.__alloc();
2384	}	2394	}
2385		2395
2386	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2396	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2387	void __copy_assign_alloc(const vector&, false_type)	2397	void __copy_assign_alloc(const vector&, false_type)
2388	{}	2398	{}
2389		2399
2390	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __move_assign(vector& __c, false_type);	2400	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __move_assign(vector& __c, false_type);
2391	_LIBCPP_CONSTEXPR_AFTER_CXX17 void __move_assign(vector& __c, true_type)	2401	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __move_assign(vector& __c, true_type)
2392	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);	2402	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
2393	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2403	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2394	void __move_assign_alloc(vector& __c)	2404	void __move_assign_alloc(vector& __c)
2395	_NOEXCEPT_(	2405	_NOEXCEPT_(
2396	!__storage_traits::propagate_on_container_move_assignment::value \|\|	2406	!__storage_traits::propagate_on_container_move_assignment::value \|\|
2397	is_nothrow_move_assignable<allocator_type>::value)	2407	is_nothrow_move_assignable<allocator_type>::value)
2398	{__move_assign_alloc(__c, integral_constant<bool,	2408	{__move_assign_alloc(__c, integral_constant<bool,
2399	__storage_traits::propagate_on_container_move_assignment::value>());}	2409	__storage_traits::propagate_on_container_move_assignment::value>());}
2400	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2410	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2401	void __move_assign_alloc(vector& __c, true_type)	2411	void __move_assign_alloc(vector& __c, true_type)
2402	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)	2412	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
2403	{	2413	{
2404	__alloc() = _VSTD::move(__c.__alloc());	2414	__alloc() = std::move(__c.__alloc());
2405	}	2415	}
2406		2416
2407	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2417	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2408	void __move_assign_alloc(vector&, false_type)	2418	void __move_assign_alloc(vector&, false_type)
2409	_NOEXCEPT	2419	_NOEXCEPT
2410	{}	2420	{}
2411		2421
2412	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_t __hash_code() const _NOEXCEPT;	2422	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_t __hash_code() const _NOEXCEPT;
2413		2423
2414	friend class __bit_reference<vector>;	2424	friend class __bit_reference<vector>;
2415	friend class __bit_const_reference<vector>;	2425	friend class __bit_const_reference<vector>;
...	@@ -2420,7 +2430,7 @@ private:	...	@@ -2420,7 +2430,7 @@ private:
2420	};	2430	};
2421		2431
2422	template <class _Allocator>	2432	template <class _Allocator>
2423	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2433	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2424	vector<bool, _Allocator>::__vdeallocate() _NOEXCEPT	2434	vector<bool, _Allocator>::__vdeallocate() _NOEXCEPT
2425	{	2435	{
2426	if (this->__begin_ != nullptr)	2436	if (this->__begin_ != nullptr)
...	@@ -2433,7 +2443,7 @@ vector<bool, _Allocator>::__vdeallocate() _NOEXCEPT	...	@@ -2433,7 +2443,7 @@ vector<bool, _Allocator>::__vdeallocate() _NOEXCEPT
2433	}	2443	}
2434		2444
2435	template <class _Allocator>	2445	template <class _Allocator>
2436	_LIBCPP_CONSTEXPR_AFTER_CXX17	2446	_LIBCPP_CONSTEXPR_SINCE_CXX20
2437	typename vector<bool, _Allocator>::size_type	2447	typename vector<bool, _Allocator>::size_type
2438	vector<bool, _Allocator>::max_size() const _NOEXCEPT	2448	vector<bool, _Allocator>::max_size() const _NOEXCEPT
2439	{	2449	{
...	@@ -2446,7 +2456,7 @@ vector<bool, _Allocator>::max_size() const _NOEXCEPT	...	@@ -2446,7 +2456,7 @@ vector<bool, _Allocator>::max_size() const _NOEXCEPT
2446		2456
2447	// Precondition: __new_size > capacity()	2457	// Precondition: __new_size > capacity()
2448	template <class _Allocator>	2458	template <class _Allocator>
2449	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2459	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2450	typename vector<bool, _Allocator>::size_type	2460	typename vector<bool, _Allocator>::size_type
2451	vector<bool, _Allocator>::__recommend(size_type __new_size) const	2461	vector<bool, _Allocator>::__recommend(size_type __new_size) const
2452	{	2462	{
...	@@ -2456,7 +2466,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const	...	@@ -2456,7 +2466,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const
2456	const size_type __cap = capacity();	2466	const size_type __cap = capacity();
2457	if (__cap >= __ms / 2)	2467	if (__cap >= __ms / 2)
2458	return __ms;	2468	return __ms;
2459	return _VSTD::max(2 * __cap, __align_it(__new_size));	2469	return std::max(2 * __cap, __align_it(__new_size));
2460	}	2470	}
2461		2471
2462	// Default constructs __n objects starting at __end_	2472	// Default constructs __n objects starting at __end_
...	@@ -2464,7 +2474,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const	...	@@ -2464,7 +2474,7 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const
2464	// Precondition: size() + __n <= capacity()	2474	// Precondition: size() + __n <= capacity()
2465	// Postcondition: size() == size() + __n	2475	// Postcondition: size() == size() + __n
2466	template <class _Allocator>	2476	template <class _Allocator>
2467	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2477	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2468	void	2478	void
2469	vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)	2479	vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)
2470	{	2480	{
...	@@ -2477,12 +2487,12 @@ vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)	...	@@ -2477,12 +2487,12 @@ vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)
2477	else	2487	else
2478	this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0);	2488	this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0);
2479	}	2489	}
2480	_VSTD::fill_n(__make_iter(__old_size), __n, __x);	2490	std::fill_n(__make_iter(__old_size), __n, __x);
2481	}	2491	}
2482		2492
2483	template <class _Allocator>	2493	template <class _Allocator>
2484	template <class _ForwardIterator>	2494	template <class _ForwardIterator>
2485	_LIBCPP_CONSTEXPR_AFTER_CXX17	2495	_LIBCPP_CONSTEXPR_SINCE_CXX20
2486	typename enable_if	2496	typename enable_if
2487	<	2497	<
2488	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2498	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -2491,7 +2501,7 @@ typename enable_if	...	@@ -2491,7 +2501,7 @@ typename enable_if
2491	vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)	2501	vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
2492	{	2502	{
2493	size_type __old_size = this->__size_;	2503	size_type __old_size = this->__size_;
2494	this->__size_ += _VSTD::distance(__first, __last);	2504	this->__size_ += std::distance(__first, __last);
2495	if (__old_size == 0 \|\| ((__old_size - 1) / __bits_per_word) != ((this->__size_ - 1) / __bits_per_word))	2505	if (__old_size == 0 \|\| ((__old_size - 1) / __bits_per_word) != ((this->__size_ - 1) / __bits_per_word))
2496	{	2506	{
2497	if (this->__size_ <= __bits_per_word)	2507	if (this->__size_ <= __bits_per_word)
...	@@ -2499,11 +2509,11 @@ vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardI	...	@@ -2499,11 +2509,11 @@ vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardI
2499	else	2509	else
2500	this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0);	2510	this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0);
2501	}	2511	}
2502	_VSTD::copy(__first, __last, __make_iter(__old_size));	2512	std::copy(__first, __last, __make_iter(__old_size));
2503	}	2513	}
2504		2514
2505	template <class _Allocator>	2515	template <class _Allocator>
2506	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2516	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2507	vector<bool, _Allocator>::vector()	2517	vector<bool, _Allocator>::vector()
2508	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)	2518	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
2509	: __begin_(nullptr),	2519	: __begin_(nullptr),
...	@@ -2513,7 +2523,7 @@ vector<bool, _Allocator>::vector()	...	@@ -2513,7 +2523,7 @@ vector<bool, _Allocator>::vector()
2513	}	2523	}
2514		2524
2515	template <class _Allocator>	2525	template <class _Allocator>
2516	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2526	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2517	vector<bool, _Allocator>::vector(const allocator_type& __a)	2527	vector<bool, _Allocator>::vector(const allocator_type& __a)
2518	#if _LIBCPP_STD_VER <= 14	2528	#if _LIBCPP_STD_VER <= 14
2519	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)	2529	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
...	@@ -2527,7 +2537,7 @@ vector<bool, _Allocator>::vector(const allocator_type& __a)	...	@@ -2527,7 +2537,7 @@ vector<bool, _Allocator>::vector(const allocator_type& __a)
2527	}	2537	}
2528		2538
2529	template <class _Allocator>	2539	template <class _Allocator>
2530	_LIBCPP_CONSTEXPR_AFTER_CXX17	2540	_LIBCPP_CONSTEXPR_SINCE_CXX20
2531	vector<bool, _Allocator>::vector(size_type __n)	2541	vector<bool, _Allocator>::vector(size_type __n)
2532	: __begin_(nullptr),	2542	: __begin_(nullptr),
2533	__size_(0),	2543	__size_(0),
...	@@ -2542,7 +2552,7 @@ vector<bool, _Allocator>::vector(size_type __n)	...	@@ -2542,7 +2552,7 @@ vector<bool, _Allocator>::vector(size_type __n)
2542		2552
2543	#if _LIBCPP_STD_VER > 11	2553	#if _LIBCPP_STD_VER > 11
2544	template <class _Allocator>	2554	template <class _Allocator>
2545	_LIBCPP_CONSTEXPR_AFTER_CXX17	2555	_LIBCPP_CONSTEXPR_SINCE_CXX20
2546	vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)	2556	vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)
2547	: __begin_(nullptr),	2557	: __begin_(nullptr),
2548	__size_(0),	2558	__size_(0),
...	@@ -2557,7 +2567,7 @@ vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)	...	@@ -2557,7 +2567,7 @@ vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)
2557	#endif	2567	#endif
2558		2568
2559	template <class _Allocator>	2569	template <class _Allocator>
2560	_LIBCPP_CONSTEXPR_AFTER_CXX17	2570	_LIBCPP_CONSTEXPR_SINCE_CXX20
2561	vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)	2571	vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)
2562	: __begin_(nullptr),	2572	: __begin_(nullptr),
2563	__size_(0),	2573	__size_(0),
...	@@ -2571,7 +2581,7 @@ vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)	...	@@ -2571,7 +2581,7 @@ vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)
2571	}	2581	}
2572		2582
2573	template <class _Allocator>	2583	template <class _Allocator>
2574	_LIBCPP_CONSTEXPR_AFTER_CXX17	2584	_LIBCPP_CONSTEXPR_SINCE_CXX20
2575	vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const allocator_type& __a)	2585	vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const allocator_type& __a)
2576	: __begin_(nullptr),	2586	: __begin_(nullptr),
2577	__size_(0),	2587	__size_(0),
...	@@ -2586,7 +2596,7 @@ vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const all	...	@@ -2586,7 +2596,7 @@ vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const all
2586		2596
2587	template <class _Allocator>	2597	template <class _Allocator>
2588	template <class _InputIterator>	2598	template <class _InputIterator>
2589	_LIBCPP_CONSTEXPR_AFTER_CXX17	2599	_LIBCPP_CONSTEXPR_SINCE_CXX20
2590	vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,	2600	vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
2591	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type*)	2601	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type*)
2592	: __begin_(nullptr),	2602	: __begin_(nullptr),
...	@@ -2613,7 +2623,7 @@ vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,	...	@@ -2613,7 +2623,7 @@ vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
2613		2623
2614	template <class _Allocator>	2624	template <class _Allocator>
2615	template <class _InputIterator>	2625	template <class _InputIterator>
2616	_LIBCPP_CONSTEXPR_AFTER_CXX17	2626	_LIBCPP_CONSTEXPR_SINCE_CXX20
2617	vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,	2627	vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
2618	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type*)	2628	typename enable_if<__is_exactly_cpp17_input_iterator<_InputIterator>::value>::type*)
2619	: __begin_(nullptr),	2629	: __begin_(nullptr),
...	@@ -2640,42 +2650,46 @@ vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,	...	@@ -2640,42 +2650,46 @@ vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
2640		2650
2641	template <class _Allocator>	2651	template <class _Allocator>
2642	template <class _ForwardIterator>	2652	template <class _ForwardIterator>
2643	_LIBCPP_CONSTEXPR_AFTER_CXX17	2653	_LIBCPP_CONSTEXPR_SINCE_CXX20
2644	vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last,	2654	vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last,
2645	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type*)	2655	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type*)
2646	: __begin_(nullptr),	2656	: __begin_(nullptr),
2647	__size_(0),	2657	__size_(0),
2648	__cap_alloc_(0, __default_init_tag())	2658	__cap_alloc_(0, __default_init_tag())
2649	{	2659	{
2650	size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));	2660	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		2661	size_type __n = static_cast<size_type>(std::distance(__first, __last));
2651	if (__n > 0)	2662	if (__n > 0)
2652	{	2663	{
2653	__vallocate(__n);	2664	__vallocate(__n);
2654	__construct_at_end(__first, __last);	2665	__construct_at_end(__first, __last);
2655	}	2666	}
		2667	__guard.__complete();
2656	}	2668	}
2657		2669
2658	template <class _Allocator>	2670	template <class _Allocator>
2659	template <class _ForwardIterator>	2671	template <class _ForwardIterator>
2660	_LIBCPP_CONSTEXPR_AFTER_CXX17	2672	_LIBCPP_CONSTEXPR_SINCE_CXX20
2661	vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,	2673	vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
2662	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type*)	2674	typename enable_if<__is_cpp17_forward_iterator<_ForwardIterator>::value>::type*)
2663	: __begin_(nullptr),	2675	: __begin_(nullptr),
2664	__size_(0),	2676	__size_(0),
2665	__cap_alloc_(0, static_cast<__storage_allocator>(__a))	2677	__cap_alloc_(0, static_cast<__storage_allocator>(__a))
2666	{	2678	{
2667	size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));	2679	auto __guard = std::__make_exception_guard(__destroy_vector(*this));
		2680	size_type __n = static_cast<size_type>(std::distance(__first, __last));
2668	if (__n > 0)	2681	if (__n > 0)
2669	{	2682	{
2670	__vallocate(__n);	2683	__vallocate(__n);
2671	__construct_at_end(__first, __last);	2684	__construct_at_end(__first, __last);
2672	}	2685	}
		2686	__guard.__complete();
2673	}	2687	}
2674		2688
2675	#ifndef _LIBCPP_CXX03_LANG	2689	#ifndef _LIBCPP_CXX03_LANG
2676		2690
2677	template <class _Allocator>	2691	template <class _Allocator>
2678	_LIBCPP_CONSTEXPR_AFTER_CXX17	2692	_LIBCPP_CONSTEXPR_SINCE_CXX20
2679	vector<bool, _Allocator>::vector(initializer_list<value_type> __il)	2693	vector<bool, _Allocator>::vector(initializer_list<value_type> __il)
2680	: __begin_(nullptr),	2694	: __begin_(nullptr),
2681	__size_(0),	2695	__size_(0),
...	@@ -2690,7 +2704,7 @@ vector<bool, _Allocator>::vector(initializer_list<value_type> __il)	...	@@ -2690,7 +2704,7 @@ vector<bool, _Allocator>::vector(initializer_list<value_type> __il)
2690	}	2704	}
2691		2705
2692	template <class _Allocator>	2706	template <class _Allocator>
2693	_LIBCPP_CONSTEXPR_AFTER_CXX17	2707	_LIBCPP_CONSTEXPR_SINCE_CXX20
2694	vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)	2708	vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
2695	: __begin_(nullptr),	2709	: __begin_(nullptr),
2696	__size_(0),	2710	__size_(0),
...	@@ -2707,16 +2721,7 @@ vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const alloca	...	@@ -2707,16 +2721,7 @@ vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const alloca
2707	#endif // _LIBCPP_CXX03_LANG	2721	#endif // _LIBCPP_CXX03_LANG
2708		2722
2709	template <class _Allocator>	2723	template <class _Allocator>
2710	_LIBCPP_CONSTEXPR_AFTER_CXX17	2724	_LIBCPP_CONSTEXPR_SINCE_CXX20
2711	vector<bool, _Allocator>::~vector()
2712	{
2713	if (__begin_ != nullptr)
2714	__storage_traits::deallocate(__alloc(), __begin_, __cap());
2715	std::__debug_db_invalidate_all(this);
2716	}
2717
2718	template <class _Allocator>
2719	_LIBCPP_CONSTEXPR_AFTER_CXX17
2720	vector<bool, _Allocator>::vector(const vector& __v)	2725	vector<bool, _Allocator>::vector(const vector& __v)
2721	: __begin_(nullptr),	2726	: __begin_(nullptr),
2722	__size_(0),	2727	__size_(0),
...	@@ -2730,7 +2735,7 @@ vector<bool, _Allocator>::vector(const vector& __v)	...	@@ -2730,7 +2735,7 @@ vector<bool, _Allocator>::vector(const vector& __v)
2730	}	2735	}
2731		2736
2732	template <class _Allocator>	2737	template <class _Allocator>
2733	_LIBCPP_CONSTEXPR_AFTER_CXX17	2738	_LIBCPP_CONSTEXPR_SINCE_CXX20
2734	vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)	2739	vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)
2735	: __begin_(nullptr),	2740	: __begin_(nullptr),
2736	__size_(0),	2741	__size_(0),
...	@@ -2744,11 +2749,11 @@ vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)	...	@@ -2744,11 +2749,11 @@ vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)
2744	}	2749	}
2745		2750
2746	template <class _Allocator>	2751	template <class _Allocator>
2747	_LIBCPP_CONSTEXPR_AFTER_CXX17	2752	_LIBCPP_CONSTEXPR_SINCE_CXX20
2748	vector<bool, _Allocator>&	2753	vector<bool, _Allocator>&
2749	vector<bool, _Allocator>::operator=(const vector& __v)	2754	vector<bool, _Allocator>::operator=(const vector& __v)
2750	{	2755	{
2751	if (this != _VSTD::addressof(__v))	2756	if (this != std::addressof(__v))
2752	{	2757	{
2753	__copy_assign_alloc(__v);	2758	__copy_assign_alloc(__v);
2754	if (__v.__size_)	2759	if (__v.__size_)
...	@@ -2758,7 +2763,7 @@ vector<bool, _Allocator>::operator=(const vector& __v)	...	@@ -2758,7 +2763,7 @@ vector<bool, _Allocator>::operator=(const vector& __v)
2758	__vdeallocate();	2763	__vdeallocate();
2759	__vallocate(__v.__size_);	2764	__vallocate(__v.__size_);
2760	}	2765	}
2761	_VSTD::copy(__v.__begin_, __v.__begin_ + __external_cap_to_internal(__v.__size_), __begin_);	2766	std::copy(__v.__begin_, __v.__begin_ + __external_cap_to_internal(__v.__size_), __begin_);
2762	}	2767	}
2763	__size_ = __v.__size_;	2768	__size_ = __v.__size_;
2764	}	2769	}
...	@@ -2766,7 +2771,7 @@ vector<bool, _Allocator>::operator=(const vector& __v)	...	@@ -2766,7 +2771,7 @@ vector<bool, _Allocator>::operator=(const vector& __v)
2766	}	2771	}
2767		2772
2768	template <class _Allocator>	2773	template <class _Allocator>
2769	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 vector<bool, _Allocator>::vector(vector&& __v)	2774	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocator>::vector(vector&& __v)
2770	#if _LIBCPP_STD_VER > 14	2775	#if _LIBCPP_STD_VER > 14
2771	_NOEXCEPT	2776	_NOEXCEPT
2772	#else	2777	#else
...	@@ -2774,14 +2779,14 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 vector<bool, _All	...	@@ -2774,14 +2779,14 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 vector<bool, _All
2774	#endif	2779	#endif
2775	: __begin_(__v.__begin_),	2780	: __begin_(__v.__begin_),
2776	__size_(__v.__size_),	2781	__size_(__v.__size_),
2777	__cap_alloc_(_VSTD::move(__v.__cap_alloc_)) {	2782	__cap_alloc_(std::move(__v.__cap_alloc_)) {
2778	__v.__begin_ = nullptr;	2783	__v.__begin_ = nullptr;
2779	__v.__size_ = 0;	2784	__v.__size_ = 0;
2780	__v.__cap() = 0;	2785	__v.__cap() = 0;
2781	}	2786	}
2782		2787
2783	template <class _Allocator>	2788	template <class _Allocator>
2784	_LIBCPP_CONSTEXPR_AFTER_CXX17	2789	_LIBCPP_CONSTEXPR_SINCE_CXX20
2785	vector<bool, _Allocator>::vector(vector&& __v, const __type_identity_t<allocator_type>& __a)	2790	vector<bool, _Allocator>::vector(vector&& __v, const __type_identity_t<allocator_type>& __a)
2786	: __begin_(nullptr),	2791	: __begin_(nullptr),
2787	__size_(0),	2792	__size_(0),
...	@@ -2803,7 +2808,7 @@ vector<bool, _Allocator>::vector(vector&& __v, const __type_identity_t<allocator	...	@@ -2803,7 +2808,7 @@ vector<bool, _Allocator>::vector(vector&& __v, const __type_identity_t<allocator
2803	}	2808	}
2804		2809
2805	template <class _Allocator>	2810	template <class _Allocator>
2806	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2811	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2807	vector<bool, _Allocator>&	2812	vector<bool, _Allocator>&
2808	vector<bool, _Allocator>::operator=(vector&& __v)	2813	vector<bool, _Allocator>::operator=(vector&& __v)
2809	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))	2814	_NOEXCEPT_((__noexcept_move_assign_container<_Allocator, __alloc_traits>::value))
...	@@ -2814,7 +2819,7 @@ vector<bool, _Allocator>::operator=(vector&& __v)	...	@@ -2814,7 +2819,7 @@ vector<bool, _Allocator>::operator=(vector&& __v)
2814	}	2819	}
2815		2820
2816	template <class _Allocator>	2821	template <class _Allocator>
2817	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2822	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2818	vector<bool, _Allocator>::__move_assign(vector& __c, false_type)	2823	vector<bool, _Allocator>::__move_assign(vector& __c, false_type)
2819	{	2824	{
2820	if (__alloc() != __c.__alloc())	2825	if (__alloc() != __c.__alloc())
...	@@ -2824,7 +2829,7 @@ vector<bool, _Allocator>::__move_assign(vector& __c, false_type)	...	@@ -2824,7 +2829,7 @@ vector<bool, _Allocator>::__move_assign(vector& __c, false_type)
2824	}	2829	}
2825		2830
2826	template <class _Allocator>	2831	template <class _Allocator>
2827	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2832	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2828	vector<bool, _Allocator>::__move_assign(vector& __c, true_type)	2833	vector<bool, _Allocator>::__move_assign(vector& __c, true_type)
2829	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)	2834	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
2830	{	2835	{
...	@@ -2838,7 +2843,7 @@ vector<bool, _Allocator>::__move_assign(vector& __c, true_type)	...	@@ -2838,7 +2843,7 @@ vector<bool, _Allocator>::__move_assign(vector& __c, true_type)
2838	}	2843	}
2839		2844
2840	template <class _Allocator>	2845	template <class _Allocator>
2841	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2846	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2842	vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)	2847	vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)
2843	{	2848	{
2844	__size_ = 0;	2849	__size_ = 0;
...	@@ -2854,14 +2859,14 @@ vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)	...	@@ -2854,14 +2859,14 @@ vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)
2854	__v.__size_ = __n;	2859	__v.__size_ = __n;
2855	swap(__v);	2860	swap(__v);
2856	}	2861	}
2857	_VSTD::fill_n(begin(), __n, __x);	2862	std::fill_n(begin(), __n, __x);
2858	}	2863	}
2859	std::__debug_db_invalidate_all(this);	2864	std::__debug_db_invalidate_all(this);
2860	}	2865	}
2861		2866
2862	template <class _Allocator>	2867	template <class _Allocator>
2863	template <class _InputIterator>	2868	template <class _InputIterator>
2864	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,	2869	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,
2865	void	2870	void
2866	>::type	2871	>::type
2867	vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)	2872	vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
...	@@ -2873,7 +2878,7 @@ vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)	...	@@ -2873,7 +2878,7 @@ vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
2873		2878
2874	template <class _Allocator>	2879	template <class _Allocator>
2875	template <class _ForwardIterator>	2880	template <class _ForwardIterator>
2876	_LIBCPP_CONSTEXPR_AFTER_CXX17	2881	_LIBCPP_CONSTEXPR_SINCE_CXX20
2877	typename enable_if	2882	typename enable_if
2878	<	2883	<
2879	__is_cpp17_forward_iterator<_ForwardIterator>::value,	2884	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -2882,7 +2887,7 @@ typename enable_if	...	@@ -2882,7 +2887,7 @@ typename enable_if
2882	vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)	2887	vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
2883	{	2888	{
2884	clear();	2889	clear();
2885	difference_type __ns = _VSTD::distance(__first, __last);	2890	difference_type __ns = std::distance(__first, __last);
2886	_LIBCPP_ASSERT(__ns >= 0, "invalid range specified");	2891	_LIBCPP_ASSERT(__ns >= 0, "invalid range specified");
2887	const size_t __n = static_cast<size_type>(__ns);	2892	const size_t __n = static_cast<size_type>(__ns);
2888	if (__n)	2893	if (__n)
...	@@ -2897,7 +2902,7 @@ vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __la	...	@@ -2897,7 +2902,7 @@ vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __la
2897	}	2902	}
2898		2903
2899	template <class _Allocator>	2904	template <class _Allocator>
2900	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2905	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2901	vector<bool, _Allocator>::reserve(size_type __n)	2906	vector<bool, _Allocator>::reserve(size_type __n)
2902	{	2907	{
2903	if (__n > capacity())	2908	if (__n > capacity())
...	@@ -2913,7 +2918,7 @@ vector<bool, _Allocator>::reserve(size_type __n)	...	@@ -2913,7 +2918,7 @@ vector<bool, _Allocator>::reserve(size_type __n)
2913	}	2918	}
2914		2919
2915	template <class _Allocator>	2920	template <class _Allocator>
2916	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2921	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2917	vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT	2922	vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT
2918	{	2923	{
2919	if (__external_cap_to_internal(size()) > __cap())	2924	if (__external_cap_to_internal(size()) > __cap())
...	@@ -2951,7 +2956,7 @@ vector<bool, _Allocator>::at(size_type __n) const	...	@@ -2951,7 +2956,7 @@ vector<bool, _Allocator>::at(size_type __n) const
2951	}	2956	}
2952		2957
2953	template <class _Allocator>	2958	template <class _Allocator>
2954	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	2959	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
2955	vector<bool, _Allocator>::push_back(const value_type& __x)	2960	vector<bool, _Allocator>::push_back(const value_type& __x)
2956	{	2961	{
2957	if (this->__size_ == this->capacity())	2962	if (this->__size_ == this->capacity())
...	@@ -2961,7 +2966,7 @@ vector<bool, _Allocator>::push_back(const value_type& __x)	...	@@ -2961,7 +2966,7 @@ vector<bool, _Allocator>::push_back(const value_type& __x)
2961	}	2966	}
2962		2967
2963	template <class _Allocator>	2968	template <class _Allocator>
2964	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename vector<bool, _Allocator>::iterator	2969	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<bool, _Allocator>::iterator
2965	vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __x)	2970	vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __x)
2966	{	2971	{
2967	iterator __r;	2972	iterator __r;
...	@@ -2969,7 +2974,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __	...	@@ -2969,7 +2974,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __
2969	{	2974	{
2970	const_iterator __old_end = end();	2975	const_iterator __old_end = end();
2971	++__size_;	2976	++__size_;
2972	_VSTD::copy_backward(__position, __old_end, end());	2977	std::copy_backward(__position, __old_end, end());
2973	__r = __const_iterator_cast(__position);	2978	__r = __const_iterator_cast(__position);
2974	}	2979	}
2975	else	2980	else
...	@@ -2977,8 +2982,8 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __	...	@@ -2977,8 +2982,8 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __
2977	vector __v(get_allocator());	2982	vector __v(get_allocator());
2978	__v.reserve(__recommend(__size_ + 1));	2983	__v.reserve(__recommend(__size_ + 1));
2979	__v.__size_ = __size_ + 1;	2984	__v.__size_ = __size_ + 1;
2980	__r = _VSTD::copy(cbegin(), __position, __v.begin());	2985	__r = std::copy(cbegin(), __position, __v.begin());
2981	_VSTD::copy_backward(__position, cend(), __v.end());	2986	std::copy_backward(__position, cend(), __v.end());
2982	swap(__v);	2987	swap(__v);
2983	}	2988	}
2984	*__r = __x;	2989	*__r = __x;
...	@@ -2986,7 +2991,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __	...	@@ -2986,7 +2991,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __
2986	}	2991	}
2987		2992
2988	template <class _Allocator>	2993	template <class _Allocator>
2989	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename vector<bool, _Allocator>::iterator	2994	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<bool, _Allocator>::iterator
2990	vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const value_type& __x)	2995	vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const value_type& __x)
2991	{	2996	{
2992	iterator __r;	2997	iterator __r;
...	@@ -2995,7 +3000,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const	...	@@ -2995,7 +3000,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const
2995	{	3000	{
2996	const_iterator __old_end = end();	3001	const_iterator __old_end = end();
2997	__size_ += __n;	3002	__size_ += __n;
2998	_VSTD::copy_backward(__position, __old_end, end());	3003	std::copy_backward(__position, __old_end, end());
2999	__r = __const_iterator_cast(__position);	3004	__r = __const_iterator_cast(__position);
3000	}	3005	}
3001	else	3006	else
...	@@ -3003,17 +3008,17 @@ vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const	...	@@ -3003,17 +3008,17 @@ vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const
3003	vector __v(get_allocator());	3008	vector __v(get_allocator());
3004	__v.reserve(__recommend(__size_ + __n));	3009	__v.reserve(__recommend(__size_ + __n));
3005	__v.__size_ = __size_ + __n;	3010	__v.__size_ = __size_ + __n;
3006	__r = _VSTD::copy(cbegin(), __position, __v.begin());	3011	__r = std::copy(cbegin(), __position, __v.begin());
3007	_VSTD::copy_backward(__position, cend(), __v.end());	3012	std::copy_backward(__position, cend(), __v.end());
3008	swap(__v);	3013	swap(__v);
3009	}	3014	}
3010	_VSTD::fill_n(__r, __n, __x);	3015	std::fill_n(__r, __n, __x);
3011	return __r;	3016	return __r;
3012	}	3017	}
3013		3018
3014	template <class _Allocator>	3019	template <class _Allocator>
3015	template <class _InputIterator>	3020	template <class _InputIterator>
3016	_LIBCPP_CONSTEXPR_AFTER_CXX17 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,	3021	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename enable_if <__is_exactly_cpp17_input_iterator<_InputIterator>::value,
3017	typename vector<bool, _Allocator>::iterator	3022	typename vector<bool, _Allocator>::iterator
3018	>::type	3023	>::type
3019	vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)	3024	vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
...	@@ -3048,14 +3053,14 @@ vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __fir	...	@@ -3048,14 +3053,14 @@ vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __fir
3048	}	3053	}
3049	#endif // _LIBCPP_NO_EXCEPTIONS	3054	#endif // _LIBCPP_NO_EXCEPTIONS
3050	}	3055	}
3051	__p = _VSTD::rotate(__p, __old_end, end());	3056	__p = std::rotate(__p, __old_end, end());
3052	insert(__p, __v.begin(), __v.end());	3057	insert(__p, __v.begin(), __v.end());
3053	return begin() + __off;	3058	return begin() + __off;
3054	}	3059	}
3055		3060
3056	template <class _Allocator>	3061	template <class _Allocator>
3057	template <class _ForwardIterator>	3062	template <class _ForwardIterator>
3058	_LIBCPP_CONSTEXPR_AFTER_CXX17	3063	_LIBCPP_CONSTEXPR_SINCE_CXX20
3059	typename enable_if	3064	typename enable_if
3060	<	3065	<
3061	__is_cpp17_forward_iterator<_ForwardIterator>::value,	3066	__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -3063,7 +3068,7 @@ typename enable_if	...	@@ -3063,7 +3068,7 @@ typename enable_if
3063	>::type	3068	>::type
3064	vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)	3069	vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
3065	{	3070	{
3066	const difference_type __n_signed = _VSTD::distance(__first, __last);	3071	const difference_type __n_signed = std::distance(__first, __last);
3067	_LIBCPP_ASSERT(__n_signed >= 0, "invalid range specified");	3072	_LIBCPP_ASSERT(__n_signed >= 0, "invalid range specified");
3068	const size_type __n = static_cast<size_type>(__n_signed);	3073	const size_type __n = static_cast<size_type>(__n_signed);
3069	iterator __r;	3074	iterator __r;
...	@@ -3072,7 +3077,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __f	...	@@ -3072,7 +3077,7 @@ vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __f
3072	{	3077	{
3073	const_iterator __old_end = end();	3078	const_iterator __old_end = end();
3074	__size_ += __n;	3079	__size_ += __n;
3075	_VSTD::copy_backward(__position, __old_end, end());	3080	std::copy_backward(__position, __old_end, end());
3076	__r = __const_iterator_cast(__position);	3081	__r = __const_iterator_cast(__position);
3077	}	3082	}
3078	else	3083	else
...	@@ -3080,39 +3085,39 @@ vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __f	...	@@ -3080,39 +3085,39 @@ vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __f
3080	vector __v(get_allocator());	3085	vector __v(get_allocator());
3081	__v.reserve(__recommend(__size_ + __n));	3086	__v.reserve(__recommend(__size_ + __n));
3082	__v.__size_ = __size_ + __n;	3087	__v.__size_ = __size_ + __n;
3083	__r = _VSTD::copy(cbegin(), __position, __v.begin());	3088	__r = std::copy(cbegin(), __position, __v.begin());
3084	_VSTD::copy_backward(__position, cend(), __v.end());	3089	std::copy_backward(__position, cend(), __v.end());
3085	swap(__v);	3090	swap(__v);
3086	}	3091	}
3087	_VSTD::copy(__first, __last, __r);	3092	std::copy(__first, __last, __r);
3088	return __r;	3093	return __r;
3089	}	3094	}
3090		3095
3091	template <class _Allocator>	3096	template <class _Allocator>
3092	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	3097	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3093	typename vector<bool, _Allocator>::iterator	3098	typename vector<bool, _Allocator>::iterator
3094	vector<bool, _Allocator>::erase(const_iterator __position)	3099	vector<bool, _Allocator>::erase(const_iterator __position)
3095	{	3100	{
3096	iterator __r = __const_iterator_cast(__position);	3101	iterator __r = __const_iterator_cast(__position);
3097	_VSTD::copy(__position + 1, this->cend(), __r);	3102	std::copy(__position + 1, this->cend(), __r);
3098	--__size_;	3103	--__size_;
3099	return __r;	3104	return __r;
3100	}	3105	}
3101		3106
3102	template <class _Allocator>	3107	template <class _Allocator>
3103	_LIBCPP_CONSTEXPR_AFTER_CXX17	3108	_LIBCPP_CONSTEXPR_SINCE_CXX20
3104	typename vector<bool, _Allocator>::iterator	3109	typename vector<bool, _Allocator>::iterator
3105	vector<bool, _Allocator>::erase(const_iterator __first, const_iterator __last)	3110	vector<bool, _Allocator>::erase(const_iterator __first, const_iterator __last)
3106	{	3111	{
3107	iterator __r = __const_iterator_cast(__first);	3112	iterator __r = __const_iterator_cast(__first);
3108	difference_type __d = __last - __first;	3113	difference_type __d = __last - __first;
3109	_VSTD::copy(__last, this->cend(), __r);	3114	std::copy(__last, this->cend(), __r);
3110	__size_ -= __d;	3115	__size_ -= __d;
3111	return __r;	3116	return __r;
3112	}	3117	}
3113		3118
3114	template <class _Allocator>	3119	template <class _Allocator>
3115	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	3120	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
3116	vector<bool, _Allocator>::swap(vector& __x)	3121	vector<bool, _Allocator>::swap(vector& __x)
3117	#if _LIBCPP_STD_VER >= 14	3122	#if _LIBCPP_STD_VER >= 14
3118	_NOEXCEPT	3123	_NOEXCEPT
...	@@ -3121,15 +3126,15 @@ vector<bool, _Allocator>::swap(vector& __x)	...	@@ -3121,15 +3126,15 @@ vector<bool, _Allocator>::swap(vector& __x)
3121	__is_nothrow_swappable<allocator_type>::value)	3126	__is_nothrow_swappable<allocator_type>::value)
3122	#endif	3127	#endif
3123	{	3128	{
3124	_VSTD::swap(this->__begin_, __x.__begin_);	3129	std::swap(this->__begin_, __x.__begin_);
3125	_VSTD::swap(this->__size_, __x.__size_);	3130	std::swap(this->__size_, __x.__size_);
3126	_VSTD::swap(this->__cap(), __x.__cap());	3131	std::swap(this->__cap(), __x.__cap());
3127	_VSTD::__swap_allocator(this->__alloc(), __x.__alloc(),	3132	std::__swap_allocator(this->__alloc(), __x.__alloc(),
3128	integral_constant<bool, __alloc_traits::propagate_on_container_swap::value>());	3133	integral_constant<bool, __alloc_traits::propagate_on_container_swap::value>());
3129	}	3134	}
3130		3135
3131	template <class _Allocator>	3136	template <class _Allocator>
3132	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	3137	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
3133	vector<bool, _Allocator>::resize(size_type __sz, value_type __x)	3138	vector<bool, _Allocator>::resize(size_type __sz, value_type __x)
3134	{	3139	{
3135	size_type __cs = size();	3140	size_type __cs = size();
...	@@ -3148,17 +3153,17 @@ vector<bool, _Allocator>::resize(size_type __sz, value_type __x)	...	@@ -3148,17 +3153,17 @@ vector<bool, _Allocator>::resize(size_type __sz, value_type __x)
3148	vector __v(get_allocator());	3153	vector __v(get_allocator());
3149	__v.reserve(__recommend(__size_ + __n));	3154	__v.reserve(__recommend(__size_ + __n));
3150	__v.__size_ = __size_ + __n;	3155	__v.__size_ = __size_ + __n;
3151	__r = _VSTD::copy(cbegin(), cend(), __v.begin());	3156	__r = std::copy(cbegin(), cend(), __v.begin());
3152	swap(__v);	3157	swap(__v);
3153	}	3158	}
3154	_VSTD::fill_n(__r, __n, __x);	3159	std::fill_n(__r, __n, __x);
3155	}	3160	}
3156	else	3161	else
3157	__size_ = __sz;	3162	__size_ = __sz;
3158	}	3163	}
3159		3164
3160	template <class _Allocator>	3165	template <class _Allocator>
3161	_LIBCPP_CONSTEXPR_AFTER_CXX17 void	3166	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
3162	vector<bool, _Allocator>::flip() _NOEXCEPT	3167	vector<bool, _Allocator>::flip() _NOEXCEPT
3163	{	3168	{
3164	// do middle whole words	3169	// do middle whole words
...	@@ -3177,7 +3182,7 @@ vector<bool, _Allocator>::flip() _NOEXCEPT	...	@@ -3177,7 +3182,7 @@ vector<bool, _Allocator>::flip() _NOEXCEPT
3177	}	3182	}
3178		3183
3179	template <class _Allocator>	3184	template <class _Allocator>
3180	_LIBCPP_CONSTEXPR_AFTER_CXX17 bool	3185	_LIBCPP_CONSTEXPR_SINCE_CXX20 bool
3181	vector<bool, _Allocator>::__invariants() const	3186	vector<bool, _Allocator>::__invariants() const
3182	{	3187	{
3183	if (this->__begin_ == nullptr)	3188	if (this->__begin_ == nullptr)
...	@@ -3196,7 +3201,7 @@ vector<bool, _Allocator>::__invariants() const	...	@@ -3196,7 +3201,7 @@ vector<bool, _Allocator>::__invariants() const
3196	}	3201	}
3197		3202
3198	template <class _Allocator>	3203	template <class _Allocator>
3199	_LIBCPP_CONSTEXPR_AFTER_CXX17 size_t	3204	_LIBCPP_CONSTEXPR_SINCE_CXX20 size_t
3200	vector<bool, _Allocator>::__hash_code() const _NOEXCEPT	3205	vector<bool, _Allocator>::__hash_code() const _NOEXCEPT
3201	{	3206	{
3202	size_t __h = 0;	3207	size_t __h = 0;
...	@@ -3218,24 +3223,24 @@ template <class _Allocator>	...	@@ -3218,24 +3223,24 @@ template <class _Allocator>
3218	struct _LIBCPP_TEMPLATE_VIS hash<vector<bool, _Allocator> >	3223	struct _LIBCPP_TEMPLATE_VIS hash<vector<bool, _Allocator> >
3219	: public __unary_function<vector<bool, _Allocator>, size_t>	3224	: public __unary_function<vector<bool, _Allocator>, size_t>
3220	{	3225	{
3221	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	3226	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3222	size_t operator()(const vector<bool, _Allocator>& __vec) const _NOEXCEPT	3227	size_t operator()(const vector<bool, _Allocator>& __vec) const _NOEXCEPT
3223	{return __vec.__hash_code();}	3228	{return __vec.__hash_code();}
3224	};	3229	};
3225		3230
3226	template <class _Tp, class _Allocator>	3231	template <class _Tp, class _Allocator>
3227	_LIBCPP_CONSTEXPR_AFTER_CXX17	3232	_LIBCPP_CONSTEXPR_SINCE_CXX20
3228	inline _LIBCPP_INLINE_VISIBILITY	3233	inline _LIBCPP_HIDE_FROM_ABI
3229	bool	3234	bool
3230	operator==(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3235	operator==(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3231	{	3236	{
3232	const typename vector<_Tp, _Allocator>::size_type __sz = __x.size();	3237	const typename vector<_Tp, _Allocator>::size_type __sz = __x.size();
3233	return __sz == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());	3238	return __sz == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());
3234	}	3239	}
3235		3240
3236	template <class _Tp, class _Allocator>	3241	template <class _Tp, class _Allocator>
3237	_LIBCPP_CONSTEXPR_AFTER_CXX17	3242	_LIBCPP_CONSTEXPR_SINCE_CXX20
3238	inline _LIBCPP_INLINE_VISIBILITY	3243	inline _LIBCPP_HIDE_FROM_ABI
3239	bool	3244	bool
3240	operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3245	operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3241	{	3246	{
...	@@ -3243,17 +3248,17 @@ operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __	...	@@ -3243,17 +3248,17 @@ operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __
3243	}	3248	}
3244		3249
3245	template <class _Tp, class _Allocator>	3250	template <class _Tp, class _Allocator>
3246	_LIBCPP_CONSTEXPR_AFTER_CXX17	3251	_LIBCPP_CONSTEXPR_SINCE_CXX20
3247	inline _LIBCPP_INLINE_VISIBILITY	3252	inline _LIBCPP_HIDE_FROM_ABI
3248	bool	3253	bool
3249	operator< (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3254	operator< (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3250	{	3255	{
3251	return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());	3256	return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
3252	}	3257	}
3253		3258
3254	template <class _Tp, class _Allocator>	3259	template <class _Tp, class _Allocator>
3255	_LIBCPP_CONSTEXPR_AFTER_CXX17	3260	_LIBCPP_CONSTEXPR_SINCE_CXX20
3256	inline _LIBCPP_INLINE_VISIBILITY	3261	inline _LIBCPP_HIDE_FROM_ABI
3257	bool	3262	bool
3258	operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3263	operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3259	{	3264	{
...	@@ -3261,8 +3266,8 @@ operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __	...	@@ -3261,8 +3266,8 @@ operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __
3261	}	3266	}
3262		3267
3263	template <class _Tp, class _Allocator>	3268	template <class _Tp, class _Allocator>
3264	_LIBCPP_CONSTEXPR_AFTER_CXX17	3269	_LIBCPP_CONSTEXPR_SINCE_CXX20
3265	inline _LIBCPP_INLINE_VISIBILITY	3270	inline _LIBCPP_HIDE_FROM_ABI
3266	bool	3271	bool
3267	operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3272	operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3268	{	3273	{
...	@@ -3270,8 +3275,8 @@ operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __	...	@@ -3270,8 +3275,8 @@ operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __
3270	}	3275	}
3271		3276
3272	template <class _Tp, class _Allocator>	3277	template <class _Tp, class _Allocator>
3273	_LIBCPP_CONSTEXPR_AFTER_CXX17	3278	_LIBCPP_CONSTEXPR_SINCE_CXX20
3274	inline _LIBCPP_INLINE_VISIBILITY	3279	inline _LIBCPP_HIDE_FROM_ABI
3275	bool	3280	bool
3276	operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)	3281	operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
3277	{	3282	{
...	@@ -3279,8 +3284,8 @@ operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __	...	@@ -3279,8 +3284,8 @@ operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __
3279	}	3284	}
3280		3285
3281	template <class _Tp, class _Allocator>	3286	template <class _Tp, class _Allocator>
3282	_LIBCPP_CONSTEXPR_AFTER_CXX17	3287	_LIBCPP_CONSTEXPR_SINCE_CXX20
3283	inline _LIBCPP_INLINE_VISIBILITY	3288	inline _LIBCPP_HIDE_FROM_ABI
3284	void	3289	void
3285	swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)	3290	swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)
3286	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))	3291	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
...	@@ -3290,34 +3295,72 @@ swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)	...	@@ -3290,34 +3295,72 @@ swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)
3290		3295
3291	#if _LIBCPP_STD_VER > 17	3296	#if _LIBCPP_STD_VER > 17
3292	template <class _Tp, class _Allocator, class _Up>	3297	template <class _Tp, class _Allocator, class _Up>
3293	_LIBCPP_CONSTEXPR_AFTER_CXX17	3298	_LIBCPP_CONSTEXPR_SINCE_CXX20
3294	inline _LIBCPP_INLINE_VISIBILITY typename vector<_Tp, _Allocator>::size_type	3299	inline _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Allocator>::size_type
3295	erase(vector<_Tp, _Allocator>& __c, const _Up& __v) {	3300	erase(vector<_Tp, _Allocator>& __c, const _Up& __v) {
3296	auto __old_size = __c.size();	3301	auto __old_size = __c.size();
3297	__c.erase(_VSTD::remove(__c.begin(), __c.end(), __v), __c.end());	3302	__c.erase(std::remove(__c.begin(), __c.end(), __v), __c.end());
3298	return __old_size - __c.size();	3303	return __old_size - __c.size();
3299	}	3304	}
3300		3305
3301	template <class _Tp, class _Allocator, class _Predicate>	3306	template <class _Tp, class _Allocator, class _Predicate>
3302	_LIBCPP_CONSTEXPR_AFTER_CXX17	3307	_LIBCPP_CONSTEXPR_SINCE_CXX20
3303	inline _LIBCPP_INLINE_VISIBILITY typename vector<_Tp, _Allocator>::size_type	3308	inline _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Allocator>::size_type
3304	erase_if(vector<_Tp, _Allocator>& __c, _Predicate __pred) {	3309	erase_if(vector<_Tp, _Allocator>& __c, _Predicate __pred) {
3305	auto __old_size = __c.size();	3310	auto __old_size = __c.size();
3306	__c.erase(_VSTD::remove_if(__c.begin(), __c.end(), __pred), __c.end());	3311	__c.erase(std::remove_if(__c.begin(), __c.end(), __pred), __c.end());
3307	return __old_size - __c.size();	3312	return __old_size - __c.size();
3308	}	3313	}
3309		3314
3310	template <>	3315	template <>
3311	inline constexpr bool __format::__enable_insertable<std::vector<char>> = true;	3316	inline constexpr bool __format::__enable_insertable<vector<char>> = true;
3312	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS	3317	#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
3313	template <>	3318	template <>
3314	inline constexpr bool __format::__enable_insertable<std::vector<wchar_t>> = true;	3319	inline constexpr bool __format::__enable_insertable<vector<wchar_t>> = true;
3315	#endif	3320	#endif
3316		3321
3317	#endif // _LIBCPP_STD_VER > 17	3322	#endif // _LIBCPP_STD_VER > 17
3318		3323
		3324	#if _LIBCPP_STD_VER > 20
		3325	template <class _Tp, class CharT>
		3326	// Since is-vector-bool-reference is only used once it's inlined here.
		3327	requires same_as<typename _Tp::__container, vector<bool, typename _Tp::__container::allocator_type>>
		3328	struct _LIBCPP_TEMPLATE_VIS _LIBCPP_AVAILABILITY_FORMAT formatter<_Tp, CharT> {
		3329	private:
		3330	formatter<bool, CharT> __underlying_;
		3331
		3332	public:
		3333	template <class _ParseContext>
		3334	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
		3335	return __underlying_.parse(__ctx);
		3336	}
		3337
		3338	template <class _FormatContext>
		3339	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator format(const _Tp& __ref, _FormatContext& __ctx) const {
		3340	return __underlying_.format(__ref, __ctx);
		3341	}
		3342	};
		3343	#endif // _LIBCPP_STD_VER > 20
		3344
3319	_LIBCPP_END_NAMESPACE_STD	3345	_LIBCPP_END_NAMESPACE_STD
3320		3346
		3347	#if _LIBCPP_STD_VER > 14
		3348	_LIBCPP_BEGIN_NAMESPACE_STD
		3349	namespace pmr {
		3350	template <class _ValueT>
		3351	using vector = std::vector<_ValueT, polymorphic_allocator<_ValueT>>;
		3352	} // namespace pmr
		3353	_LIBCPP_END_NAMESPACE_STD
		3354	#endif
		3355
3321	_LIBCPP_POP_MACROS	3356	_LIBCPP_POP_MACROS
3322		3357
		3358	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		3359	# include <algorithm>
		3360	# include <atomic>
		3361	# include <concepts>
		3362	# include <typeinfo>
		3363	# include <utility>
		3364	#endif
		3365
3323	#endif // _LIBCPP_VECTOR	3366	#endif // _LIBCPP_VECTOR

lib/libcxx/include/version+22-11

 @@ -55,13 +55,16 @@ __cpp_lib_chrono_udls                                   201304L <chrono>
 __cpp_lib_clamp                                         201603L <algorithm>
 __cpp_lib_complex_udls                                  201309L <complex>
 __cpp_lib_concepts                                      202002L <concepts>
-__cpp_lib_constexpr_algorithms                          201806L <algorithm>
+__cpp_lib_constexpr_algorithms                          201806L <algorithm> <utility>
+__cpp_lib_constexpr_bitset                              202207L <bitset>
+__cpp_lib_constexpr_charconv                            202207L <charconv>
 __cpp_lib_constexpr_cmath                               202202L <cmath> <cstdlib>
 __cpp_lib_constexpr_complex                             201711L <complex>
 __cpp_lib_constexpr_dynamic_alloc                       201907L <memory>
 __cpp_lib_constexpr_functional                          201907L <functional>
 __cpp_lib_constexpr_iterator                            201811L <iterator>
-__cpp_lib_constexpr_memory                              201811L <memory>
+__cpp_lib_constexpr_memory                              202202L <memory>
+                                                        201811L // C++20
 __cpp_lib_constexpr_numeric                             201911L <numeric>
 __cpp_lib_constexpr_string                              201907L <string>
 __cpp_lib_constexpr_string_view                         201811L <string_view>
 @@ -79,8 +82,10 @@ __cpp_lib_erase_if                                      202002L <deque> <forward
 __cpp_lib_exchange_function                             201304L <utility>
 __cpp_lib_execution                                     201902L <execution>
                                                         201603L // C++17
+__cpp_lib_expected                                      202202L <expected>
 __cpp_lib_filesystem                                    201703L <filesystem>
 __cpp_lib_format                                        202106L <format>
+__cpp_lib_forward_like                                  202207L <utility>
 __cpp_lib_gcd_lcm                                       201606L <numeric>
 __cpp_lib_generic_associative_lookup                    201304L <map> <set>
 __cpp_lib_generic_unordered_lookup                      201811L <unordered_map> <unordered_set>
 @@ -132,7 +137,7 @@ __cpp_lib_out_ptr                                       202106L <memory>
 __cpp_lib_parallel_algorithm                            201603L <algorithm> <numeric>
 __cpp_lib_polymorphic_allocator                         201902L <memory_resource>
 __cpp_lib_quoted_string_io                              201304L <iomanip>
-__cpp_lib_ranges                                        201811L <algorithm> <functional> <iterator>
+__cpp_lib_ranges                                        202106L <algorithm> <functional> <iterator>
                                                                 <memory> <ranges>
 __cpp_lib_ranges_chunk                                  202202L <ranges>
 __cpp_lib_ranges_chunk_by                               202202L <ranges>
 @@ -262,7 +267,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_make_from_tuple                      201606L
 # define __cpp_lib_map_try_emplace                      201411L
 // # define __cpp_lib_math_special_functions               201603L
-// # define __cpp_lib_memory_resource                      201603L
+# define __cpp_lib_memory_resource                      201603L
 # define __cpp_lib_node_extract                         201606L
 # define __cpp_lib_nonmember_container_access           201411L
 # define __cpp_lib_not_fn                               201603L
 @@ -312,7 +317,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # endif
 # define __cpp_lib_concepts                             202002L
 # define __cpp_lib_constexpr_algorithms                 201806L
-// # define __cpp_lib_constexpr_complex                    201711L
+# define __cpp_lib_constexpr_complex                    201711L
 # define __cpp_lib_constexpr_dynamic_alloc              201907L
 # define __cpp_lib_constexpr_functional                 201907L
 # define __cpp_lib_constexpr_iterator                   201811L
 @@ -322,7 +327,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_constexpr_string_view                201811L
 # define __cpp_lib_constexpr_tuple                      201811L
 # define __cpp_lib_constexpr_utility                    201811L
-// # define __cpp_lib_constexpr_vector                     201907L
+# define __cpp_lib_constexpr_vector                     201907L
 # define __cpp_lib_coroutine                            201902L
 # if _LIBCPP_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L
 #   define __cpp_lib_destroying_delete                  201806L
 @@ -350,10 +355,8 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # endif
 # define __cpp_lib_list_remove_return_type              201806L
 # define __cpp_lib_math_constants                       201907L
-// # define __cpp_lib_polymorphic_allocator                201902L
+# define __cpp_lib_polymorphic_allocator                201902L
-# if !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
+# define __cpp_lib_ranges                               202106L
-#   define __cpp_lib_ranges                             201811L
-# endif
 # define __cpp_lib_remove_cvref                         201711L
 # if !defined(_LIBCPP_HAS_NO_THREADS) && !defined(_LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_semaphore)
 #   define __cpp_lib_semaphore                          201907L
 @@ -362,7 +365,9 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_shared_ptr_arrays                    201707L
 # define __cpp_lib_shift                                201806L
 // # define __cpp_lib_smart_ptr_for_overwrite              202002L
-// # define __cpp_lib_source_location                      201907L
+# if __has_builtin(__builtin_source_location)
+#   define __cpp_lib_source_location                    201907L
+# endif
 # define __cpp_lib_span                                 202002L
 # define __cpp_lib_ssize                                201902L
 # define __cpp_lib_starts_ends_with                     201711L
 @@ -382,8 +387,14 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_associative_heterogeneous_erasure    202110L
 // # define __cpp_lib_bind_back                            202202L
 # define __cpp_lib_byteswap                             202110L
+# define __cpp_lib_constexpr_bitset                     202207L
+# define __cpp_lib_constexpr_charconv                   202207L
 // # define __cpp_lib_constexpr_cmath                      202202L
+# undef  __cpp_lib_constexpr_memory
+# define __cpp_lib_constexpr_memory                     202202L
 // # define __cpp_lib_constexpr_typeinfo                   202106L
+# define __cpp_lib_expected                             202202L
+# define __cpp_lib_forward_like                         202207L
 // # define __cpp_lib_invoke_r                             202106L
 # define __cpp_lib_is_scoped_enum                       202011L
 // # define __cpp_lib_move_only_function                   202110L

lib/libcxx/include/wchar.h+3-1

 @@ -120,7 +120,9 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
 #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
 #endif
-#include_next <wchar.h>
+#  if __has_include_next(<wchar.h>)
+#    include_next <wchar.h>
+#  endif
 // Determine whether we have const-correct overloads for wcschr and friends.
 #if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)

lib/libcxx/src/atomic.cpp+24-3

...	@@ -26,6 +26,11 @@	...	@@ -26,6 +26,11 @@
26	# define SYS_futex SYS_futex_time64	26	# define SYS_futex SYS_futex_time64
27	#endif	27	#endif
28		28
		29	#elif defined(__FreeBSD__)
		30
		31	#include <sys/types.h>
		32	#include <sys/umtx.h>
		33
29	#else // <- Add other operating systems here	34	#else // <- Add other operating systems here
30		35
31	// Baseline needs no new headers	36	// Baseline needs no new headers
...	@@ -52,11 +57,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo	...	@@ -52,11 +57,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
52	#elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)	57	#elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)
53		58
54	extern "C" int __ulock_wait(uint32_t operation, void *addr, uint64_t value,	59	extern "C" int __ulock_wait(uint32_t operation, void *addr, uint64_t value,
55	uint32_t timeout); /* timeout is specified in microseconds */	60	uint32_t timeout); /* timeout is specified in microseconds */
56	extern "C" int __ulock_wake(uint32_t operation, void *addr, uint64_t wake_value);	61	extern "C" int __ulock_wake(uint32_t operation, void *addr, uint64_t wake_value);
57		62
58	#define UL_COMPARE_AND_WAIT 1	63	#define UL_COMPARE_AND_WAIT 1
59	#define ULF_WAKE_ALL 0x00000100	64	#define ULF_WAKE_ALL 0x00000100
60		65
61	static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,	66	static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
62	__cxx_contention_t __val)	67	__cxx_contention_t __val)
...	@@ -72,6 +77,22 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo	...	@@ -72,6 +77,22 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
72	const_cast<__cxx_atomic_contention_t*>(__ptr), 0);	77	const_cast<__cxx_atomic_contention_t*>(__ptr), 0);
73	}	78	}
74		79
		80	#elif defined(__FreeBSD__)
		81
		82	static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
		83	__cxx_contention_t __val)
		84	{
		85	_umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
		86	UMTX_OP_WAIT_UINT_PRIVATE, __val, NULL, NULL);
		87	}
		88
		89	static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr,
		90	bool __notify_one)
		91	{
		92	_umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
		93	UMTX_OP_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, NULL, NULL);
		94	}
		95
75	#else // <- Add other operating systems here	96	#else // <- Add other operating systems here
76		97
77	// Baseline is just a timed backoff	98	// Baseline is just a timed backoff

lib/libcxx/src/charconv.cpp+2-2

...	@@ -21,13 +21,13 @@ namespace __itoa	...	@@ -21,13 +21,13 @@ namespace __itoa
21	_LIBCPP_FUNC_VIS char*	21	_LIBCPP_FUNC_VIS char*
22	__u32toa(uint32_t value, char* buffer) noexcept	22	__u32toa(uint32_t value, char* buffer) noexcept
23	{	23	{
24	return __base_10_u32(buffer, value);	24	return __base_10_u32(buffer, value);
25	}	25	}
26		26
27	_LIBCPP_FUNC_VIS char*	27	_LIBCPP_FUNC_VIS char*
28	__u64toa(uint64_t value, char* buffer) noexcept	28	__u64toa(uint64_t value, char* buffer) noexcept
29	{	29	{
30	return __base_10_u64(buffer, value);	30	return __base_10_u64(buffer, value);
31	}	31	}
32		32
33	} // namespace __itoa	33	} // namespace __itoa

lib/libcxx/src/experimental/memory_resource.cpp+3-1

...	@@ -8,6 +8,8 @@	...	@@ -8,6 +8,8 @@
8		8
9	#include <experimental/memory_resource>	9	#include <experimental/memory_resource>
10		10
		11	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
		12
11	#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER	13	#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
12	# include <atomic>	14	# include <atomic>
13	#elif !defined(_LIBCPP_HAS_NO_THREADS)	15	#elif !defined(_LIBCPP_HAS_NO_THREADS)
...	@@ -72,7 +74,7 @@ union ResourceInitHelper {	...	@@ -72,7 +74,7 @@ union ResourceInitHelper {
72	__null_memory_resource_imp null_res;	74	__null_memory_resource_imp null_res;
73	} resources;	75	} resources;
74	char dummy;	76	char dummy;
75	_LIBCPP_CONSTEXPR_AFTER_CXX11 ResourceInitHelper() : resources() {}	77	_LIBCPP_CONSTEXPR_SINCE_CXX14 ResourceInitHelper() : resources() {}
76	~ResourceInitHelper() {}	78	~ResourceInitHelper() {}
77	};	79	};
78		80

lib/libcxx/src/filesystem/filesystem_common.h+10-10

...	@@ -124,7 +124,7 @@ error_code make_windows_error(int err) {	...	@@ -124,7 +124,7 @@ error_code make_windows_error(int err) {
124	template <class T>	124	template <class T>
125	T error_value();	125	T error_value();
126	template <>	126	template <>
127	_LIBCPP_CONSTEXPR_AFTER_CXX11 void error_value<void>() {}	127	_LIBCPP_CONSTEXPR_SINCE_CXX14 void error_value<void>() {}
128	template <>	128	template <>
129	bool error_value<bool>() {	129	bool error_value<bool>() {
130	return false;	130	return false;
...	@@ -140,7 +140,7 @@ uintmax_t error_value<uintmax_t>() {	...	@@ -140,7 +140,7 @@ uintmax_t error_value<uintmax_t>() {
140	return uintmax_t(-1);	140	return uintmax_t(-1);
141	}	141	}
142	template <>	142	template <>
143	_LIBCPP_CONSTEXPR_AFTER_CXX11 file_time_type error_value<file_time_type>() {	143	_LIBCPP_CONSTEXPR_SINCE_CXX14 file_time_type error_value<file_time_type>() {
144	return file_time_type::min();	144	return file_time_type::min();
145	}	145	}
146	template <>	146	template <>
...	@@ -309,7 +309,7 @@ struct time_util_base {	...	@@ -309,7 +309,7 @@ struct time_util_base {
309	.count();	309	.count();
310		310
311	private:	311	private:
312	static _LIBCPP_CONSTEXPR_AFTER_CXX11 fs_duration get_min_nsecs() {	312	static _LIBCPP_CONSTEXPR_SINCE_CXX14 fs_duration get_min_nsecs() {
313	return duration_cast<fs_duration>(	313	return duration_cast<fs_duration>(
314	fs_nanoseconds(min_nsec_timespec) -	314	fs_nanoseconds(min_nsec_timespec) -
315	duration_cast<fs_nanoseconds>(fs_seconds(1)));	315	duration_cast<fs_nanoseconds>(fs_seconds(1)));
...	@@ -319,7 +319,7 @@ private:	...	@@ -319,7 +319,7 @@ private:
319	FileTimeT::duration::min(),	319	FileTimeT::duration::min(),
320	"value doesn't roundtrip");	320	"value doesn't roundtrip");
321		321
322	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool check_range() {	322	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool check_range() {
323	// This kinda sucks, but it's what happens when we don't have __int128_t.	323	// This kinda sucks, but it's what happens when we don't have __int128_t.
324	if (sizeof(TimeT) == sizeof(rep)) {	324	if (sizeof(TimeT) == sizeof(rep)) {
325	typedef duration<long long, ratio<3600 * 24 * 365> > Years;	325	typedef duration<long long, ratio<3600 * 24 * 365> > Years;
...	@@ -385,7 +385,7 @@ struct time_util : time_util_base<FileTimeT, TimeT> {	...	@@ -385,7 +385,7 @@ struct time_util : time_util_base<FileTimeT, TimeT> {
385		385
386	public:	386	public:
387	template <class CType, class ChronoType>	387	template <class CType, class ChronoType>
388	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool checked_set(CType* out,	388	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool checked_set(CType* out,
389	ChronoType time) {	389	ChronoType time) {
390	using Lim = numeric_limits<CType>;	390	using Lim = numeric_limits<CType>;
391	if (time > Lim::max() \|\| time < Lim::min())	391	if (time > Lim::max() \|\| time < Lim::min())
...	@@ -394,7 +394,7 @@ public:	...	@@ -394,7 +394,7 @@ public:
394	return true;	394	return true;
395	}	395	}
396		396
397	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool is_representable(TimeSpecT tm) {	397	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool is_representable(TimeSpecT tm) {
398	if (tm.tv_sec >= 0) {	398	if (tm.tv_sec >= 0) {
399	return tm.tv_sec < max_seconds \|\|	399	return tm.tv_sec < max_seconds \|\|
400	(tm.tv_sec == max_seconds && tm.tv_nsec <= max_nsec);	400	(tm.tv_sec == max_seconds && tm.tv_nsec <= max_nsec);
...	@@ -405,7 +405,7 @@ public:	...	@@ -405,7 +405,7 @@ public:
405	}	405	}
406	}	406	}
407		407
408	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool is_representable(FileTimeT tm) {	408	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool is_representable(FileTimeT tm) {
409	auto secs = duration_cast<fs_seconds>(tm.time_since_epoch());	409	auto secs = duration_cast<fs_seconds>(tm.time_since_epoch());
410	auto nsecs = duration_cast<fs_nanoseconds>(tm.time_since_epoch() - secs);	410	auto nsecs = duration_cast<fs_nanoseconds>(tm.time_since_epoch() - secs);
411	if (nsecs.count() < 0) {	411	if (nsecs.count() < 0) {
...	@@ -418,7 +418,7 @@ public:	...	@@ -418,7 +418,7 @@ public:
418	return secs.count() >= TLim::min();	418	return secs.count() >= TLim::min();
419	}	419	}
420		420
421	static _LIBCPP_CONSTEXPR_AFTER_CXX11 FileTimeT	421	static _LIBCPP_CONSTEXPR_SINCE_CXX14 FileTimeT
422	convert_from_timespec(TimeSpecT tm) {	422	convert_from_timespec(TimeSpecT tm) {
423	if (tm.tv_sec >= 0 \|\| tm.tv_nsec == 0) {	423	if (tm.tv_sec >= 0 \|\| tm.tv_nsec == 0) {
424	return FileTimeT(fs_seconds(tm.tv_sec) +	424	return FileTimeT(fs_seconds(tm.tv_sec) +
...	@@ -432,7 +432,7 @@ public:	...	@@ -432,7 +432,7 @@ public:
432	}	432	}
433		433
434	template <class SubSecT>	434	template <class SubSecT>
435	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool	435	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
436	set_times_checked(TimeT* sec_out, SubSecT* subsec_out, FileTimeT tp) {	436	set_times_checked(TimeT* sec_out, SubSecT* subsec_out, FileTimeT tp) {
437	auto dur = tp.time_since_epoch();	437	auto dur = tp.time_since_epoch();
438	auto sec_dur = duration_cast<fs_seconds>(dur);	438	auto sec_dur = duration_cast<fs_seconds>(dur);
...	@@ -449,7 +449,7 @@ public:	...	@@ -449,7 +449,7 @@ public:
449	return checked_set(sec_out, sec_dur.count()) &&	449	return checked_set(sec_out, sec_dur.count()) &&
450	checked_set(subsec_out, subsec_dur.count());	450	checked_set(subsec_out, subsec_dur.count());
451	}	451	}
452	static _LIBCPP_CONSTEXPR_AFTER_CXX11 bool convert_to_timespec(TimeSpecT& dest,	452	static _LIBCPP_CONSTEXPR_SINCE_CXX14 bool convert_to_timespec(TimeSpecT& dest,
453	FileTimeT tp) {	453	FileTimeT tp) {
454	if (!is_representable(tp))	454	if (!is_representable(tp))
455	return false;	455	return false;

lib/libcxx/src/filesystem/operations.cpp+2-1

...	@@ -1348,7 +1348,7 @@ bool __remove(const path& p, error_code* ec) {	...	@@ -1348,7 +1348,7 @@ bool __remove(const path& p, error_code* ec) {
1348	//	1348	//
1349	// The second implementation is used on platforms where `openat()` & friends are available,	1349	// The second implementation is used on platforms where `openat()` & friends are available,
1350	// and it threads file descriptors through recursive calls to avoid such race conditions.	1350	// and it threads file descriptors through recursive calls to avoid such race conditions.
1351	#if defined(_LIBCPP_WIN32API)	1351	#if defined(_LIBCPP_WIN32API) \|\| defined (__MVS__)
1352	# define REMOVE_ALL_USE_DIRECTORY_ITERATOR	1352	# define REMOVE_ALL_USE_DIRECTORY_ITERATOR
1353	#endif	1353	#endif
1354		1354
...	@@ -1408,6 +1408,7 @@ struct scope_exit {	...	@@ -1408,6 +1408,7 @@ struct scope_exit {
1408	private:	1408	private:
1409	Cleanup cleanup_;	1409	Cleanup cleanup_;
1410	};	1410	};
		1411	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(scope_exit);
1411		1412
1412	uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) {	1413	uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) {
1413	// First, try to open the path as a directory.	1414	// First, try to open the path as a directory.

lib/libcxx/src/format.cpp+2

...	@@ -10,6 +10,8 @@	...	@@ -10,6 +10,8 @@
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
12		12
		13	#ifndef _LIBCPP_INLINE_FORMAT_ERROR_DTOR
13	format_error::~format_error() noexcept = default;	14	format_error::~format_error() noexcept = default;
		15	#endif
14		16
15	_LIBCPP_END_NAMESPACE_STD	17	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/include/apple_availability.h+1

...	@@ -5,6 +5,7 @@	...	@@ -5,6 +5,7 @@
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//	6	//
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
		8
8	#ifndef _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H	9	#ifndef _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H
9	#define _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H	10	#define _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H
10		11

lib/libcxx/src/include/ryu/digit_table.h+1-1

...	@@ -50,7 +50,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -50,7 +50,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
50	// In order to minimize the diff in the Ryu code between MSVC STL and libc++	50	// In order to minimize the diff in the Ryu code between MSVC STL and libc++
51	// the code uses the name __DIGIT_TABLE. In order to avoid code duplication it	51	// the code uses the name __DIGIT_TABLE. In order to avoid code duplication it
52	// reuses the table already available in libc++.	52	// reuses the table already available in libc++.
53	inline constexpr auto& __DIGIT_TABLE = __itoa::__table<>::__digits_base_10;	53	inline constexpr auto& __DIGIT_TABLE = __itoa::__digits_base_10;
54		54
55	_LIBCPP_END_NAMESPACE_STD	55	_LIBCPP_END_NAMESPACE_STD
56		56

lib/libcxx/src/ios.cpp+5-5

...	@@ -145,11 +145,11 @@ int ios_base::__xindex_ = 0;	...	@@ -145,11 +145,11 @@ int ios_base::__xindex_ = 0;
145	template <typename _Tp>	145	template <typename _Tp>
146	static size_t __ios_new_cap(size_t __req_size, size_t __current_cap)	146	static size_t __ios_new_cap(size_t __req_size, size_t __current_cap)
147	{ // Precondition: __req_size > __current_cap	147	{ // Precondition: __req_size > __current_cap
148	const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp);	148	const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp);
149	if (__req_size < mx/2)	149	if (__req_size < mx/2)
150	return _VSTD::max(2 * __current_cap, __req_size);	150	return _VSTD::max(2 * __current_cap, __req_size);
151	else	151	else
152	return mx;	152	return mx;
153	}	153	}
154		154
155	int	155	int

lib/libcxx/src/ios.instantiations.cpp+3

 @@ -36,9 +36,12 @@ template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_stringbuf<char>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_stringstream<char>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ostringstream<char>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_istringstream<char>;
+#ifndef _LIBCPP_HAS_NO_FSTREAM
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ifstream<char>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ofstream<char>;
 template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_filebuf<char>;
+#endif
 // Add more here if needed...

lib/libcxx/src/iostream.cpp+2-2

...	@@ -109,8 +109,8 @@ static void force_locale_initialization() {	...	@@ -109,8 +109,8 @@ static void force_locale_initialization() {
109		109
110	class DoIOSInit {	110	class DoIOSInit {
111	public:	111	public:
112	DoIOSInit();	112	DoIOSInit();
113	~DoIOSInit();	113	~DoIOSInit();
114	};	114	};
115		115
116	DoIOSInit::DoIOSInit()	116	DoIOSInit::DoIOSInit()

lib/libcxx/src/locale.cpp+160-167

 @@ -141,14 +141,7 @@ class _LIBCPP_HIDDEN locale::__imp
     : public facet
 {
     enum {N = 30};
-#if defined(_LIBCPP_COMPILER_MSVC)
-// FIXME: MSVC doesn't support aligned parameters by value.
-// I can't get the __sso_allocator to work here
-// for MSVC I think for this reason.
-    vector<facet*> facets_;
-#else
     vector<facet*, __sso_allocator<facet*, N> > facets_;
-#endif
     string         name_;
 public:
     explicit __imp(size_t refs = 0);
 @@ -739,25 +732,25 @@ locale::id::__init()
 collate_byname<char>::collate_byname(const char* n, size_t refs)
     : collate<char>(refs),
-      __l(newlocale(LC_ALL_MASK, n, 0))
+      __l_(newlocale(LC_ALL_MASK, n, 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("collate_byname<char>::collate_byname"
                             " failed to construct for " + string(n));
 }
 collate_byname<char>::collate_byname(const string& name, size_t refs)
     : collate<char>(refs),
-      __l(newlocale(LC_ALL_MASK, name.c_str(), 0))
+      __l_(newlocale(LC_ALL_MASK, name.c_str(), 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("collate_byname<char>::collate_byname"
                             " failed to construct for " + name);
 }
 collate_byname<char>::~collate_byname()
 {
-    freelocale(__l);
+    freelocale(__l_);
 }
 int
 @@ -766,7 +759,7 @@ collate_byname<char>::do_compare(const char_type* __lo1, const char_type* __hi1,
 {
     string_type lhs(__lo1, __hi1);
     string_type rhs(__lo2, __hi2);
-    int r = strcoll_l(lhs.c_str(), rhs.c_str(), __l);
+    int r = strcoll_l(lhs.c_str(), rhs.c_str(), __l_);
     if (r < 0)
         return -1;
     if (r > 0)
 @@ -778,8 +771,8 @@ collate_byname<char>::string_type
 collate_byname<char>::do_transform(const char_type* lo, const char_type* hi) const
 {
     const string_type in(lo, hi);
-    string_type out(strxfrm_l(0, in.c_str(), 0, __l), char());
+    string_type out(strxfrm_l(0, in.c_str(), 0, __l_), char());
-    strxfrm_l(const_cast<char*>(out.c_str()), in.c_str(), out.size()+1, __l);
+    strxfrm_l(const_cast<char*>(out.c_str()), in.c_str(), out.size()+1, __l_);
     return out;
 }
 @@ -788,25 +781,25 @@ collate_byname<char>::do_transform(const char_type* lo, const char_type* hi) con
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 collate_byname<wchar_t>::collate_byname(const char* n, size_t refs)
     : collate<wchar_t>(refs),
-      __l(newlocale(LC_ALL_MASK, n, 0))
+      __l_(newlocale(LC_ALL_MASK, n, 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("collate_byname<wchar_t>::collate_byname(size_t refs)"
                             " failed to construct for " + string(n));
 }
 collate_byname<wchar_t>::collate_byname(const string& name, size_t refs)
     : collate<wchar_t>(refs),
-      __l(newlocale(LC_ALL_MASK, name.c_str(), 0))
+      __l_(newlocale(LC_ALL_MASK, name.c_str(), 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("collate_byname<wchar_t>::collate_byname(size_t refs)"
                             " failed to construct for " + name);
 }
 collate_byname<wchar_t>::~collate_byname()
 {
-    freelocale(__l);
+    freelocale(__l_);
 }
 int
 @@ -815,7 +808,7 @@ collate_byname<wchar_t>::do_compare(const char_type* __lo1, const char_type* __h
 {
     string_type lhs(__lo1, __hi1);
     string_type rhs(__lo2, __hi2);
-    int r = wcscoll_l(lhs.c_str(), rhs.c_str(), __l);
+    int r = wcscoll_l(lhs.c_str(), rhs.c_str(), __l_);
     if (r < 0)
         return -1;
     if (r > 0)
 @@ -827,8 +820,8 @@ collate_byname<wchar_t>::string_type
 collate_byname<wchar_t>::do_transform(const char_type* lo, const char_type* hi) const
 {
     const string_type in(lo, hi);
-    string_type out(wcsxfrm_l(0, in.c_str(), 0, __l), wchar_t());
+    string_type out(wcsxfrm_l(0, in.c_str(), 0, __l_), wchar_t());
-    wcsxfrm_l(const_cast<wchar_t*>(out.c_str()), in.c_str(), out.size()+1, __l);
+    wcsxfrm_l(const_cast<wchar_t*>(out.c_str()), in.c_str(), out.size()+1, __l_);
     return out;
 }
 #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 @@ -1190,7 +1183,7 @@ ctype<char>::classic_table() noexcept
 const ctype<char>::mask*
 ctype<char>::classic_table() noexcept
 {
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     return _DefaultRuneLocale.__runetype;
 #elif defined(__NetBSD__)
     return _C_ctype_tab_ + 1;
 @@ -1286,52 +1279,52 @@ ctype<char>::__classic_upper_table() _NOEXCEPT
 ctype_byname<char>::ctype_byname(const char* name, size_t refs)
     : ctype<char>(0, false, refs),
-      __l(newlocale(LC_ALL_MASK, name, 0))
+      __l_(newlocale(LC_ALL_MASK, name, 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("ctype_byname<char>::ctype_byname"
                             " failed to construct for " + string(name));
 }
 ctype_byname<char>::ctype_byname(const string& name, size_t refs)
     : ctype<char>(0, false, refs),
-      __l(newlocale(LC_ALL_MASK, name.c_str(), 0))
+      __l_(newlocale(LC_ALL_MASK, name.c_str(), 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("ctype_byname<char>::ctype_byname"
                             " failed to construct for " + name);
 }
 ctype_byname<char>::~ctype_byname()
 {
-    freelocale(__l);
+    freelocale(__l_);
 }
 char
 ctype_byname<char>::do_toupper(char_type c) const
 {
-    return static_cast<char>(toupper_l(static_cast<unsigned char>(c), __l));
+    return static_cast<char>(toupper_l(static_cast<unsigned char>(c), __l_));
 }
 const char*
 ctype_byname<char>::do_toupper(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
-        *low = static_cast<char>(toupper_l(static_cast<unsigned char>(*low), __l));
+        *low = static_cast<char>(toupper_l(static_cast<unsigned char>(*low), __l_));
     return low;
 }
 char
 ctype_byname<char>::do_tolower(char_type c) const
 {
-    return static_cast<char>(tolower_l(static_cast<unsigned char>(c), __l));
+    return static_cast<char>(tolower_l(static_cast<unsigned char>(c), __l_));
 }
 const char*
 ctype_byname<char>::do_tolower(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
-        *low = static_cast<char>(tolower_l(static_cast<unsigned char>(*low), __l));
+        *low = static_cast<char>(tolower_l(static_cast<unsigned char>(*low), __l_));
     return low;
 }
 @@ -1340,45 +1333,45 @@ ctype_byname<char>::do_tolower(char_type* low, const char_type* high) const
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 ctype_byname<wchar_t>::ctype_byname(const char* name, size_t refs)
     : ctype<wchar_t>(refs),
-      __l(newlocale(LC_ALL_MASK, name, 0))
+      __l_(newlocale(LC_ALL_MASK, name, 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("ctype_byname<wchar_t>::ctype_byname"
                             " failed to construct for " + string(name));
 }
 ctype_byname<wchar_t>::ctype_byname(const string& name, size_t refs)
     : ctype<wchar_t>(refs),
-      __l(newlocale(LC_ALL_MASK, name.c_str(), 0))
+      __l_(newlocale(LC_ALL_MASK, name.c_str(), 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("ctype_byname<wchar_t>::ctype_byname"
                             " failed to construct for " + name);
 }
 ctype_byname<wchar_t>::~ctype_byname()
 {
-    freelocale(__l);
+    freelocale(__l_);
 }
 bool
 ctype_byname<wchar_t>::do_is(mask m, char_type c) const
 {
 #ifdef _LIBCPP_WCTYPE_IS_MASK
-    return static_cast<bool>(iswctype_l(c, m, __l));
+    return static_cast<bool>(iswctype_l(c, m, __l_));
 #else
     bool result = false;
     wint_t ch = static_cast<wint_t>(c);
-    if ((m & space) == space) result |= (iswspace_l(ch, __l) != 0);
+    if ((m & space) == space) result |= (iswspace_l(ch, __l_) != 0);
-    if ((m & print) == print) result |= (iswprint_l(ch, __l) != 0);
+    if ((m & print) == print) result |= (iswprint_l(ch, __l_) != 0);
-    if ((m & cntrl) == cntrl) result |= (iswcntrl_l(ch, __l) != 0);
+    if ((m & cntrl) == cntrl) result |= (iswcntrl_l(ch, __l_) != 0);
-    if ((m & upper) == upper) result |= (iswupper_l(ch, __l) != 0);
+    if ((m & upper) == upper) result |= (iswupper_l(ch, __l_) != 0);
-    if ((m & lower) == lower) result |= (iswlower_l(ch, __l) != 0);
+    if ((m & lower) == lower) result |= (iswlower_l(ch, __l_) != 0);
-    if ((m & alpha) == alpha) result |= (iswalpha_l(ch, __l) != 0);
+    if ((m & alpha) == alpha) result |= (iswalpha_l(ch, __l_) != 0);
-    if ((m & digit) == digit) result |= (iswdigit_l(ch, __l) != 0);
+    if ((m & digit) == digit) result |= (iswdigit_l(ch, __l_) != 0);
-    if ((m & punct) == punct) result |= (iswpunct_l(ch, __l) != 0);
+    if ((m & punct) == punct) result |= (iswpunct_l(ch, __l_) != 0);
-    if ((m & xdigit) == xdigit) result |= (iswxdigit_l(ch, __l) != 0);
+    if ((m & xdigit) == xdigit) result |= (iswxdigit_l(ch, __l_) != 0);
-    if ((m & blank) == blank) result |= (iswblank_l(ch, __l) != 0);
+    if ((m & blank) == blank) result |= (iswblank_l(ch, __l_) != 0);
     return result;
 #endif
 }
 @@ -1394,32 +1387,32 @@ ctype_byname<wchar_t>::do_is(const char_type* low, const char_type* high, mask*
         {
             *vec = 0;
             wint_t ch = static_cast<wint_t>(*low);
-            if (iswspace_l(ch, __l))
+            if (iswspace_l(ch, __l_))
                 *vec |= space;
 #ifndef _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT
-            if (iswprint_l(ch, __l))
+            if (iswprint_l(ch, __l_))
                 *vec |= print;
 #endif
-            if (iswcntrl_l(ch, __l))
+            if (iswcntrl_l(ch, __l_))
                 *vec |= cntrl;
-            if (iswupper_l(ch, __l))
+            if (iswupper_l(ch, __l_))
                 *vec |= upper;
-            if (iswlower_l(ch, __l))
+            if (iswlower_l(ch, __l_))
                 *vec |= lower;
 #ifndef _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA
-            if (iswalpha_l(ch, __l))
+            if (iswalpha_l(ch, __l_))
                 *vec |= alpha;
 #endif
-            if (iswdigit_l(ch, __l))
+            if (iswdigit_l(ch, __l_))
                 *vec |= digit;
-            if (iswpunct_l(ch, __l))
+            if (iswpunct_l(ch, __l_))
                 *vec |= punct;
 #ifndef _LIBCPP_CTYPE_MASK_IS_COMPOSITE_XDIGIT
-            if (iswxdigit_l(ch, __l))
+            if (iswxdigit_l(ch, __l_))
                 *vec |= xdigit;
 #endif
 #if !defined(__sun__)
-            if (iswblank_l(ch, __l))
+            if (iswblank_l(ch, __l_))
                 *vec |= blank;
 #endif
         }
 @@ -1433,20 +1426,20 @@ ctype_byname<wchar_t>::do_scan_is(mask m, const char_type* low, const char_type*
     for (; low != high; ++low)
     {
 #ifdef _LIBCPP_WCTYPE_IS_MASK
-        if (iswctype_l(*low, m, __l))
+        if (iswctype_l(*low, m, __l_))
             break;
 #else
         wint_t ch = static_cast<wint_t>(*low);
-        if ((m & space) == space && iswspace_l(ch, __l)) break;
+        if ((m & space) == space && iswspace_l(ch, __l_)) break;
-        if ((m & print) == print && iswprint_l(ch, __l)) break;
+        if ((m & print) == print && iswprint_l(ch, __l_)) break;
-        if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l)) break;
+        if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l_)) break;
-        if ((m & upper) == upper && iswupper_l(ch, __l)) break;
+        if ((m & upper) == upper && iswupper_l(ch, __l_)) break;
-        if ((m & lower) == lower && iswlower_l(ch, __l)) break;
+        if ((m & lower) == lower && iswlower_l(ch, __l_)) break;
-        if ((m & alpha) == alpha && iswalpha_l(ch, __l)) break;
+        if ((m & alpha) == alpha && iswalpha_l(ch, __l_)) break;
-        if ((m & digit) == digit && iswdigit_l(ch, __l)) break;
+        if ((m & digit) == digit && iswdigit_l(ch, __l_)) break;
-        if ((m & punct) == punct && iswpunct_l(ch, __l)) break;
+        if ((m & punct) == punct && iswpunct_l(ch, __l_)) break;
-        if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l)) break;
+        if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l_)) break;
-        if ((m & blank) == blank && iswblank_l(ch, __l)) break;
+        if ((m & blank) == blank && iswblank_l(ch, __l_)) break;
 #endif
     }
     return low;
 @@ -1458,20 +1451,20 @@ ctype_byname<wchar_t>::do_scan_not(mask m, const char_type* low, const char_type
     for (; low != high; ++low)
     {
 #ifdef _LIBCPP_WCTYPE_IS_MASK
-        if (!iswctype_l(*low, m, __l))
+        if (!iswctype_l(*low, m, __l_))
             break;
 #else
         wint_t ch = static_cast<wint_t>(*low);
-        if ((m & space) == space && iswspace_l(ch, __l)) continue;
+        if ((m & space) == space && iswspace_l(ch, __l_)) continue;
-        if ((m & print) == print && iswprint_l(ch, __l)) continue;
+        if ((m & print) == print && iswprint_l(ch, __l_)) continue;
-        if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l)) continue;
+        if ((m & cntrl) == cntrl && iswcntrl_l(ch, __l_)) continue;
-        if ((m & upper) == upper && iswupper_l(ch, __l)) continue;
+        if ((m & upper) == upper && iswupper_l(ch, __l_)) continue;
-        if ((m & lower) == lower && iswlower_l(ch, __l)) continue;
+        if ((m & lower) == lower && iswlower_l(ch, __l_)) continue;
-        if ((m & alpha) == alpha && iswalpha_l(ch, __l)) continue;
+        if ((m & alpha) == alpha && iswalpha_l(ch, __l_)) continue;
-        if ((m & digit) == digit && iswdigit_l(ch, __l)) continue;
+        if ((m & digit) == digit && iswdigit_l(ch, __l_)) continue;
-        if ((m & punct) == punct && iswpunct_l(ch, __l)) continue;
+        if ((m & punct) == punct && iswpunct_l(ch, __l_)) continue;
-        if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l)) continue;
+        if ((m & xdigit) == xdigit && iswxdigit_l(ch, __l_)) continue;
-        if ((m & blank) == blank && iswblank_l(ch, __l)) continue;
+        if ((m & blank) == blank && iswblank_l(ch, __l_)) continue;
         break;
 #endif
     }
 @@ -1481,49 +1474,49 @@ ctype_byname<wchar_t>::do_scan_not(mask m, const char_type* low, const char_type
 wchar_t
 ctype_byname<wchar_t>::do_toupper(char_type c) const
 {
-    return towupper_l(c, __l);
+    return towupper_l(c, __l_);
 }
 const wchar_t*
 ctype_byname<wchar_t>::do_toupper(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
-        *low = towupper_l(*low, __l);
+        *low = towupper_l(*low, __l_);
     return low;
 }
 wchar_t
 ctype_byname<wchar_t>::do_tolower(char_type c) const
 {
-    return towlower_l(c, __l);
+    return towlower_l(c, __l_);
 }
 const wchar_t*
 ctype_byname<wchar_t>::do_tolower(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
-        *low = towlower_l(*low, __l);
+        *low = towlower_l(*low, __l_);
     return low;
 }
 wchar_t
 ctype_byname<wchar_t>::do_widen(char c) const
 {
-    return __libcpp_btowc_l(c, __l);
+    return __libcpp_btowc_l(c, __l_);
 }
 const char*
 ctype_byname<wchar_t>::do_widen(const char* low, const char* high, char_type* dest) const
 {
     for (; low != high; ++low, ++dest)
-        *dest = __libcpp_btowc_l(*low, __l);
+        *dest = __libcpp_btowc_l(*low, __l_);
     return low;
 }
 char
 ctype_byname<wchar_t>::do_narrow(char_type c, char dfault) const
 {
-    int r = __libcpp_wctob_l(c, __l);
+    int r = __libcpp_wctob_l(c, __l_);
     return (r != EOF) ? static_cast<char>(r) : dfault;
 }
 @@ -1532,7 +1525,7 @@ ctype_byname<wchar_t>::do_narrow(const char_type* low, const char_type* high, ch
 {
     for (; low != high; ++low, ++dest)
     {
-        int r = __libcpp_wctob_l(*low, __l);
+        int r = __libcpp_wctob_l(*low, __l_);
         *dest = (r != EOF) ? static_cast<char>(r) : dfault;
     }
     return low;
 @@ -1607,23 +1600,23 @@ locale::id codecvt<wchar_t, char, mbstate_t>::id;
 codecvt<wchar_t, char, mbstate_t>::codecvt(size_t refs)
     : locale::facet(refs),
-      __l(_LIBCPP_GET_C_LOCALE)
+      __l_(_LIBCPP_GET_C_LOCALE)
 {
 }
 codecvt<wchar_t, char, mbstate_t>::codecvt(const char* nm, size_t refs)
     : locale::facet(refs),
-      __l(newlocale(LC_ALL_MASK, nm, 0))
+      __l_(newlocale(LC_ALL_MASK, nm, 0))
 {
-    if (__l == 0)
+    if (__l_ == 0)
         __throw_runtime_error("codecvt_byname<wchar_t, char, mbstate_t>::codecvt_byname"
                             " failed to construct for " + string(nm));
 }
 codecvt<wchar_t, char, mbstate_t>::~codecvt()
 {
-    if (__l != _LIBCPP_GET_C_LOCALE)
+    if (__l_ != _LIBCPP_GET_C_LOCALE)
-        freelocale(__l);
+        freelocale(__l_);
 }
 codecvt<wchar_t, char, mbstate_t>::result
 @@ -1643,13 +1636,13 @@ codecvt<wchar_t, char, mbstate_t>::do_out(state_type& st,
         // save state in case it is needed to recover to_nxt on error
         mbstate_t save_state = st;
         size_t n = __libcpp_wcsnrtombs_l(to, &frm_nxt, static_cast<size_t>(fend-frm),
-                                     static_cast<size_t>(to_end-to), &st, __l);
+                                     static_cast<size_t>(to_end-to), &st, __l_);
         if (n == size_t(-1))
         {
             // need to recover to_nxt
             for (to_nxt = to; frm != frm_nxt; ++frm)
             {
-                n = __libcpp_wcrtomb_l(to_nxt, *frm, &save_state, __l);
+                n = __libcpp_wcrtomb_l(to_nxt, *frm, &save_state, __l_);
                 if (n == size_t(-1))
                     break;
                 to_nxt += n;
 @@ -1666,7 +1659,7 @@ codecvt<wchar_t, char, mbstate_t>::do_out(state_type& st,
         {
             // Try to write the terminating null
             extern_type tmp[MB_LEN_MAX];
-            n = __libcpp_wcrtomb_l(tmp, intern_type(), &st, __l);
+            n = __libcpp_wcrtomb_l(tmp, intern_type(), &st, __l_);
             if (n == size_t(-1))  // on error
                 return error;
             if (n > static_cast<size_t>(to_end-to_nxt))  // is there room?
 @@ -1700,14 +1693,14 @@ codecvt<wchar_t, char, mbstate_t>::do_in(state_type& st,
         // save state in case it is needed to recover to_nxt on error
         mbstate_t save_state = st;
         size_t n = __libcpp_mbsnrtowcs_l(to, &frm_nxt, static_cast<size_t>(fend-frm),
-                                     static_cast<size_t>(to_end-to), &st, __l);
+                                     static_cast<size_t>(to_end-to), &st, __l_);
         if (n == size_t(-1))
         {
             // need to recover to_nxt
             for (to_nxt = to; frm != frm_nxt; ++to_nxt)
             {
                 n = __libcpp_mbrtowc_l(to_nxt, frm, static_cast<size_t>(fend-frm),
-                                   &save_state, __l);
+                                   &save_state, __l_);
                 switch (n)
                 {
                 case 0:
 @@ -1735,7 +1728,7 @@ codecvt<wchar_t, char, mbstate_t>::do_in(state_type& st,
         if (fend != frm_end)  // set up next null terminated sequence
         {
             // Try to write the terminating null
-            n = __libcpp_mbrtowc_l(to_nxt, frm_nxt, 1, &st, __l);
+            n = __libcpp_mbrtowc_l(to_nxt, frm_nxt, 1, &st, __l_);
             if (n != 0)  // on error
                 return error;
             ++to_nxt;
 @@ -1755,7 +1748,7 @@ codecvt<wchar_t, char, mbstate_t>::do_unshift(state_type& st,
 {
     to_nxt = to;
     extern_type tmp[MB_LEN_MAX];
-    size_t n = __libcpp_wcrtomb_l(tmp, intern_type(), &st, __l);
+    size_t n = __libcpp_wcrtomb_l(tmp, intern_type(), &st, __l_);
     if (n == size_t(-1) || n == 0)  // on error
         return error;
     --n;
 @@ -1769,11 +1762,11 @@ codecvt<wchar_t, char, mbstate_t>::do_unshift(state_type& st,
 int
 codecvt<wchar_t, char, mbstate_t>::do_encoding() const noexcept
 {
-    if (__libcpp_mbtowc_l(nullptr, nullptr, MB_LEN_MAX, __l) != 0)
+    if (__libcpp_mbtowc_l(nullptr, nullptr, MB_LEN_MAX, __l_) != 0)
         return -1;
     // stateless encoding
-    if (__l == 0 || __libcpp_mb_cur_max_l(__l) == 1)  // there are no known constant length encodings
+    if (__l_ == 0 || __libcpp_mb_cur_max_l(__l_) == 1)  // there are no known constant length encodings
         return 1;                // which take more than 1 char to form a wchar_t
     return 0;
 }
 @@ -1791,7 +1784,7 @@ codecvt<wchar_t, char, mbstate_t>::do_length(state_type& st,
     int nbytes = 0;
     for (size_t nwchar_t = 0; nwchar_t < mx && frm != frm_end; ++nwchar_t)
     {
-        size_t n = __libcpp_mbrlen_l(frm, static_cast<size_t>(frm_end-frm), &st, __l);
+        size_t n = __libcpp_mbrlen_l(frm, static_cast<size_t>(frm_end-frm), &st, __l_);
         switch (n)
         {
         case 0:
 @@ -1813,7 +1806,7 @@ codecvt<wchar_t, char, mbstate_t>::do_length(state_type& st,
 int
 codecvt<wchar_t, char, mbstate_t>::do_max_length() const noexcept
 {
-    return __l == 0 ? 1 : static_cast<int>(__libcpp_mb_cur_max_l(__l));
+    return __l_ == 0 ? 1 : static_cast<int>(__libcpp_mb_cur_max_l(__l_));
 }
 #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 @@ -3545,10 +3538,10 @@ __codecvt_utf8<wchar_t>::do_out(state_type&,
     uint8_t* _to_nxt = _to;
 #if defined(_LIBCPP_SHORT_WCHAR)
     result r = ucs2_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
 #else
     result r = ucs4_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3568,13 +3561,13 @@ __codecvt_utf8<wchar_t>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf8_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
 #else
     uint32_t* _to = reinterpret_cast<uint32_t*>(to);
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf8_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3608,9 +3601,9 @@ __codecvt_utf8<wchar_t>::do_length(state_type&,
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
 #if defined(_LIBCPP_SHORT_WCHAR)
-    return utf8_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #else
-    return utf8_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #endif
 }
 @@ -3619,11 +3612,11 @@ int
 __codecvt_utf8<wchar_t>::do_max_length() const noexcept
 {
 #if defined(_LIBCPP_SHORT_WCHAR)
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 3;
 #else
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 7;
     return 4;
 #endif
 @@ -3644,7 +3637,7 @@ __codecvt_utf8<char16_t>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs2_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -3662,7 +3655,7 @@ __codecvt_utf8<char16_t>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf8_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -3694,14 +3687,14 @@ __codecvt_utf8<char16_t>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf8_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf8<char16_t>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 3;
 }
 @@ -3721,7 +3714,7 @@ __codecvt_utf8<char32_t>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs4_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -3739,7 +3732,7 @@ __codecvt_utf8<char32_t>::do_in(state_type&,
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf8_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                            _Maxcode_, _Mode_);
+                            __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -3771,14 +3764,14 @@ __codecvt_utf8<char32_t>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf8_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf8<char32_t>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 7;
     return 4;
 }
 @@ -3806,10 +3799,10 @@ __codecvt_utf16<wchar_t, false>::do_out(state_type&,
     uint8_t* _to_nxt = _to;
 #if defined(_LIBCPP_SHORT_WCHAR)
     result r = ucs2_to_utf16be(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #else
     result r = ucs4_to_utf16be(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3829,13 +3822,13 @@ __codecvt_utf16<wchar_t, false>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf16be_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #else
     uint32_t* _to = reinterpret_cast<uint32_t*>(to);
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf16be_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3869,9 +3862,9 @@ __codecvt_utf16<wchar_t, false>::do_length(state_type&,
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
 #if defined(_LIBCPP_SHORT_WCHAR)
-    return utf16be_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16be_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #else
-    return utf16be_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16be_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #endif
 }
 @@ -3879,11 +3872,11 @@ int
 __codecvt_utf16<wchar_t, false>::do_max_length() const noexcept
 {
 #if defined(_LIBCPP_SHORT_WCHAR)
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 4;
     return 2;
 #else
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 4;
 #endif
 @@ -3910,10 +3903,10 @@ __codecvt_utf16<wchar_t, true>::do_out(state_type&,
     uint8_t* _to_nxt = _to;
 #if defined(_LIBCPP_SHORT_WCHAR)
     result r = ucs2_to_utf16le(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #else
     result r = ucs4_to_utf16le(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3933,13 +3926,13 @@ __codecvt_utf16<wchar_t, true>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf16le_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #else
     uint32_t* _to = reinterpret_cast<uint32_t*>(to);
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf16le_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
 #endif
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
 @@ -3973,9 +3966,9 @@ __codecvt_utf16<wchar_t, true>::do_length(state_type&,
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
 #if defined(_LIBCPP_SHORT_WCHAR)
-    return utf16le_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16le_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #else
-    return utf16le_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16le_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 #endif
 }
 @@ -3983,11 +3976,11 @@ int
 __codecvt_utf16<wchar_t, true>::do_max_length() const noexcept
 {
 #if defined(_LIBCPP_SHORT_WCHAR)
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 4;
     return 2;
 #else
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 4;
 #endif
 @@ -4008,7 +4001,7 @@ __codecvt_utf16<char16_t, false>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs2_to_utf16be(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4026,7 +4019,7 @@ __codecvt_utf16<char16_t, false>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf16be_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4058,14 +4051,14 @@ __codecvt_utf16<char16_t, false>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf16be_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16be_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf16<char16_t, false>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 4;
     return 2;
 }
 @@ -4085,7 +4078,7 @@ __codecvt_utf16<char16_t, true>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs2_to_utf16le(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4103,7 +4096,7 @@ __codecvt_utf16<char16_t, true>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf16le_to_ucs2(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4135,14 +4128,14 @@ __codecvt_utf16<char16_t, true>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf16le_to_ucs2_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16le_to_ucs2_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf16<char16_t, true>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 4;
     return 2;
 }
 @@ -4162,7 +4155,7 @@ __codecvt_utf16<char32_t, false>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs4_to_utf16be(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4180,7 +4173,7 @@ __codecvt_utf16<char32_t, false>::do_in(state_type&,
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf16be_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4212,14 +4205,14 @@ __codecvt_utf16<char32_t, false>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf16be_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16be_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf16<char32_t, false>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 4;
 }
 @@ -4239,7 +4232,7 @@ __codecvt_utf16<char32_t, true>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = ucs4_to_utf16le(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4257,7 +4250,7 @@ __codecvt_utf16<char32_t, true>::do_in(state_type&,
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf16le_to_ucs4(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                               _Maxcode_, _Mode_);
+                               __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4289,14 +4282,14 @@ __codecvt_utf16<char32_t, true>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf16le_to_ucs4_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf16le_to_ucs4_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf16<char32_t, true>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 6;
     return 4;
 }
 @@ -4323,7 +4316,7 @@ __codecvt_utf8_utf16<wchar_t>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = utf16_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4347,7 +4340,7 @@ __codecvt_utf8_utf16<wchar_t>::do_in(state_type&,
     uint32_t* _to_nxt = _to;
 #endif
     result r = utf8_to_utf16(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4379,13 +4372,13 @@ __codecvt_utf8_utf16<wchar_t>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf8_to_utf16_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_utf16_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 int
 __codecvt_utf8_utf16<wchar_t>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 7;
     return 4;
 }
 @@ -4405,7 +4398,7 @@ __codecvt_utf8_utf16<char16_t>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = utf16_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4423,7 +4416,7 @@ __codecvt_utf8_utf16<char16_t>::do_in(state_type&,
     uint16_t* _to_end = reinterpret_cast<uint16_t*>(to_end);
     uint16_t* _to_nxt = _to;
     result r = utf8_to_utf16(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4455,14 +4448,14 @@ __codecvt_utf8_utf16<char16_t>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf8_to_utf16_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_utf16_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf8_utf16<char16_t>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 7;
     return 4;
 }
 @@ -4482,7 +4475,7 @@ __codecvt_utf8_utf16<char32_t>::do_out(state_type&,
     uint8_t* _to_end = reinterpret_cast<uint8_t*>(to_end);
     uint8_t* _to_nxt = _to;
     result r = utf16_to_utf8(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4500,7 +4493,7 @@ __codecvt_utf8_utf16<char32_t>::do_in(state_type&,
     uint32_t* _to_end = reinterpret_cast<uint32_t*>(to_end);
     uint32_t* _to_nxt = _to;
     result r = utf8_to_utf16(_frm, _frm_end, _frm_nxt, _to, _to_end, _to_nxt,
-                             _Maxcode_, _Mode_);
+                             __maxcode_, __mode_);
     frm_nxt = frm + (_frm_nxt - _frm);
     to_nxt = to + (_to_nxt - _to);
     return r;
 @@ -4532,14 +4525,14 @@ __codecvt_utf8_utf16<char32_t>::do_length(state_type&,
 {
     const uint8_t* _frm = reinterpret_cast<const uint8_t*>(frm);
     const uint8_t* _frm_end = reinterpret_cast<const uint8_t*>(frm_end);
-    return utf8_to_utf16_length(_frm, _frm_end, mx, _Maxcode_, _Mode_);
+    return utf8_to_utf16_length(_frm, _frm_end, mx, __maxcode_, __mode_);
 }
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 int
 __codecvt_utf8_utf16<char32_t>::do_max_length() const noexcept
 {
-    if (_Mode_ & consume_header)
+    if (__mode_ & consume_header)
         return 7;
     return 4;
 }
 @@ -4805,7 +4798,7 @@ __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end,
 {
 //  if the grouping pattern is empty _or_ there are no grouping bits, then do nothing
 //  we always have at least a single entry in [__g, __g_end); the end of the input sequence
-	if (__grouping.size() != 0 && __g_end - __g > 1)
+    if (__grouping.size() != 0 && __g_end - __g > 1)
     {
         reverse(__g, __g_end);
         const char* __ig = __grouping.data();
 @@ -4838,7 +4831,7 @@ __num_put_base::__format_int(char* __fmtp, const char* __len, bool __signd,
     if ((__flags & ios_base::showpos) &&
         (__flags & ios_base::basefield) != ios_base::oct &&
         (__flags & ios_base::basefield) != ios_base::hex &&
-	__signd)
+        __signd)
         *__fmtp++ = '+';
     if (__flags & ios_base::showbase)
         *__fmtp++ = '#';

lib/libcxx/src/memory.cpp+4-4

...	@@ -152,21 +152,21 @@ static constinit __libcpp_mutex_t mut_back[__sp_mut_count] =	...	@@ -152,21 +152,21 @@ static constinit __libcpp_mutex_t mut_back[__sp_mut_count] =
152	};	152	};
153		153
154	_LIBCPP_CONSTEXPR __sp_mut::__sp_mut(void* p) noexcept	154	_LIBCPP_CONSTEXPR __sp_mut::__sp_mut(void* p) noexcept
155	: __lx(p)	155	: __lx_(p)
156	{	156	{
157	}	157	}
158		158
159	void	159	void
160	__sp_mut::lock() noexcept	160	__sp_mut::lock() noexcept
161	{	161	{
162	auto m = static_cast<__libcpp_mutex_t*>(__lx);	162	auto m = static_cast<__libcpp_mutex_t*>(__lx_);
163	__libcpp_mutex_lock(m);	163	__libcpp_mutex_lock(m);
164	}	164	}
165		165
166	void	166	void
167	__sp_mut::unlock() noexcept	167	__sp_mut::unlock() noexcept
168	{	168	{
169	__libcpp_mutex_unlock(static_cast<__libcpp_mutex_t*>(__lx));	169	__libcpp_mutex_unlock(static_cast<__libcpp_mutex_t*>(__lx_));
170	}	170	}
171		171
172	__sp_mut&	172	__sp_mut&
...	@@ -194,7 +194,7 @@ align(size_t alignment, size_t size, void*& ptr, size_t& space)	...	@@ -194,7 +194,7 @@ align(size_t alignment, size_t size, void*& ptr, size_t& space)
194	if (size <= space)	194	if (size <= space)
195	{	195	{
196	char* p1 = static_cast<char*>(ptr);	196	char* p1 = static_cast<char*>(ptr);
197	char* p2 = reinterpret_cast<char*>(reinterpret_cast<size_t>(p1 + (alignment - 1)) & -alignment);	197	char* p2 = reinterpret_cast<char*>(reinterpret_cast<uintptr_t>(p1 + (alignment - 1)) & -alignment);
198	size_t d = static_cast<size_t>(p2 - p1);	198	size_t d = static_cast<size_t>(p2 - p1);
199	if (d <= space - size)	199	if (d <= space - size)
200	{	200	{

lib/libcxx/src/memory_resource.cpp created+496

...	@@ -0,0 +1,496 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#include <memory>
10	#include <memory_resource>
11
12	#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
13	# include <atomic>
14	#elif !defined(_LIBCPP_HAS_NO_THREADS)
15	# include <mutex>
16	# if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB)
17	# pragma comment(lib, "pthread")
18	# endif
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	namespace pmr {
24
25	// memory_resource
26
27	memory_resource::~memory_resource() = default;
28
29	// new_delete_resource()
30
31	#ifdef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
32	static bool is_aligned_to(void* ptr, size_t align) {
33	void* p2 = ptr;
34	size_t space = 1;
35	void* result = std::align(align, 1, p2, space);
36	return (result == ptr);
37	}
38	#endif
39
40	class _LIBCPP_TYPE_VIS __new_delete_memory_resource_imp : public memory_resource {
41	void* do_allocate(size_t bytes, size_t align) override {
42	#ifndef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
43	return std::__libcpp_allocate(bytes, align);
44	#else
45	if (bytes == 0)
46	bytes = 1;
47	void* result = std::__libcpp_allocate(bytes, align);
48	if (!is_aligned_to(result, align)) {
49	std::__libcpp_deallocate(result, bytes, align);
50	__throw_bad_alloc();
51	}
52	return result;
53	#endif
54	}
55
56	void do_deallocate(void* p, size_t bytes, size_t align) override { std::__libcpp_deallocate(p, bytes, align); }
57
58	bool do_is_equal(const memory_resource& other) const noexcept override { return &other == this; }
59	};
60
61	// null_memory_resource()
62
63	class _LIBCPP_TYPE_VIS __null_memory_resource_imp : public memory_resource {
64	void* do_allocate(size_t, size_t) override { __throw_bad_alloc(); }
65	void do_deallocate(void*, size_t, size_t) override {}
66	bool do_is_equal(const memory_resource& other) const noexcept override { return &other == this; }
67	};
68
69	namespace {
70
71	union ResourceInitHelper {
72	struct {
73	__new_delete_memory_resource_imp new_delete_res;
74	__null_memory_resource_imp null_res;
75	} resources;
76	char dummy;
77	_LIBCPP_CONSTEXPR_SINCE_CXX14 ResourceInitHelper() : resources() {}
78	~ResourceInitHelper() {}
79	};
80
81	// Pretend we're inside a system header so the compiler doesn't flag the use of the init_priority
82	// attribute with a value that's reserved for the implementation (we're the implementation).
83	#include "memory_resource_init_helper.h"
84
85	} // end namespace
86
87	memory_resource* new_delete_resource() noexcept { return &res_init.resources.new_delete_res; }
88
89	memory_resource* null_memory_resource() noexcept { return &res_init.resources.null_res; }
90
91	// default_memory_resource()
92
93	static memory_resource* __default_memory_resource(bool set = false, memory_resource* new_res = nullptr) noexcept {
94	#ifndef _LIBCPP_HAS_NO_ATOMIC_HEADER
95	static constinit atomic<memory_resource*> __res{&res_init.resources.new_delete_res};
96	if (set) {
97	new_res = new_res ? new_res : new_delete_resource();
98	// TODO: Can a weaker ordering be used?
99	return std::atomic_exchange_explicit(&__res, new_res, memory_order_acq_rel);
100	} else {
101	return std::atomic_load_explicit(&__res, memory_order_acquire);
102	}
103	#elif !defined(_LIBCPP_HAS_NO_THREADS)
104	static constinit memory_resource* res = &res_init.resources.new_delete_res;
105	static mutex res_lock;
106	if (set) {
107	new_res = new_res ? new_res : new_delete_resource();
108	lock_guard<mutex> guard(res_lock);
109	memory_resource* old_res = res;
110	res = new_res;
111	return old_res;
112	} else {
113	lock_guard<mutex> guard(res_lock);
114	return res;
115	}
116	#else
117	static constinit memory_resource* res = &res_init.resources.new_delete_res;
118	if (set) {
119	new_res = new_res ? new_res : new_delete_resource();
120	memory_resource* old_res = res;
121	res = new_res;
122	return old_res;
123	} else {
124	return res;
125	}
126	#endif
127	}
128
129	memory_resource* get_default_resource() noexcept { return __default_memory_resource(); }
130
131	memory_resource* set_default_resource(memory_resource* __new_res) noexcept {
132	return __default_memory_resource(true, __new_res);
133	}
134
135	// 23.12.5, mem.res.pool
136
137	static size_t roundup(size_t count, size_t alignment) {
138	size_t mask = alignment - 1;
139	return (count + mask) & ~mask;
140	}
141
142	struct unsynchronized_pool_resource::__adhoc_pool::__chunk_footer {
143	__chunk_footer* __next_;
144	char* __start_;
145	size_t __align_;
146	size_t __allocation_size() { return (reinterpret_cast<char>(this) - __start_) + sizeof(this); }
147	};
148
149	void unsynchronized_pool_resource::__adhoc_pool::__release_ptr(memory_resource* upstream) {
150	while (__first_ != nullptr) {
151	__chunk_footer* next = __first_->__next_;
152	upstream->deallocate(__first_->__start_, __first_->__allocation_size(), __first_->__align_);
153	__first_ = next;
154	}
155	}
156
157	void* unsynchronized_pool_resource::__adhoc_pool::__do_allocate(memory_resource* upstream, size_t bytes, size_t align) {
158	const size_t footer_size = sizeof(__chunk_footer);
159	const size_t footer_align = alignof(__chunk_footer);
160
161	if (align < footer_align)
162	align = footer_align;
163
164	size_t aligned_capacity = roundup(bytes, footer_align) + footer_size;
165
166	void* result = upstream->allocate(aligned_capacity, align);
167
168	__chunk_footer* h = (__chunk_footer)((char)result + aligned_capacity - footer_size);
169	h->__next_ = __first_;
170	h->__start_ = (char*)result;
171	h->__align_ = align;
172	__first_ = h;
173	return result;
174	}
175
176	void unsynchronized_pool_resource::__adhoc_pool::__do_deallocate(
177	memory_resource* upstream, void* p, size_t bytes, size_t align) {
178	_LIBCPP_ASSERT(__first_ != nullptr, "deallocating a block that was not allocated with this allocator");
179	if (__first_->__start_ == p) {
180	__chunk_footer* next = __first_->__next_;
181	upstream->deallocate(p, __first_->__allocation_size(), __first_->__align_);
182	__first_ = next;
183	} else {
184	for (__chunk_footer* h = __first_; h->__next_ != nullptr; h = h->__next_) {
185	if (h->__next_->__start_ == p) {
186	__chunk_footer* next = h->__next_->__next_;
187	upstream->deallocate(p, h->__next_->__allocation_size(), h->__next_->__align_);
188	h->__next_ = next;
189	return;
190	}
191	}
192	_LIBCPP_ASSERT(false, "deallocating a block that was not allocated with this allocator");
193	}
194	}
195
196	class unsynchronized_pool_resource::__fixed_pool {
197	struct __chunk_footer {
198	__chunk_footer* __next_;
199	char* __start_;
200	size_t __align_;
201	size_t __allocation_size() { return (reinterpret_cast<char>(this) - __start_) + sizeof(this); }
202	};
203
204	struct __vacancy_header {
205	__vacancy_header* __next_vacancy_;
206	};
207
208	__chunk_footer* __first_chunk_ = nullptr;
209	__vacancy_header* __first_vacancy_ = nullptr;
210
211	public:
212	explicit __fixed_pool() = default;
213
214	void __release_ptr(memory_resource* upstream) {
215	__first_vacancy_ = nullptr;
216	while (__first_chunk_ != nullptr) {
217	__chunk_footer* next = __first_chunk_->__next_;
218	upstream->deallocate(__first_chunk_->__start_, __first_chunk_->__allocation_size(), __first_chunk_->__align_);
219	__first_chunk_ = next;
220	}
221	}
222
223	void* __try_allocate_from_vacancies() {
224	if (__first_vacancy_ != nullptr) {
225	void* result = __first_vacancy_;
226	__first_vacancy_ = __first_vacancy_->__next_vacancy_;
227	return result;
228	}
229	return nullptr;
230	}
231
232	void* __allocate_in_new_chunk(memory_resource* upstream, size_t block_size, size_t chunk_size) {
233	_LIBCPP_ASSERT(chunk_size % block_size == 0, "");
234	static_assert(__default_alignment >= alignof(std::max_align_t), "");
235	static_assert(__default_alignment >= alignof(__chunk_footer), "");
236	static_assert(__default_alignment >= alignof(__vacancy_header), "");
237
238	const size_t footer_size = sizeof(__chunk_footer);
239	const size_t footer_align = alignof(__chunk_footer);
240
241	size_t aligned_capacity = roundup(chunk_size, footer_align) + footer_size;
242
243	void* result = upstream->allocate(aligned_capacity, __default_alignment);
244
245	__chunk_footer* h = (__chunk_footer)((char)result + aligned_capacity - footer_size);
246	h->__next_ = __first_chunk_;
247	h->__start_ = (char*)result;
248	h->__align_ = __default_alignment;
249	__first_chunk_ = h;
250
251	if (chunk_size > block_size) {
252	__vacancy_header* last_vh = this->__first_vacancy_;
253	for (size_t i = block_size; i != chunk_size; i += block_size) {
254	__vacancy_header* vh = (__vacancy_header)((char)result + i);
255	vh->__next_vacancy_ = last_vh;
256	last_vh = vh;
257	}
258	this->__first_vacancy_ = last_vh;
259	}
260	return result;
261	}
262
263	void __evacuate(void* p) {
264	__vacancy_header* vh = (__vacancy_header*)(p);
265	vh->__next_vacancy_ = __first_vacancy_;
266	__first_vacancy_ = vh;
267	}
268
269	size_t __previous_chunk_size_in_bytes() const { return __first_chunk_ ? __first_chunk_->__allocation_size() : 0; }
270
271	static const size_t __default_alignment = alignof(max_align_t);
272	};
273
274	size_t unsynchronized_pool_resource::__pool_block_size(int i) const { return size_t(1) << __log2_pool_block_size(i); }
275
276	int unsynchronized_pool_resource::__log2_pool_block_size(int i) const { return (i + __log2_smallest_block_size); }
277
278	int unsynchronized_pool_resource::__pool_index(size_t bytes, size_t align) const {
279	if (align > alignof(std::max_align_t) \|\| bytes > (size_t(1) << __num_fixed_pools_))
280	return __num_fixed_pools_;
281	else {
282	int i = 0;
283	bytes = (bytes > align) ? bytes : align;
284	bytes -= 1;
285	bytes >>= __log2_smallest_block_size;
286	while (bytes != 0) {
287	bytes >>= 1;
288	i += 1;
289	}
290	return i;
291	}
292	}
293
294	unsynchronized_pool_resource::unsynchronized_pool_resource(const pool_options& opts, memory_resource* upstream)
295	: __res_(upstream), __fixed_pools_(nullptr) {
296	size_t largest_block_size;
297	if (opts.largest_required_pool_block == 0)
298	largest_block_size = __default_largest_block_size;
299	else if (opts.largest_required_pool_block < __smallest_block_size)
300	largest_block_size = __smallest_block_size;
301	else if (opts.largest_required_pool_block > __max_largest_block_size)
302	largest_block_size = __max_largest_block_size;
303	else
304	largest_block_size = opts.largest_required_pool_block;
305
306	if (opts.max_blocks_per_chunk == 0)
307	__options_max_blocks_per_chunk_ = __max_blocks_per_chunk;
308	else if (opts.max_blocks_per_chunk < __min_blocks_per_chunk)
309	__options_max_blocks_per_chunk_ = __min_blocks_per_chunk;
310	else if (opts.max_blocks_per_chunk > __max_blocks_per_chunk)
311	__options_max_blocks_per_chunk_ = __max_blocks_per_chunk;
312	else
313	__options_max_blocks_per_chunk_ = opts.max_blocks_per_chunk;
314
315	__num_fixed_pools_ = 1;
316	size_t capacity = __smallest_block_size;
317	while (capacity < largest_block_size) {
318	capacity <<= 1;
319	__num_fixed_pools_ += 1;
320	}
321	}
322
323	pool_options unsynchronized_pool_resource::options() const {
324	pool_options p;
325	p.max_blocks_per_chunk = __options_max_blocks_per_chunk_;
326	p.largest_required_pool_block = __pool_block_size(__num_fixed_pools_ - 1);
327	return p;
328	}
329
330	void unsynchronized_pool_resource::release() {
331	__adhoc_pool_.__release_ptr(__res_);
332	if (__fixed_pools_ != nullptr) {
333	const int n = __num_fixed_pools_;
334	for (int i = 0; i < n; ++i)
335	__fixed_pools_[i].__release_ptr(__res_);
336	__res_->deallocate(__fixed_pools_, __num_fixed_pools_ * sizeof(__fixed_pool), alignof(__fixed_pool));
337	__fixed_pools_ = nullptr;
338	}
339	}
340
341	void* unsynchronized_pool_resource::do_allocate(size_t bytes, size_t align) {
342	// A pointer to allocated storage (6.6.4.4.1) with a size of at least bytes.
343	// The size and alignment of the allocated memory shall meet the requirements for
344	// a class derived from memory_resource (23.12).
345	// If the pool selected for a block of size bytes is unable to satisfy the memory request
346	// from its own internal data structures, it will call upstream_resource()->allocate()
347	// to obtain more memory. If bytes is larger than that which the largest pool can handle,
348	// then memory will be allocated using upstream_resource()->allocate().
349
350	int i = __pool_index(bytes, align);
351	if (i == __num_fixed_pools_)
352	return __adhoc_pool_.__do_allocate(__res_, bytes, align);
353	else {
354	if (__fixed_pools_ == nullptr) {
355	__fixed_pools_ =
356	(__fixed_pool)__res_->allocate(__num_fixed_pools_ sizeof(__fixed_pool), alignof(__fixed_pool));
357	__fixed_pool* first = __fixed_pools_;
358	__fixed_pool* last = __fixed_pools_ + __num_fixed_pools_;
359	for (__fixed_pool* pool = first; pool != last; ++pool)
360	::new ((void*)pool) __fixed_pool;
361	}
362	void* result = __fixed_pools_[i].__try_allocate_from_vacancies();
363	if (result == nullptr) {
364	auto min = [](size_t a, size_t b) { return a < b ? a : b; };
365	auto max = [](size_t a, size_t b) { return a < b ? b : a; };
366
367	size_t prev_chunk_size_in_bytes = __fixed_pools_[i].__previous_chunk_size_in_bytes();
368	size_t prev_chunk_size_in_blocks = prev_chunk_size_in_bytes >> __log2_pool_block_size(i);
369
370	size_t chunk_size_in_blocks;
371
372	if (prev_chunk_size_in_blocks == 0) {
373	size_t min_blocks_per_chunk = max(__min_bytes_per_chunk >> __log2_pool_block_size(i), __min_blocks_per_chunk);
374	chunk_size_in_blocks = min_blocks_per_chunk;
375	} else {
376	static_assert(__max_bytes_per_chunk <= SIZE_MAX - (__max_bytes_per_chunk / 4), "unsigned overflow is possible");
377	chunk_size_in_blocks = prev_chunk_size_in_blocks + (prev_chunk_size_in_blocks / 4);
378	}
379
380	size_t max_blocks_per_chunk =
381	min((__max_bytes_per_chunk >> __log2_pool_block_size(i)),
382	min(__max_blocks_per_chunk, __options_max_blocks_per_chunk_));
383	if (chunk_size_in_blocks > max_blocks_per_chunk)
384	chunk_size_in_blocks = max_blocks_per_chunk;
385
386	size_t block_size = __pool_block_size(i);
387
388	size_t chunk_size_in_bytes = (chunk_size_in_blocks << __log2_pool_block_size(i));
389	result = __fixed_pools_[i].__allocate_in_new_chunk(__res_, block_size, chunk_size_in_bytes);
390	}
391	return result;
392	}
393	}
394
395	void unsynchronized_pool_resource::do_deallocate(void* p, size_t bytes, size_t align) {
396	// Returns the memory at p to the pool. It is unspecified if,
397	// or under what circumstances, this operation will result in
398	// a call to upstream_resource()->deallocate().
399
400	int i = __pool_index(bytes, align);
401	if (i == __num_fixed_pools_)
402	return __adhoc_pool_.__do_deallocate(__res_, p, bytes, align);
403	else {
404	_LIBCPP_ASSERT(__fixed_pools_ != nullptr, "deallocating a block that was not allocated with this allocator");
405	__fixed_pools_[i].__evacuate(p);
406	}
407	}
408
409	bool synchronized_pool_resource::do_is_equal(const memory_resource& other) const noexcept { return &other == this; }
410
411	// 23.12.6, mem.res.monotonic.buffer
412
413	static void* align_down(size_t align, size_t size, void*& ptr, size_t& space) {
414	if (size > space)
415	return nullptr;
416
417	char* p1 = static_cast<char*>(ptr);
418	char* new_ptr = reinterpret_cast<char*>(reinterpret_cast<uintptr_t>(p1 - size) & ~(align - 1));
419
420	if (new_ptr < (p1 - space))
421	return nullptr;
422
423	ptr = new_ptr;
424	space -= p1 - new_ptr;
425
426	return ptr;
427	}
428
429	void* monotonic_buffer_resource::__initial_descriptor::__try_allocate_from_chunk(size_t bytes, size_t align) {
430	if (!__cur_)
431	return nullptr;
432	void* new_ptr = static_cast<void*>(__cur_);
433	size_t new_capacity = (__cur_ - __start_);
434	void* aligned_ptr = align_down(align, bytes, new_ptr, new_capacity);
435	if (aligned_ptr != nullptr)
436	__cur_ = static_cast<char*>(new_ptr);
437	return aligned_ptr;
438	}
439
440	void* monotonic_buffer_resource::__chunk_footer::__try_allocate_from_chunk(size_t bytes, size_t align) {
441	void* new_ptr = static_cast<void*>(__cur_);
442	size_t new_capacity = (__cur_ - __start_);
443	void* aligned_ptr = align_down(align, bytes, new_ptr, new_capacity);
444	if (aligned_ptr != nullptr)
445	__cur_ = static_cast<char*>(new_ptr);
446	return aligned_ptr;
447	}
448
449	void* monotonic_buffer_resource::do_allocate(size_t bytes, size_t align) {
450	const size_t footer_size = sizeof(__chunk_footer);
451	const size_t footer_align = alignof(__chunk_footer);
452
453	auto previous_allocation_size = [&]() {
454	if (__chunks_ != nullptr)
455	return __chunks_->__allocation_size();
456
457	size_t newsize = (__initial_.__start_ != nullptr) ? (__initial_.__end_ - __initial_.__start_) : __initial_.__size_;
458
459	return roundup(newsize, footer_align) + footer_size;
460	};
461
462	if (void* result = __initial_.__try_allocate_from_chunk(bytes, align))
463	return result;
464	if (__chunks_ != nullptr) {
465	if (void* result = __chunks_->__try_allocate_from_chunk(bytes, align))
466	return result;
467	}
468
469	// Allocate a brand-new chunk.
470
471	if (align < footer_align)
472	align = footer_align;
473
474	size_t aligned_capacity = roundup(bytes, footer_align) + footer_size;
475	size_t previous_capacity = previous_allocation_size();
476
477	if (aligned_capacity <= previous_capacity) {
478	size_t newsize = 2 * (previous_capacity - footer_size);
479	aligned_capacity = roundup(newsize, footer_align) + footer_size;
480	}
481
482	char* start = (char*)__res_->allocate(aligned_capacity, align);
483	auto end = start + aligned_capacity - footer_size;
484	__chunk_footer* footer = (__chunk_footer*)(end);
485	footer->__next_ = __chunks_;
486	footer->__start_ = start;
487	footer->__cur_ = end;
488	footer->__align_ = align;
489	__chunks_ = footer;
490
491	return __chunks_->__try_allocate_from_chunk(bytes, align);
492	}
493
494	} // namespace pmr
495
496	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/memory_resource_init_helper.h created+2

...	@@ -0,0 +1,2 @@
1	#pragma GCC system_header
2	static constinit ResourceInitHelper res_init _LIBCPP_INIT_PRIORITY_MAX;

lib/libcxx/src/optional.cpp+5-5

...	@@ -16,7 +16,7 @@ bad_optional_access::~bad_optional_access() noexcept = default;	...	@@ -16,7 +16,7 @@ bad_optional_access::~bad_optional_access() noexcept = default;
16		16
17	const char* bad_optional_access::what() const noexcept {	17	const char* bad_optional_access::what() const noexcept {
18	return "bad_optional_access";	18	return "bad_optional_access";
19	}	19	}
20		20
21	} // std	21	} // std
22		22
...	@@ -28,13 +28,13 @@ const char* bad_optional_access::what() const noexcept {	...	@@ -28,13 +28,13 @@ const char* bad_optional_access::what() const noexcept {
28	_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL	28	_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
29		29
30	class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optional_access	30	class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optional_access
31	: public std::logic_error	31	: public std::logic_error
32	{	32	{
33	public:	33	public:
34	bad_optional_access() : std::logic_error("Bad optional Access") {}	34	bad_optional_access() : std::logic_error("Bad optional Access") {}
35		35
36	// Get the key function ~bad_optional_access() into the dylib	36	// Get the key function ~bad_optional_access() into the dylib
37	virtual ~bad_optional_access() noexcept;	37	virtual ~bad_optional_access() noexcept;
38	};	38	};
39		39
40	bad_optional_access::~bad_optional_access() noexcept = default;	40	bad_optional_access::~bad_optional_access() noexcept = default;

lib/libcxx/src/shared_mutex.cpp+7-7

...	@@ -106,13 +106,13 @@ __shared_mutex_base::unlock_shared()	...	@@ -106,13 +106,13 @@ __shared_mutex_base::unlock_shared()
106		106
107	// Shared Timed Mutex	107	// Shared Timed Mutex
108	// These routines are here for ABI stability	108	// These routines are here for ABI stability
109	shared_timed_mutex::shared_timed_mutex() : __base() {}	109	shared_timed_mutex::shared_timed_mutex() : __base_() {}
110	void shared_timed_mutex::lock() { return __base.lock(); }	110	void shared_timed_mutex::lock() { return __base_.lock(); }
111	bool shared_timed_mutex::try_lock() { return __base.try_lock(); }	111	bool shared_timed_mutex::try_lock() { return __base_.try_lock(); }
112	void shared_timed_mutex::unlock() { return __base.unlock(); }	112	void shared_timed_mutex::unlock() { return __base_.unlock(); }
113	void shared_timed_mutex::lock_shared() { return __base.lock_shared(); }	113	void shared_timed_mutex::lock_shared() { return __base_.lock_shared(); }
114	bool shared_timed_mutex::try_lock_shared() { return __base.try_lock_shared(); }	114	bool shared_timed_mutex::try_lock_shared() { return __base_.try_lock_shared(); }
115	void shared_timed_mutex::unlock_shared() { return __base.unlock_shared(); }	115	void shared_timed_mutex::unlock_shared() { return __base_.unlock_shared(); }
116		116
117	_LIBCPP_END_NAMESPACE_STD	117	_LIBCPP_END_NAMESPACE_STD
118		118

lib/libcxx/src/string.cpp+2-2

...	@@ -85,7 +85,7 @@ template<typename V, typename S, typename F>	...	@@ -85,7 +85,7 @@ template<typename V, typename S, typename F>
85	inline V as_integer_helper(const string& func, const S& str, size_t* idx, int base, F f) {	85	inline V as_integer_helper(const string& func, const S& str, size_t* idx, int base, F f) {
86	typename S::value_type* ptr = nullptr;	86	typename S::value_type* ptr = nullptr;
87	const typename S::value_type* const p = str.c_str();	87	const typename S::value_type* const p = str.c_str();
88	typename remove_reference<decltype(errno)>::type errno_save = errno;	88	__libcpp_remove_reference_t<decltype(errno)> errno_save = errno;
89	errno = 0;	89	errno = 0;
90	V r = f(p, &ptr, base);	90	V r = f(p, &ptr, base);
91	swap(errno, errno_save);	91	swap(errno, errno_save);
...	@@ -172,7 +172,7 @@ template<typename V, typename S, typename F>	...	@@ -172,7 +172,7 @@ template<typename V, typename S, typename F>
172	inline V as_float_helper(const string& func, const S& str, size_t* idx, F f) {	172	inline V as_float_helper(const string& func, const S& str, size_t* idx, F f) {
173	typename S::value_type* ptr = nullptr;	173	typename S::value_type* ptr = nullptr;
174	const typename S::value_type* const p = str.c_str();	174	const typename S::value_type* const p = str.c_str();
175	typename remove_reference<decltype(errno)>::type errno_save = errno;	175	__libcpp_remove_reference_t<decltype(errno)> errno_save = errno;
176	errno = 0;	176	errno = 0;
177	V r = f(p, &ptr);	177	V r = f(p, &ptr);
178	swap(errno, errno_save);	178	swap(errno, errno_save);

lib/libcxx/src/support/ibm/wcsnrtombs.cpp+1-1

...	@@ -14,7 +14,7 @@	...	@@ -14,7 +14,7 @@
14	// Converts `max_source_chars` from the wide character buffer pointer to by *`src`,	14	// Converts `max_source_chars` from the wide character buffer pointer to by *`src`,
15	// into the multi byte character sequence buffer stored at `dst`, which must be	15	// into the multi byte character sequence buffer stored at `dst`, which must be
16	// `dst_size_bytes` bytes in size. Returns the number of bytes in the sequence	16	// `dst_size_bytes` bytes in size. Returns the number of bytes in the sequence
17	// converted from *src, excluding the null terminator.	17	// converted from *src, excluding the null terminator.
18	// Returns (size_t) -1 if an error occurs and sets errno.	18	// Returns (size_t) -1 if an error occurs and sets errno.
19	// If `dst` is NULL, `dst_size_bytes` is ignored and no bytes are copied to `dst`.	19	// If `dst` is NULL, `dst_size_bytes` is ignored and no bytes are copied to `dst`.
20	_LIBCPP_FUNC_VIS	20	_LIBCPP_FUNC_VIS

lib/libcxx/src/support/runtime/stdexcept_vcruntime.ipp+1-1

...	@@ -7,7 +7,7 @@	...	@@ -7,7 +7,7 @@
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
8		8
9	#ifndef _LIBCPP_ABI_VCRUNTIME	9	#ifndef _LIBCPP_ABI_VCRUNTIME
10	#error This file may only be used when defering to vcruntime	10	#error This file may only be used when deferring to vcruntime
11	#endif	11	#endif
12		12
13	namespace std {	13	namespace std {

lib/libcxx/src/thread.cpp+1-1

 @@ -164,8 +164,8 @@ __thread_struct_imp::~__thread_struct_imp()
     for (_Notify::iterator i = notify_.begin(), e = notify_.end();
             i != e; ++i)
     {
-        i->second->unlock();
         i->first->notify_all();
+        i->second->unlock();
     }
     for (_AsyncStates::iterator i = async_states_.begin(), e = async_states_.end();
             i != e; ++i)

author	Andrew Kelley <andrew@ziglang.org> 2023-01-26 13:23:03-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-01-26 16:36:13-07:00
log	1eaf180dd04efcf65ef981b1e1064658b5ec09c3
tree	c12e99871e9ba098bea523da0bde266d9afbd065
parent	85be0b8c6589f58d5667d0a8a8f94524d5de5ba6

...	@@ -23,7 +23,11 @@	...	@@ -23,7 +23,11 @@
23	#include <__iterator/distance.h>	23	#include <__iterator/distance.h>
24	#include <__iterator/iterator_traits.h>	24	#include <__iterator/iterator_traits.h>
25	#include <__iterator/reverse_iterator.h>	25	#include <__iterator/reverse_iterator.h>
26	#include <memory>	26	#include <__memory/destruct_n.h>
		27	#include <__memory/temporary_buffer.h>
		28	#include <__memory/unique_ptr.h>
		29	#include <__utility/pair.h>
		30	#include <new>
27		31
28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	32	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
29	# pragma GCC system_header	33	# pragma GCC system_header
...	@@ -56,6 +60,7 @@ public:	...	@@ -56,6 +60,7 @@ public:
56		60
57	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _Sent1,	61	template <class _AlgPolicy, class _Compare, class _InputIterator1, class _Sent1,
58	class _InputIterator2, class _Sent2, class _OutputIterator>	62	class _InputIterator2, class _Sent2, class _OutputIterator>
		63	_LIBCPP_HIDE_FROM_ABI
59	void __half_inplace_merge(_InputIterator1 __first1, _Sent1 __last1,	64	void __half_inplace_merge(_InputIterator1 __first1, _Sent1 __last1,
60	_InputIterator2 __first2, _Sent2 __last2,	65	_InputIterator2 __first2, _Sent2 __last2,
61	_OutputIterator __result, _Compare&& __comp)	66	_OutputIterator __result, _Compare&& __comp)
...	@@ -83,6 +88,7 @@ void __half_inplace_merge(_InputIterator1 __first1, _Sent1 __last1,	...	@@ -83,6 +88,7 @@ void __half_inplace_merge(_InputIterator1 __first1, _Sent1 __last1,
83	}	88	}
84		89
85	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>	90	template <class _AlgPolicy, class _Compare, class _BidirectionalIterator>
		91	_LIBCPP_HIDE_FROM_ABI
86	void __buffered_inplace_merge(	92	void __buffered_inplace_merge(
87	_BidirectionalIterator __first,	93	_BidirectionalIterator __first,
88	_BidirectionalIterator __middle,	94	_BidirectionalIterator __middle,
...	@@ -231,9 +237,8 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP	...	@@ -231,9 +237,8 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
231	template <class _BidirectionalIterator, class _Compare>	237	template <class _BidirectionalIterator, class _Compare>
232	inline _LIBCPP_HIDE_FROM_ABI void inplace_merge(	238	inline _LIBCPP_HIDE_FROM_ABI void inplace_merge(
233	_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last, _Compare __comp) {	239	_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last, _Compare __comp) {
234	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
235	std::__inplace_merge<_ClassicAlgPolicy>(	240	std::__inplace_merge<_ClassicAlgPolicy>(
236	std::move(__first), std::move(__middle), std::move(__last), static_cast<_Comp_ref>(__comp));	241	std::move(__first), std::move(__middle), std::move(__last), static_cast<__comp_ref_type<_Compare> >(__comp));
237	}	242	}
238		243
239	template <class _BidirectionalIterator>	244	template <class _BidirectionalIterator>

...	@@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
25		25
26	template<class _Tp, class _Compare>	26	template<class _Tp, class _Compare>
27	_LIBCPP_NODISCARD_EXT inline	27	_LIBCPP_NODISCARD_EXT inline
28	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	28	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
29	pair<const _Tp&, const _Tp&>	29	pair<const _Tp&, const _Tp&>
30	minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)	30	minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
31	{	31	{
...	@@ -35,7 +35,7 @@ minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)	...	@@ -35,7 +35,7 @@ minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
35		35
36	template<class _Tp>	36	template<class _Tp>
37	_LIBCPP_NODISCARD_EXT inline	37	_LIBCPP_NODISCARD_EXT inline
38	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	38	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
39	pair<const _Tp&, const _Tp&>	39	pair<const _Tp&, const _Tp&>
40	minmax(const _Tp& __a, const _Tp& __b)	40	minmax(const _Tp& __a, const _Tp& __b)
41	{	41	{
...	@@ -45,7 +45,7 @@ minmax(const _Tp& __a, const _Tp& __b)	...	@@ -45,7 +45,7 @@ minmax(const _Tp& __a, const _Tp& __b)
45	#ifndef _LIBCPP_CXX03_LANG	45	#ifndef _LIBCPP_CXX03_LANG
46		46
47	template<class _Tp, class _Compare>	47	template<class _Tp, class _Compare>
48	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	48	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
49	pair<_Tp, _Tp> minmax(initializer_list<_Tp> __t, _Compare __comp) {	49	pair<_Tp, _Tp> minmax(initializer_list<_Tp> __t, _Compare __comp) {
50	static_assert(__is_callable<_Compare, _Tp, _Tp>::value, "The comparator has to be callable");	50	static_assert(__is_callable<_Compare, _Tp, _Tp>::value, "The comparator has to be callable");
51	__identity __proj;	51	__identity __proj;
...	@@ -55,7 +55,7 @@ pair<_Tp, _Tp> minmax(initializer_list<_Tp> __t, _Compare __comp) {	...	@@ -55,7 +55,7 @@ pair<_Tp, _Tp> minmax(initializer_list<_Tp> __t, _Compare __comp) {
55		55
56	template<class _Tp>	56	template<class _Tp>
57	_LIBCPP_NODISCARD_EXT inline	57	_LIBCPP_NODISCARD_EXT inline
58	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	58	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
59	pair<_Tp, _Tp>	59	pair<_Tp, _Tp>
60	minmax(initializer_list<_Tp> __t)	60	minmax(initializer_list<_Tp> __t)
61	{	61	{

...	@@ -32,14 +32,14 @@ public:	...	@@ -32,14 +32,14 @@ public:
32	_MinmaxElementLessFunc(_Comp& __comp, _Proj& __proj) : __comp_(__comp), __proj_(__proj) {}	32	_MinmaxElementLessFunc(_Comp& __comp, _Proj& __proj) : __comp_(__comp), __proj_(__proj) {}
33		33
34	template <class _Iter>	34	template <class _Iter>
35	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	35	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
36	bool operator()(_Iter& __it1, _Iter& __it2) {	36	bool operator()(_Iter& __it1, _Iter& __it2) {
37	return std::__invoke(__comp_, std::__invoke(__proj_, __it1), std::__invoke(__proj_, __it2));	37	return std::__invoke(__comp_, std::__invoke(__proj_, __it1), std::__invoke(__proj_, __it2));
38	}	38	}
39	};	39	};
40		40
41	template <class _Iter, class _Sent, class _Proj, class _Comp>	41	template <class _Iter, class _Sent, class _Proj, class _Comp>
42	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	42	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
43	pair<_Iter, _Iter> __minmax_element_impl(_Iter __first, _Sent __last, _Comp& __comp, _Proj& __proj) {	43	pair<_Iter, _Iter> __minmax_element_impl(_Iter __first, _Sent __last, _Comp& __comp, _Proj& __proj) {
44	auto __less = _MinmaxElementLessFunc<_Comp, _Proj>(__comp, __proj);	44	auto __less = _MinmaxElementLessFunc<_Comp, _Proj>(__comp, __proj);
45		45
...	@@ -79,7 +79,7 @@ pair<_Iter, _Iter> __minmax_element_impl(_Iter __first, _Sent __last, _Comp& __c	...	@@ -79,7 +79,7 @@ pair<_Iter, _Iter> __minmax_element_impl(_Iter __first, _Sent __last, _Comp& __c
79	}	79	}
80		80
81	template <class _ForwardIterator, class _Compare>	81	template <class _ForwardIterator, class _Compare>
82	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX11	82	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
83	pair<_ForwardIterator, _ForwardIterator>	83	pair<_ForwardIterator, _ForwardIterator>
84	minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp) {	84	minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp) {
85	static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,	85	static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,
...	@@ -91,7 +91,7 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __com	...	@@ -91,7 +91,7 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __com
91	}	91	}
92		92
93	template <class _ForwardIterator>	93	template <class _ForwardIterator>
94	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	94	_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
95	pair<_ForwardIterator, _ForwardIterator> minmax_element(_ForwardIterator __first, _ForwardIterator __last) {	95	pair<_ForwardIterator, _ForwardIterator> minmax_element(_ForwardIterator __first, _ForwardIterator __last) {
96	return std::minmax_element(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());	96	return std::minmax_element(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
97	}	97	}

...	@@ -23,13 +23,14 @@	...	@@ -23,13 +23,14 @@
23	#include <__ranges/concepts.h>	23	#include <__ranges/concepts.h>
24	#include <__utility/forward.h>	24	#include <__utility/forward.h>
25	#include <__utility/move.h>	25	#include <__utility/move.h>
		26	#include <__utility/pair.h>
26	#include <initializer_list>	27	#include <initializer_list>
27		28
28	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
29	# pragma GCC system_header	30	# pragma GCC system_header
30	#endif	31	#endif
31		32
32	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	33	#if _LIBCPP_STD_VER > 17
33		34
34	_LIBCPP_PUSH_MACROS	35	_LIBCPP_PUSH_MACROS
35	#include <__undef_macros>	36	#include <__undef_macros>
...	@@ -44,7 +45,7 @@ namespace __minmax {	...	@@ -44,7 +45,7 @@ namespace __minmax {
44	struct __fn {	45	struct __fn {
45	template <class _Type, class _Proj = identity,	46	template <class _Type, class _Proj = identity,
46	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>	47	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>
47	_LIBCPP_HIDE_FROM_ABI constexpr ranges::minmax_result<const _Type&>	48	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr ranges::minmax_result<const _Type&>
48	operator()(const _Type& __a, const _Type& __b, _Comp __comp = {}, _Proj __proj = {}) const {	49	operator()(const _Type& __a, const _Type& __b, _Comp __comp = {}, _Proj __proj = {}) const {
49	if (std::invoke(__comp, std::invoke(__proj, __b), std::invoke(__proj, __a)))	50	if (std::invoke(__comp, std::invoke(__proj, __b), std::invoke(__proj, __a)))
50	return {__b, __a};	51	return {__b, __a};
...	@@ -53,7 +54,7 @@ struct __fn {	...	@@ -53,7 +54,7 @@ struct __fn {
53		54
54	template <copyable _Type, class _Proj = identity,	55	template <copyable _Type, class _Proj = identity,
55	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>	56	indirect_strict_weak_order<projected<const _Type*, _Proj>> _Comp = ranges::less>
56	_LIBCPP_HIDE_FROM_ABI constexpr	57	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
57	ranges::minmax_result<_Type> operator()(initializer_list<_Type> __il, _Comp __comp = {}, _Proj __proj = {}) const {	58	ranges::minmax_result<_Type> operator()(initializer_list<_Type> __il, _Comp __comp = {}, _Proj __proj = {}) const {
58	_LIBCPP_ASSERT(__il.begin() != __il.end(), "initializer_list has to contain at least one element");	59	_LIBCPP_ASSERT(__il.begin() != __il.end(), "initializer_list has to contain at least one element");
59	auto __iters = std::__minmax_element_impl(__il.begin(), __il.end(), __comp, __proj);	60	auto __iters = std::__minmax_element_impl(__il.begin(), __il.end(), __comp, __proj);
...	@@ -63,7 +64,7 @@ struct __fn {	...	@@ -63,7 +64,7 @@ struct __fn {
63	template <input_range _Range, class _Proj = identity,	64	template <input_range _Range, class _Proj = identity,
64	indirect_strict_weak_order<projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>	65	indirect_strict_weak_order<projected<iterator_t<_Range>, _Proj>> _Comp = ranges::less>
65	requires indirectly_copyable_storable<iterator_t<_Range>, range_value_t<_Range>*>	66	requires indirectly_copyable_storable<iterator_t<_Range>, range_value_t<_Range>*>
66	_LIBCPP_HIDE_FROM_ABI constexpr	67	_LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr
67	ranges::minmax_result<range_value_t<_Range>> operator()(_Range&& __r, _Comp __comp = {}, _Proj __proj = {}) const {	68	ranges::minmax_result<range_value_t<_Range>> operator()(_Range&& __r, _Comp __comp = {}, _Proj __proj = {}) const {
68	auto __first = ranges::begin(__r);	69	auto __first = ranges::begin(__r);
69	auto __last = ranges::end(__r);	70	auto __last = ranges::end(__r);
...	@@ -128,6 +129,6 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -128,6 +129,6 @@ _LIBCPP_END_NAMESPACE_STD
128		129
129	_LIBCPP_POP_MACROS	130	_LIBCPP_POP_MACROS
130		131
131	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	132	#endif // _LIBCPP_STD_VER > 17
132		133
133	#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H	134	#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H

...	@@ -25,10 +25,9 @@	...	@@ -25,10 +25,9 @@
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>	27	template <class _AlgPolicy, class _Compare, class _RandomAccessIterator>
28	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11	28	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
29	void __sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare&& __comp) {	29	void __sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare&& __comp) {
30	using _CompRef = typename __comp_ref_type<_Compare>::type;	30	__comp_ref_type<_Compare> __comp_ref = __comp;
31	_CompRef __comp_ref = __comp;
32		31
33	using difference_type = typename iterator_traits<_RandomAccessIterator>::difference_type;	32	using difference_type = typename iterator_traits<_RandomAccessIterator>::difference_type;
34	for (difference_type __n = __last - __first; __n > 1; --__last, (void) --__n)	33	for (difference_type __n = __last - __first; __n > 1; --__last, (void) --__n)
...	@@ -36,7 +35,7 @@ void __sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _C	...	@@ -36,7 +35,7 @@ void __sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _C
36	}	35	}
37		36
38	template <class _RandomAccessIterator, class _Compare>	37	template <class _RandomAccessIterator, class _Compare>
39	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	38	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
40	void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {	39	void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
41	static_assert(std::is_copy_constructible<_RandomAccessIterator>::value, "Iterators must be copy constructible.");	40	static_assert(std::is_copy_constructible<_RandomAccessIterator>::value, "Iterators must be copy constructible.");
42	static_assert(std::is_copy_assignable<_RandomAccessIterator>::value, "Iterators must be copy assignable.");	41	static_assert(std::is_copy_assignable<_RandomAccessIterator>::value, "Iterators must be copy assignable.");
...	@@ -45,7 +44,7 @@ void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Com	...	@@ -45,7 +44,7 @@ void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Com
45	}	44	}
46		45
47	template <class _RandomAccessIterator>	46	template <class _RandomAccessIterator>
48	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	47	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
49	void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {	48	void sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
50	std::sort_heap(std::move(__first), std::move(__last),	49	std::sort_heap(std::move(__first), std::move(__last),
51	__less<typename iterator_traits<_RandomAccessIterator>::value_type>());	50	__less<typename iterator_traits<_RandomAccessIterator>::value_type>());

...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	// 2+2 iterators: the shorter size will be used.	23	// 2+2 iterators: the shorter size will be used.
24	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2, class _Sentinel2>	24	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2, class _Sentinel2>
25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
26	pair<_ForwardIterator1, _ForwardIterator2>	26	pair<_ForwardIterator1, _ForwardIterator2>
27	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2, _Sentinel2 __last2) {	27	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2, _Sentinel2 __last2) {
28	while (__first1 != __last1 && __first2 != __last2) {	28	while (__first1 != __last1 && __first2 != __last2) {
...	@@ -36,7 +36,7 @@ __swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2	...	@@ -36,7 +36,7 @@ __swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2
36		36
37	// 2+1 iterators: size2 >= size1.	37	// 2+1 iterators: size2 >= size1.
38	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2>	38	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2>
39	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17	39	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
40	pair<_ForwardIterator1, _ForwardIterator2>	40	pair<_ForwardIterator1, _ForwardIterator2>
41	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2) {	41	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2) {
42	while (__first1 != __last1) {	42	while (__first1 != __last1) {
...	@@ -49,7 +49,7 @@ __swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2	...	@@ -49,7 +49,7 @@ __swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2
49	}	49	}
50		50
51	template <class _ForwardIterator1, class _ForwardIterator2>	51	template <class _ForwardIterator1, class _ForwardIterator2>
52	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator2	52	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator2
53	swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) {	53	swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) {
54	return std::__swap_ranges<_ClassicAlgPolicy>(	54	return std::__swap_ranges<_ClassicAlgPolicy>(
55	std::move(__first1), std::move(__last1), std::move(__first2)).second;	55	std::move(__first1), std::move(__last1), std::move(__first2)).second;

...	@@ -25,54 +25,54 @@ _LIBCPP_PUSH_MACROS	...	@@ -25,54 +25,54 @@ _LIBCPP_PUSH_MACROS
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
27		27
28	#ifndef _LIBCPP_CXX03_LANG	28	#if _LIBCPP_STD_VER > 14
29		29
30	namespace __itoa {	30	namespace __itoa {
31		31
32	_LIBCPP_HIDE_FROM_ABI inline char* __append1(char* __first, uint32_t __value) noexcept {	32	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append1(char* __first, uint32_t __value) noexcept {
33	*__first = '0' + static_cast<char>(__value);	33	*__first = '0' + static_cast<char>(__value);
34	return __first + 1;	34	return __first + 1;
35	}	35	}
36		36
37	_LIBCPP_HIDE_FROM_ABI inline char* __append2(char* __first, uint32_t __value) noexcept {	37	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append2(char* __first, uint32_t __value) noexcept {
38	return std::copy_n(&__table<>::__digits_base_10[__value * 2], 2, __first);	38	return std::copy_n(&__digits_base_10[__value * 2], 2, __first);
39	}	39	}
40		40
41	_LIBCPP_HIDE_FROM_ABI inline char* __append3(char* __first, uint32_t __value) noexcept {	41	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append3(char* __first, uint32_t __value) noexcept {
42	return __itoa::__append2(__itoa::__append1(__first, __value / 100), __value % 100);	42	return __itoa::__append2(__itoa::__append1(__first, __value / 100), __value % 100);
43	}	43	}
44		44
45	_LIBCPP_HIDE_FROM_ABI inline char* __append4(char* __first, uint32_t __value) noexcept {	45	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append4(char* __first, uint32_t __value) noexcept {
46	return __itoa::__append2(__itoa::__append2(__first, __value / 100), __value % 100);	46	return __itoa::__append2(__itoa::__append2(__first, __value / 100), __value % 100);
47	}	47	}
48		48
49	_LIBCPP_HIDE_FROM_ABI inline char* __append5(char* __first, uint32_t __value) noexcept {	49	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append5(char* __first, uint32_t __value) noexcept {
50	return __itoa::__append4(__itoa::__append1(__first, __value / 10000), __value % 10000);	50	return __itoa::__append4(__itoa::__append1(__first, __value / 10000), __value % 10000);
51	}	51	}
52		52
53	_LIBCPP_HIDE_FROM_ABI inline char* __append6(char* __first, uint32_t __value) noexcept {	53	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append6(char* __first, uint32_t __value) noexcept {
54	return __itoa::__append4(__itoa::__append2(__first, __value / 10000), __value % 10000);	54	return __itoa::__append4(__itoa::__append2(__first, __value / 10000), __value % 10000);
55	}	55	}
56		56
57	_LIBCPP_HIDE_FROM_ABI inline char* __append7(char* __first, uint32_t __value) noexcept {	57	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append7(char* __first, uint32_t __value) noexcept {
58	return __itoa::__append6(__itoa::__append1(__first, __value / 1000000), __value % 1000000);	58	return __itoa::__append6(__itoa::__append1(__first, __value / 1000000), __value % 1000000);
59	}	59	}
60		60
61	_LIBCPP_HIDE_FROM_ABI inline char* __append8(char* __first, uint32_t __value) noexcept {	61	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append8(char* __first, uint32_t __value) noexcept {
62	return __itoa::__append6(__itoa::__append2(__first, __value / 1000000), __value % 1000000);	62	return __itoa::__append6(__itoa::__append2(__first, __value / 1000000), __value % 1000000);
63	}	63	}
64		64
65	_LIBCPP_HIDE_FROM_ABI inline char* __append9(char* __first, uint32_t __value) noexcept {	65	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __append9(char* __first, uint32_t __value) noexcept {
66	return __itoa::__append8(__itoa::__append1(__first, __value / 100000000), __value % 100000000);	66	return __itoa::__append8(__itoa::__append1(__first, __value / 100000000), __value % 100000000);
67	}	67	}
68		68
69	template <class _Tp>	69	template <class _Tp>
70	_LIBCPP_HIDE_FROM_ABI char* __append10(char* __first, _Tp __value) noexcept {	70	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI char* __append10(char* __first, _Tp __value) noexcept {
71	return __itoa::__append8(__itoa::__append2(__first, static_cast<uint32_t>(__value / 100000000)),	71	return __itoa::__append8(__itoa::__append2(__first, static_cast<uint32_t>(__value / 100000000)),
72	static_cast<uint32_t>(__value % 100000000));	72	static_cast<uint32_t>(__value % 100000000));
73	}	73	}
74		74
75	_LIBCPP_HIDE_FROM_ABI inline char* __base_10_u32(char* __first, uint32_t __value) noexcept {	75	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u32(char* __first, uint32_t __value) noexcept {
76	if (__value < 1000000) {	76	if (__value < 1000000) {
77	if (__value < 10000) {	77	if (__value < 10000) {
78	if (__value < 100) {	78	if (__value < 100) {
...	@@ -107,7 +107,7 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u32(char* __first, uint32_t __value	...	@@ -107,7 +107,7 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u32(char* __first, uint32_t __value
107	return __itoa::__append10(__first, __value);	107	return __itoa::__append10(__first, __value);
108	}	108	}
109		109
110	_LIBCPP_HIDE_FROM_ABI inline char* __base_10_u64(char* __buffer, uint64_t __value) noexcept {	110	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u64(char* __buffer, uint64_t __value) noexcept {
111	if (__value <= UINT32_MAX)	111	if (__value <= UINT32_MAX)
112	return __itoa::__base_10_u32(__buffer, static_cast<uint32_t>(__value));	112	return __itoa::__base_10_u32(__buffer, static_cast<uint32_t>(__value));
113		113
...	@@ -129,12 +129,12 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u64(char* __buffer, uint64_t __valu	...	@@ -129,12 +129,12 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u64(char* __buffer, uint64_t __valu
129	/// \note The lookup table contains a partial set of exponents limiting the	129	/// \note The lookup table contains a partial set of exponents limiting the
130	/// range that can be used. However the range is sufficient for	130	/// range that can be used. However the range is sufficient for
131	/// \ref __base_10_u128.	131	/// \ref __base_10_u128.
132	_LIBCPP_HIDE_FROM_ABI inline __uint128_t __pow_10(int __exp) noexcept {	132	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline __uint128_t __pow_10(int __exp) noexcept {
133	_LIBCPP_ASSERT(__exp >= __table<>::__pow10_128_offset, "Index out of bounds");	133	_LIBCPP_ASSERT(__exp >= __pow10_128_offset, "Index out of bounds");
134	return __table<>::__pow10_128[__exp - __table<>::__pow10_128_offset];	134	return __pow10_128[__exp - __pow10_128_offset];
135	}	135	}
136		136
137	_LIBCPP_HIDE_FROM_ABI inline char* __base_10_u128(char* __buffer, __uint128_t __value) noexcept {	137	_LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u128(char* __buffer, __uint128_t __value) noexcept {
138	_LIBCPP_ASSERT(	138	_LIBCPP_ASSERT(
139	__value > numeric_limits<uint64_t>::max(), "The optimizations for this algorithm fail when this isn't true.");	139	__value > numeric_limits<uint64_t>::max(), "The optimizations for this algorithm fail when this isn't true.");
140		140
...	@@ -176,7 +176,7 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u128(char* __buffer, __uint128_t __	...	@@ -176,7 +176,7 @@ _LIBCPP_HIDE_FROM_ABI inline char* __base_10_u128(char* __buffer, __uint128_t __
176	# endif	176	# endif
177	} // namespace __itoa	177	} // namespace __itoa
178		178
179	#endif // _LIBCPP_CXX03_LANG	179	#endif // _LIBCPP_STD_VER > 14
180		180
181	_LIBCPP_END_NAMESPACE_STD	181	_LIBCPP_END_NAMESPACE_STD
182		182

...	@@ -27,18 +27,18 @@ namespace chrono	...	@@ -27,18 +27,18 @@ namespace chrono
27		27
28	class day {	28	class day {
29	private:	29	private:
30	unsigned char __d;	30	unsigned char __d_;
31	public:	31	public:
32	_LIBCPP_HIDE_FROM_ABI day() = default;	32	_LIBCPP_HIDE_FROM_ABI day() = default;
33	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr day(unsigned __val) noexcept : __d(static_cast<unsigned char>(__val)) {}	33	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr day(unsigned __val) noexcept : __d_(static_cast<unsigned char>(__val)) {}
34	_LIBCPP_HIDE_FROM_ABI inline constexpr day& operator++() noexcept { ++__d; return *this; }	34	_LIBCPP_HIDE_FROM_ABI inline constexpr day& operator++() noexcept { ++__d_; return *this; }
35	_LIBCPP_HIDE_FROM_ABI inline constexpr day operator++(int) noexcept { day __tmp = this; ++(this); return __tmp; }	35	_LIBCPP_HIDE_FROM_ABI inline constexpr day operator++(int) noexcept { day __tmp = this; ++(this); return __tmp; }
36	_LIBCPP_HIDE_FROM_ABI inline constexpr day& operator--() noexcept { --__d; return *this; }	36	_LIBCPP_HIDE_FROM_ABI inline constexpr day& operator--() noexcept { --__d_; return *this; }
37	_LIBCPP_HIDE_FROM_ABI inline constexpr day operator--(int) noexcept { day __tmp = this; --(this); return __tmp; }	37	_LIBCPP_HIDE_FROM_ABI inline constexpr day operator--(int) noexcept { day __tmp = this; --(this); return __tmp; }
38	_LIBCPP_HIDE_FROM_ABI constexpr day& operator+=(const days& __dd) noexcept;	38	_LIBCPP_HIDE_FROM_ABI constexpr day& operator+=(const days& __dd) noexcept;
39	_LIBCPP_HIDE_FROM_ABI constexpr day& operator-=(const days& __dd) noexcept;	39	_LIBCPP_HIDE_FROM_ABI constexpr day& operator-=(const days& __dd) noexcept;
40	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __d; }	40	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __d_; }
41	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __d >= 1 && __d <= 31; }	41	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __d_ >= 1 && __d_ <= 31; }
42	};	42	};
43		43
44		44

...	@@ -12,8 +12,10 @@	...	@@ -12,8 +12,10 @@
12		12
13	#include <__chrono/duration.h>	13	#include <__chrono/duration.h>
14	#include <__config>	14	#include <__config>
		15	#include <__type_traits/common_type.h>
		16	#include <__type_traits/enable_if.h>
		17	#include <__type_traits/is_convertible.h>
15	#include <limits>	18	#include <limits>
16	#include <type_traits>
17		19
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header	21	# pragma GCC system_header
...	@@ -41,12 +43,12 @@ private:	...	@@ -41,12 +43,12 @@ private:
41	duration __d_;	43	duration __d_;
42		44
43	public:	45	public:
44	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 time_point() : __d_(duration::zero()) {}	46	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 time_point() : __d_(duration::zero()) {}
45	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 explicit time_point(const duration& __d) : __d_(__d) {}	47	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit time_point(const duration& __d) : __d_(__d) {}
46		48
47	// conversions	49	// conversions
48	template <class _Duration2>	50	template <class _Duration2>
49	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	51	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
50	time_point(const time_point<clock, _Duration2>& __t,	52	time_point(const time_point<clock, _Duration2>& __t,
51	typename enable_if	53	typename enable_if
52	<	54	<
...	@@ -56,12 +58,12 @@ public:	...	@@ -56,12 +58,12 @@ public:
56		58
57	// observer	59	// observer
58		60
59	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 duration time_since_epoch() const {return __d_;}	61	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14 duration time_since_epoch() const {return __d_;}
60		62
61	// arithmetic	63	// arithmetic
62		64
63	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 time_point& operator+=(const duration& __d) {__d_ += __d; return *this;}	65	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 time_point& operator+=(const duration& __d) {__d_ += __d; return *this;}
64	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 time_point& operator-=(const duration& __d) {__d_ -= __d; return *this;}	66	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17 time_point& operator-=(const duration& __d) {__d_ -= __d; return *this;}
65		67
66	// special values	68	// special values
67		69
...	@@ -81,7 +83,7 @@ struct _LIBCPP_TEMPLATE_VIS common_type<chrono::time_point<_Clock, _Duration1>,	...	@@ -81,7 +83,7 @@ struct _LIBCPP_TEMPLATE_VIS common_type<chrono::time_point<_Clock, _Duration1>,
81	namespace chrono {	83	namespace chrono {
82		84
83	template <class _ToDuration, class _Clock, class _Duration>	85	template <class _ToDuration, class _Clock, class _Duration>
84	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	86	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
85	time_point<_Clock, _ToDuration>	87	time_point<_Clock, _ToDuration>
86	time_point_cast(const time_point<_Clock, _Duration>& __t)	88	time_point_cast(const time_point<_Clock, _Duration>& __t)
87	{	89	{
...	@@ -98,7 +100,7 @@ typename enable_if	...	@@ -98,7 +100,7 @@ typename enable_if
98	>::type	100	>::type
99	floor(const time_point<_Clock, _Duration>& __t)	101	floor(const time_point<_Clock, _Duration>& __t)
100	{	102	{
101	return time_point<_Clock, _ToDuration>{floor<_ToDuration>(__t.time_since_epoch())};	103	return time_point<_Clock, _ToDuration>{chrono::floor<_ToDuration>(__t.time_since_epoch())};
102	}	104	}
103		105
104	template <class _ToDuration, class _Clock, class _Duration>	106	template <class _ToDuration, class _Clock, class _Duration>
...	@@ -110,7 +112,7 @@ typename enable_if	...	@@ -110,7 +112,7 @@ typename enable_if
110	>::type	112	>::type
111	ceil(const time_point<_Clock, _Duration>& __t)	113	ceil(const time_point<_Clock, _Duration>& __t)
112	{	114	{
113	return time_point<_Clock, _ToDuration>{ceil<_ToDuration>(__t.time_since_epoch())};	115	return time_point<_Clock, _ToDuration>{chrono::ceil<_ToDuration>(__t.time_since_epoch())};
114	}	116	}
115		117
116	template <class _ToDuration, class _Clock, class _Duration>	118	template <class _ToDuration, class _Clock, class _Duration>
...	@@ -122,7 +124,7 @@ typename enable_if	...	@@ -122,7 +124,7 @@ typename enable_if
122	>::type	124	>::type
123	round(const time_point<_Clock, _Duration>& __t)	125	round(const time_point<_Clock, _Duration>& __t)
124	{	126	{
125	return time_point<_Clock, _ToDuration>{round<_ToDuration>(__t.time_since_epoch())};	127	return time_point<_Clock, _ToDuration>{chrono::round<_ToDuration>(__t.time_since_epoch())};
126	}	128	}
127		129
128	template <class _Rep, class _Period>	130	template <class _Rep, class _Period>
...	@@ -141,7 +143,7 @@ abs(duration<_Rep, _Period> __d)	...	@@ -141,7 +143,7 @@ abs(duration<_Rep, _Period> __d)
141	// time_point ==	143	// time_point ==
142		144
143	template <class _Clock, class _Duration1, class _Duration2>	145	template <class _Clock, class _Duration1, class _Duration2>
144	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	146	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
145	bool	147	bool
146	operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	148	operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
147	{	149	{
...	@@ -151,7 +153,7 @@ operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -151,7 +153,7 @@ operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
151	// time_point !=	153	// time_point !=
152		154
153	template <class _Clock, class _Duration1, class _Duration2>	155	template <class _Clock, class _Duration1, class _Duration2>
154	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	156	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
155	bool	157	bool
156	operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	158	operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
157	{	159	{
...	@@ -161,7 +163,7 @@ operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -161,7 +163,7 @@ operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
161	// time_point <	163	// time_point <
162		164
163	template <class _Clock, class _Duration1, class _Duration2>	165	template <class _Clock, class _Duration1, class _Duration2>
164	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	166	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
165	bool	167	bool
166	operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	168	operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
167	{	169	{
...	@@ -171,7 +173,7 @@ operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -171,7 +173,7 @@ operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
171	// time_point >	173	// time_point >
172		174
173	template <class _Clock, class _Duration1, class _Duration2>	175	template <class _Clock, class _Duration1, class _Duration2>
174	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	176	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
175	bool	177	bool
176	operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	178	operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
177	{	179	{
...	@@ -181,7 +183,7 @@ operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -181,7 +183,7 @@ operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
181	// time_point <=	183	// time_point <=
182		184
183	template <class _Clock, class _Duration1, class _Duration2>	185	template <class _Clock, class _Duration1, class _Duration2>
184	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	186	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
185	bool	187	bool
186	operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	188	operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
187	{	189	{
...	@@ -191,7 +193,7 @@ operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -191,7 +193,7 @@ operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
191	// time_point >=	193	// time_point >=
192		194
193	template <class _Clock, class _Duration1, class _Duration2>	195	template <class _Clock, class _Duration1, class _Duration2>
194	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	196	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
195	bool	197	bool
196	operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	198	operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
197	{	199	{
...	@@ -201,7 +203,7 @@ operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,	...	@@ -201,7 +203,7 @@ operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock,
201	// time_point operator+(time_point x, duration y);	203	// time_point operator+(time_point x, duration y);
202		204
203	template <class _Clock, class _Duration1, class _Rep2, class _Period2>	205	template <class _Clock, class _Duration1, class _Rep2, class _Period2>
204	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	206	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
205	time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>	207	time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
206	operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)	208	operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
207	{	209	{
...	@@ -212,7 +214,7 @@ operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Pe	...	@@ -212,7 +214,7 @@ operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Pe
212	// time_point operator+(duration x, time_point y);	214	// time_point operator+(duration x, time_point y);
213		215
214	template <class _Rep1, class _Period1, class _Clock, class _Duration2>	216	template <class _Rep1, class _Period1, class _Clock, class _Duration2>
215	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	217	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
216	time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>	218	time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
217	operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	219	operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
218	{	220	{
...	@@ -222,7 +224,7 @@ operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Dura	...	@@ -222,7 +224,7 @@ operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Dura
222	// time_point operator-(time_point x, duration y);	224	// time_point operator-(time_point x, duration y);
223		225
224	template <class _Clock, class _Duration1, class _Rep2, class _Period2>	226	template <class _Clock, class _Duration1, class _Rep2, class _Period2>
225	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	227	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
226	time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>	228	time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
227	operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)	229	operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
228	{	230	{
...	@@ -233,7 +235,7 @@ operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Pe	...	@@ -233,7 +235,7 @@ operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Pe
233	// duration operator-(time_point x, time_point y);	235	// duration operator-(time_point x, time_point y);
234		236
235	template <class _Clock, class _Duration1, class _Duration2>	237	template <class _Clock, class _Duration1, class _Duration2>
236	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	238	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX14
237	typename common_type<_Duration1, _Duration2>::type	239	typename common_type<_Duration1, _Duration2>::type
238	operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)	240	operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
239	{	241	{

...	@@ -32,25 +32,25 @@ class weekday_last;	...	@@ -32,25 +32,25 @@ class weekday_last;
32		32
33	class weekday {	33	class weekday {
34	private:	34	private:
35	unsigned char __wd;	35	unsigned char __wd_;
36	_LIBCPP_HIDE_FROM_ABI static constexpr unsigned char __weekday_from_days(int __days) noexcept;	36	_LIBCPP_HIDE_FROM_ABI static constexpr unsigned char __weekday_from_days(int __days) noexcept;
37	public:	37	public:
38	_LIBCPP_HIDE_FROM_ABI weekday() = default;	38	_LIBCPP_HIDE_FROM_ABI weekday() = default;
39	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr weekday(unsigned __val) noexcept : __wd(static_cast<unsigned char>(__val == 7 ? 0 : __val)) {}	39	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr weekday(unsigned __val) noexcept : __wd_(static_cast<unsigned char>(__val == 7 ? 0 : __val)) {}
40	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday(const sys_days& __sysd) noexcept	40	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday(const sys_days& __sysd) noexcept
41	: __wd(__weekday_from_days(__sysd.time_since_epoch().count())) {}	41	: __wd_(__weekday_from_days(__sysd.time_since_epoch().count())) {}
42	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr weekday(const local_days& __locd) noexcept	42	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr weekday(const local_days& __locd) noexcept
43	: __wd(__weekday_from_days(__locd.time_since_epoch().count())) {}	43	: __wd_(__weekday_from_days(__locd.time_since_epoch().count())) {}
44		44
45	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday& operator++() noexcept { __wd = (__wd == 6 ? 0 : __wd + 1); return *this; }	45	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday& operator++() noexcept { __wd_ = (__wd_ == 6 ? 0 : __wd_ + 1); return *this; }
46	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator++(int) noexcept { weekday __tmp = this; ++(this); return __tmp; }	46	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator++(int) noexcept { weekday __tmp = this; ++(this); return __tmp; }
47	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday& operator--() noexcept { __wd = (__wd == 0 ? 6 : __wd - 1); return *this; }	47	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday& operator--() noexcept { __wd_ = (__wd_ == 0 ? 6 : __wd_ - 1); return *this; }
48	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator--(int) noexcept { weekday __tmp = this; --(this); return __tmp; }	48	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator--(int) noexcept { weekday __tmp = this; --(this); return __tmp; }
49	_LIBCPP_HIDE_FROM_ABI constexpr weekday& operator+=(const days& __dd) noexcept;	49	_LIBCPP_HIDE_FROM_ABI constexpr weekday& operator+=(const days& __dd) noexcept;
50	_LIBCPP_HIDE_FROM_ABI constexpr weekday& operator-=(const days& __dd) noexcept;	50	_LIBCPP_HIDE_FROM_ABI constexpr weekday& operator-=(const days& __dd) noexcept;
51	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned c_encoding() const noexcept { return __wd; }	51	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned c_encoding() const noexcept { return __wd_; }
52	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned iso_encoding() const noexcept { return __wd == 0u ? 7 : __wd; }	52	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned iso_encoding() const noexcept { return __wd_ == 0u ? 7 : __wd_; }
53	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd <= 6; }	53	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd_ <= 6; }
54	_LIBCPP_HIDE_FROM_ABI constexpr weekday_indexed operator[](unsigned __index) const noexcept;	54	_LIBCPP_HIDE_FROM_ABI constexpr weekday_indexed operator[](unsigned __index) const noexcept;
55	_LIBCPP_HIDE_FROM_ABI constexpr weekday_last operator[](last_spec) const noexcept;	55	_LIBCPP_HIDE_FROM_ABI constexpr weekday_last operator[](last_spec) const noexcept;
56	};	56	};
...	@@ -123,15 +123,15 @@ weekday& weekday::operator-=(const days& __dd) noexcept	...	@@ -123,15 +123,15 @@ weekday& weekday::operator-=(const days& __dd) noexcept
123		123
124	class weekday_indexed {	124	class weekday_indexed {
125	private:	125	private:
126	chrono::weekday __wd;	126	chrono::weekday __wd_;
127	unsigned char __idx;	127	unsigned char __idx_;
128	public:	128	public:
129	_LIBCPP_HIDE_FROM_ABI weekday_indexed() = default;	129	_LIBCPP_HIDE_FROM_ABI weekday_indexed() = default;
130	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday_indexed(const chrono::weekday& __wdval, unsigned __idxval) noexcept	130	_LIBCPP_HIDE_FROM_ABI inline constexpr weekday_indexed(const chrono::weekday& __wdval, unsigned __idxval) noexcept
131	: __wd{__wdval}, __idx(__idxval) {}	131	: __wd_{__wdval}, __idx_(__idxval) {}
132	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wd; }	132	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wd_; }
133	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __idx; }	133	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __idx_; }
134	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd.ok() && __idx >= 1 && __idx <= 5; }	134	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd_.ok() && __idx_ >= 1 && __idx_ <= 5; }
135	};	135	};
136		136
137	_LIBCPP_HIDE_FROM_ABI inline constexpr	137	_LIBCPP_HIDE_FROM_ABI inline constexpr
...	@@ -145,12 +145,12 @@ bool operator!=(const weekday_indexed& __lhs, const weekday_indexed& __rhs) noex	...	@@ -145,12 +145,12 @@ bool operator!=(const weekday_indexed& __lhs, const weekday_indexed& __rhs) noex
145		145
146	class weekday_last {	146	class weekday_last {
147	private:	147	private:
148	chrono::weekday __wd;	148	chrono::weekday __wd_;
149	public:	149	public:
150	_LIBCPP_HIDE_FROM_ABI explicit constexpr weekday_last(const chrono::weekday& __val) noexcept	150	_LIBCPP_HIDE_FROM_ABI explicit constexpr weekday_last(const chrono::weekday& __val) noexcept
151	: __wd{__val} {}	151	: __wd_{__val} {}
152	_LIBCPP_HIDE_FROM_ABI constexpr chrono::weekday weekday() const noexcept { return __wd; }	152	_LIBCPP_HIDE_FROM_ABI constexpr chrono::weekday weekday() const noexcept { return __wd_; }
153	_LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept { return __wd.ok(); }	153	_LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept { return __wd_.ok(); }
154	};	154	};
155		155
156	_LIBCPP_HIDE_FROM_ABI inline constexpr	156	_LIBCPP_HIDE_FROM_ABI inline constexpr

...	@@ -35,14 +35,14 @@ namespace chrono	...	@@ -35,14 +35,14 @@ namespace chrono
35	{	35	{
36		36
37	class year_month_weekday {	37	class year_month_weekday {
38	chrono::year __y;	38	chrono::year __y_;
39	chrono::month __m;	39	chrono::month __m_;
40	chrono::weekday_indexed __wdi;	40	chrono::weekday_indexed __wdi_;
41	public:	41	public:
42	_LIBCPP_HIDE_FROM_ABI year_month_weekday() = default;	42	_LIBCPP_HIDE_FROM_ABI year_month_weekday() = default;
43	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday(const chrono::year& __yval, const chrono::month& __mval,	43	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday(const chrono::year& __yval, const chrono::month& __mval,
44	const chrono::weekday_indexed& __wdival) noexcept	44	const chrono::weekday_indexed& __wdival) noexcept
45	: __y{__yval}, __m{__mval}, __wdi{__wdival} {}	45	: __y_{__yval}, __m_{__mval}, __wdi_{__wdival} {}
46	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday(const sys_days& __sysd) noexcept	46	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday(const sys_days& __sysd) noexcept
47	: year_month_weekday(__from_days(__sysd.time_since_epoch())) {}	47	: year_month_weekday(__from_days(__sysd.time_since_epoch())) {}
48	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_weekday(const local_days& __locd) noexcept	48	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_weekday(const local_days& __locd) noexcept
...	@@ -52,24 +52,24 @@ public:	...	@@ -52,24 +52,24 @@ public:
52	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const years&) noexcept;	52	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const years&) noexcept;
53	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const years&) noexcept;	53	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const years&) noexcept;
54		54
55	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y; }	55	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
56	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	56	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
57	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdi.weekday(); }	57	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdi_.weekday(); }
58	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __wdi.index(); }	58	_LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __wdi_.index(); }
59	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi; }	59	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi_; }
60		60
61	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }	61	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
62	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }	62	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }
63	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept	63	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept
64	{	64	{
65	if (!__y.ok() \|\| !__m.ok() \|\| !__wdi.ok()) return false;	65	if (!__y_.ok() \|\| !__m_.ok() \|\| !__wdi_.ok()) return false;
66	if (__wdi.index() <= 4) return true;	66	if (__wdi_.index() <= 4) return true;
67	auto __nth_weekday_day =	67	auto __nth_weekday_day =
68	__wdi.weekday() -	68	__wdi_.weekday() -
69	chrono::weekday{static_cast<sys_days>(__y / __m / 1)} +	69	chrono::weekday{static_cast<sys_days>(__y_ / __m_ / 1)} +
70	days{(__wdi.index() - 1) * 7 + 1};	70	days{(__wdi_.index() - 1) * 7 + 1};
71	return static_cast<unsigned>(__nth_weekday_day.count()) <=	71	return static_cast<unsigned>(__nth_weekday_day.count()) <=
72	static_cast<unsigned>((__y / __m / last).day());	72	static_cast<unsigned>((__y_ / __m_ / last).day());
73	}	73	}
74		74
75	_LIBCPP_HIDE_FROM_ABI static constexpr year_month_weekday __from_days(days __d) noexcept;	75	_LIBCPP_HIDE_FROM_ABI static constexpr year_month_weekday __from_days(days __d) noexcept;
...	@@ -89,8 +89,8 @@ year_month_weekday year_month_weekday::__from_days(days __d) noexcept	...	@@ -89,8 +89,8 @@ year_month_weekday year_month_weekday::__from_days(days __d) noexcept
89	_LIBCPP_HIDE_FROM_ABI inline constexpr	89	_LIBCPP_HIDE_FROM_ABI inline constexpr
90	days year_month_weekday::__to_days() const noexcept	90	days year_month_weekday::__to_days() const noexcept
91	{	91	{
92	const sys_days __sysd = sys_days(__y/__m/1);	92	const sys_days __sysd = sys_days(__y_/__m_/1);
93	return (__sysd + (__wdi.weekday() - chrono::weekday(__sysd) + days{(__wdi.index()-1)*7}))	93	return (__sysd + (__wdi_.weekday() - chrono::weekday(__sysd) + days{(__wdi_.index()-1)*7}))
94	.time_since_epoch();	94	.time_since_epoch();
95	}	95	}
96		96
...	@@ -155,25 +155,25 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::o	...	@@ -155,25 +155,25 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::o
155		155
156	class year_month_weekday_last {	156	class year_month_weekday_last {
157	private:	157	private:
158	chrono::year __y;	158	chrono::year __y_;
159	chrono::month __m;	159	chrono::month __m_;
160	chrono::weekday_last __wdl;	160	chrono::weekday_last __wdl_;
161	public:	161	public:
162	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last(const chrono::year& __yval, const chrono::month& __mval,	162	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last(const chrono::year& __yval, const chrono::month& __mval,
163	const chrono::weekday_last& __wdlval) noexcept	163	const chrono::weekday_last& __wdlval) noexcept
164	: __y{__yval}, __m{__mval}, __wdl{__wdlval} {}	164	: __y_{__yval}, __m_{__mval}, __wdl_{__wdlval} {}
165	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const months& __dm) noexcept;	165	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const months& __dm) noexcept;
166	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const months& __dm) noexcept;	166	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const months& __dm) noexcept;
167	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const years& __dy) noexcept;	167	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const years& __dy) noexcept;
168	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const years& __dy) noexcept;	168	_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const years& __dy) noexcept;
169		169
170	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y; }	170	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
171	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m; }	171	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
172	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdl.weekday(); }	172	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdl_.weekday(); }
173	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl; }	173	_LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl_; }
174	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }	174	_LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
175	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }	175	_LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept { return local_days{__to_days()}; }
176	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y.ok() && __m.ok() && __wdl.ok(); }	176	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __m_.ok() && __wdl_.ok(); }
177		177
178	_LIBCPP_HIDE_FROM_ABI constexpr days __to_days() const noexcept;	178	_LIBCPP_HIDE_FROM_ABI constexpr days __to_days() const noexcept;
179		179
...	@@ -182,8 +182,8 @@ public:	...	@@ -182,8 +182,8 @@ public:
182	_LIBCPP_HIDE_FROM_ABI inline constexpr	182	_LIBCPP_HIDE_FROM_ABI inline constexpr
183	days year_month_weekday_last::__to_days() const noexcept	183	days year_month_weekday_last::__to_days() const noexcept
184	{	184	{
185	const sys_days __last = sys_days{__y/__m/last};	185	const sys_days __last = sys_days{__y_/__m_/last};
186	return (__last - (chrono::weekday{__last} - __wdl.weekday())).time_since_epoch();	186	return (__last - (chrono::weekday{__last} - __wdl_.weekday())).time_since_epoch();
187		187
188	}	188	}
189		189

...	@@ -13,11 +13,12 @@	...	@@ -13,11 +13,12 @@
13	#include <__concepts/arithmetic.h>	13	#include <__concepts/arithmetic.h>
14	#include <__concepts/same_as.h>	14	#include <__concepts/same_as.h>
15	#include <__config>	15	#include <__config>
		16	#include <__format/concepts.h>
16	#include <__format/format_error.h>	17	#include <__format/format_error.h>
17	#include <__format/formatter.h> // for __char_type TODO FMT Move the concept?
18	#include <__format/formatter_output.h>	18	#include <__format/formatter_output.h>
19	#include <__format/parser_std_format_spec.h>	19	#include <__format/parser_std_format_spec.h>
20	#include <__utility/unreachable.h>	20	#include <__utility/unreachable.h>
		21	#include <array>
21	#include <charconv>	22	#include <charconv>
22	#include <limits>	23	#include <limits>
23	#include <string>	24	#include <string>
...	@@ -112,7 +113,7 @@ _LIBCPP_HIDE_FROM_ABI inline string __determine_grouping(ptrdiff_t __size, const	...	@@ -112,7 +113,7 @@ _LIBCPP_HIDE_FROM_ABI inline string __determine_grouping(ptrdiff_t __size, const
112	// Char	113	// Char
113	//	114	//
114		115
115	template <__formatter::__char_type _CharT>	116	template <__fmt_char_type _CharT>
116	_LIBCPP_HIDE_FROM_ABI auto __format_char(	117	_LIBCPP_HIDE_FROM_ABI auto __format_char(
117	integral auto __value,	118	integral auto __value,
118	output_iterator<const _CharT&> auto __out_it,	119	output_iterator<const _CharT&> auto __out_it,
...	@@ -216,7 +217,7 @@ _LIBCPP_HIDE_FROM_ABI auto __format_integer(	...	@@ -216,7 +217,7 @@ _LIBCPP_HIDE_FROM_ABI auto __format_integer(
216		217
217	# ifndef _LIBCPP_HAS_NO_LOCALIZATION	218	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
218	if (__specs.__std_.__locale_specific_form_) {	219	if (__specs.__std_.__locale_specific_form_) {
219	const auto& __np = use_facet<numpunct<_CharT>>(__ctx.locale());	220	const auto& __np = std::use_facet<numpunct<_CharT>>(__ctx.locale());
220	string __grouping = __np.grouping();	221	string __grouping = __np.grouping();
221	ptrdiff_t __size = __last - __first;	222	ptrdiff_t __size = __last - __first;
222	// Writing the grouped form has more overhead than the normal output	223	// Writing the grouped form has more overhead than the normal output
...	@@ -243,7 +244,7 @@ _LIBCPP_HIDE_FROM_ABI auto __format_integer(	...	@@ -243,7 +244,7 @@ _LIBCPP_HIDE_FROM_ABI auto __format_integer(
243	// The zero padding is done like:	244	// The zero padding is done like:
244	// - Write [sign][prefix]	245	// - Write [sign][prefix]
245	// - Write data right aligned with '0' as fill character.	246	// - Write data right aligned with '0' as fill character.
246	__out_it = _VSTD::copy(__begin, __first, _VSTD::move(__out_it));	247	__out_it = __formatter::__copy(__begin, __first, _VSTD::move(__out_it));
247	__specs.__alignment_ = __format_spec::__alignment::__right;	248	__specs.__alignment_ = __format_spec::__alignment::__right;
248	__specs.__fill_ = _CharT('0');	249	__specs.__fill_ = _CharT('0');
249	int32_t __size = __first - __begin;	250	int32_t __size = __first - __begin;
...	@@ -309,7 +310,7 @@ __format_integer(_Tp __value, auto& __ctx, __format_spec::__parsed_specification	...	@@ -309,7 +310,7 @@ __format_integer(_Tp __value, auto& __ctx, __format_spec::__parsed_specification
309	auto __r = std::__to_unsigned_like(__value);	310	auto __r = std::__to_unsigned_like(__value);
310	bool __negative = __value < 0;	311	bool __negative = __value < 0;
311	if (__negative)	312	if (__negative)
312	__r = __complement(__r);	313	__r = std::__complement(__r);
313		314
314	return __formatter::__format_integer(__r, __ctx, __specs, __negative);	315	return __formatter::__format_integer(__r, __ctx, __specs, __negative);
315	}	316	}
...	@@ -341,7 +342,7 @@ __format_bool(bool __value, auto& __ctx, __format_spec::__parsed_specifications<	...	@@ -341,7 +342,7 @@ __format_bool(bool __value, auto& __ctx, __format_spec::__parsed_specifications<
341	-> decltype(__ctx.out()) {	342	-> decltype(__ctx.out()) {
342	# ifndef _LIBCPP_HAS_NO_LOCALIZATION	343	# ifndef _LIBCPP_HAS_NO_LOCALIZATION
343	if (__specs.__std_.__locale_specific_form_) {	344	if (__specs.__std_.__locale_specific_form_) {
344	const auto& __np = use_facet<numpunct<_CharT>>(__ctx.locale());	345	const auto& __np = std::use_facet<numpunct<_CharT>>(__ctx.locale());
345	basic_string<_CharT> __str = __value ? __np.truename() : __np.falsename();	346	basic_string<_CharT> __str = __value ? __np.truename() : __np.falsename();
346	return __formatter::__write_string_no_precision(basic_string_view<_CharT>{__str}, __ctx.out(), __specs);	347	return __formatter::__write_string_no_precision(basic_string_view<_CharT>{__str}, __ctx.out(), __specs);
347	}	348	}

...	@@ -24,70 +24,70 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,70 +24,70 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24	#if _LIBCPP_STD_VER > 11	24	#if _LIBCPP_STD_VER > 11
25		25
26	template <class _Tp, size_t _Np>	26	template <class _Tp, size_t _Np>
27	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	27	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
28	reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np])	28	reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np])
29	{	29	{
30	return reverse_iterator<_Tp*>(__array + _Np);	30	return reverse_iterator<_Tp*>(__array + _Np);
31	}	31	}
32		32
33	template <class _Tp, size_t _Np>	33	template <class _Tp, size_t _Np>
34	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	34	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
35	reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np])	35	reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np])
36	{	36	{
37	return reverse_iterator<_Tp*>(__array);	37	return reverse_iterator<_Tp*>(__array);
38	}	38	}
39		39
40	template <class _Ep>	40	template <class _Ep>
41	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	41	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
42	reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il)	42	reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il)
43	{	43	{
44	return reverse_iterator<const _Ep*>(__il.end());	44	return reverse_iterator<const _Ep*>(__il.end());
45	}	45	}
46		46
47	template <class _Ep>	47	template <class _Ep>
48	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	48	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
49	reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)	49	reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)
50	{	50	{
51	return reverse_iterator<const _Ep*>(__il.begin());	51	return reverse_iterator<const _Ep*>(__il.begin());
52	}	52	}
53		53
54	template <class _Cp>	54	template <class _Cp>
55	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	55	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
56	auto rbegin(_Cp& __c) -> decltype(__c.rbegin())	56	auto rbegin(_Cp& __c) -> decltype(__c.rbegin())
57	{	57	{
58	return __c.rbegin();	58	return __c.rbegin();
59	}	59	}
60		60
61	template <class _Cp>	61	template <class _Cp>
62	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	62	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
63	auto rbegin(const _Cp& __c) -> decltype(__c.rbegin())	63	auto rbegin(const _Cp& __c) -> decltype(__c.rbegin())
64	{	64	{
65	return __c.rbegin();	65	return __c.rbegin();
66	}	66	}
67		67
68	template <class _Cp>	68	template <class _Cp>
69	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	69	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
70	auto rend(_Cp& __c) -> decltype(__c.rend())	70	auto rend(_Cp& __c) -> decltype(__c.rend())
71	{	71	{
72	return __c.rend();	72	return __c.rend();
73	}	73	}
74		74
75	template <class _Cp>	75	template <class _Cp>
76	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	76	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
77	auto rend(const _Cp& __c) -> decltype(__c.rend())	77	auto rend(const _Cp& __c) -> decltype(__c.rend())
78	{	78	{
79	return __c.rend();	79	return __c.rend();
80	}	80	}
81		81
82	template <class _Cp>	82	template <class _Cp>
83	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	83	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
84	auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c))	84	auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c))
85	{	85	{
86	return _VSTD::rbegin(__c);	86	return _VSTD::rbegin(__c);
87	}	87	}
88		88
89	template <class _Cp>	89	template <class _Cp>
90	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14	90	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX17
91	auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))	91	auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))
92	{	92	{
93	return _VSTD::rend(__c);	93	return _VSTD::rend(__c);

...	@@ -23,8 +23,9 @@	...	@@ -23,8 +23,9 @@
23	#include <__ranges/access.h>	23	#include <__ranges/access.h>
24	#include <__ranges/concepts.h>	24	#include <__ranges/concepts.h>
25	#include <__ranges/dangling.h>	25	#include <__ranges/dangling.h>
		26	#include <__type_traits/remove_reference.h>
26	#include <__utility/move.h>	27	#include <__utility/move.h>
27	#include <type_traits>	28	#include <new>
28		29
29	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
30	# pragma GCC system_header	31	# pragma GCC system_header
...	@@ -32,7 +33,7 @@	...	@@ -32,7 +33,7 @@
32		33
33	_LIBCPP_BEGIN_NAMESPACE_STD	34	_LIBCPP_BEGIN_NAMESPACE_STD
34		35
35	#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	36	#if _LIBCPP_STD_VER > 17
36		37
37	namespace ranges {	38	namespace ranges {
38		39
...	@@ -255,7 +256,7 @@ struct __fn {	...	@@ -255,7 +256,7 @@ struct __fn {
255	sentinel_for<_InputIterator> _Sentinel1,	256	sentinel_for<_InputIterator> _Sentinel1,
256	__nothrow_forward_iterator _OutputIterator,	257	__nothrow_forward_iterator _OutputIterator,
257	__nothrow_sentinel_for<_OutputIterator> _Sentinel2>	258	__nothrow_sentinel_for<_OutputIterator> _Sentinel2>
258	requires constructible_from<iter_value_t<_OutputIterator>, iter_reference_t<_InputIterator>>	259	requires constructible_from<iter_value_t<_OutputIterator>, iter_rvalue_reference_t<_InputIterator>>
259	uninitialized_move_result<_InputIterator, _OutputIterator>	260	uninitialized_move_result<_InputIterator, _OutputIterator>
260	operator()(_InputIterator __ifirst, _Sentinel1 __ilast, _OutputIterator __ofirst, _Sentinel2 __olast) const {	261	operator()(_InputIterator __ifirst, _Sentinel1 __ilast, _OutputIterator __ofirst, _Sentinel2 __olast) const {
261	using _ValueType = remove_reference_t<iter_reference_t<_OutputIterator>>;	262	using _ValueType = remove_reference_t<iter_reference_t<_OutputIterator>>;
...	@@ -266,7 +267,7 @@ struct __fn {	...	@@ -266,7 +267,7 @@ struct __fn {
266	}	267	}
267		268
268	template <input_range _InputRange, __nothrow_forward_range _OutputRange>	269	template <input_range _InputRange, __nothrow_forward_range _OutputRange>
269	requires constructible_from<range_value_t<_OutputRange>, range_reference_t<_InputRange>>	270	requires constructible_from<range_value_t<_OutputRange>, range_rvalue_reference_t<_InputRange>>
270	uninitialized_move_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>	271	uninitialized_move_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>
271	operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {	272	operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {
272	return (*this)(ranges::begin(__in_range), ranges::end(__in_range),	273	return (*this)(ranges::begin(__in_range), ranges::end(__in_range),
...	@@ -291,7 +292,7 @@ struct __fn {	...	@@ -291,7 +292,7 @@ struct __fn {
291	template <input_iterator _InputIterator,	292	template <input_iterator _InputIterator,
292	__nothrow_forward_iterator _OutputIterator,	293	__nothrow_forward_iterator _OutputIterator,
293	__nothrow_sentinel_for<_OutputIterator> _Sentinel>	294	__nothrow_sentinel_for<_OutputIterator> _Sentinel>
294	requires constructible_from<iter_value_t<_OutputIterator>, iter_reference_t<_InputIterator>>	295	requires constructible_from<iter_value_t<_OutputIterator>, iter_rvalue_reference_t<_InputIterator>>
295	uninitialized_move_n_result<_InputIterator, _OutputIterator>	296	uninitialized_move_n_result<_InputIterator, _OutputIterator>
296	operator()(_InputIterator __ifirst, iter_difference_t<_InputIterator> __n,	297	operator()(_InputIterator __ifirst, iter_difference_t<_InputIterator> __n,
297	_OutputIterator __ofirst, _Sentinel __olast) const {	298	_OutputIterator __ofirst, _Sentinel __olast) const {
...	@@ -311,7 +312,7 @@ inline namespace __cpo {	...	@@ -311,7 +312,7 @@ inline namespace __cpo {
311		312
312	} // namespace ranges	313	} // namespace ranges
313		314
314	#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)	315	#endif // _LIBCPP_STD_VER > 17
315		316
316	_LIBCPP_END_NAMESPACE_STD	317	_LIBCPP_END_NAMESPACE_STD
317		318

...	@@ -24,7 +24,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,7 +24,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24	#if _LIBCPP_STD_VER > 14	24	#if _LIBCPP_STD_VER > 14
25		25
26	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp>	26	template <class _InputIterator, class _OutputIterator, class _Tp, class _BinaryOp>
27	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator	27	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
28	inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryOp __b, _Tp __init) {	28	inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryOp __b, _Tp __init) {
29	for (; __first != __last; ++__first, (void)++__result) {	29	for (; __first != __last; ++__first, (void)++__result) {
30	__init = __b(__init, *__first);	30	__init = __b(__init, *__first);
...	@@ -34,7 +34,7 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __	...	@@ -34,7 +34,7 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __
34	}	34	}
35		35
36	template <class _InputIterator, class _OutputIterator, class _BinaryOp>	36	template <class _InputIterator, class _OutputIterator, class _BinaryOp>
37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator	37	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
38	inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryOp __b) {	38	inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryOp __b) {
39	if (__first != __last) {	39	if (__first != __last) {
40	typename iterator_traits<_InputIterator>::value_type __init = *__first;	40	typename iterator_traits<_InputIterator>::value_type __init = *__first;
...	@@ -47,7 +47,7 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __	...	@@ -47,7 +47,7 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __
47	}	47	}
48		48
49	template <class _InputIterator, class _OutputIterator>	49	template <class _InputIterator, class _OutputIterator>
50	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _OutputIterator inclusive_scan(_InputIterator __first,	50	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator inclusive_scan(_InputIterator __first,
51	_InputIterator __last,	51	_InputIterator __last,
52	_OutputIterator __result) {	52	_OutputIterator __result) {
53	return _VSTD::inclusive_scan(__first, __last, __result, _VSTD::plus<>());	53	return _VSTD::inclusive_scan(__first, __last, __result, _VSTD::plus<>());

...	@@ -133,9 +133,9 @@ binomial_distribution<_IntType>::param_type::param_type(result_type __t, double	...	@@ -133,9 +133,9 @@ binomial_distribution<_IntType>::param_type::param_type(result_type __t, double
133	if (0 < __p_ && __p_ < 1)	133	if (0 < __p_ && __p_ < 1)
134	{	134	{
135	__r0_ = static_cast<result_type>((__t_ + 1) * __p_);	135	__r0_ = static_cast<result_type>((__t_ + 1) * __p_);
136	__pr_ = _VSTD::exp(__libcpp_lgamma(__t_ + 1.) -	136	__pr_ = _VSTD::exp(std::__libcpp_lgamma(__t_ + 1.) -
137	__libcpp_lgamma(__r0_ + 1.) -	137	std::__libcpp_lgamma(__r0_ + 1.) -
138	__libcpp_lgamma(__t_ - __r0_ + 1.) + __r0_ * _VSTD::log(__p_) +	138	std::__libcpp_lgamma(__t_ - __r0_ + 1.) + __r0_ * _VSTD::log(__p_) +
139	(__t_ - __r0_) * _VSTD::log(1 - __p_));	139	(__t_ - __r0_) * _VSTD::log(1 - __p_));
140	__odds_ratio_ = __p_ / (1 - __p_);	140	__odds_ratio_ = __p_ / (1 - __p_);
141	}	141	}
...	@@ -189,7 +189,7 @@ binomial_distribution<_IntType>::operator()(_URNG& __g, const param_type& __pr)	...	@@ -189,7 +189,7 @@ binomial_distribution<_IntType>::operator()(_URNG& __g, const param_type& __pr)
189	}	189	}
190		190
191	template <class _CharT, class _Traits, class _IntType>	191	template <class _CharT, class _Traits, class _IntType>
192	basic_ostream<_CharT, _Traits>&	192	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
193	operator<<(basic_ostream<_CharT, _Traits>& __os,	193	operator<<(basic_ostream<_CharT, _Traits>& __os,
194	const binomial_distribution<_IntType>& __x)	194	const binomial_distribution<_IntType>& __x)
195	{	195	{
...	@@ -203,7 +203,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -203,7 +203,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
203	}	203	}
204		204
205	template <class _CharT, class _Traits, class _IntType>	205	template <class _CharT, class _Traits, class _IntType>
206	basic_istream<_CharT, _Traits>&	206	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
207	operator>>(basic_istream<_CharT, _Traits>& __is,	207	operator>>(basic_istream<_CharT, _Traits>& __is,
208	binomial_distribution<_IntType>& __x)	208	binomial_distribution<_IntType>& __x)
209	{	209	{

...	@@ -12,8 +12,8 @@	...	@@ -12,8 +12,8 @@
12	#include <__config>	12	#include <__config>
13	#include <__random/is_seed_sequence.h>	13	#include <__random/is_seed_sequence.h>
14	#include <__utility/move.h>	14	#include <__utility/move.h>
15	#include <climits>
16	#include <iosfwd>	15	#include <iosfwd>
		16	#include <limits>
17	#include <type_traits>	17	#include <type_traits>
18		18
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -33,7 +33,9 @@ class _LIBCPP_TEMPLATE_VIS discard_block_engine	...	@@ -33,7 +33,9 @@ class _LIBCPP_TEMPLATE_VIS discard_block_engine
33		33
34	static_assert( 0 < __r, "discard_block_engine invalid parameters");	34	static_assert( 0 < __r, "discard_block_engine invalid parameters");
35	static_assert(__r <= __p, "discard_block_engine invalid parameters");	35	static_assert(__r <= __p, "discard_block_engine invalid parameters");
36	static_assert(__r <= INT_MAX, "discard_block_engine invalid parameters");	36	#ifndef _LIBCPP_CXX03_LANG // numeric_limits::max() is not constexpr in C++03
		37	static_assert(__r <= numeric_limits<int>::max(), "discard_block_engine invalid parameters");
		38	#endif
37	public:	39	public:
38	// types	40	// types
39	typedef typename _Engine::result_type result_type;	41	typedef typename _Engine::result_type result_type;
...	@@ -164,7 +166,7 @@ operator!=(const discard_block_engine<_Eng, _Pp, _Rp>& __x,	...	@@ -164,7 +166,7 @@ operator!=(const discard_block_engine<_Eng, _Pp, _Rp>& __x,
164		166
165	template <class _CharT, class _Traits,	167	template <class _CharT, class _Traits,
166	class _Eng, size_t _Pp, size_t _Rp>	168	class _Eng, size_t _Pp, size_t _Rp>
167	basic_ostream<_CharT, _Traits>&	169	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
168	operator<<(basic_ostream<_CharT, _Traits>& __os,	170	operator<<(basic_ostream<_CharT, _Traits>& __os,
169	const discard_block_engine<_Eng, _Pp, _Rp>& __x)	171	const discard_block_engine<_Eng, _Pp, _Rp>& __x)
170	{	172	{
...	@@ -178,7 +180,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -178,7 +180,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
178		180
179	template <class _CharT, class _Traits,	181	template <class _CharT, class _Traits,
180	class _Eng, size_t _Pp, size_t _Rp>	182	class _Eng, size_t _Pp, size_t _Rp>
181	basic_istream<_CharT, _Traits>&	183	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
182	operator>>(basic_istream<_CharT, _Traits>& __is,	184	operator>>(basic_istream<_CharT, _Traits>& __is,
183	discard_block_engine<_Eng, _Pp, _Rp>& __x)	185	discard_block_engine<_Eng, _Pp, _Rp>& __x)
184	{	186	{

...	@@ -51,12 +51,8 @@ private:	...	@@ -51,12 +51,8 @@ private:
51	static_assert(__w <= _Dt, "independent_bits_engine invalid parameters");	51	static_assert(__w <= _Dt, "independent_bits_engine invalid parameters");
52		52
53	typedef typename _Engine::result_type _Engine_result_type;	53	typedef typename _Engine::result_type _Engine_result_type;
54	typedef typename conditional	54	typedef __conditional_t<sizeof(_Engine_result_type) <= sizeof(result_type), result_type, _Engine_result_type>
55	<	55	_Working_result_type;
56	sizeof(_Engine_result_type) <= sizeof(result_type),
57	result_type,
58	_Engine_result_type
59	>::type _Working_result_type;
60	#ifdef _LIBCPP_CXX03_LANG	56	#ifdef _LIBCPP_CXX03_LANG
61	static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min	57	static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min
62	+ _Working_result_type(1);	58	+ _Working_result_type(1);
...	@@ -244,7 +240,7 @@ operator!=(	...	@@ -244,7 +240,7 @@ operator!=(
244		240
245	template <class _CharT, class _Traits,	241	template <class _CharT, class _Traits,
246	class _Eng, size_t _Wp, class _UInt>	242	class _Eng, size_t _Wp, class _UInt>
247	basic_ostream<_CharT, _Traits>&	243	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
248	operator<<(basic_ostream<_CharT, _Traits>& __os,	244	operator<<(basic_ostream<_CharT, _Traits>& __os,
249	const independent_bits_engine<_Eng, _Wp, _UInt>& __x)	245	const independent_bits_engine<_Eng, _Wp, _UInt>& __x)
250	{	246	{
...	@@ -253,7 +249,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -253,7 +249,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
253		249
254	template <class _CharT, class _Traits,	250	template <class _CharT, class _Traits,
255	class _Eng, size_t _Wp, class _UInt>	251	class _Eng, size_t _Wp, class _UInt>
256	basic_istream<_CharT, _Traits>&	252	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
257	operator>>(basic_istream<_CharT, _Traits>& __is,	253	operator>>(basic_istream<_CharT, _Traits>& __is,
258	independent_bits_engine<_Eng, _Wp, _UInt>& __x)	254	independent_bits_engine<_Eng, _Wp, _UInt>& __x)
259	{	255	{

...	@@ -36,7 +36,7 @@ class _LIBCPP_TEMPLATE_VIS mersenne_twister_engine;	...	@@ -36,7 +36,7 @@ class _LIBCPP_TEMPLATE_VIS mersenne_twister_engine;
36	template <class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	36	template <class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
37	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	37	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
38	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	38	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
39	bool	39	_LIBCPP_HIDE_FROM_ABI bool
40	operator==(const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	40	operator==(const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
41	_Bp, _Tp, _Cp, _Lp, _Fp>& __x,	41	_Bp, _Tp, _Cp, _Lp, _Fp>& __x,
42	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	42	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
...	@@ -56,7 +56,7 @@ template <class _CharT, class _Traits,	...	@@ -56,7 +56,7 @@ template <class _CharT, class _Traits,
56	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	56	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
57	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	57	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
58	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	58	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
59	basic_ostream<_CharT, _Traits>&	59	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
60	operator<<(basic_ostream<_CharT, _Traits>& __os,	60	operator<<(basic_ostream<_CharT, _Traits>& __os,
61	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	61	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
62	_Bp, _Tp, _Cp, _Lp, _Fp>& __x);	62	_Bp, _Tp, _Cp, _Lp, _Fp>& __x);
...	@@ -65,7 +65,7 @@ template <class _CharT, class _Traits,	...	@@ -65,7 +65,7 @@ template <class _CharT, class _Traits,
65	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	65	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
66	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	66	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
67	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	67	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
68	basic_istream<_CharT, _Traits>&	68	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
69	operator>>(basic_istream<_CharT, _Traits>& __is,	69	operator>>(basic_istream<_CharT, _Traits>& __is,
70	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	70	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
71	_Bp, _Tp, _Cp, _Lp, _Fp>& __x);	71	_Bp, _Tp, _Cp, _Lp, _Fp>& __x);
...	@@ -416,7 +416,7 @@ mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,	...	@@ -416,7 +416,7 @@ mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
416	template <class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	416	template <class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
417	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	417	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
418	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	418	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
419	bool	419	_LIBCPP_HIDE_FROM_ABI bool
420	operator==(const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	420	operator==(const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
421	_Bp, _Tp, _Cp, _Lp, _Fp>& __x,	421	_Bp, _Tp, _Cp, _Lp, _Fp>& __x,
422	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	422	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
...	@@ -474,7 +474,7 @@ template <class _CharT, class _Traits,	...	@@ -474,7 +474,7 @@ template <class _CharT, class _Traits,
474	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	474	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
475	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	475	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
476	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	476	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
477	basic_ostream<_CharT, _Traits>&	477	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
478	operator<<(basic_ostream<_CharT, _Traits>& __os,	478	operator<<(basic_ostream<_CharT, _Traits>& __os,
479	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	479	const mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
480	_Bp, _Tp, _Cp, _Lp, _Fp>& __x)	480	_Bp, _Tp, _Cp, _Lp, _Fp>& __x)
...	@@ -496,7 +496,7 @@ template <class _CharT, class _Traits,	...	@@ -496,7 +496,7 @@ template <class _CharT, class _Traits,
496	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,	496	class _UInt, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
497	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,	497	_UInt _Ap, size_t _Up, _UInt _Dp, size_t _Sp,
498	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>	498	_UInt _Bp, size_t _Tp, _UInt _Cp, size_t _Lp, _UInt _Fp>
499	basic_istream<_CharT, _Traits>&	499	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
500	operator>>(basic_istream<_CharT, _Traits>& __is,	500	operator>>(basic_istream<_CharT, _Traits>& __is,
501	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,	501	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
502	_Bp, _Tp, _Cp, _Lp, _Fp>& __x)	502	_Bp, _Tp, _Cp, _Lp, _Fp>& __x)

update libcxx to llvm 16

...	@@ -33,7 +33,7 @@ template<class _UIntType, size_t __w, size_t __s, size_t __r>	...	@@ -33,7 +33,7 @@ template<class _UIntType, size_t __w, size_t __s, size_t __r>
33	class _LIBCPP_TEMPLATE_VIS subtract_with_carry_engine;	33	class _LIBCPP_TEMPLATE_VIS subtract_with_carry_engine;
34		34
35	template<class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	35	template<class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
36	bool	36	_LIBCPP_HIDE_FROM_ABI bool
37	operator==(	37	operator==(
38	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x,	38	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x,
39	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __y);	39	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __y);
...	@@ -47,13 +47,13 @@ operator!=(	...	@@ -47,13 +47,13 @@ operator!=(
47		47
48	template <class _CharT, class _Traits,	48	template <class _CharT, class _Traits,
49	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	49	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
50	basic_ostream<_CharT, _Traits>&	50	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
51	operator<<(basic_ostream<_CharT, _Traits>& __os,	51	operator<<(basic_ostream<_CharT, _Traits>& __os,
52	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);	52	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);
53		53
54	template <class _CharT, class _Traits,	54	template <class _CharT, class _Traits,
55	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	55	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
56	basic_istream<_CharT, _Traits>&	56	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
57	operator>>(basic_istream<_CharT, _Traits>& __is,	57	operator>>(basic_istream<_CharT, _Traits>& __is,
58	subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);	58	subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);
59		59
...	@@ -251,7 +251,7 @@ subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()()	...	@@ -251,7 +251,7 @@ subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()()
251	}	251	}
252		252
253	template<class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	253	template<class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
254	bool	254	_LIBCPP_HIDE_FROM_ABI bool
255	operator==(	255	operator==(
256	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x,	256	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x,
257	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __y)	257	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __y)
...	@@ -305,7 +305,7 @@ operator!=(	...	@@ -305,7 +305,7 @@ operator!=(
305		305
306	template <class _CharT, class _Traits,	306	template <class _CharT, class _Traits,
307	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	307	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
308	basic_ostream<_CharT, _Traits>&	308	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
309	operator<<(basic_ostream<_CharT, _Traits>& __os,	309	operator<<(basic_ostream<_CharT, _Traits>& __os,
310	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x)	310	const subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x)
311	{	311	{
...	@@ -325,7 +325,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,	...	@@ -325,7 +325,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os,
325		325
326	template <class _CharT, class _Traits,	326	template <class _CharT, class _Traits,
327	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	327	class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
328	basic_istream<_CharT, _Traits>&	328	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
329	operator>>(basic_istream<_CharT, _Traits>& __is,	329	operator>>(basic_istream<_CharT, _Traits>& __is,
330	subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x)	330	subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x)
331	{	331	{

...	@@ -210,10 +210,6 @@ template <class Key, class T, class Hash, class Pred, class Alloc>	...	@@ -210,10 +210,6 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
210	#include <stdexcept>	210	#include <stdexcept>
211	#include <type_traits>	211	#include <type_traits>
212		212
213	#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
214	# include <iterator>
215	#endif
216
217	#if defined(__DEPRECATED) && __DEPRECATED	213	#if defined(__DEPRECATED) && __DEPRECATED
218	#if defined(_LIBCPP_WARNING)	214	#if defined(_LIBCPP_WARNING)
219	_LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>")	215	_LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>")
...	@@ -382,7 +378,7 @@ public:	...	@@ -382,7 +378,7 @@ public:
382	typedef std::pair<key_type, mapped_type> value_type;	378	typedef std::pair<key_type, mapped_type> value_type;
383	typedef typename _HashIterator::difference_type difference_type;	379	typedef typename _HashIterator::difference_type difference_type;
384	typedef value_type& reference;	380	typedef value_type& reference;
385	typedef typename std::__rebind_pointer<typename _HashIterator::pointer, value_type>::type	381	typedef std::__rebind_pointer_t<typename _HashIterator::pointer, value_type>
386	pointer;	382	pointer;
387		383
388	_LIBCPP_INLINE_VISIBILITY __hash_map_iterator() {}	384	_LIBCPP_INLINE_VISIBILITY __hash_map_iterator() {}
...	@@ -427,7 +423,7 @@ public:	...	@@ -427,7 +423,7 @@ public:
427	typedef std::pair<key_type, mapped_type> value_type;	423	typedef std::pair<key_type, mapped_type> value_type;
428	typedef typename _HashIterator::difference_type difference_type;	424	typedef typename _HashIterator::difference_type difference_type;
429	typedef const value_type& reference;	425	typedef const value_type& reference;
430	typedef typename std::__rebind_pointer<typename _HashIterator::pointer, const value_type>::type	426	typedef std::__rebind_pointer_t<typename _HashIterator::pointer, const value_type>
431	pointer;	427	pointer;
432		428
433	_LIBCPP_INLINE_VISIBILITY __hash_map_const_iterator() {}	429	_LIBCPP_INLINE_VISIBILITY __hash_map_const_iterator() {}
...	@@ -487,8 +483,7 @@ private:	...	@@ -487,8 +483,7 @@ private:
487	typedef std::pair<key_type, mapped_type> __value_type;	483	typedef std::pair<key_type, mapped_type> __value_type;
488	typedef __hash_map_hasher<__value_type, hasher> __hasher;	484	typedef __hash_map_hasher<__value_type, hasher> __hasher;
489	typedef __hash_map_equal<__value_type, key_equal> __key_equal;	485	typedef __hash_map_equal<__value_type, key_equal> __key_equal;
490	typedef typename std::__rebind_alloc_helper<	486	typedef std::__rebind_alloc<std::allocator_traits<allocator_type>, __value_type> __allocator_type;
491	std::allocator_traits<allocator_type>, __value_type>::type __allocator_type;
492		487
493	typedef std::__hash_table<__value_type, __hasher,	488	typedef std::__hash_table<__value_type, __hasher,
494	__key_equal, __allocator_type> __table;	489	__key_equal, __allocator_type> __table;
...	@@ -714,7 +709,7 @@ swap(hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	...	@@ -714,7 +709,7 @@ swap(hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
714	}	709	}
715		710
716	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	711	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
717	bool	712	_LIBCPP_HIDE_FROM_ABI bool
718	operator==(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	713	operator==(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
719	const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)	714	const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
720	{	715	{
...	@@ -761,7 +756,7 @@ private:	...	@@ -761,7 +756,7 @@ private:
761	typedef std::pair<key_type, mapped_type> __value_type;	756	typedef std::pair<key_type, mapped_type> __value_type;
762	typedef __hash_map_hasher<__value_type, hasher> __hasher;	757	typedef __hash_map_hasher<__value_type, hasher> __hasher;
763	typedef __hash_map_equal<__value_type, key_equal> __key_equal;	758	typedef __hash_map_equal<__value_type, key_equal> __key_equal;
764	typedef typename std::__rebind_alloc_helper<std::allocator_traits<allocator_type>, __value_type>::type __allocator_type;	759	typedef std::__rebind_alloc<std::allocator_traits<allocator_type>, __value_type> __allocator_type;
765		760
766	typedef std::__hash_table<__value_type, __hasher,	761	typedef std::__hash_table<__value_type, __hasher,
767	__key_equal, __allocator_type> __table;	762	__key_equal, __allocator_type> __table;
...	@@ -954,7 +949,7 @@ swap(hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	...	@@ -954,7 +949,7 @@ swap(hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
954	}	949	}
955		950
956	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	951	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
957	bool	952	_LIBCPP_HIDE_FROM_ABI bool
958	operator==(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	953	operator==(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
959	const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)	954	const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
960	{	955	{
...	@@ -987,4 +982,9 @@ operator!=(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,	...	@@ -987,4 +982,9 @@ operator!=(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
987		982
988	} // namespace __gnu_cxx	983	} // namespace __gnu_cxx
989		984
		985	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		986	# include <concepts>
		987	# include <iterator>
		988	#endif
		989
990	#endif // _LIBCPP_HASH_MAP	990	#endif // _LIBCPP_HASH_MAP

...	@@ -278,7 +278,7 @@ setw(int __n)	...	@@ -278,7 +278,7 @@ setw(int __n)
278	template <class _MoneyT> class __iom_t7;	278	template <class _MoneyT> class __iom_t7;
279		279
280	template <class _CharT, class _Traits, class _MoneyT>	280	template <class _CharT, class _Traits, class _MoneyT>
281	basic_istream<_CharT, _Traits>&	281	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
282	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x);	282	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x);
283		283
284	template <class _MoneyT>	284	template <class _MoneyT>
...	@@ -298,7 +298,7 @@ public:	...	@@ -298,7 +298,7 @@ public:
298	};	298	};
299		299
300	template <class _CharT, class _Traits, class _MoneyT>	300	template <class _CharT, class _Traits, class _MoneyT>
301	basic_istream<_CharT, _Traits>&	301	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
302	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)	302	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)
303	{	303	{
304	#ifndef _LIBCPP_NO_EXCEPTIONS	304	#ifndef _LIBCPP_NO_EXCEPTIONS
...	@@ -311,7 +311,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)	...	@@ -311,7 +311,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)
311	typedef istreambuf_iterator<_CharT, _Traits> _Ip;	311	typedef istreambuf_iterator<_CharT, _Traits> _Ip;
312	typedef money_get<_CharT, _Ip> _Fp;	312	typedef money_get<_CharT, _Ip> _Fp;
313	ios_base::iostate __err = ios_base::goodbit;	313	ios_base::iostate __err = ios_base::goodbit;
314	const _Fp& __mf = use_facet<_Fp>(__is.getloc());	314	const _Fp& __mf = std::use_facet<_Fp>(__is.getloc());
315	__mf.get(_Ip(__is), _Ip(), __x.__intl_, __is, __err, __x.__mon_);	315	__mf.get(_Ip(__is), _Ip(), __x.__intl_, __is, __err, __x.__mon_);
316	__is.setstate(__err);	316	__is.setstate(__err);
317	}	317	}
...	@@ -338,7 +338,7 @@ get_money(_MoneyT& __mon, bool __intl = false)	...	@@ -338,7 +338,7 @@ get_money(_MoneyT& __mon, bool __intl = false)
338	template <class _MoneyT> class __iom_t8;	338	template <class _MoneyT> class __iom_t8;
339		339
340	template <class _CharT, class _Traits, class _MoneyT>	340	template <class _CharT, class _Traits, class _MoneyT>
341	basic_ostream<_CharT, _Traits>&	341	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
342	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x);	342	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x);
343		343
344	template <class _MoneyT>	344	template <class _MoneyT>
...	@@ -358,7 +358,7 @@ public:	...	@@ -358,7 +358,7 @@ public:
358	};	358	};
359		359
360	template <class _CharT, class _Traits, class _MoneyT>	360	template <class _CharT, class _Traits, class _MoneyT>
361	basic_ostream<_CharT, _Traits>&	361	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
362	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)	362	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)
363	{	363	{
364	#ifndef _LIBCPP_NO_EXCEPTIONS	364	#ifndef _LIBCPP_NO_EXCEPTIONS
...	@@ -370,7 +370,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)	...	@@ -370,7 +370,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)
370	{	370	{
371	typedef ostreambuf_iterator<_CharT, _Traits> _Op;	371	typedef ostreambuf_iterator<_CharT, _Traits> _Op;
372	typedef money_put<_CharT, _Op> _Fp;	372	typedef money_put<_CharT, _Op> _Fp;
373	const _Fp& __mf = use_facet<_Fp>(__os.getloc());	373	const _Fp& __mf = std::use_facet<_Fp>(__os.getloc());
374	if (__mf.put(_Op(__os), __x.__intl_, __os, __os.fill(), __x.__mon_).failed())	374	if (__mf.put(_Op(__os), __x.__intl_, __os, __os.fill(), __x.__mon_).failed())
375	__os.setstate(ios_base::badbit);	375	__os.setstate(ios_base::badbit);
376	}	376	}
...	@@ -397,7 +397,7 @@ put_money(const _MoneyT& __mon, bool __intl = false)	...	@@ -397,7 +397,7 @@ put_money(const _MoneyT& __mon, bool __intl = false)
397	template <class _CharT> class __iom_t9;	397	template <class _CharT> class __iom_t9;
398		398
399	template <class _CharT, class _Traits>	399	template <class _CharT, class _Traits>
400	basic_istream<_CharT, _Traits>&	400	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
401	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x);	401	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x);
402		402
403	template <class _CharT>	403	template <class _CharT>
...	@@ -417,7 +417,7 @@ public:	...	@@ -417,7 +417,7 @@ public:
417	};	417	};
418		418
419	template <class _CharT, class _Traits>	419	template <class _CharT, class _Traits>
420	basic_istream<_CharT, _Traits>&	420	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
421	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)	421	operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)
422	{	422	{
423	#ifndef _LIBCPP_NO_EXCEPTIONS	423	#ifndef _LIBCPP_NO_EXCEPTIONS
...	@@ -430,7 +430,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)	...	@@ -430,7 +430,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)
430	typedef istreambuf_iterator<_CharT, _Traits> _Ip;	430	typedef istreambuf_iterator<_CharT, _Traits> _Ip;
431	typedef time_get<_CharT, _Ip> _Fp;	431	typedef time_get<_CharT, _Ip> _Fp;
432	ios_base::iostate __err = ios_base::goodbit;	432	ios_base::iostate __err = ios_base::goodbit;
433	const _Fp& __tf = use_facet<_Fp>(__is.getloc());	433	const _Fp& __tf = std::use_facet<_Fp>(__is.getloc());
434	__tf.get(_Ip(__is), _Ip(), __is, __err, __x.__tm_,	434	__tf.get(_Ip(__is), _Ip(), __is, __err, __x.__tm_,
435	__x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_));	435	__x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_));
436	__is.setstate(__err);	436	__is.setstate(__err);
...	@@ -458,7 +458,7 @@ get_time(tm* __tm, const _CharT* __fmt)	...	@@ -458,7 +458,7 @@ get_time(tm* __tm, const _CharT* __fmt)
458	template <class _CharT> class __iom_t10;	458	template <class _CharT> class __iom_t10;
459		459
460	template <class _CharT, class _Traits>	460	template <class _CharT, class _Traits>
461	basic_ostream<_CharT, _Traits>&	461	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
462	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x);	462	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x);
463		463
464	template <class _CharT>	464	template <class _CharT>
...	@@ -478,7 +478,7 @@ public:	...	@@ -478,7 +478,7 @@ public:
478	};	478	};
479		479
480	template <class _CharT, class _Traits>	480	template <class _CharT, class _Traits>
481	basic_ostream<_CharT, _Traits>&	481	_LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
482	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)	482	operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)
483	{	483	{
484	#ifndef _LIBCPP_NO_EXCEPTIONS	484	#ifndef _LIBCPP_NO_EXCEPTIONS
...	@@ -490,7 +490,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)	...	@@ -490,7 +490,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)
490	{	490	{
491	typedef ostreambuf_iterator<_CharT, _Traits> _Op;	491	typedef ostreambuf_iterator<_CharT, _Traits> _Op;
492	typedef time_put<_CharT, _Op> _Fp;	492	typedef time_put<_CharT, _Op> _Fp;
493	const _Fp& __tf = use_facet<_Fp>(__os.getloc());	493	const _Fp& __tf = std::use_facet<_Fp>(__os.getloc());
494	if (__tf.put(_Op(__os), __os, __os.fill(), __x.__tm_,	494	if (__tf.put(_Op(__os), __os, __os.fill(), __x.__tm_,
495	__x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_)).failed())	495	__x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_)).failed())
496	__os.setstate(ios_base::badbit);	496	__os.setstate(ios_base::badbit);

...	@@ -192,7 +192,7 @@ public:	...	@@ -192,7 +192,7 @@ public:
192	inline _LIBCPP_HIDE_FROM_ABI_AFTER_V1	192	inline _LIBCPP_HIDE_FROM_ABI_AFTER_V1
193	explicit basic_istream(basic_streambuf<char_type, traits_type>* __sb) : __gc_(0)	193	explicit basic_istream(basic_streambuf<char_type, traits_type>* __sb) : __gc_(0)
194	{ this->init(__sb); }	194	{ this->init(__sb); }
195	virtual ~basic_istream();	195	~basic_istream() override;
196	protected:	196	protected:
197	inline _LIBCPP_INLINE_VISIBILITY	197	inline _LIBCPP_INLINE_VISIBILITY
198	basic_istream(basic_istream&& __rhs);	198	basic_istream(basic_istream&& __rhs);
...	@@ -316,7 +316,7 @@ basic_istream<_CharT, _Traits>::sentry::sentry(basic_istream<_CharT, _Traits>& _	...	@@ -316,7 +316,7 @@ basic_istream<_CharT, _Traits>::sentry::sentry(basic_istream<_CharT, _Traits>& _
316	if (!__noskipws && (__is.flags() & ios_base::skipws))	316	if (!__noskipws && (__is.flags() & ios_base::skipws))
317	{	317	{
318	typedef istreambuf_iterator<_CharT, _Traits> _Ip;	318	typedef istreambuf_iterator<_CharT, _Traits> _Ip;
319	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());	319	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
320	_Ip __i(__is);	320	_Ip __i(__is);
321	_Ip __eof;	321	_Ip __eof;
322	for (; __i != __eof; ++__i)	322	for (; __i != __eof; ++__i)
...	@@ -366,7 +366,7 @@ __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {	...	@@ -366,7 +366,7 @@ __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
366	#endif // _LIBCPP_NO_EXCEPTIONS	366	#endif // _LIBCPP_NO_EXCEPTIONS
367	typedef istreambuf_iterator<_CharT, _Traits> _Ip;	367	typedef istreambuf_iterator<_CharT, _Traits> _Ip;
368	typedef num_get<_CharT, _Ip> _Fp;	368	typedef num_get<_CharT, _Ip> _Fp;
369	use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __n);	369	std::use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __n);
370	#ifndef _LIBCPP_NO_EXCEPTIONS	370	#ifndef _LIBCPP_NO_EXCEPTIONS
371	}	371	}
372	catch (...)	372	catch (...)
...	@@ -476,7 +476,7 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp	...	@@ -476,7 +476,7 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp
476	typedef istreambuf_iterator<_CharT, _Traits> _Ip;	476	typedef istreambuf_iterator<_CharT, _Traits> _Ip;
477	typedef num_get<_CharT, _Ip> _Fp;	477	typedef num_get<_CharT, _Ip> _Fp;
478	long __temp;	478	long __temp;
479	use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __temp);	479	std::use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __temp);
480	if (__temp < numeric_limits<_Tp>::min())	480	if (__temp < numeric_limits<_Tp>::min())
481	{	481	{
482	__state \|= ios_base::failbit;	482	__state \|= ios_base::failbit;
...	@@ -536,7 +536,7 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)	...	@@ -536,7 +536,7 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)
536	{	536	{
537	#endif	537	#endif
538	_CharT* __s = __p;	538	_CharT* __s = __p;
539	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());	539	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
540	while (__s != __p + (__n-1))	540	while (__s != __p + (__n-1))
541	{	541	{
542	typename _Traits::int_type __i = __is.rdbuf()->sgetc();	542	typename _Traits::int_type __i = __is.rdbuf()->sgetc();
...	@@ -633,7 +633,7 @@ operator>>(basic_istream<char, _Traits>& __is, signed char* __s)	...	@@ -633,7 +633,7 @@ operator>>(basic_istream<char, _Traits>& __is, signed char* __s)
633	#endif // _LIBCPP_STD_VER > 17	633	#endif // _LIBCPP_STD_VER > 17
634		634
635	template<class _CharT, class _Traits>	635	template<class _CharT, class _Traits>
636	basic_istream<_CharT, _Traits>&	636	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
637	operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)	637	operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
638	{	638	{
639	ios_base::iostate __state = ios_base::goodbit;	639	ios_base::iostate __state = ios_base::goodbit;
...	@@ -1329,7 +1329,7 @@ basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)	...	@@ -1329,7 +1329,7 @@ basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)
1329	}	1329	}
1330		1330
1331	template <class _CharT, class _Traits>	1331	template <class _CharT, class _Traits>
1332	basic_istream<_CharT, _Traits>&	1332	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
1333	ws(basic_istream<_CharT, _Traits>& __is)	1333	ws(basic_istream<_CharT, _Traits>& __is)
1334	{	1334	{
1335	ios_base::iostate __state = ios_base::goodbit;	1335	ios_base::iostate __state = ios_base::goodbit;
...	@@ -1340,7 +1340,7 @@ ws(basic_istream<_CharT, _Traits>& __is)	...	@@ -1340,7 +1340,7 @@ ws(basic_istream<_CharT, _Traits>& __is)
1340	try	1340	try
1341	{	1341	{
1342	#endif // _LIBCPP_NO_EXCEPTIONS	1342	#endif // _LIBCPP_NO_EXCEPTIONS
1343	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());	1343	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
1344	while (true)	1344	while (true)
1345	{	1345	{
1346	typename _Traits::int_type __i = __is.rdbuf()->sgetc();	1346	typename _Traits::int_type __i = __is.rdbuf()->sgetc();
...	@@ -1375,7 +1375,7 @@ struct __is_istreamable : false_type { };	...	@@ -1375,7 +1375,7 @@ struct __is_istreamable : false_type { };
1375		1375
1376	template <class _Stream, class _Tp>	1376	template <class _Stream, class _Tp>
1377	struct __is_istreamable<_Stream, _Tp, decltype(	1377	struct __is_istreamable<_Stream, _Tp, decltype(
1378	declval<_Stream>() >> declval<_Tp>(), void()	1378	std::declval<_Stream>() >> std::declval<_Tp>(), void()
1379	)> : true_type { };	1379	)> : true_type { };
1380		1380
1381	template <class _Stream, class _Tp, class = typename enable_if<	1381	template <class _Stream, class _Tp, class = typename enable_if<
...	@@ -1408,7 +1408,7 @@ public:	...	@@ -1408,7 +1408,7 @@ public:
1408	: basic_istream<_CharT, _Traits>(__sb)	1408	: basic_istream<_CharT, _Traits>(__sb)
1409	{}	1409	{}
1410		1410
1411	virtual ~basic_iostream();	1411	~basic_iostream() override;
1412	protected:	1412	protected:
1413	inline _LIBCPP_INLINE_VISIBILITY	1413	inline _LIBCPP_INLINE_VISIBILITY
1414	basic_iostream(basic_iostream&& __rhs);	1414	basic_iostream(basic_iostream&& __rhs);
...	@@ -1442,7 +1442,7 @@ basic_iostream<_CharT, _Traits>::~basic_iostream()	...	@@ -1442,7 +1442,7 @@ basic_iostream<_CharT, _Traits>::~basic_iostream()
1442	}	1442	}
1443		1443
1444	template<class _CharT, class _Traits, class _Allocator>	1444	template<class _CharT, class _Traits, class _Allocator>
1445	basic_istream<_CharT, _Traits>&	1445	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
1446	operator>>(basic_istream<_CharT, _Traits>& __is,	1446	operator>>(basic_istream<_CharT, _Traits>& __is,
1447	basic_string<_CharT, _Traits, _Allocator>& __str)	1447	basic_string<_CharT, _Traits, _Allocator>& __str)
1448	{	1448	{
...	@@ -1461,7 +1461,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is,	...	@@ -1461,7 +1461,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
1461	if (__n <= 0)	1461	if (__n <= 0)
1462	__n = numeric_limits<streamsize>::max();	1462	__n = numeric_limits<streamsize>::max();
1463	streamsize __c = 0;	1463	streamsize __c = 0;
1464	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());	1464	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
1465	while (__c < __n)	1465	while (__c < __n)
1466	{	1466	{
1467	typename _Traits::int_type __i = __is.rdbuf()->sgetc();	1467	typename _Traits::int_type __i = __is.rdbuf()->sgetc();
...	@@ -1498,7 +1498,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is,	...	@@ -1498,7 +1498,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
1498	}	1498	}
1499		1499
1500	template<class _CharT, class _Traits, class _Allocator>	1500	template<class _CharT, class _Traits, class _Allocator>
1501	basic_istream<_CharT, _Traits>&	1501	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
1502	getline(basic_istream<_CharT, _Traits>& __is,	1502	getline(basic_istream<_CharT, _Traits>& __is,
1503	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)	1503	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
1504	{	1504	{
...	@@ -1556,7 +1556,7 @@ basic_istream<_CharT, _Traits>&	...	@@ -1556,7 +1556,7 @@ basic_istream<_CharT, _Traits>&
1556	getline(basic_istream<_CharT, _Traits>& __is,	1556	getline(basic_istream<_CharT, _Traits>& __is,
1557	basic_string<_CharT, _Traits, _Allocator>& __str)	1557	basic_string<_CharT, _Traits, _Allocator>& __str)
1558	{	1558	{
1559	return getline(__is, __str, __is.widen('\n'));	1559	return std::getline(__is, __str, __is.widen('\n'));
1560	}	1560	}
1561		1561
1562	template<class _CharT, class _Traits, class _Allocator>	1562	template<class _CharT, class _Traits, class _Allocator>
...	@@ -1565,7 +1565,7 @@ basic_istream<_CharT, _Traits>&	...	@@ -1565,7 +1565,7 @@ basic_istream<_CharT, _Traits>&
1565	getline(basic_istream<_CharT, _Traits>&& __is,	1565	getline(basic_istream<_CharT, _Traits>&& __is,
1566	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)	1566	basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
1567	{	1567	{
1568	return getline(__is, __str, __dlm);	1568	return std::getline(__is, __str, __dlm);
1569	}	1569	}
1570		1570
1571	template<class _CharT, class _Traits, class _Allocator>	1571	template<class _CharT, class _Traits, class _Allocator>
...	@@ -1574,11 +1574,11 @@ basic_istream<_CharT, _Traits>&	...	@@ -1574,11 +1574,11 @@ basic_istream<_CharT, _Traits>&
1574	getline(basic_istream<_CharT, _Traits>&& __is,	1574	getline(basic_istream<_CharT, _Traits>&& __is,
1575	basic_string<_CharT, _Traits, _Allocator>& __str)	1575	basic_string<_CharT, _Traits, _Allocator>& __str)
1576	{	1576	{
1577	return getline(__is, __str, __is.widen('\n'));	1577	return std::getline(__is, __str, __is.widen('\n'));
1578	}	1578	}
1579		1579
1580	template <class _CharT, class _Traits, size_t _Size>	1580	template <class _CharT, class _Traits, size_t _Size>
1581	basic_istream<_CharT, _Traits>&	1581	_LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>&
1582	operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)	1582	operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
1583	{	1583	{
1584	ios_base::iostate __state = ios_base::goodbit;	1584	ios_base::iostate __state = ios_base::goodbit;
...	@@ -1590,7 +1590,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)	...	@@ -1590,7 +1590,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
1590	{	1590	{
1591	#endif	1591	#endif
1592	basic_string<_CharT, _Traits> __str;	1592	basic_string<_CharT, _Traits> __str;
1593	const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());	1593	const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
1594	size_t __c = 0;	1594	size_t __c = 0;
1595	_CharT __zero = __ct.widen('0');	1595	_CharT __zero = __ct.widen('0');
1596	_CharT __one = __ct.widen('1');	1596	_CharT __one = __ct.widen('1');
...	@@ -1637,6 +1637,11 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_iostream<char>;	...	@@ -1637,6 +1637,11 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_iostream<char>;
1637		1637
1638	_LIBCPP_END_NAMESPACE_STD	1638	_LIBCPP_END_NAMESPACE_STD
1639		1639
		1640	#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
		1641	# include <concepts>
		1642	# include <type_traits>
		1643	#endif
		1644
1640	_LIBCPP_POP_MACROS	1645	_LIBCPP_POP_MACROS
1641		1646
1642	#endif // _LIBCPP_ISTREAM	1647	#endif // _LIBCPP_ISTREAM