This is an archive of the discontinued LLVM Phabricator instance.

Differential D117402

[libc++][NFC] Use _LIBCPP_DEBUG_ASSERT in <vector>
ClosedPublic

Authored by philnik on Jan 15 2022, 10:58 AM.

Details

Reviewers
• Quuxplusone
ldionne
Mordante
Group Reviewers
Restricted Project
Commits
rGd7630b37ceb8: [libc++][NFC] Use _LIBCPP_DEBUG_ASSERT in <vector>
Summary

Use _LIBCPP_DEBUG_ASSERT in <vector>

Diff Detail

Event Timeline

philnik requested review of this revision.Jan 15 2022, 10:58 AM
philnik created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2022, 10:58 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante accepted this revision as: Mordante.Jan 15 2022, 11:16 AM

LGTM module some nits.

libcxx/include/vector
1705

Style nit: Please indent this line like the others. Since it seems to fit for emplace it should fit for insert.
Same for the insert below.

philnik updated this revision to Diff 400310.Jan 15 2022, 11:25 AM
philnik marked an inline comment as done.
  • Indent messages
Harbormaster completed remote builds in B143613: Diff 400310.Jan 15 2022, 1:12 PM
• Quuxplusone accepted this revision.Jan 16 2022, 7:19 AM
This revision is now accepted and ready to land.Jan 16 2022, 7:19 AM
ldionne accepted this revision.Jan 17 2022, 8:49 AM
Closed by commit rGd7630b37ceb8: [libc++][NFC] Use _LIBCPP_DEBUG_ASSERT in <vector> (authored by philnik). · Explain WhyJan 17 2022, 10:30 AM
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGd7630b37ceb8: [libc++][NFC] Use _LIBCPP_DEBUG_ASSERT in <vector>.

Revision Contents

PathSize
libcxx/
include/
62 lines

Diff 400310

libcxx/include/vector

Show First 20 Lines • Show All 1,641 Lines • ▼ Show 20 Linesvector<_Tp, _Allocator>::pop_back()
this->__destruct_at_end(this->__end_ - 1); this->__destruct_at_end(this->__end_ - 1);
} }
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::erase(const_iterator __position) vector<_Tp, _Allocator>::erase(const_iterator __position)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::erase(iterator) called with an iterator not referring to this vector");
"vector::erase(iterator) called with an iterator not"
" referring to this vector");
#endif
_LIBCPP_ASSERT(__position != end(), _LIBCPP_ASSERT(__position != end(),
"vector::erase(iterator) called with a non-dereferenceable iterator"); "vector::erase(iterator) called with a non-dereferenceable iterator");
difference_type __ps = __position - cbegin(); difference_type __ps = __position - cbegin();
pointer __p = this->__begin_ + __ps; pointer __p = this->__begin_ + __ps;
this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p)); this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p));
this->__invalidate_iterators_past(__p-1); this->__invalidate_iterators_past(__p-1);
iterator __r = __make_iter(__p); iterator __r = __make_iter(__p);
return __r; return __r;
} }
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last) vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__first)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__first)) == this, "vector::erase(iterator, iterator) called with an iterator not referring to this vector");
"vector::erase(iterator, iterator) called with an iterator not" _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__last)) == this,
" referring to this vector"); "vector::erase(iterator, iterator) called with an iterator not referring to this vector");
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__last)) == this,
"vector::erase(iterator, iterator) called with an iterator not"
" referring to this vector");
#endif
_LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range"); _LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");
pointer __p = this->__begin_ + (__first - begin()); pointer __p = this->__begin_ + (__first - begin());
if (__first != __last) { if (__first != __last) {
this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p)); this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));
this->__invalidate_iterators_past(__p - 1); this->__invalidate_iterators_past(__p - 1);
} }
iterator __r = __make_iter(__p); iterator __r = __make_iter(__p);
return __r; return __r;
Show All 17 Linesvector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to)
} }
_VSTD::move_backward(__from_s, __from_s + __n, __old_last); _VSTD::move_backward(__from_s, __from_s + __n, __old_last);
} }
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x) vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::insert(iterator, x) called with an iterator not referring to this vector");
MordanteUnsubmitted
Done
ReplyInline Actions

Style nit: Please indent this line like the others. Since it seems to fit for emplace it should fit for insert.
Same for the insert below.

