ldionne's recommendations

llvm · Jul 18, 2024 · d186443 · d186443
1 parent 89c15f3
commit d186443
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 22 deletions.
diff --git a/libcxx/docs/ReleaseNotes/19.rst b/libcxx/docs/ReleaseNotes/19.rst
@@ -55,7 +55,7 @@ Implemented Papers
 - P2231R1 - Missing ``constexpr`` in ``std::optional`` and ``std::variant``
 - P0019R8 - ``std::atomic_ref``
 - P2389R2 - Alias template ``dims`` for the ``extents`` of ``mdspan``
-- P1223R5 - ``find_last``
+- P1223R5 - ``ranges::find_last()``, ``ranges::find_last_if()``, and ``ranges::find_last_if_not()``
 
 Improvements and New Features
 -----------------------------

diff --git a/libcxx/include/__algorithm/ranges_find_last.h b/libcxx/include/__algorithm/ranges_find_last.h
@@ -37,7 +37,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 
 template <class _Iter, class _Sent, class _Pred, class _Proj>
-_LIBCPP_HIDE_FROM_ABI constexpr static subrange<_Iter>
+_LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>
 __find_last_impl(_Iter __first, _Sent __last, _Pred __pred, _Proj& __proj) {
   if (__first == __last) {
     return subrange<_Iter>(__first, __first);
@@ -78,7 +78,7 @@ struct __fn {
   struct __op {
     const _Type& __value;
     template <class _Elem>
-    constexpr decltype(auto) operator()(_Elem&& __elem) const {
+    _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Elem&& __elem) const {
       return std::forward<_Elem>(__elem) == __value;
     }
   };
@@ -105,7 +105,7 @@ struct __fn {
   struct __op {
     _Pred& __pred;
     template <class _Elem>
-    constexpr decltype(auto) operator()(_Elem&& __elem) const {
+    _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Elem&& __elem) const {
       return std::invoke(__pred, std::forward<_Elem>(__elem));
     }
   };
@@ -135,7 +135,7 @@ struct __fn {
   struct __op {
     _Pred& __pred;
     template <class _Elem>
-    constexpr decltype(auto) operator()(_Elem&& __elem) const {
+    _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Elem&& __elem) const {
       return !std::invoke(__pred, std::forward<_Elem>(__elem));
     }
   };

diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
@@ -105,19 +105,24 @@ namespace ranges {
   template<forward_iterator I, sentinel_for<I> S, class T, class Proj = identity>
     requires indirect_binary_predicate<ranges::equal_to, projected<I, Proj>, const T*>
     constexpr subrange<I> find_last(I first, S last, const T& value, Proj proj = {});                     // since C++23
+
   template<forward_range R, class T, class Proj = identity>
     requires
       indirect_binary_predicate<ranges::equal_to, projected<iterator_t<R>, Proj>, const T*>
     constexpr borrowed_subrange_t<R> find_last(R&& r, const T& value, Proj proj = {});                   // since C++23
+
   template<forward_iterator I, sentinel_for<I> S, class Proj = identity,
            indirect_unary_predicate<projected<I, Proj>> Pred>
     constexpr subrange<I> find_last_if(I first, S last, Pred pred, Proj proj = {});                      // since C++23
+
   template<forward_range R, class Proj = identity,
            indirect_unary_predicate<projected<iterator_t<R>, Proj>> Pred>
     constexpr borrowed_subrange_t<R> find_last_if(R&& r, Pred pred, Proj proj = {});                     // since C++23
+
   template<forward_iterator I, sentinel_for<I> S, class Proj = identity,
            indirect_unary_predicate<projected<I, Proj>> Pred>
     constexpr subrange<I> find_last_if_not(I first, S last, Pred pred, Proj proj = {});                  // since C++23
+
   template<forward_range R, class Proj = identity,
            indirect_unary_predicate<projected<iterator_t<R>, Proj>> Pred>
     constexpr borrowed_subrange_t<R> find_last_if_not(R&& r, Pred pred, Proj proj = {});                 // since C++23

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
@@ -25,7 +25,6 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
-#include <deque>
 #include <ranges>
 #include <vector>
 
@@ -154,12 +153,12 @@ class TriviallyComparable {
   ElementT el_;
 
 public:
-  TEST_CONSTEXPR TriviallyComparable(ElementT el) : el_(el) {}
+  constexpr TriviallyComparable(ElementT el) : el_(el) {}
   bool operator==(const TriviallyComparable&) const = default;
 };
 
 constexpr bool test() {
-  types::for_each(types::type_list<char, wchar_t, int, long, TriviallyComparable<char>, TriviallyComparable<wchar_t>>{},
+  types::for_each(types::type_list<char, int, TriviallyComparable<char>>{},
                   []<class T> {
                     types::for_each(types::forward_iterator_list<T*>{}, []<class Iter> {
                       test_iterators<Iter>();

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if.pass.cpp
@@ -184,13 +184,7 @@ struct NonConstComparable {
 };
 
 template <class T>
-struct add_const_to_ptr;
-template <class T>
-struct add_const_to_ptr<T*> {
-  using type = const T*;
-};
-template <class T>
-using add_const_to_ptr_t = add_const_to_ptr<T>::type;
+using add_const_to_ptr_t = std::add_pointer_t<std::add_const_t<std::remove_pointer_t<T>>>;
 
 constexpr bool test() {
   test_iterator_classes<std::type_identity_t, std::type_identity_t>();

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if_not.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if_not.pass.cpp
@@ -184,13 +184,7 @@ struct NonConstComparable {
 };
 
 template <class T>
-struct add_const_to_ptr;
-template <class T>
-struct add_const_to_ptr<T*> {
-  using type = const T*;
-};
-template <class T>
-using add_const_to_ptr_t = add_const_to_ptr<T>::type;
+using add_const_to_ptr_t = std::add_pointer_t<std::add_const_t<std::remove_pointer_t<T>>>;
 
 constexpr bool test() {
   test_iterator_classes<std::type_identity_t, std::type_identity_t>();