public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Francois Dumont <fdumont@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5180] libstdc++: [_GLIBCXX_DEBUG] Complete deadlock fix on safe iterators [PR108288] Date: Sun, 15 Jan 2023 16:07:01 +0000 (GMT) [thread overview] Message-ID: <20230115160701.09C383858D32@sourceware.org> (raw) https://gcc.gnu.org/g:5c9833d878602de20043a5b74e4c6acd33d5fb3e commit r13-5180-g5c9833d878602de20043a5b74e4c6acd33d5fb3e Author: François Dumont <fdumont@gcc.gnu.org> Date: Mon Jan 9 18:48:30 2023 +0100 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. Diff: --- libstdc++-v3/include/debug/safe_iterator.h | 44 ++++++++-------------- libstdc++-v3/include/debug/safe_local_iterator.h | 14 ++----- .../invalid_local_iterator_post_increment_neg.cc | 16 ++++++++ .../invalid_local_iterator_pre_increment_neg.cc | 16 ++++++++ .../testsuite/util/debug/unordered_checks.h | 34 +++++++++++++++++ 5 files changed, 84 insertions(+), 40 deletions(-) diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index f9068eaf8d6..755da7dffe5 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 6e3c4eb1505..1079ee8dc4f 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 ------ diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_post_increment_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_post_increment_neg.cc new file mode 100644 index 00000000000..74005c3ec69 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_post_increment_neg.cc @@ -0,0 +1,16 @@ +// { dg-do run { target c++11 xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include <unordered_map> +#include <debug/unordered_checks.h> + +void test01() +{ + __gnu_test::invalid_local_iterator_post_increment<std::unordered_map<int, int>>(); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_pre_increment_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_pre_increment_neg.cc new file mode 100644 index 00000000000..016cd1c6947 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_pre_increment_neg.cc @@ -0,0 +1,16 @@ +// { dg-do run { target c++11 xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include <unordered_map> +#include <debug/unordered_checks.h> + +void test01() +{ + __gnu_test::invalid_local_iterator_pre_increment<std::unordered_map<int, int>>(); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/util/debug/unordered_checks.h b/libstdc++-v3/testsuite/util/debug/unordered_checks.h index 655f16f199f..76ae05bbf8b 100644 --- a/libstdc++-v3/testsuite/util/debug/unordered_checks.h +++ b/libstdc++-v3/testsuite/util/debug/unordered_checks.h @@ -125,6 +125,40 @@ namespace __gnu_test VERIFY( *it == val ); } + template<typename _Tp> + void invalid_local_iterator_pre_increment() + { + typedef _Tp cont_type; + typedef typename cont_type::value_type cont_val_type; + typedef typename CopyableValueType<cont_val_type>::value_type val_type; + generate_unique<val_type> gu; + + cont_type c; + for (size_t i = 0; i != 5; ++i) + c.insert(gu.build()); + + auto lit = c.begin(0); + for (size_t i = 0; i != 6; ++i) + ++lit; + } + + template<typename _Tp> + void invalid_local_iterator_post_increment() + { + typedef _Tp cont_type; + typedef typename cont_type::value_type cont_val_type; + typedef typename CopyableValueType<cont_val_type>::value_type val_type; + generate_unique<val_type> gu; + + cont_type c; + for (size_t i = 0; i != 5; ++i) + c.insert(gu.build()); + + auto lit = c.begin(0); + for (size_t i = 0; i != 6; ++i) + lit++; + } + template<typename _Tp> void invalid_local_iterator_compare() {
reply other threads:[~2023-01-15 16:07 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230115160701.09C383858D32@sourceware.org \ --to=fdumont@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).