Mordante: Style nit: Please indent this line like the others. Since it seems to fit for `emplace` it…
"vector::insert(iterator, x) called with an iterator not"
" referring to this vector");
#endif
pointer __p = this->__begin_ + (__position - begin()); pointer __p = this->__begin_ + (__position - begin());
if (this->__end_ < this->__end_cap()) if (this->__end_ < this->__end_cap())
{ {
if (__p == this->__end_) if (__p == this->__end_)
{ {
__construct_one_at_end(__x); __construct_one_at_end(__x);
} }
else else
Show All 16 Lines
} }
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x) vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::insert(iterator, x) called with an iterator not referring to this vector");
"vector::insert(iterator, x) called with an iterator not"
" referring to this vector");
#endif
pointer __p = this->__begin_ + (__position - begin()); pointer __p = this->__begin_ + (__position - begin());
if (this->__end_ < this->__end_cap()) if (this->__end_ < this->__end_cap())
{ {
if (__p == this->__end_) if (__p == this->__end_)
{ {
__construct_one_at_end(_VSTD::move(__x)); __construct_one_at_end(_VSTD::move(__x));
} }
else else
Show All 12 Linesvector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)
return __make_iter(__p); return __make_iter(__p);
} }
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
template <class... _Args> template <class... _Args>
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args) vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::emplace(iterator, x) called with an iterator not referring to this vector");
"vector::emplace(iterator, x) called with an iterator not"
" referring to this vector");
#endif
pointer __p = this->__begin_ + (__position - begin()); pointer __p = this->__begin_ + (__position - begin());
if (this->__end_ < this->__end_cap()) if (this->__end_ < this->__end_cap())
{ {
if (__p == this->__end_) if (__p == this->__end_)
{ {
__construct_one_at_end(_VSTD::forward<_Args>(__args)...); __construct_one_at_end(_VSTD::forward<_Args>(__args)...);
} }
else else
Show All 14 Lines
} }
#endif // !_LIBCPP_CXX03_LANG #endif // !_LIBCPP_CXX03_LANG
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x) vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::insert(iterator, n, x) called with an iterator not referring to this vector");
"vector::insert(iterator, n, x) called with an iterator not"
" referring to this vector");
#endif
pointer __p = this->__begin_ + (__position - begin()); pointer __p = this->__begin_ + (__position - begin());
if (__n > 0) if (__n > 0)
{ {
if (__n <= static_cast<size_type>(this->__end_cap() - this->__end_)) if (__n <= static_cast<size_type>(this->__end_cap() - this->__end_))
{ {
size_type __old_n = __n; size_type __old_n = __n;
pointer __old_last = this->__end_; pointer __old_last = this->__end_;
if (__n > static_cast<size_type>(this->__end_ - __p)) if (__n > static_cast<size_type>(this->__end_ - __p))
Show All 30 Lines<
!__is_cpp17_forward_iterator<_InputIterator>::value && !__is_cpp17_forward_iterator<_InputIterator>::value &&
is_constructible< is_constructible<
_Tp, _Tp,
typename iterator_traits<_InputIterator>::reference>::value, typename iterator_traits<_InputIterator>::reference>::value,
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
>::type >::type
vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last) vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::insert(iterator, range) called with an iterator not referring to this vector");
"vector::insert(iterator, range) called with an iterator not"
" referring to this vector");
#endif
difference_type __off = __position - begin(); difference_type __off = __position - begin();
pointer __p = this->__begin_ + __off; pointer __p = this->__begin_ + __off;
allocator_type& __a = this->__alloc(); allocator_type& __a = this->__alloc();
pointer __old_last = this->__end_; pointer __old_last = this->__end_;
for (; this->__end_ != this->__end_cap() && __first != __last; ++__first) for (; this->__end_ != this->__end_cap() && __first != __last; ++__first)
{ {
__construct_one_at_end(*__first); __construct_one_at_end(*__first);
} }
Show All 32 Lines<
__is_cpp17_forward_iterator<_ForwardIterator>::value && __is_cpp17_forward_iterator<_ForwardIterator>::value &&
is_constructible< is_constructible<
_Tp, _Tp,
typename iterator_traits<_ForwardIterator>::reference>::value, typename iterator_traits<_ForwardIterator>::reference>::value,
typename vector<_Tp, _Allocator>::iterator typename vector<_Tp, _Allocator>::iterator
>::type >::type
vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last) vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 _LIBCPP_DEBUG_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this,
_LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(_VSTD::addressof(__position)) == this, "vector::insert(iterator, range) called with an iterator not referring to this vector");
"vector::insert(iterator, range) called with an iterator not"
" referring to this vector");
#endif
pointer __p = this->__begin_ + (__position - begin()); pointer __p = this->__begin_ + (__position - begin());
difference_type __n = _VSTD::distance(__first, __last); difference_type __n = _VSTD::distance(__first, __last);
if (__n > 0) if (__n > 0)
{ {
if (__n <= this->__end_cap() - this->__end_) if (__n <= this->__end_cap() - this->__end_)
{ {
size_type __old_n = __n; size_type __old_n = __n;
pointer __old_last = this->__end_; pointer __old_last = this->__end_;
▲ Show 20 Lines • Show All 1,426 Lines • Show Last 20 Lines