public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-7625] libstdc++: Avoid bogus overflow warnings in std::vector<bool> [PR110807] Date: Fri, 28 Jul 2023 17:32:20 +0000 (GMT) [thread overview] Message-ID: <20230728173220.B709B385AF83@sourceware.org> (raw) https://gcc.gnu.org/g:962cd3e2c475e8197fd0cfa7330a8f352b4ff5b2 commit r13-7625-g962cd3e2c475e8197fd0cfa7330a8f352b4ff5b2 Author: Jonathan Wakely <jwakely@redhat.com> Date: Wed Jul 26 14:09:24 2023 +0100 libstdc++: Avoid bogus overflow warnings in std::vector<bool> [PR110807] GCC thinks the allocation can alter the object being copied if it's globally reachable, so doesn't realize that [x.begin(), x.end()) after the allocation is the same as x.size() before it. This causes a testsuite failure when testing with -D_GLIBCXX_DEBUG: FAIL: 23_containers/vector/bool/swap.cc (test for excess errors) A fix is to move the calls to x.begin() and x.end() to before the allocation. A similar problem exists in vector<bool>::_M_insert_range where *this is globally reachable, as reported in PR libstdc++/110807. That can also be fixed by moving calls to begin() and end() before the allocation. libstdc++-v3/ChangeLog: PR libstdc++/110807 * include/bits/stl_bvector.h (vector(const vector&)): Access iterators before allocating. * include/bits/vector.tcc (vector<bool>::_M_insert_range): Likewise. * testsuite/23_containers/vector/bool/110807.cc: New test. (cherry picked from commit 7931a1de9ec87b996d51d3d60786f5c81f63919f) Diff: --- libstdc++-v3/include/bits/stl_bvector.h | 3 ++- libstdc++-v3/include/bits/vector.tcc | 5 +++-- libstdc++-v3/testsuite/23_containers/vector/bool/110807.cc | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index ad462c5933c..8d18bcaffd4 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -773,8 +773,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER vector(const vector& __x) : _Base(_Bit_alloc_traits::_S_select_on_copy(__x._M_get_Bit_allocator())) { + const_iterator __xbegin = __x.begin(), __xend = __x.end(); _M_initialize(__x.size()); - _M_copy_aligned(__x.begin(), __x.end(), begin()); + _M_copy_aligned(__xbegin, __xend, begin()); } #if __cplusplus >= 201103L diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index d6fdea2dd01..c762dbf798f 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -910,11 +910,12 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { const size_type __len = _M_check_len(__n, "vector<bool>::_M_insert_range"); + const iterator __begin = begin(), __end = end(); _Bit_pointer __q = this->_M_allocate(__len); iterator __start(std::__addressof(*__q), 0); - iterator __i = _M_copy_aligned(begin(), __position, __start); + iterator __i = _M_copy_aligned(__begin, __position, __start); __i = std::copy(__first, __last, __i); - iterator __finish = std::copy(__position, end(), __i); + iterator __finish = std::copy(__position, __end, __i); this->_M_deallocate(); this->_M_impl._M_end_of_storage = __q + _S_nword(__len); this->_M_impl._M_start = __start; diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/110807.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/110807.cc new file mode 100644 index 00000000000..2e9d4019edb --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/110807.cc @@ -0,0 +1,14 @@ +// { dg-options "-O2" } +// { dg-do compile { target c++11 } } + +// Bug 110807 +// Copy list initialisation of a vector<bool> raises a warning with -O2 + +#include <vector> + +std::vector<bool> byCallSpread; + +void f() +{ + byCallSpread = {true}; +}
reply other threads:[~2023-07-28 17:32 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=20230728173220.B709B385AF83@sourceware.org \ --to=redi@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).