From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id DD1BB382E536; Mon, 14 Nov 2022 18:34:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD1BB382E536 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668450883; bh=NJa5SqJSMlo6NL/PtUOpkSopxGm5OX926hi/I4jW6m4=; h=From:To:Subject:Date:From; b=P++2YWn3tDQwxHyMEz+OG8SO84mkO8pJgKz+DEBB4kjlcDEf7ysf/Tl/gKphgA71o RxUOst9UhNTbqmV1u0qWUG3qvCWYxAwu0mUx1CyLCyEjv9j8S7KUuN0WwlsfIMbBsD SbQyoRZUchv95ZtRpyAZs65rj9Ss+tTeJgEn6xJ0= 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 r12-8908] libstdc++: Set active union member in constexpr std::string [PR103295] X-Act-Checkin: gcc X-Git-Author: Nathaniel Shead X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 58da1386d2233b8e01aaac8f7c4a61a2ccf52743 X-Git-Newrev: a088d93c210f9b662d706e2fcf63a59d05fe27c1 Message-Id: <20221114183443.DD1BB382E536@sourceware.org> Date: Mon, 14 Nov 2022 18:34:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a088d93c210f9b662d706e2fcf63a59d05fe27c1 commit r12-8908-ga088d93c210f9b662d706e2fcf63a59d05fe27c1 Author: Nathaniel Shead Date: Fri Nov 11 22:23:31 2022 +1100 libstdc++: Set active union member in constexpr std::string [PR103295] 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 (cherry picked from commit 52672be7d328df50f9a05ce3ab44ebcae50fee1b) Diff: --- libstdc++-v3/include/bits/basic_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 9777deaf2e9..f1a0e6984a1 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -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(); }