From 5c9833d878602de20043a5b74e4c6acd33d5fb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dumont?= Date: Mon, 9 Jan 2023 18:48:30 +0100 Subject: libstdc++: [_GLIBCXX_DEBUG] Complete deadlock fix on safe iterators [PR108288] Complete fix on all _Safe_iterator post-increment and post-decrement implementations and on _Safe_local_iterator. libstdc++-v3/ChangeLog: PR libstdc++/108288 * include/debug/safe_iterator.h (_Safe_iterator<>::operator++(int)): Extend deadlock fix to other iterator category. (_Safe_iterator<>::operator--(int)): Likewise. * include/debug/safe_local_iterator.h (_Safe_local_iterator<>::operator++(int)): Fix deadlock. * testsuite/util/debug/unordered_checks.h (invalid_local_iterator_pre_increment): New. (invalid_local_iterator_post_increment): New. * testsuite/23_containers/unordered_map/debug/invalid_local_iterator_post_increment_neg.cc: New test. * testsuite/23_containers/unordered_map/debug/invalid_local_iterator_pre_increment_neg.cc: New test. --- libstdc++-v3/include/debug/safe_iterator.h | 44 ++++++++---------------- libstdc++-v3/include/debug/safe_local_iterator.h | 14 ++------ 2 files changed, 18 insertions(+), 40 deletions(-) (limited to 'libstdc++-v3/include') diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index f9068ea..755da7d 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -129,14 +129,6 @@ namespace __gnu_debug typename _Sequence::_Base::iterator, typename _Sequence::_Base::const_iterator>::__type _OtherIterator; - struct _Attach_single - { }; - - _Safe_iterator(_Iterator __i, _Safe_sequence_base* __seq, _Attach_single) - _GLIBCXX_NOEXCEPT - : _Iter_base(__i) - { _M_attach_single(__seq); } - public: typedef _Iterator iterator_type; typedef typename _Traits::iterator_category iterator_category; @@ -347,8 +339,9 @@ namespace __gnu_debug _GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(), _M_message(__msg_bad_inc) ._M_iterator(*this, "this")); - __gnu_cxx::__scoped_lock __l(this->_M_get_mutex()); - return _Safe_iterator(base()++, this->_M_sequence, _Attach_single()); + _Safe_iterator __ret = *this; + ++*this; + return __ret; } // ------ Utilities ------ @@ -520,12 +513,6 @@ namespace __gnu_debug protected: typedef typename _Safe_base::_OtherIterator _OtherIterator; - typedef typename _Safe_base::_Attach_single _Attach_single; - - _Safe_iterator(_Iterator __i, _Safe_sequence_base* __seq, _Attach_single) - _GLIBCXX_NOEXCEPT - : _Safe_base(__i, __seq, _Attach_single()) - { } public: /// @post the iterator is singular and unattached @@ -609,9 +596,9 @@ namespace __gnu_debug _GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(), _M_message(__msg_bad_inc) ._M_iterator(*this, "this")); - __gnu_cxx::__scoped_lock __l(this->_M_get_mutex()); - return _Safe_iterator(this->base()++, this->_M_sequence, - _Attach_single()); + _Safe_iterator __ret = *this; + ++*this; + return __ret; } // ------ Bidirectional iterator requirements ------ @@ -640,9 +627,9 @@ namespace __gnu_debug _GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(), _M_message(__msg_bad_dec) ._M_iterator(*this, "this")); - __gnu_cxx::__scoped_lock __l(this->_M_get_mutex()); - return _Safe_iterator(this->base()--, this->_M_sequence, - _Attach_single()); + _Safe_iterator __ret = *this; + --*this; + return __ret; } // ------ Utilities ------ @@ -666,13 +653,6 @@ namespace __gnu_debug typedef _Safe_iterator<_OtherIterator, _Sequence, std::random_access_iterator_tag> _OtherSelf; - typedef typename _Safe_base::_Attach_single _Attach_single; - - _Safe_iterator(_Iterator __i, _Safe_sequence_base* __seq, _Attach_single) - _GLIBCXX_NOEXCEPT - : _Safe_base(__i, __seq, _Attach_single()) - { } - public: typedef typename _Safe_base::difference_type difference_type; typedef typename _Safe_base::reference reference; @@ -761,6 +741,9 @@ namespace __gnu_debug _Safe_iterator operator++(int) _GLIBCXX_NOEXCEPT { + _GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(), + _M_message(__msg_bad_inc) + ._M_iterator(*this, "this")); _Safe_iterator __ret = *this; ++*this; return __ret; @@ -785,6 +768,9 @@ namespace __gnu_debug _Safe_iterator operator--(int) _GLIBCXX_NOEXCEPT { + _GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(), + _M_message(__msg_bad_dec) + ._M_iterator(*this, "this")); _Safe_iterator __ret = *this; --*this; return __ret; diff --git a/libstdc++-v3/include/debug/safe_local_iterator.h b/libstdc++-v3/include/debug/safe_local_iterator.h index 6e3c4eb..1079ee8 100644 --- a/libstdc++-v3/include/debug/safe_local_iterator.h +++ b/libstdc++-v3/include/debug/safe_local_iterator.h @@ -84,14 +84,6 @@ namespace __gnu_debug typedef _Safe_local_iterator _Self; typedef _Safe_local_iterator<_OtherIterator, _Sequence> _OtherSelf; - struct _Attach_single - { }; - - _Safe_local_iterator(_Iterator __i, _Safe_sequence_base* __cont, - _Attach_single) noexcept - : _Iter_base(__i) - { _M_attach_single(__cont); } - public: typedef _Iterator iterator_type; typedef typename _Traits::iterator_category iterator_category; @@ -290,9 +282,9 @@ namespace __gnu_debug _GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(), _M_message(__msg_bad_inc) ._M_iterator(*this, "this")); - __gnu_cxx::__scoped_lock __l(this->_M_get_mutex()); - return _Safe_local_iterator(base()++, this->_M_sequence, - _Attach_single()); + _Safe_local_iterator __ret = *this; + ++*this; + return __ret; } // ------ Utilities ------ -- cgit v1.1