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 r12-8657] libstdc++: Support constexpr global std::string for size < 15 [PR105995]
Date: Wed,  3 Aug 2022 13:47:03 +0000 (GMT)	[thread overview]
Message-ID: <20220803134703.A57C23885C33@sourceware.org> (raw)

https://gcc.gnu.org/g:e562236851e06091256593aa0d3fbda60a28e45b

commit r12-8657-ge562236851e06091256593aa0d3fbda60a28e45b
Author: Jonathan Wakely <jwakely@redhat.com>
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.
    
    (cherry picked from commit 98a0d72a610a87e8e383d366e50253ddcc9a51dd)

Diff:
---
 libstdc++-v3/include/bits/basic_string.h                      |  3 ++-
 .../testsuite/21_strings/basic_string/cons/char/105995.cc     | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 6041d05815b..9777deaf2e9 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..4764ceff72a
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
@@ -0,0 +1,11 @@
+// { dg-options "-std=gnu++20" }
+// { dg-do compile { target c++20 } }
+// { dg-require-effective-target cxx11_abi }
+
+#include <string>
+
+// 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";


                 reply	other threads:[~2022-08-03 13:47 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=20220803134703.A57C23885C33@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: link
Be 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).