[libcxx-commits] [libcxx] b07b5bd - [libc++] Test that our algorithms never copy a user-provided comparator.
Arthur O'Dwyer via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Nov 19 12:08:35 PST 2021
Author: Arthur O'Dwyer
Date: 2021-11-19T15:03:24-05:00
New Revision: b07b5bd72716625e0976a84d23652d94d8d0165a
URL: https://github.com/llvm/llvm-project/commit/b07b5bd72716625e0976a84d23652d94d8d0165a
DIFF: https://github.com/llvm/llvm-project/commit/b07b5bd72716625e0976a84d23652d94d8d0165a.diff
LOG: [libc++] Test that our algorithms never copy a user-provided comparator.
This is not mandated by the standard, so it goes in libcxx/test/libcxx/.
It's certainly arguable that the algorithms changed here
(`is_heap`, `is_sorted`, `min`, `max`) are harmless and we should
just let them copy their comparators once. But at the same time,
it's nice to have all our algorithms be 100% consistent and never
copy a comparator, not even once.
Differential Revision: https://reviews.llvm.org/D114136
Added:
libcxx/test/libcxx/algorithms/robust_against_copying_comparators.pass.cpp
Modified:
libcxx/include/__algorithm/binary_search.h
libcxx/include/__algorithm/is_heap.h
libcxx/include/__algorithm/is_heap_until.h
libcxx/include/__algorithm/is_sorted.h
libcxx/include/__algorithm/is_sorted_until.h
libcxx/include/__algorithm/max.h
libcxx/include/__algorithm/max_element.h
libcxx/include/__algorithm/min.h
libcxx/include/__algorithm/min_element.h
libcxx/test/std/algorithms/robust_against_adl.compile.pass.cpp
libcxx/test/std/algorithms/robust_re_difference_type.compile.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/include/__algorithm/binary_search.h b/libcxx/include/__algorithm/binary_search.h
index cd1d7b1a752d3..8fc55b9becb1b 100644
--- a/libcxx/include/__algorithm/binary_search.h
+++ b/libcxx/include/__algorithm/binary_search.h
@@ -11,8 +11,8 @@
#include <__config>
#include <__algorithm/comp.h>
-#include <__algorithm/lower_bound.h>
#include <__algorithm/comp_ref_type.h>
+#include <__algorithm/lower_bound.h>
#include <__iterator/iterator_traits.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/__algorithm/is_heap.h b/libcxx/include/__algorithm/is_heap.h
index 7fd5d6ff9a004..22c27a66d129e 100644
--- a/libcxx/include/__algorithm/is_heap.h
+++ b/libcxx/include/__algorithm/is_heap.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__algorithm/is_heap_until.h>
#include <__iterator/iterator_traits.h>
@@ -26,7 +27,8 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
{
- return _VSTD::is_heap_until(__first, __last, __comp) == __last;
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return _VSTD::__is_heap_until<_Comp_ref>(__first, __last, __comp) == __last;
}
template<class _RandomAccessIterator>
diff --git a/libcxx/include/__algorithm/is_heap_until.h b/libcxx/include/__algorithm/is_heap_until.h
index 99291c102bfc4..dd8a62f07fd3b 100644
--- a/libcxx/include/__algorithm/is_heap_until.h
+++ b/libcxx/include/__algorithm/is_heap_until.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__iterator/iterator_traits.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -19,9 +20,9 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _RandomAccessIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
-is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
+template <class _Compare, class _RandomAccessIterator>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
+__is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
{
typedef typename iterator_traits<_RandomAccessIterator>::
diff erence_type
diff erence_type;
diff erence_type __len = __last - __first;
@@ -46,13 +47,19 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp
return __last;
}
+template <class _RandomAccessIterator, class _Compare>
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
+is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
+{
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return _VSTD::__is_heap_until<_Comp_ref>(__first, __last, __comp);
+}
+
template<class _RandomAccessIterator>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
-_RandomAccessIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
{
- return _VSTD::is_heap_until(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
+ return _VSTD::__is_heap_until(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
}
_LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/include/__algorithm/is_sorted.h b/libcxx/include/__algorithm/is_sorted.h
index c6954934e8c0f..57953295a8885 100644
--- a/libcxx/include/__algorithm/is_sorted.h
+++ b/libcxx/include/__algorithm/is_sorted.h
@@ -10,6 +10,7 @@
#define _LIBCPP___ALGORITHM_IS_SORTED_H
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__algorithm/is_sorted_until.h>
#include <__config>
#include <__iterator/iterator_traits.h>
@@ -26,7 +27,8 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool
is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
{
- return _VSTD::is_sorted_until(__first, __last, __comp) == __last;
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return _VSTD::__is_sorted_until<_Comp_ref>(__first, __last, __comp) == __last;
}
template<class _ForwardIterator>
diff --git a/libcxx/include/__algorithm/is_sorted_until.h b/libcxx/include/__algorithm/is_sorted_until.h
index 5b6385991a74a..9a7f275c54001 100644
--- a/libcxx/include/__algorithm/is_sorted_until.h
+++ b/libcxx/include/__algorithm/is_sorted_until.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__iterator/iterator_traits.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -19,9 +20,9 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
-is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
+template <class _Compare, class _ForwardIterator>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
+__is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
{
if (__first != __last)
{
@@ -36,10 +37,16 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __co
return __last;
}
+template <class _ForwardIterator, class _Compare>
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _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>(__first, __last, __comp);
+}
+
template<class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
-_ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
{
return _VSTD::is_sorted_until(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
diff --git a/libcxx/include/__algorithm/max.h b/libcxx/include/__algorithm/max.h
index 2fa97cad87f61..79cbd2be86b62 100644
--- a/libcxx/include/__algorithm/max.h
+++ b/libcxx/include/__algorithm/max.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__algorithm/max_element.h>
#include <initializer_list>
@@ -49,7 +50,8 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
_Tp
max(initializer_list<_Tp> __t, _Compare __comp)
{
- return *_VSTD::max_element(__t.begin(), __t.end(), __comp);
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return *_VSTD::__max_element<_Comp_ref>(__t.begin(), __t.end(), __comp);
}
template<class _Tp>
diff --git a/libcxx/include/__algorithm/max_element.h b/libcxx/include/__algorithm/max_element.h
index c51519605af94..f932ca7049fab 100644
--- a/libcxx/include/__algorithm/max_element.h
+++ b/libcxx/include/__algorithm/max_element.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__iterator/iterator_traits.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -19,11 +20,9 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
+template <class _Compare, class _ForwardIterator>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+__max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
{
static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,
"std::max_element requires a ForwardIterator");
@@ -37,11 +36,17 @@ max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
return __first;
}
+template <class _ForwardIterator, class _Compare>
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
+{
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return _VSTD::__max_element<_Comp_ref>(__first, __last, __comp);
+}
+
template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
max_element(_ForwardIterator __first, _ForwardIterator __last)
{
return _VSTD::max_element(__first, __last,
diff --git a/libcxx/include/__algorithm/min.h b/libcxx/include/__algorithm/min.h
index 9fea7f70a2bba..5cacb2f28e7e7 100644
--- a/libcxx/include/__algorithm/min.h
+++ b/libcxx/include/__algorithm/min.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__algorithm/min_element.h>
#include <initializer_list>
@@ -49,7 +50,8 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
_Tp
min(initializer_list<_Tp> __t, _Compare __comp)
{
- return *_VSTD::min_element(__t.begin(), __t.end(), __comp);
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return *_VSTD::__min_element<_Comp_ref>(__t.begin(), __t.end(), __comp);
}
template<class _Tp>
diff --git a/libcxx/include/__algorithm/min_element.h b/libcxx/include/__algorithm/min_element.h
index 9bfd0793c69d8..3aebebca91ab1 100644
--- a/libcxx/include/__algorithm/min_element.h
+++ b/libcxx/include/__algorithm/min_element.h
@@ -11,6 +11,7 @@
#include <__config>
#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
#include <__iterator/iterator_traits.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -19,11 +20,9 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _ForwardIterator, class _Compare>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
+template <class _Compare, class _ForwardIterator>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+__min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
{
static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value,
"std::min_element requires a ForwardIterator");
@@ -37,10 +36,16 @@ min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
return __first;
}
+template <class _ForwardIterator, class _Compare>
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
+min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
+{
+ typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+ return _VSTD::__min_element<_Comp_ref>(__first, __last, __comp);
+}
+
template <class _ForwardIterator>
-_LIBCPP_NODISCARD_EXT inline
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
+_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator
min_element(_ForwardIterator __first, _ForwardIterator __last)
{
return _VSTD::min_element(__first, __last,
diff --git a/libcxx/test/libcxx/algorithms/robust_against_copying_comparators.pass.cpp b/libcxx/test/libcxx/algorithms/robust_against_copying_comparators.pass.cpp
new file mode 100644
index 0000000000000..aa3d34ada4c57
--- /dev/null
+++ b/libcxx/test/libcxx/algorithms/robust_against_copying_comparators.pass.cpp
@@ -0,0 +1,190 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// <algorithm>
+
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+
+#include "test_macros.h"
+
+struct Less {
+ int *copies_;
+ TEST_CONSTEXPR explicit Less(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 Less(const Less& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 Less& operator=(const Less&) = default;
+ TEST_CONSTEXPR bool operator()(void*, void*) const { return false; }
+};
+
+struct Equal {
+ int *copies_;
+ TEST_CONSTEXPR explicit Equal(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 Equal(const Equal& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 Equal& operator=(const Equal&) = default;
+ TEST_CONSTEXPR bool operator()(void*, void*) const { return true; }
+};
+
+struct UnaryVoid {
+ int *copies_;
+ TEST_CONSTEXPR explicit UnaryVoid(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 UnaryVoid(const UnaryVoid& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 UnaryVoid& operator=(const UnaryVoid&) = default;
+ TEST_CONSTEXPR_CXX14 void operator()(void*) const {}
+};
+
+struct UnaryTrue {
+ int *copies_;
+ TEST_CONSTEXPR explicit UnaryTrue(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 UnaryTrue(const UnaryTrue& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 UnaryTrue& operator=(const UnaryTrue&) = default;
+ TEST_CONSTEXPR bool operator()(void*) const { return true; }
+};
+
+struct NullaryValue {
+ int *copies_;
+ TEST_CONSTEXPR explicit NullaryValue(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 NullaryValue(const NullaryValue& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 NullaryValue& operator=(const NullaryValue&) = default;
+ TEST_CONSTEXPR std::nullptr_t operator()() const { return nullptr; }
+};
+
+struct UnaryTransform {
+ int *copies_;
+ TEST_CONSTEXPR explicit UnaryTransform(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 UnaryTransform(const UnaryTransform& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 UnaryTransform& operator=(const UnaryTransform&) = default;
+ TEST_CONSTEXPR std::nullptr_t operator()(void*) const { return nullptr; }
+};
+
+struct BinaryTransform {
+ int *copies_;
+ TEST_CONSTEXPR explicit BinaryTransform(int *copies) : copies_(copies) {}
+ TEST_CONSTEXPR_CXX14 BinaryTransform(const BinaryTransform& rhs) : copies_(rhs.copies_) { *copies_ += 1; }
+ TEST_CONSTEXPR_CXX14 BinaryTransform& operator=(const BinaryTransform&) = default;
+ TEST_CONSTEXPR std::nullptr_t operator()(void*, void*) const { return nullptr; }
+};
+
+TEST_CONSTEXPR_CXX20 bool all_the_algorithms()
+{
+ void *a[10] = {};
+ void *b[10] = {};
+ void **first = a;
+ void **mid = a+5;
+ void **last = a+10;
+ void **first2 = b;
+ void **mid2 = b+5;
+ void **last2 = b+10;
+ void *value = nullptr;
+ int count = 1;
+
+ int copies = 0;
+ (void)std::adjacent_find(first, last, Equal(&copies)); assert(copies == 0);
+#if TEST_STD_VER >= 11
+ (void)std::all_of(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::any_of(first, last, UnaryTrue(&copies)); assert(copies == 0);
+#endif
+ (void)std::binary_search(first, last, value, Less(&copies)); assert(copies == 0);
+#if TEST_STD_VER > 17
+ (void)std::clamp(value, value, value, Less(&copies)); assert(copies == 0);
+#endif
+ (void)std::count_if(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::equal(first, last, first2, Equal(&copies)); assert(copies == 0);
+#if TEST_STD_VER > 11
+ (void)std::equal(first, last, first2, last2, Equal(&copies)); assert(copies == 0);
+#endif
+ (void)std::equal_range(first, last, value, Less(&copies)); assert(copies == 0);
+ (void)std::find_end(first, last, first2, mid2, Equal(&copies)); assert(copies == 0);
+ (void)std::find_if(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::find_if_not(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::for_each(first, last, UnaryVoid(&copies)); assert(copies == 1); copies = 0;
+#if TEST_STD_VER > 14
+ (void)std::for_each_n(first, count, UnaryVoid(&copies)); assert(copies == 0);
+#endif
+ (void)std::generate(first, last, NullaryValue(&copies)); assert(copies == 0);
+ (void)std::generate_n(first, count, NullaryValue(&copies)); assert(copies == 0);
+ (void)std::includes(first, last, first2, last2, Less(&copies)); assert(copies == 0);
+ (void)std::is_heap(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::is_heap_until(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::is_partitioned(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::is_permutation(first, last, first2, Equal(&copies)); assert(copies == 0);
+#if TEST_STD_VER > 11
+ (void)std::is_permutation(first, last, first2, last2, Equal(&copies)); assert(copies == 0);
+#endif
+ (void)std::is_sorted(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::is_sorted_until(first, last, Less(&copies)); assert(copies == 0);
+ if (!TEST_IS_CONSTANT_EVALUATED) { (void)std::inplace_merge(first, mid, last, Less(&copies)); assert(copies == 0); }
+ (void)std::lexicographical_compare(first, last, first2, last2, Less(&copies)); assert(copies == 0);
+ // TODO: lexicographical_compare_three_way
+ (void)std::lower_bound(first, last, value, Less(&copies)); assert(copies == 0);
+ (void)std::make_heap(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::max(value, value, Less(&copies)); assert(copies == 0);
+#if TEST_STD_VER >= 11
+ (void)std::max({ value, value }, Less(&copies)); assert(copies == 0);
+#endif
+ (void)std::max_element(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::merge(first, mid, mid, last, first2, Less(&copies)); assert(copies == 0);
+ (void)std::min(value, value, Less(&copies)); assert(copies == 0);
+#if TEST_STD_VER >= 11
+ (void)std::min({ value, value }, Less(&copies)); assert(copies == 0);
+#endif
+ (void)std::min_element(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::minmax(value, value, Less(&copies)); assert(copies == 0);
+#if TEST_STD_VER >= 11
+ (void)std::minmax({ value, value }, Less(&copies)); assert(copies == 0);
+#endif
+ (void)std::minmax_element(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::mismatch(first, last, first2, Equal(&copies)); assert(copies == 0);
+#if TEST_STD_VER > 11
+ (void)std::mismatch(first, last, first2, last2, Equal(&copies)); assert(copies == 0);
+#endif
+ (void)std::next_permutation(first, last, Less(&copies)); assert(copies == 0);
+#if TEST_STD_VER >= 11
+ (void)std::none_of(first, last, UnaryTrue(&copies)); assert(copies == 0);
+#endif
+ (void)std::nth_element(first, mid, last, Less(&copies)); assert(copies == 0);
+ (void)std::partial_sort(first, mid, last, Less(&copies)); assert(copies == 0);
+ (void)std::partial_sort_copy(first, last, first2, mid2, Less(&copies)); assert(copies == 0);
+ (void)std::partition(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::partition_copy(first, last, first2, last2, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::partition_point(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::pop_heap(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::prev_permutation(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::push_heap(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::remove_copy_if(first, last, first2, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::remove_if(first, last, UnaryTrue(&copies)); assert(copies == 0);
+ (void)std::replace_copy_if(first, last, first2, UnaryTrue(&copies), value); assert(copies == 0);
+ (void)std::replace_if(first, last, UnaryTrue(&copies), value); assert(copies == 0);
+ (void)std::search(first, last, first2, mid2, Equal(&copies)); assert(copies == 0);
+ (void)std::search_n(first, last, count, value, Equal(&copies)); assert(copies == 0);
+ (void)std::set_
diff erence(first, mid, mid, last, first2, Less(&copies)); assert(copies == 0);
+ (void)std::set_intersection(first, mid, mid, last, first2, Less(&copies)); assert(copies == 0);
+ (void)std::set_symmetric_
diff erence(first, mid, mid, last, first2, Less(&copies)); assert(copies == 0);
+ (void)std::set_union(first, mid, mid, last, first2, Less(&copies)); assert(copies == 0);
+ (void)std::sort(first, last, Less(&copies)); assert(copies == 0);
+ (void)std::sort_heap(first, last, Less(&copies)); assert(copies == 0);
+ if (!TEST_IS_CONSTANT_EVALUATED) { (void)std::stable_partition(first, last, UnaryTrue(&copies)); assert(copies == 0); }
+ if (!TEST_IS_CONSTANT_EVALUATED) { (void)std::stable_sort(first, last, Less(&copies)); assert(copies == 0); }
+ (void)std::transform(first, last, first2, UnaryTransform(&copies)); assert(copies == 0);
+ (void)std::transform(first, mid, mid, first2, BinaryTransform(&copies)); assert(copies == 0);
+ (void)std::unique(first, last, Equal(&copies)); assert(copies == 0);
+ (void)std::unique_copy(first, last, first2, Equal(&copies)); assert(copies == 0);
+ (void)std::upper_bound(first, last, value, Less(&copies)); assert(copies == 0);
+
+ return true;
+}
+
+int main(int, char**)
+{
+ all_the_algorithms();
+#if TEST_STD_VER > 17
+ static_assert(all_the_algorithms());
+#endif
+
+ return 0;
+}
diff --git a/libcxx/test/std/algorithms/robust_against_adl.compile.pass.cpp b/libcxx/test/std/algorithms/robust_against_adl.compile.pass.cpp
index 0da925794084e..c06118a4ef61b 100644
--- a/libcxx/test/std/algorithms/robust_against_adl.compile.pass.cpp
+++ b/libcxx/test/std/algorithms/robust_against_adl.compile.pass.cpp
@@ -9,6 +9,7 @@
// <algorithm>
#include <algorithm>
+#include <cstddef>
#include <functional>
#include "test_macros.h"
@@ -28,9 +29,9 @@ struct Tester {
struct UnaryVoid { TEST_CONSTEXPR_CXX14 void operator()(void*) const {} };
struct UnaryTrue { TEST_CONSTEXPR bool operator()(void*) const { return true; } };
-struct NullaryValue { TEST_CONSTEXPR decltype(nullptr) operator()() const { return nullptr; } };
-struct UnaryTransform { TEST_CONSTEXPR decltype(nullptr) operator()(void*) const { return nullptr; } };
-struct BinaryTransform { TEST_CONSTEXPR decltype(nullptr) operator()(void*, void*) const { return nullptr; } };
+struct NullaryValue { TEST_CONSTEXPR std::nullptr_t operator()() const { return nullptr; } };
+struct UnaryTransform { TEST_CONSTEXPR std::nullptr_t operator()(void*) const { return nullptr; } };
+struct BinaryTransform { TEST_CONSTEXPR std::nullptr_t operator()(void*, void*) const { return nullptr; } };
TEST_CONSTEXPR_CXX20 bool all_the_algorithms()
{
diff --git a/libcxx/test/std/algorithms/robust_re_
diff erence_type.compile.pass.cpp b/libcxx/test/std/algorithms/robust_re_
diff erence_type.compile.pass.cpp
index d7590d7b49e1a..c060f467e9097 100644
--- a/libcxx/test/std/algorithms/robust_re_
diff erence_type.compile.pass.cpp
+++ b/libcxx/test/std/algorithms/robust_re_
diff erence_type.compile.pass.cpp
@@ -14,6 +14,7 @@
// those of a + D(n) and a - D(n).
#include <algorithm>
+#include <cstddef>
#include <functional>
#include <iterator>
@@ -66,9 +67,9 @@ class PickyIterator {
struct UnaryVoid { TEST_CONSTEXPR_CXX14 void operator()(void*) const {} };
struct UnaryTrue { TEST_CONSTEXPR bool operator()(void*) const { return true; } };
-struct NullaryValue { TEST_CONSTEXPR decltype(nullptr) operator()() const { return nullptr; } };
-struct UnaryTransform { TEST_CONSTEXPR decltype(nullptr) operator()(void*) const { return nullptr; } };
-struct BinaryTransform { TEST_CONSTEXPR decltype(nullptr) operator()(void*, void*) const { return nullptr; } };
+struct NullaryValue { TEST_CONSTEXPR std::nullptr_t operator()() const { return nullptr; } };
+struct UnaryTransform { TEST_CONSTEXPR std::nullptr_t operator()(void*) const { return nullptr; } };
+struct BinaryTransform { TEST_CONSTEXPR std::nullptr_t operator()(void*, void*) const { return nullptr; } };
TEST_CONSTEXPR_CXX20 bool all_the_algorithms()
{
More information about the libcxx-commits
mailing list