Skip to content

Commit 22b86cd

Browse files
author
Patrick Palka
committed
libstdc++: Implement P2325 changes to default-constructibility of views
NB: This backport of r12-1606 to the 10 branch deliberately omits parts of P2325R3 so as to maximize backward compatibility with pre-P2325R3 code. In particular, we don't remove the default ctors for back_insert_iterator, front_insert_iterator, ostream_iterator, ref_view and basic_istream_view. And in the 10 branch we we don't have __non_propagating_cache or the partial specialization of __box, so the changes to them are omitted too. Finally, we don't update __cpp_lib_ranges to 202106L because many significant 202106 Ranges changes still aren't implemented in the 10 branch, e.g. P2281R1 and P2210R2. === This implements the wording changes of P2325R3 "Views should not be required to be default constructible". Changes are relatively straightforward, besides perhaps those to __box (which now stands for copyable-box instead of semiregular-box) and __non_propagating_cache. For __box, this patch implements the recommended practice to also avoid std::optional when the boxed type is nothrow_move/copy_constructible. For __non_propagating_cache, now that it's used by split_view::_M_current, we need to add assignment from a value of the underlying type to the subset of the std::optional API implemented for the cache (needed by split_view::begin()). Hence the new __non_propagating_cache::operator= overload. In passing, this fixes the undesirable list-init in the constructors of the partial specialization of __box as reported in PR100475 comment gcc-mirror#7. PR libstdc++/103904 libstdc++-v3/ChangeLog: * include/bits/iterator_concepts.h (weakly_incrementable): Remove default_initializable requirement. * include/bits/stl_iterator.h (common_iterator): Constrain the default ctor. (counted_iterator): Likewise. * include/std/ranges (ranges::view): Remove default_initializable requirement. (subrange): Constrain the default ctor. (__detail::__box::operator=): Handle self-assignment. (single_view): Constraint the default ctor. (iota_view): Relax semiregular constraint to copyable. Constrain the default ctor. (iota_view::_Iterator): Constraint the default ctor. (filter_view): Likewise. (filter_view::_Iterator): Likewise. (transform_view): Likewise. (transform_view::_Iterator): Likewise. (take_view): Likewise. (take_view::_Iterator): Likewise. (take_while_view): Likewise. (take_while_view::_Iterator): Likewise. (drop_while_view): Likewise. (drop_while_view::_Iterator): Likewise. (join_view): Likewise. (split_view): Constrain the default ctor. (common_view): Likewise. (reverse_view): Likewise. (elements_view): Likewise. (elements_view::_Iterator): Likewise. * include/std/span (enable_view<span<_ElementType, _Extent>>): Define this partial specialization to true unconditionally. * testsuite/std/ranges/p2325.cc: New test. * testsuite/std/ranges/single_view.cc (test06): New test. * testsuite/std/ranges/view.cc: Adjust now that view doesn't require default_initializable. (cherry picked from commit 4b4f566)
1 parent 903c18c commit 22b86cd

File tree

7 files changed

+249
-36
lines changed

7 files changed

+249
-36
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
573573

