From 433ada29c2a7ca5710368e750a82a695a5aa3ab1 Mon Sep 17 00:00:00 2001 From: Nikolas Klauser Date: Tue, 17 Sep 2024 11:01:22 +0200 Subject: [PATCH] [libc++][NFC] Remove some boilerplate after #76756 --- libcxx/include/vector | 240 ++++++++++++++++++------------------------ 1 file changed, 104 insertions(+), 136 deletions(-) diff --git a/libcxx/include/vector b/libcxx/include/vector index 7d3aac5989a48c..5a461d3295f048 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -542,7 +542,7 @@ private: if (__vec_.__begin_ != nullptr) { __vec_.__clear(); __vec_.__annotate_delete(); - __alloc_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.capacity()); + __alloc_traits::deallocate(__vec_.__alloc_, __vec_.__begin_, __vec_.capacity()); } } @@ -616,7 +616,7 @@ public: #endif _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT { - return this->__alloc(); + return __alloc_; } _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT; @@ -648,7 +648,7 @@ public: return static_cast(this->__end_ - this->__begin_); } _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type capacity() const _NOEXCEPT { - return static_cast(__end_cap() - this->__begin_); + return static_cast(__cap_ - __begin_); } [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT { return this->__begin_ == this->__end_; @@ -783,17 +783,17 @@ private: // Allocate space for __n objects // throws length_error if __n > max_size() // throws (probably bad_alloc) if memory run out - // Precondition: __begin_ == __end_ == __end_cap() == 0 + // Precondition: __begin_ == __end_ == __cap_ == 0 // Precondition: __n > 0 // Postcondition: capacity() >= __n // Postcondition: size() == 0 _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __vallocate(size_type __n) { if (__n > max_size()) __throw_length_error(); - auto __allocation = std::__allocate_at_least(__alloc(), __n); + auto __allocation = std::__allocate_at_least(__alloc_, __n); __begin_ = __allocation.ptr; __end_ = __allocation.ptr; - __end_cap() = __begin_ + __allocation.count; + __cap_ = __begin_ + __allocation.count; __annotate_new(0); } @@ -860,9 +860,7 @@ private: // don't have a way to update existing valid iterators when the container is resized and thus have to go with // a laxer approach. return std::__make_bounded_iter( - std::__wrap_iter(__p), - std::__wrap_iter(this->__begin_), - std::__wrap_iter(this->__end_cap())); + std::__wrap_iter(__p), std::__wrap_iter(__begin_), std::__wrap_iter(__cap_)); #else return iterator(__p); #endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR @@ -873,8 +871,8 @@ private: // Bound the iterator according to the capacity, rather than the size. return std::__make_bounded_iter( std::__wrap_iter(__p), - std::__wrap_iter(this->__begin_), - std::__wrap_iter(this->__end_cap())); + std::__wrap_iter(__begin_), + std::__wrap_iter(__cap_)); #else return const_iterator(__p); #endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR @@ -970,20 +968,10 @@ private: template _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __construct_one_at_end(_Args&&... __args) { _ConstructTransaction __tx(*this, 1); - __alloc_traits::construct(this->__alloc(), std::__to_address(__tx.__pos_), std::forward<_Args>(__args)...); + __alloc_traits::construct(__alloc_, std::__to_address(__tx.__pos_), std::forward<_Args>(__args)...); ++__tx.__pos_; } - // TODO: Remove these now redundant accessors - _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI allocator_type& __alloc() _NOEXCEPT { return this->__alloc_; } - _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const allocator_type& __alloc() const _NOEXCEPT { - return this->__alloc_; - } - _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer& __end_cap() _NOEXCEPT { return this->__cap_; } - _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const pointer& __end_cap() const _NOEXCEPT { - return this->__cap_; - } - _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __clear() _NOEXCEPT { __base_destruct_at_end(this->__begin_); } @@ -991,7 +979,7 @@ private: _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __base_destruct_at_end(pointer __new_last) _NOEXCEPT { pointer __soon_to_be_end = this->__end_; while (__new_last != __soon_to_be_end) - __alloc_traits::destroy(__alloc(), std::__to_address(--__soon_to_be_end)); + __alloc_traits::destroy(__alloc_, std::__to_address(--__soon_to_be_end)); this->__end_ = __new_last; } @@ -1010,20 +998,20 @@ private: [[__noreturn__]] _LIBCPP_HIDE_FROM_ABI void __throw_out_of_range() const { std::__throw_out_of_range("vector"); } _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const vector& __c, true_type) { - if (__alloc() != __c.__alloc()) { + if (__alloc_ != __c.__alloc_) { __clear(); __annotate_delete(); - __alloc_traits::deallocate(__alloc(), this->__begin_, capacity()); - this->__begin_ = this->__end_ = __end_cap() = nullptr; + __alloc_traits::deallocate(__alloc_, this->__begin_, capacity()); + __begin_ = __end_ = __cap_ = nullptr; } - __alloc() = __c.__alloc(); + __alloc_ = __c.__alloc_; } _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const vector&, false_type) {} _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(vector& __c, true_type) _NOEXCEPT_(is_nothrow_move_assignable::value) { - __alloc() = std::move(__c.__alloc()); + __alloc_ = std::move(__c.__alloc_); } _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(vector&, false_type) _NOEXCEPT {} @@ -1059,12 +1047,12 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer__begin_, __v.__begin_); std::swap(this->__end_, __v.__end_); - std::swap(this->__end_cap(), __v.__end_cap()); + std::swap(__cap_, __v.__cap_); __v.__first_ = __v.__begin_; __annotate_new(size()); } @@ -1082,19 +1070,19 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer__begin_, __v.__begin_); std::swap(this->__end_, __v.__end_); - std::swap(this->__end_cap(), __v.__end_cap()); + std::swap(__cap_, __v.__cap_); __v.__first_ = __v.__begin_; __annotate_new(size()); return __ret; @@ -1105,15 +1093,15 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__vdeallocate() _NOE if (this->__begin_ != nullptr) { clear(); __annotate_delete(); - __alloc_traits::deallocate(this->__alloc(), this->__begin_, capacity()); - this->__begin_ = this->__end_ = this->__end_cap() = nullptr; + __alloc_traits::deallocate(__alloc_, this->__begin_, capacity()); + __begin_ = __end_ = __cap_ = nullptr; } } template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::size_type vector<_Tp, _Allocator>::max_size() const _NOEXCEPT { - return std::min(__alloc_traits::max_size(this->__alloc()), numeric_limits::max()); + return std::min(__alloc_traits::max_size(__alloc_), numeric_limits::max()); } // Precondition: __new_size > capacity() @@ -1139,7 +1127,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__construct_at_end(s _ConstructTransaction __tx(*this, __n); const_pointer __new_end = __tx.__new_end_; for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) { - __alloc_traits::construct(this->__alloc(), std::__to_address(__pos)); + __alloc_traits::construct(__alloc_, std::__to_address(__pos)); } } @@ -1155,7 +1143,7 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x) _ConstructTransaction __tx(*this, __n); const_pointer __new_end = __tx.__new_end_; for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) { - __alloc_traits::construct(this->__alloc(), std::__to_address(__pos), __x); + __alloc_traits::construct(__alloc_, std::__to_address(__pos), __x); } } @@ -1164,7 +1152,7 @@ template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__construct_at_end(_InputIterator __first, _Sentinel __last, size_type __n) { _ConstructTransaction __tx(*this, __n); - __tx.__pos_ = std::__uninitialized_allocator_copy(__alloc(), __first, __last, __tx.__pos_); + __tx.__pos_ = std::__uninitialized_allocator_copy(__alloc_, __first, __last, __tx.__pos_); } // Default constructs __n objects starting at __end_ @@ -1173,11 +1161,10 @@ vector<_Tp, _Allocator>::__construct_at_end(_InputIterator __first, _Sentinel __ // Exception safety: strong. template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__append(size_type __n) { - if (static_cast(this->__end_cap() - this->__end_) >= __n) + if (static_cast(__cap_ - __end_) >= __n) this->__construct_at_end(__n); else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + __n), size(), __a); + __split_buffer __v(__recommend(size() + __n), size(), __alloc_); __v.__construct_at_end(__n); __swap_out_circular_buffer(__v); } @@ -1189,11 +1176,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__append(size_type _ // Exception safety: strong. template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x) { - if (static_cast(this->__end_cap() - this->__end_) >= __n) + if (static_cast(__cap_ - __end_) >= __n) this->__construct_at_end(__n, __x); else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + __n), size(), __a); + __split_buffer __v(__recommend(size() + __n), size(), __alloc_); __v.__construct_at_end(__n, __x); __swap_out_circular_buffer(__v); } @@ -1243,7 +1229,7 @@ vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __las template _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<_Tp, _Allocator>::vector(const vector& __x) - : __alloc_(__alloc_traits::select_on_container_copy_construction(__x.__alloc())) { + : __alloc_(__alloc_traits::select_on_container_copy_construction(__x.__alloc_)) { __init_with_size(__x.__begin_, __x.__end_, __x.size()); } @@ -1261,22 +1247,22 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI vector<_Tp, _Allocato #else _NOEXCEPT_(is_nothrow_move_constructible::value) #endif - : __alloc_(std::move(__x.__alloc())) { - this->__begin_ = __x.__begin_; - this->__end_ = __x.__end_; - this->__end_cap() = __x.__end_cap(); - __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr; + : __alloc_(std::move(__x.__alloc_)) { + __begin_ = __x.__begin_; + __end_ = __x.__end_; + __cap_ = __x.__cap_; + __x.__begin_ = __x.__end_ = __x.__cap_ = nullptr; } template _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t& __a) : __alloc_(__a) { - if (__a == __x.__alloc()) { - this->__begin_ = __x.__begin_; - this->__end_ = __x.__end_; - this->__end_cap() = __x.__end_cap(); - __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr; + if (__a == __x.__alloc_) { + __begin_ = __x.__begin_; + __end_ = __x.__end_; + __cap_ = __x.__cap_; + __x.__begin_ = __x.__end_ = __x.__cap_ = nullptr; } else { typedef move_iterator _Ip; auto __guard = std::__make_exception_guard(__destroy_vector(*this)); @@ -1323,7 +1309,7 @@ vector<_Tp, _Allocator>::operator=(vector&& __x) template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type) _NOEXCEPT_(__alloc_traits::is_always_equal::value) { - if (__alloc() != __c.__alloc()) { + if (__alloc_ != __c.__alloc_) { typedef move_iterator _Ip; assign(_Ip(__c.begin()), _Ip(__c.end())); } else @@ -1335,10 +1321,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__move_assign(vector _NOEXCEPT_(is_nothrow_move_assignable::value) { __vdeallocate(); __move_assign_alloc(__c); // this can throw - this->__begin_ = __c.__begin_; - this->__end_ = __c.__end_; - this->__end_cap() = __c.__end_cap(); - __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr; + __begin_ = __c.__begin_; + __end_ = __c.__end_; + __cap_ = __c.__cap_; + __c.__begin_ = __c.__end_ = __c.__cap_ = nullptr; } template @@ -1473,8 +1459,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::reserve(size_type __ if (__n > capacity()) { if (__n > max_size()) this->__throw_length_error(); - allocator_type& __a = this->__alloc(); - __split_buffer __v(__n, size(), __a); + __split_buffer __v(__n, size(), __alloc_); __swap_out_circular_buffer(__v); } } @@ -1485,8 +1470,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::shrink_to_fit() _NOE #ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { #endif // _LIBCPP_HAS_NO_EXCEPTIONS - allocator_type& __a = this->__alloc(); - __split_buffer __v(size(), size(), __a); + __split_buffer __v(size(), size(), __alloc_); // The Standard mandates shrink_to_fit() does not increase the capacity. // With equal capacity keep the existing buffer. This avoids extra work // due to swapping the elements. @@ -1503,10 +1487,9 @@ template template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::pointer vector<_Tp, _Allocator>::__push_back_slow_path(_Up&& __x) { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + 1), size(), __a); + __split_buffer __v(__recommend(size() + 1), size(), __alloc_); // __v.push_back(std::forward<_Up>(__x)); - __alloc_traits::construct(__a, std::__to_address(__v.__end_), std::forward<_Up>(__x)); + __alloc_traits::construct(__alloc_, std::__to_address(__v.__end_), std::forward<_Up>(__x)); __v.__end_++; __swap_out_circular_buffer(__v); return this->__end_; @@ -1516,7 +1499,7 @@ template _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI void vector<_Tp, _Allocator>::push_back(const_reference __x) { pointer __end = this->__end_; - if (__end < this->__end_cap()) { + if (__end < __cap_) { __construct_one_at_end(__x); ++__end; } else { @@ -1528,7 +1511,7 @@ vector<_Tp, _Allocator>::push_back(const_reference __x) { template _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI void vector<_Tp, _Allocator>::push_back(value_type&& __x) { pointer __end = this->__end_; - if (__end < this->__end_cap()) { + if (__end < __cap_) { __construct_one_at_end(std::move(__x)); ++__end; } else { @@ -1541,10 +1524,9 @@ template template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::pointer vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args) { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + 1), size(), __a); + __split_buffer __v(__recommend(size() + 1), size(), __alloc_); // __v.emplace_back(std::forward<_Args>(__args)...); - __alloc_traits::construct(__a, std::__to_address(__v.__end_), std::forward<_Args>(__args)...); + __alloc_traits::construct(__alloc_, std::__to_address(__v.__end_), std::forward<_Args>(__args)...); __v.__end_++; __swap_out_circular_buffer(__v); return this->__end_; @@ -1560,7 +1542,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 inline #endif vector<_Tp, _Allocator>::emplace_back(_Args&&... __args) { pointer __end = this->__end_; - if (__end < this->__end_cap()) { + if (__end < __cap_) { __construct_one_at_end(std::forward<_Args>(__args)...); ++__end; } else { @@ -1609,7 +1591,7 @@ vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointe pointer __i = __from_s + __n; _ConstructTransaction __tx(*this, __from_e - __i); for (pointer __pos = __tx.__pos_; __i < __from_e; ++__i, (void)++__pos, __tx.__pos_ = __pos) { - __alloc_traits::construct(this->__alloc(), std::__to_address(__pos), std::move(*__i)); + __alloc_traits::construct(__alloc_, std::__to_address(__pos), std::move(*__i)); } } std::move_backward(__from_s, __from_s + __n, __old_last); @@ -1619,7 +1601,7 @@ template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x) { pointer __p = this->__begin_ + (__position - begin()); - if (this->__end_ < this->__end_cap()) { + if (__end_ < __cap_) { if (__p == this->__end_) { __construct_one_at_end(__x); } else { @@ -1630,8 +1612,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x) *__p = *__xr; } } else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __a); + __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __alloc_); __v.push_back(__x); __p = __swap_out_circular_buffer(__v, __p); } @@ -1642,7 +1623,7 @@ template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x) { pointer __p = this->__begin_ + (__position - begin()); - if (this->__end_ < this->__end_cap()) { + if (__end_ < __cap_) { if (__p == this->__end_) { __construct_one_at_end(std::move(__x)); } else { @@ -1650,8 +1631,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x) { *__p = std::move(__x); } } else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __a); + __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __alloc_); __v.push_back(std::move(__x)); __p = __swap_out_circular_buffer(__v, __p); } @@ -1663,17 +1643,16 @@ template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args) { pointer __p = this->__begin_ + (__position - begin()); - if (this->__end_ < this->__end_cap()) { + if (__end_ < __cap_) { if (__p == this->__end_) { __construct_one_at_end(std::forward<_Args>(__args)...); } else { - __temp_value __tmp(this->__alloc(), std::forward<_Args>(__args)...); + __temp_value __tmp(__alloc_, std::forward<_Args>(__args)...); __move_range(__p, this->__end_, __p + 1); *__p = std::move(__tmp.get()); } } else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __a); + __split_buffer __v(__recommend(size() + 1), __p - this->__begin_, __alloc_); __v.emplace_back(std::forward<_Args>(__args)...); __p = __swap_out_circular_buffer(__v, __p); } @@ -1686,7 +1665,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_ pointer __p = this->__begin_ + (__position - begin()); if (__n > 0) { // We can't compare unrelated pointers inside constant expressions - if (!__libcpp_is_constant_evaluated() && __n <= static_cast(this->__end_cap() - this->__end_)) { + if (!__libcpp_is_constant_evaluated() && __n <= static_cast(__cap_ - __end_)) { size_type __old_n = __n; pointer __old_last = this->__end_; if (__n > static_cast(this->__end_ - __p)) { @@ -1702,8 +1681,7 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_ std::fill_n(__p, __n, *__xr); } } else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + __n), __p - this->__begin_, __a); + __split_buffer __v(__recommend(size() + __n), __p - this->__begin_, __alloc_); __v.__construct_at_end(__n, __x); __p = __swap_out_circular_buffer(__v, __p); } @@ -1726,12 +1704,11 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Alloca vector<_Tp, _Allocator>::__insert_with_sentinel(const_iterator __position, _InputIterator __first, _Sentinel __last) { difference_type __off = __position - begin(); pointer __p = this->__begin_ + __off; - allocator_type& __a = this->__alloc(); pointer __old_last = this->__end_; - for (; this->__end_ != this->__end_cap() && __first != __last; ++__first) { + for (; __end_ != __cap_ && __first != __last; ++__first) { __construct_one_at_end(*__first); } - __split_buffer __v(__a); + __split_buffer __v(__alloc_); if (__first != __last) { #ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { @@ -1772,7 +1749,7 @@ vector<_Tp, _Allocator>::__insert_with_size( auto __insertion_size = __n; pointer __p = this->__begin_ + (__position - begin()); if (__n > 0) { - if (__n <= this->__end_cap() - this->__end_) { + if (__n <= __cap_ - __end_) { size_type __old_n = __n; pointer __old_last = this->__end_; _Iterator __m = std::next(__first, __n); @@ -1789,8 +1766,7 @@ vector<_Tp, _Allocator>::__insert_with_size( std::copy(__first, __m, __p); } } else { - allocator_type& __a = this->__alloc(); - __split_buffer __v(__recommend(size() + __n), __p - this->__begin_, __a); + __split_buffer __v(__recommend(size() + __n), __p - this->__begin_, __alloc_); __v.__construct_at_end_with_size(__first, __insertion_size); __p = __swap_out_circular_buffer(__v, __p); } @@ -1825,26 +1801,26 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::swap(vector& __x) #endif { _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR( - __alloc_traits::propagate_on_container_swap::value || this->__alloc() == __x.__alloc(), + __alloc_traits::propagate_on_container_swap::value || __alloc_ == __x.__alloc_, "vector::swap: Either propagate_on_container_swap must be true" " or the allocators must compare equal"); std::swap(this->__begin_, __x.__begin_); std::swap(this->__end_, __x.__end_); - std::swap(this->__end_cap(), __x.__end_cap()); - std::__swap_allocator(this->__alloc(), __x.__alloc()); + std::swap(__cap_, __x.__cap_); + std::__swap_allocator(__alloc_, __x.__alloc_); } template _LIBCPP_CONSTEXPR_SINCE_CXX20 bool vector<_Tp, _Allocator>::__invariants() const { if (this->__begin_ == nullptr) { - if (this->__end_ != nullptr || this->__end_cap() != nullptr) + if (__end_ != nullptr || __cap_ != nullptr) return false; } else { if (this->__begin_ > this->__end_) return false; - if (this->__begin_ == this->__end_cap()) + if (__begin_ == __cap_) return false; - if (this->__end_ > this->__end_cap()) + if (__end_ > __cap_) return false; } return true; @@ -1899,14 +1875,6 @@ public: #endif private: - // TODO: Remove these now redundant accessors - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type& __cap() _NOEXCEPT { return __cap_; } - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const size_type& __cap() const _NOEXCEPT { return __cap_; } - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __storage_allocator& __alloc() _NOEXCEPT { return __alloc_; } - _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const __storage_allocator& __alloc() const _NOEXCEPT { - return __alloc_; - } - static const unsigned __bits_per_word = static_cast(sizeof(__storage_type) * CHAR_BIT); _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static size_type @@ -1936,7 +1904,7 @@ private: _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void operator()() { if (__vec_.__begin_ != nullptr) - __storage_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.__cap()); + __storage_traits::deallocate(__vec_.__alloc_, __vec_.__begin_, __vec_.__cap_); } private: @@ -2032,12 +2000,12 @@ public: #endif _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 allocator_type get_allocator() const _NOEXCEPT { - return allocator_type(this->__alloc()); + return __alloc_; } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type max_size() const _NOEXCEPT; _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type capacity() const _NOEXCEPT { - return __internal_cap_to_external(__cap()); + return __internal_cap_to_external(__cap_); } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type size() const _NOEXCEPT { return __size_; } [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool empty() const _NOEXCEPT { @@ -2198,7 +2166,7 @@ private: #ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { if (__begin_ != nullptr) - __storage_traits::deallocate(__alloc(), __begin_, __cap()); + __storage_traits::deallocate(__alloc_, __begin_, __cap_); throw; } #endif // _LIBCPP_HAS_NO_EXCEPTIONS @@ -2222,19 +2190,19 @@ private: // Allocate space for __n objects // throws length_error if __n > max_size() // throws (probably bad_alloc) if memory run out - // Precondition: __begin_ == __end_ == __cap() == 0 + // Precondition: __begin_ == __end_ == __cap_ == 0 // Precondition: __n > 0 // Postcondition: capacity() >= __n // Postcondition: size() == 0 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __vallocate(size_type __n) { if (__n > max_size()) __throw_length_error(); - auto __allocation = std::__allocate_at_least(__alloc(), __external_cap_to_internal(__n)); + auto __allocation = std::__allocate_at_least(__alloc_, __external_cap_to_internal(__n)); __begin_ = __allocation.ptr; __size_ = 0; - __cap() = __allocation.count; + __cap_ = __allocation.count; if (__libcpp_is_constant_evaluated()) { - for (size_type __i = 0; __i != __cap(); ++__i) + for (size_type __i = 0; __i != __cap_; ++__i) std::__construct_at(std::__to_address(__begin_) + __i); } } @@ -2271,9 +2239,9 @@ private: __v, integral_constant()); } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __copy_assign_alloc(const vector& __c, true_type) { - if (__alloc() != __c.__alloc()) + if (__alloc_ != __c.__alloc_) __vdeallocate(); - __alloc() = __c.__alloc(); + __alloc_ = __c.__alloc_; } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __copy_assign_alloc(const vector&, false_type) {} @@ -2289,7 +2257,7 @@ private: } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __move_assign_alloc(vector& __c, true_type) _NOEXCEPT_(is_nothrow_move_assignable::value) { - __alloc() = std::move(__c.__alloc()); + __alloc_ = std::move(__c.__alloc_); } _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __move_assign_alloc(vector&, false_type) _NOEXCEPT {} @@ -2307,16 +2275,16 @@ private: template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::__vdeallocate() _NOEXCEPT { if (this->__begin_ != nullptr) { - __storage_traits::deallocate(this->__alloc(), this->__begin_, __cap()); + __storage_traits::deallocate(__alloc_, this->__begin_, __cap_); this->__begin_ = nullptr; - this->__size_ = this->__cap() = 0; + __size_ = __cap_ = 0; } } template _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector::size_type vector::max_size() const _NOEXCEPT { - size_type __amax = __storage_traits::max_size(__alloc()); + size_type __amax = __storage_traits::max_size(__alloc_); size_type __nmax = numeric_limits::max() / 2; // end() >= begin(), always if (__nmax / __bits_per_word <= __amax) return __nmax; @@ -2485,7 +2453,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 vector::vector(const vector& __v : __begin_(nullptr), __size_(0), __cap_(0), - __alloc_(__storage_traits::select_on_container_copy_construction(__v.__alloc())) { + __alloc_(__storage_traits::select_on_container_copy_construction(__v.__alloc_)) { if (__v.size() > 0) { __vallocate(__v.size()); __construct_at_end(__v.begin(), __v.end(), __v.size()); @@ -2530,19 +2498,19 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector _LIBCPP_CONSTEXPR_SINCE_CXX20 vector::vector(vector&& __v, const __type_identity_t& __a) : __begin_(nullptr), __size_(0), __cap_(0), __alloc_(__a) { - if (__a == allocator_type(__v.__alloc())) { + if (__a == allocator_type(__v.__alloc_)) { this->__begin_ = __v.__begin_; this->__size_ = __v.__size_; - this->__cap() = __v.__cap(); + __cap_ = __v.__cap_; __v.__begin_ = nullptr; - __v.__cap() = __v.__size_ = 0; + __v.__cap_ = __v.__size_ = 0; } else if (__v.size() > 0) { __vallocate(__v.size()); __construct_at_end(__v.begin(), __v.end(), __v.size()); @@ -2559,7 +2527,7 @@ vector::operator=(vector&& __v) template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::__move_assign(vector& __c, false_type) { - if (__alloc() != __c.__alloc()) + if (__alloc_ != __c.__alloc_) assign(__c.begin(), __c.end()); else __move_assign(__c, true_type()); @@ -2572,9 +2540,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::__move_assign(vecto __move_assign_alloc(__c); this->__begin_ = __c.__begin_; this->__size_ = __c.__size_; - this->__cap() = __c.__cap(); + __cap_ = __c.__cap_; __c.__begin_ = nullptr; - __c.__cap() = __c.__size_ = 0; + __c.__cap_ = __c.__size_ = 0; } template @@ -2647,11 +2615,11 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::reserve(size_type _ template _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::shrink_to_fit() _NOEXCEPT { - if (__external_cap_to_internal(size()) > __cap()) { + if (__external_cap_to_internal(size()) > __cap_) { #ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { #endif // _LIBCPP_HAS_NO_EXCEPTIONS - vector(*this, allocator_type(__alloc())).swap(*this); + vector(*this, __alloc_).swap(*this); #ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } @@ -2827,8 +2795,8 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::swap(vector& __x) { std::swap(this->__begin_, __x.__begin_); std::swap(this->__size_, __x.__size_); - std::swap(this->__cap(), __x.__cap()); - std::__swap_allocator(this->__alloc(), __x.__alloc()); + std::swap(__cap_, __x.__cap_); + std::__swap_allocator(__alloc_, __x.__alloc_); } template @@ -2872,10 +2840,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector::flip() _NOEXCEPT { template _LIBCPP_CONSTEXPR_SINCE_CXX20 bool vector::__invariants() const { if (this->__begin_ == nullptr) { - if (this->__size_ != 0 || this->__cap() != 0) + if (this->__size_ != 0 || __cap_ != 0) return false; } else { - if (this->__cap() == 0) + if (__cap_ == 0) return false; if (this->__size_ > this->capacity()) return false;