diff options
Diffstat (limited to 'contrib/llvm-project/libcxx/include/__algorithm')
3 files changed, 5 insertions, 4 deletions
| diff --git a/contrib/llvm-project/libcxx/include/__algorithm/pop_heap.h b/contrib/llvm-project/libcxx/include/__algorithm/pop_heap.h index a93a9875f705..798a1d09934b 100644 --- a/contrib/llvm-project/libcxx/include/__algorithm/pop_heap.h +++ b/contrib/llvm-project/libcxx/include/__algorithm/pop_heap.h @@ -36,7 +36,8 @@ __pop_heap(_RandomAccessIterator __first,             _RandomAccessIterator __last,             _Compare& __comp,             typename iterator_traits<_RandomAccessIterator>::difference_type __len) { -  _LIBCPP_ASSERT_UNCATEGORIZED(__len > 0, "The heap given to pop_heap must be non-empty"); +  // Calling `pop_heap` on an empty range is undefined behavior, but in practice it will be a no-op. +  _LIBCPP_ASSERT_PEDANTIC(__len > 0, "The heap given to pop_heap must be non-empty");    __comp_ref_type<_Compare> __comp_ref = __comp; diff --git a/contrib/llvm-project/libcxx/include/__algorithm/sift_down.h b/contrib/llvm-project/libcxx/include/__algorithm/sift_down.h index 7f152e4dbd7f..42803e30631f 100644 --- a/contrib/llvm-project/libcxx/include/__algorithm/sift_down.h +++ b/contrib/llvm-project/libcxx/include/__algorithm/sift_down.h @@ -85,7 +85,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _RandomAccessIterator __floy      _Compare&& __comp,      typename iterator_traits<_RandomAccessIterator>::difference_type __len) {    using difference_type = typename iterator_traits<_RandomAccessIterator>::difference_type; -  _LIBCPP_ASSERT_UNCATEGORIZED(__len >= 2, "shouldn't be called unless __len >= 2"); +  _LIBCPP_ASSERT_INTERNAL(__len >= 2, "shouldn't be called unless __len >= 2");    _RandomAccessIterator __hole    = __first;    _RandomAccessIterator __child_i = __first; diff --git a/contrib/llvm-project/libcxx/include/__algorithm/sort.h b/contrib/llvm-project/libcxx/include/__algorithm/sort.h index 1b878c33c7a1..ac47489af0aa 100644 --- a/contrib/llvm-project/libcxx/include/__algorithm/sort.h +++ b/contrib/llvm-project/libcxx/include/__algorithm/sort.h @@ -533,7 +533,7 @@ __bitset_partition(_RandomAccessIterator __first, _RandomAccessIterator __last,    using _Ops = _IterOps<_AlgPolicy>;    typedef typename std::iterator_traits<_RandomAccessIterator>::value_type value_type;    typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type difference_type; -  _LIBCPP_ASSERT_UNCATEGORIZED(__last - __first >= difference_type(3), ""); +  _LIBCPP_ASSERT_INTERNAL(__last - __first >= difference_type(3), "");    const _RandomAccessIterator __begin = __first; // used for bounds checking, those are not moved around    const _RandomAccessIterator __end   = __last;    (void)__end; // @@ -625,7 +625,7 @@ __partition_with_equals_on_right(_RandomAccessIterator __first, _RandomAccessIte    using _Ops = _IterOps<_AlgPolicy>;    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;    typedef typename std::iterator_traits<_RandomAccessIterator>::value_type value_type; -  _LIBCPP_ASSERT_UNCATEGORIZED(__last - __first >= difference_type(3), ""); +  _LIBCPP_ASSERT_INTERNAL(__last - __first >= difference_type(3), "");    const _RandomAccessIterator __begin = __first; // used for bounds checking, those are not moved around    const _RandomAccessIterator __end   = __last;    (void)__end; // | 
