[committed] libstdc++: Support constexpr global std::string for size < 15 [PR105995]

[committed] libstdc++: Support constexpr global std::string for size < 15 [PR105995]

[Jonathan Wakely]

Tested x86_64-linux, pushed to trunk.

-- >8 --

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.
---
 libstdc++-v3/include/bits/basic_string.h                 | 3 ++-
 .../21_strings/basic_string/cons/char/105995.cc          | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc

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";
-- 
2.34.3

Re: [committed] libstdc++: Support constexpr global std::string for size < 15 [PR105995]

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

On Thu, 16 Jun 2022 at 20:23, Jonathan Wakely via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> Tested x86_64-linux, pushed to trunk.

Somehow I messed up the test in the commit I pushed (but not the one I
tested ... weird).

Fixed at r13-1151-g0f96ac43fa0a5f by the attached patch.

-- >8 --

   libstdc++: Add missing #include <string> to new test

   Somehow I pushed a different version of this test to the one I actually
   tested.

   libstdc++-v3/ChangeLog:

           * testsuite/21_strings/basic_string/cons/char/105995.cc: Add
           missing #include.

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 996 bytes --]

commit 0f96ac43fa0a5fdbfce317b274233852d5b46d23
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Jun 17 13:29:05 2022

    libstdc++: Add missing #include <string> to new test
    
    Somehow I pushed a different version of this test to the one I actually
    tested.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/21_strings/basic_string/cons/char/105995.cc: Add
            missing #include.

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
index aa8bcba3dca..4764ceff72a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/105995.cc
@@ -2,6 +2,8 @@
 // { 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;