From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 149253847718; Wed, 3 Apr 2024 10:46:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 149253847718 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1712141199; bh=U/3aa6ykVA65pO8l8DyGMATQj6AW1FztiK0K6Em7PBg=; h=From:To:Subject:Date:From; b=jYFwsxIz5pNy27fCsLNaMTC368cfRj0KlbU6DK18NGnAlWLZE4S9HG/xREZobBj6E tik6Rr3Or8xsQk48TlHUsgh5H4C8I1w+8qmbe80KdlXot76ASTfiClng6YyFIOSrNQ 6iLGyGYjFkfZgXhrkq4wJCZRde6T6+w6msc48tpg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8568] libstdc++: Begin lifetime of storage in std::vector [PR114367] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: d178e964f14cb69cc6540ebe647dba37b6453e30 X-Git-Newrev: d8d71b19f0b1e28fd6d413a6874ec55c568865b0 Message-Id: <20240403104639.149253847718@sourceware.org> Date: Wed, 3 Apr 2024 10:46:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d8d71b19f0b1e28fd6d413a6874ec55c568865b0 commit r13-8568-gd8d71b19f0b1e28fd6d413a6874ec55c568865b0 Author: Jonathan Wakely Date: Mon Mar 18 13:00:17 2024 +0000 libstdc++: Begin lifetime of storage in std::vector [PR114367] This doesn't cause a problem with GCC, but Clang correctly diagnoses a bug in the code. The objects in the allocated storage need to begin their lifetime before we start using them. This change uses the allocator's construct function instead of using std::construct_at directly, in order to support fancy pointers. libstdc++-v3/ChangeLog: PR libstdc++/114367 * include/bits/stl_bvector.h (_M_allocate): Use allocator's construct function to begin lifetime of words. (cherry picked from commit 16afbd9c9c4282d56062cef95e6eccfdcf3efe03) Diff: --- libstdc++-v3/include/bits/stl_bvector.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 64f04c1f4f5..8b54292e51b 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -674,13 +674,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _M_allocate(size_t __n) { _Bit_pointer __p = _Bit_alloc_traits::allocate(_M_impl, _S_nword(__n)); -#if __cpp_lib_is_constant_evaluated +#if __cpp_lib_is_constant_evaluated && __cpp_constexpr_dynamic_alloc if (std::is_constant_evaluated()) - { - __n = _S_nword(__n); - for (size_t __i = 0; __i < __n; ++__i) - __p[__i] = 0ul; - } + { + __n = _S_nword(__n); + for (size_t __i = 0; __i < __n; ++__i) + std::construct_at(std::to_address(__p) + __i); + } #endif return __p; }