Skip to content

Commit 0614bbb

Browse files
author
Patrick Palka
committed
libstdc++: Avoid hard error in ranges::unique_copy [PR100770]
Here, in the constexpr if condition within ranges::unique_copy, when input_iterator<_Out> isn't satisfied we must avoid substituting into iter_value_t<_Out> because the latter isn't necessarily well-formed then. To that end, this patch factors out the condition into a concept and uses it throughout. This patch also makes the definition of our testsuite output_iterator_wrapper more minimal by setting its value_type, pointer and reference member types to void. This means our existing tests for unique_copy already exercise the fix for this bug, so we don't need to add another test. The only other fallout of this testsuite iterator change appears in std/ranges/range.cc, where the use of range_value_t on a test_output_range is now ill-formed. libstdc++-v3/ChangeLog: * include/bits/ranges_algo.h (__detail::__can_reread_output): Factor out this concept from ... (__unique_copy_fn::operator()): ... here. Use the concept throughout. * testsuite/std/ranges/range.cc: Remove now ill-formed use of range_value_t on an output_range. * testsuite/util/testsuite_iterators.h (output_iterator_wrapper): Define value_type, pointer and reference member types to void.
1 parent cd4dd47 commit 0614bbb

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

libstdc++-v3/include/bits/ranges_algo.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,6 +1396,13 @@ namespace ranges
13961396

13971397
inline constexpr __unique_fn unique{};
13981398

1399+
namespace __detail
1400+
{
1401+
template<typename _Out, typename _Tp>
1402+
concept __can_reread_output = input_iterator<_Out>
1403+
&& same_as<_Tp, iter_value_t<_Out>>;
1404+
}
1405+
13991406
template<typename _Iter, typename _Out>
14001407
using unique_copy_result = in_out_result<_Iter, _Out>;
14011408

@@ -1407,8 +1414,7 @@ namespace ranges
14071414
projected<_Iter, _Proj>> _Comp = ranges::equal_to>
14081415
requires indirectly_copyable<_Iter, _Out>
14091416
&& (forward_iterator<_Iter>
1410-
|| (input_iterator<_Out>
1411-
&& same_as<iter_value_t<_Iter>, iter_value_t<_Out>>)
1417+
|| __detail::__can_reread_output<_Out, iter_value_t<_Iter>>
14121418
|| indirectly_copyable_storable<_Iter, _Out>)
14131419
constexpr unique_copy_result<_Iter, _Out>
14141420
operator()(_Iter __first, _Sent __last, _Out __result,
@@ -1432,8 +1438,7 @@ namespace ranges
14321438
}
14331439
return {__next, std::move(++__result)};
14341440
}
1435-
else if constexpr (input_iterator<_Out>
1436-
&& same_as<iter_value_t<_Iter>, iter_value_t<_Out>>)
1441+
else if constexpr (__detail::__can_reread_output<_Out, iter_value_t<_Iter>>)
14371442
{
14381443
*__result = *__first;
14391444
while (++__first != __last)
@@ -1467,8 +1472,7 @@ namespace ranges
14671472
projected<iterator_t<_Range>, _Proj>> _Comp = ranges::equal_to>
14681473
requires indirectly_copyable<iterator_t<_Range>, _Out>
14691474
&& (forward_iterator<iterator_t<_Range>>
1470-
|| (input_iterator<_Out>
1471-
&& same_as<range_value_t<_Range>, iter_value_t<_Out>>)
1475+
|| __detail::__can_reread_output<_Out, range_value_t<_Range>>
14721476
|| indirectly_copyable_storable<iterator_t<_Range>, _Out>)
14731477
constexpr unique_copy_result<borrowed_iterator_t<_Range>, _Out>
14741478
operator()(_Range&& __r, _Out __result,

libstdc++-v3/testsuite/std/ranges/range.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ static_assert( same_as<std::ranges::range_difference_t<C>,
7575
static_assert( same_as<std::ranges::range_difference_t<O>,
7676
std::ptrdiff_t> );
7777

78-
static_assert( same_as<std::ranges::range_value_t<O>,
79-
char> );
80-
8178
static_assert( same_as<std::ranges::range_reference_t<I>,
8279
char&> );
8380
static_assert( same_as<std::ranges::range_reference_t<O>,

libstdc++-v3/testsuite/util/testsuite_iterators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ namespace __gnu_test
122122
*/
123123
template<class T>
124124
struct output_iterator_wrapper
125-
: public std::iterator<std::output_iterator_tag, T, std::ptrdiff_t, T*, T&>
125+
: public std::iterator<std::output_iterator_tag, void, std::ptrdiff_t, void, void>
126126
{
127127
protected:
128128
output_iterator_wrapper() : ptr(0), SharedInfo(0)

0 commit comments

Comments
 (0)