]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Set active union member in constexpr std::string [PR103295]
authorNathaniel Shead <nathanieloshead@gmail.com>
Fri, 11 Nov 2022 11:23:31 +0000 (22:23 +1100)
committerJonathan Wakely <jwakely@redhat.com>
Fri, 11 Nov 2022 17:57:37 +0000 (17:57 +0000)
Clang still complains about using std::string in constexpr contexts due
to the changes made in commit 98a0d72a. This patch ensures that we set
the active member of the union as according to [class.union.general] p6.

libstdc++-v3/ChangeLog:

PR libstdc++/103295
* include/bits/basic_string.h (_M_use_local_data): Set active
member to _M_local_buf.

Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
libstdc++-v3/include/bits/basic_string.h

index 9c2b57f5a1d7b145c62186d92c980f50d7e23424..109915653af09aeabdb86349003a857b3b49ee8b 100644 (file)
@@ -352,8 +352,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       {
 #if __cpp_lib_is_constant_evaluated
        if (std::is_constant_evaluated())
-         for (_CharT& __c : _M_local_buf)
-           __c = _CharT();
+         for (size_type __i = 0; __i <= _S_local_capacity; ++__i)
+           _M_local_buf[__i] = _CharT();
 #endif
        return _M_local_data();
       }