Re: [committed] libstdc++: Fix value categories used by ranges access CPOs [PR 100824]

[Jonathan Wakely <jwakely@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2871 bytes --]

On 04/06/21 18:03 +0100, Jonathan Wakely wrote:
>The implementation of P2091R0 was incomplete, so that some range access
>CPOs used perfect forwarding where they should not. This fixes it by
>consistently operating on lvalues.
>
>Some additional changes that are not necessary to fix the bug:
>
>Modify the __as_const helper to simplify its usage. Instead of deducing
>the value category from its argument, and requiring callers to forward
>the argument as the correct category, add a non-deduced template
>parameter which is used for the value category and accept the argument
>as an lvalue. This means callers say __as_const<T>(t) instead of
>__as_const(std::forward<T>(t)).
>
>Always use an lvalue reference type as the template argument for the
>_S_noexcept helpers, so that we only instantiate one specialization for
>lvalues and rvalues of the same type.
>
>Move some helper concepts and functions from namespace std::__detail
>to ranges::__cust_access, to be consistent with the ranges::begin CPO.
>This ensures that the __adl_begin concept and the _Begin::operator()
>function are in the same namespace, so unqualified lookup is consistent
>and the poison pills for begin are visible to both.
>
>Simplified static assertions for arrays, because the expression a+0 is
>already ill-formed for an array of incomplete type.
>
>Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
>
>libstdc++-v3/ChangeLog:
>
>	PR libstdc++/100824
>	* include/bits/iterator_concepts.h (__detail::__decay_copy)
>	(__detail::__member_begin, __detail::__adl_begin): Move to
>	namespace ranges::__cust_access.
>	(__detail::__ranges_begin): Likewise, and rename to __begin.
>	Remove redundant static assertion.
>	* include/bits/ranges_base.h (_Begin, _End, _RBegin, _REnd):
>	Use lvalue in noexcept specifier.
>	(__as_const): Add non-deduced parameter for value category.
>	(_CBegin, _CEnd, _CRBegin, _CREnd, _CData): Adjust uses of
>	__as_const.
>	(__member_size, __adl_size, __member_empty, __size0_empty):
>	(__eq_iter_empty, __adl_data): Use lvalue objects in
>	requirements.
>	(__sentinel_size): Likewise. Add check for conversion to
>	unsigned-like.
>	(__member_data): Allow non-lvalue types to satisfy the concept,
>	but use lvalue object in requirements.
>	(_Size, _SSize): Remove forwarding to always use an lvalue.
>	(_Data): Likewise. Add static assertion for arrays.
>	* testsuite/std/ranges/access/cdata.cc: Adjust expected
>	behaviour for rvalues. Add negative tests for ill-formed
>	expressions.
>	* testsuite/std/ranges/access/data.cc: Likewise.
>	* testsuite/std/ranges/access/empty.cc: Adjust expected
>	behaviour for rvalues.
>	* testsuite/std/ranges/access/size.cc: Likewise.

An additional problem with ranges::data was pointed out in the PR,
fixed with this patch.

Tested powerpc64le-linux. Committed to trunk.

This should also be backported to gcc-11 and gcc-10.



[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 1846 bytes --]

commit 3e5f2425f80aedd00f28235022a2755eb46f310d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Jun 4 20:25:39 2021

    libstdc++: Fix helper concept for ranges::data [PR 100824]
    
    We need to decay the result of t.data() before checking if it's a
    pointer.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/100824
            * include/bits/ranges_base.h (__member_data): Use __decay_copy.
            * testsuite/std/ranges/access/data.cc: Add testcase from PR.

diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h
index 17a421a4927..61d91eb8389 100644
--- a/libstdc++-v3/include/bits/ranges_base.h
+++ b/libstdc++-v3/include/bits/ranges_base.h
@@ -495,8 +495,10 @@ namespace ranges
 				    && is_object_v<remove_pointer_t<_Tp>>;
 
     template<typename _Tp>
-      concept __member_data
-	= requires(_Tp& __t) { { __t.data() } -> __pointer_to_object; };
+      concept __member_data = requires(_Tp& __t)
+	{
+	  { __cust_access::__decay_copy(__t.data()) } -> __pointer_to_object;
+	};
 
     template<typename _Tp>
       concept __begin_data = requires(_Tp& __t)
diff --git a/libstdc++-v3/testsuite/std/ranges/access/data.cc b/libstdc++-v3/testsuite/std/ranges/access/data.cc
index 237bbcc76c5..4f16f447f9f 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/data.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/data.cc
@@ -92,8 +92,12 @@ test03()
   // ranges::data should treat the subexpression as an lvalue
   VERIFY( std::ranges::data(std::move(r)) == &R3::i );
   VERIFY( std::ranges::data(std::move(c)) == &R3::l );
-}
 
+  // PR libstdc++/100824 comment 3
+  // Check for member data() should use decay-copy
+  struct A { int*&& data(); };
+  static_assert( has_data<A&> );
+}
 
 int
 main()