From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1720) id CBAFD3858CD1; Wed, 20 Mar 2024 05:40:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBAFD3858CD1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1710913208; bh=nJF+IotB59Y1QbKLI2hhTy8vDIaqe5veIagP/gUi8ns=; h=From:To:Subject:Date:From; b=sMTCEBJINyOAxuYIa1yWKPFiRD+T8WUiXgOC6+irLRm+hLCF8ik8rduJkBvzESOXG b19IzU1E6fky9UpwSEaFyseJ7Gcpgz8jxBeBGJY+1ntUqbN9JJrECcgXXG6d4bPMF3 xW9r+rcxC4fW+SMzZSW+MYadBjGivEDVOr3A24y8= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Francois Dumont To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8470] libstdc++: Fix _Safe_local_iterator<>::_M_valid_range X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 77f94f0f59a889eb9c0e8e573276dfebdd08d17a X-Git-Newrev: 86183487993315214091d593334893a883954f17 Message-Id: <20240320054008.CBAFD3858CD1@sourceware.org> Date: Wed, 20 Mar 2024 05:40:08 +0000 (GMT) List-Id: https://gcc.gnu.org/g:86183487993315214091d593334893a883954f17 commit r13-8470-g86183487993315214091d593334893a883954f17 Author: François Dumont Date: Sun Mar 17 17:30:58 2024 +0100 libstdc++: Fix _Safe_local_iterator<>::_M_valid_range Unordered container local_iterator range shall not contain any singular iterator unless both iterators are both value-initialized. libstdc++-v3/ChangeLog: * include/debug/safe_local_iterator.tcc (_Safe_local_iterator::_M_valid_range): Add _M_value_initialized and _M_singular checks. * testsuite/23_containers/unordered_set/debug/114316.cc: New test case. (cherry picked from commit 5f6e0853c30fec72d977afaa6f7a5633a8d910be) Diff: --- libstdc++-v3/include/debug/safe_local_iterator.tcc | 8 ++++++- .../23_containers/unordered_set/debug/114316.cc | 28 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/debug/safe_local_iterator.tcc b/libstdc++-v3/include/debug/safe_local_iterator.tcc index 6fba344f16a..2444f41bb85 100644 --- a/libstdc++-v3/include/debug/safe_local_iterator.tcc +++ b/libstdc++-v3/include/debug/safe_local_iterator.tcc @@ -78,7 +78,13 @@ namespace __gnu_debug _M_valid_range(const _Safe_local_iterator& __rhs, std::pair& __dist) const { - if (!_M_can_compare(__rhs)) + if (_M_value_initialized() && __rhs._M_value_initialized()) + { + __dist = { 0, __dp_exact }; + return true; + } + + if (_M_singular() || __rhs._M_singular() || !_M_can_compare(__rhs)) return false; if (bucket() != __rhs.bucket()) diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/114316.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/114316.cc new file mode 100644 index 00000000000..41b649a9cbd --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/114316.cc @@ -0,0 +1,28 @@ +// { dg-do run { target c++11 } } +// { dg-require-debug-mode "" } + +// PR libstdc++/114316 + +#include +#include + +#include + +void test01() +{ + std::unordered_set::iterator it{}; + VERIFY( std::find(it, it, 0) == it ); +} + +void test02() +{ + std::unordered_set::local_iterator it{}; + VERIFY( std::find(it, it, 0) == it ); +} + +int main() +{ + test01(); + test02(); + return 0; +}