From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 39A203857360; Thu, 16 Jun 2022 19:20:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39A203857360 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-1139] libstdc++: Support constexpr global std::string for size < 15 [PR105995] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 51309d1158b85560a975819260776c0ca68fd142 X-Git-Newrev: 98a0d72a610a87e8e383d366e50253ddcc9a51dd Message-Id: <20220616192052.39A203857360@sourceware.org> Date: Thu, 16 Jun 2022 19:20:52 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2022 19:20:52 -0000 https://gcc.gnu.org/g:98a0d72a610a87e8e383d366e50253ddcc9a51dd commit r13-1139-g98a0d72a610a87e8e383d366e50253ddcc9a51dd Author: Jonathan Wakely Date: Thu Jun 16 14:57:32 2022 +0100 libstdc++: Support constexpr global std::string for size < 15 [PR105995] I don't think this is required by the standard, but it's easy to support. libstdc++-v3/ChangeLog: PR libstdc++/105995 * include/bits/basic_string.h (_M_use_local_data): Initialize the entire SSO buffer. * testsuite/21_strings/basic_string/cons/char/105995.cc: New test. Diff: --- libstdc++-v3/include/bits/basic_string.h | 3 ++- .../testsuite/21_strings/basic_string/cons/char/105995.cc | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 57247e306dc..b04fba95678 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -352,7 +352,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { #if __cpp_lib_is_constant_evaluated if (std::is_constant_evaluated()) - _M_local_buf[0] = _CharT(); + for (_CharT& __c : _M_local_buf) + __c = _CharT(); #endif return _M_local_data(); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc new file mode 100644 index 00000000000..aa8bcba3dca --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc @@ -0,0 +1,9 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } +// { dg-require-effective-target cxx11_abi } + +// PR libstdc++/105995 +// Not required by the standard, but supported for QoI. +constexpr std::string pr105995_empty; +constexpr std::string pr105995_partial = "0"; +constexpr std::string pr105995_full = "0123456789abcde";