@@ -552,28 +552,29 @@ vector<bool, _Allocator>::__recommend(size_type __new_size) const {
552
552
}
553
553
554
554
// Default constructs __n objects starting at __end_
555
- // Precondition: __n > 0
556
555
// Precondition: size() + __n <= capacity()
557
556
// Postcondition: size() == size() + __n
558
557
template <class _Allocator >
559
558
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
560
559
vector<bool , _Allocator>::__construct_at_end(size_type __n, bool __x) {
561
- _LIBCPP_ASSERT_INTERNAL (__n > 0 , " This function expects __n > 0" );
562
- iterator __old_end = end ();
560
+ _LIBCPP_ASSERT_INTERNAL (
561
+ capacity () >= size () + __n, " vector<bool>::__construct_at_end called with insufficient capacity" );
562
+ std::fill_n (end (), __n, __x);
563
563
this ->__size_ += __n;
564
- this -> __begin_ [( this -> __size_ - 1 ) / __bits_per_word] = __storage_type ( 0 );
565
- std::fill_n (__old_end, __n, __x );
564
+ if ( end (). __ctz_ != 0 ) // has uninitialized trailing bits in the last word
565
+ std::fill_n (end (), __bits_per_word - end (). __ctz_ , 0 );
566
566
}
567
567
568
568
template <class _Allocator >
569
569
template <class _InputIterator , class _Sentinel >
570
570
_LIBCPP_CONSTEXPR_SINCE_CXX20 void
571
571
vector<bool , _Allocator>::__construct_at_end(_InputIterator __first, _Sentinel __last, size_type __n) {
572
- _LIBCPP_ASSERT_INTERNAL (__n > 0 , " This function expects __n > 0" );
573
- iterator __old_end = end ();
572
+ _LIBCPP_ASSERT_INTERNAL (
573
+ capacity () >= size () + __n, " vector<bool>::__construct_at_end called with insufficient capacity" );
574
+ std::__copy (std::move (__first), std::move (__last), end ());
574
575
this ->__size_ += __n;
575
- this -> __begin_ [( this -> __size_ - 1 ) / __bits_per_word] = __storage_type ( 0 );
576
- std::__copy ( std::move (__first ), std::move (__last), __old_end );
576
+ if ( end (). __ctz_ != 0 ) // has uninitialized trailing bits in the last word
577
+ std::fill_n ( end ( ), __bits_per_word - end (). __ctz_ , 0 );
577
578
}
578
579
579
580
template <class _Allocator >
0 commit comments