574574
/// Requirements on types that can be incremented with ++.
575575
template<typename _Iter>
576-
concept weakly_incrementable = default_initializable<_Iter>
577-
&& movable<_Iter>
576+
concept weakly_incrementable = movable<_Iter>
578577
&& requires(_Iter __i)
579578
{
580579
typename iter_difference_t<_Iter>;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,6 +1729,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
17291729
constexpr
17301730
common_iterator()
17311731
noexcept(is_nothrow_default_constructible_v<_It>)
1732+
requires default_initializable<_It>
17321733
: _M_it(), _M_index(0)
17331734
{ }
17341735

@@ -2106,7 +2107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
21062107
// iterator_concept defined in __counted_iter_concept
21072108
// iterator_category defined in __counted_iter_cat
21082109

2109-
constexpr counted_iterator() = default;
2110+
constexpr counted_iterator() requires default_initializable<_It> = default;
21102111

21112112
constexpr
21122113
counted_iterator(_It __i, iter_difference_t<_It> __n)

libstdc++-v3/include/std/ranges

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ namespace ranges
7070

7171
template<typename _Tp>
7272
concept view
73-
= range<_Tp> && movable<_Tp> && default_initializable<_Tp>
74-
&& enable_view<_Tp>;
73+
= range<_Tp> && movable<_Tp> && enable_view<_Tp>;
7574

7675
/// A range which can be safely converted to a view.
7776
template<typename _Tp>
@@ -251,7 +250,7 @@ namespace ranges
251250
[[no_unique_address]] _Size<iter_difference_t<_It>> _M_size = {};
252251

253252
public:
254-
subrange() = default;
253+
subrange() requires default_initializable<_It> = default;
255254

256255
constexpr
257256
subrange(__detail::__convertible_to_non_slicing<_It> auto __i, _Sent __s)
@@ -486,10 +485,13 @@ namespace ranges
486485
noexcept(is_nothrow_copy_constructible_v<_Tp>)
487486
requires (!copyable<_Tp>)
488487
{
489-
if ((bool)__that)
490-
this->emplace(*__that);
491-
else
492-
this->reset();
488+
if (this != std::__addressof(__that))
489+
{
490+
if ((bool)__that)
491+
this->emplace(*__that);
492+
else
493+
this->reset();
494+
}
493495
return *this;
494496
}
495497

@@ -498,10 +500,13 @@ namespace ranges
498500
noexcept(is_nothrow_move_constructible_v<_Tp>)
499501
requires (!movable<_Tp>)
500502
{
501-
if ((bool)__that)
502-
this->emplace(std::move(*__that));
503-
else
504-
this->reset();
503+
if (this != std::__addressof(__that))
504+
{
505+
if ((bool)__that)
506+
this->emplace(std::move(*__that));
507+
else
508+
this->reset();
509+
}
505510
return *this;
506511
}
507512
};
@@ -513,7 +518,7 @@ namespace ranges
513518
class single_view : public view_interface<single_view<_Tp>>
514519
{
515520
public:
516-
single_view() = default;
521+
single_view() requires default_initializable<_Tp> = default;
517522

518523
constexpr explicit
519524
single_view(const _Tp& __t)
@@ -622,7 +627,7 @@ namespace ranges
622627
template<weakly_incrementable _Winc,
623628
semiregular _Bound = unreachable_sentinel_t>
624629
requires std::__detail::__weakly_eq_cmp_with<_Winc, _Bound>
625-
&& semiregular<_Winc>
630+
&& copyable<_Winc>
626631
class iota_view : public view_interface<iota_view<_Winc, _Bound>>
627632
{
628633
private:
@@ -651,7 +656,7 @@ namespace ranges
651656
using value_type = _Winc;
652657
using difference_type = __detail::__iota_diff_t<_Winc>;
653658

654-
_Iterator() = default;
659+
_Iterator() requires default_initializable<_Winc> = default;
655660

656661
constexpr explicit
657662
_Iterator(_Winc __value)
@@ -848,7 +853,7 @@ namespace ranges
848853
_Bound _M_bound = _Bound();
849854

850855
public:
851-
iota_view() = default;
856+
iota_view() requires default_initializable<_Winc> = default;
852857

853858
constexpr explicit
854859
iota_view(_Winc __value)
@@ -1475,7 +1480,7 @@ namespace views
14751480
using value_type = range_value_t<_Vp>;
14761481
using difference_type = range_difference_t<_Vp>;
14771482

1478-
_Iterator() = default;
1483+
_Iterator() requires default_initializable<_Vp_iter> = default;
14791484

14801485
constexpr
14811486
_Iterator(filter_view* __parent, _Vp_iter __current)
@@ -1587,7 +1592,9 @@ namespace views
15871592
[[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin;
15881593

15891594
public:
1590-
filter_view() = default;
1595+
filter_view() requires (default_initializable<_Vp>
1596+
&& default_initializable<_Pred>)
1597+
= default;
15911598

15921599
constexpr
15931600
filter_view(_Vp __base, _Pred __pred)
@@ -1718,7 +1725,7 @@ namespace views
17181725
= remove_cvref_t<invoke_result_t<_Fp&, range_reference_t<_Base>>>;
17191726
using difference_type = range_difference_t<_Base>;
17201727

1721-
_Iterator() = default;
1728+
_Iterator() requires default_initializable<_Base_iter> = default;
17221729

17231730
constexpr
17241731
_Iterator(_Parent* __parent, _Base_iter __current)
@@ -1933,7 +1940,9 @@ namespace views
19331940
__detail::__box<_Fp> _M_fun;
19341941

19351942
public:
1936-
transform_view() = default;
1943+
transform_view() requires (default_initializable<_Vp>
1944+
&& default_initializable<_Fp>)
1945+
= default;
19371946

19381947
constexpr
19391948
transform_view(_Vp __base, _Fp __fun)
@@ -2050,7 +2059,7 @@ namespace views
20502059
range_difference_t<_Vp> _M_count = 0;
20512060

20522061
public:
2053-
take_view() = default;
2062+
take_view() requires default_initializable<_Vp> = default;
20542063

20552064
constexpr
20562065
take_view(_Vp base, range_difference_t<_Vp> __count)
@@ -2211,7 +2220,9 @@ namespace views
22112220
__detail::__box<_Pred> _M_pred;
22122221

22132222
public:
2214-
take_while_view() = default;
2223+
take_while_view() requires (default_initializable<_Vp>
2224+
&& default_initializable<_Pred>)
2225+
= default;
22152226

22162227
constexpr
22172228
take_while_view(_Vp base, _Pred __pred)
@@ -2282,7 +2293,7 @@ namespace views
22822293
_M_cached_begin;
22832294

22842295
public:
2285-
drop_view() = default;
2296+
drop_view() requires default_initializable<_Vp> = default;
22862297

22872298
constexpr
22882299
drop_view(_Vp __base, range_difference_t<_Vp> __count)
@@ -2378,7 +2389,9 @@ namespace views
23782389
[[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin;
23792390

23802391
public:
2381-
drop_while_view() = default;
2392+
drop_while_view() requires (default_initializable<_Vp>
2393+
&& default_initializable<_Pred>)
2394+
= default;
23822395

23832396
constexpr
23842397
drop_while_view(_Vp __base, _Pred __pred)
@@ -2553,7 +2566,9 @@ namespace views
25532566
= common_type_t<range_difference_t<_Base>,
25542567
range_difference_t<range_reference_t<_Base>>>;
25552568

2556-
_Iterator() = default;
2569+
_Iterator() requires (default_initializable<_Outer_iter>
2570+
&& default_initializable<_Inner_iter>)
2571+
= default;
25572572

25582573
constexpr
25592574
_Iterator(_Parent* __parent, _Outer_iter __outer)
@@ -2709,7 +2724,7 @@ namespace views
27092724
views::all_t<_InnerRange>> _M_inner;
27102725

27112726
public:
2712-
join_view() = default;
2727+
join_view() requires default_initializable<_Vp> = default;
27132728

27142729
constexpr explicit
27152730
join_view(_Vp __base)
@@ -3123,7 +3138,10 @@ namespace views
31233138

31243139

31253140
public:
3126-
split_view() = default;
3141+
split_view() requires (default_initializable<_Vp>
3142+
&& default_initializable<_Pattern>
3143+
&& default_initializable<iterator_t<_Vp>>)
3144+
= default;
31273145

31283146
constexpr
31293147
split_view(_Vp __base, _Pattern __pattern)
@@ -3229,7 +3247,7 @@ namespace views
32293247
_Vp _M_base = _Vp();
32303248

32313249
public:
3232-
common_view() = default;
3250+
common_view() requires default_initializable<_Vp> = default;
32333251

32343252
constexpr explicit
32353253
common_view(_Vp __r)
@@ -3339,7 +3357,7 @@ namespace views
33393357
_M_cached_begin;
33403358

33413359
public:
3342-
reverse_view() = default;
3360+
reverse_view() requires default_initializable<_Vp> = default;
33433361

33443362
constexpr explicit
33453363
reverse_view(_Vp __r)
@@ -3466,7 +3484,7 @@ namespace views
34663484
class elements_view : public view_interface<elements_view<_Vp, _Nm>>
34673485
{
34683486
public:
3469-
elements_view() = default;
3487+
elements_view() requires default_initializable<_Vp> = default;
34703488

34713489
constexpr explicit
34723490
elements_view(_Vp base)
@@ -3587,7 +3605,7 @@ namespace views
35873605
= remove_cvref_t<tuple_element_t<_Nm, range_value_t<_Base>>>;
35883606
using difference_type = range_difference_t<_Base>;
35893607

3590-
_Iterator() = default;
3608+
_Iterator() requires default_initializable<iterator_t<_Base>> = default;
35913609

35923610
constexpr explicit
35933611
_Iterator(iterator_t<_Base> current)

libstdc++-v3/include/std/span

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
453453
// Opt-in to view concept
454454
template<typename _ElementType, size_t _Extent>
455455
inline constexpr bool
456-
enable_view<span<_ElementType, _Extent>>
457-
= _Extent == 0 || _Extent == dynamic_extent;
456+
enable_view<span<_ElementType, _Extent>> = true;
458457
}
459458
_GLIBCXX_END_NAMESPACE_VERSION
460459
} // namespace std

0 commit comments

Comments
 (0)