From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 438F9385829E; Fri, 16 Feb 2024 15:21:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 438F9385829E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708096871; bh=GndBIzr1Qu9ovEE0t/P6I320GUsKshZFqdnQLc0+SOs=; h=From:To:Subject:Date:From; b=XUsy1BoC/ZNsYSVdKVyx3wJOP0rRNJgab5TKgUpOy8HIRrhuhlNcmT9iX9ZUAAA1p alpGNB0HUUfFhN+fY40y1imC4bFMIVo1tgnD2t4pEE94raYnrbJGhsxuz/QoQF8T/h 0Z7PCikbrB66ITnSf3SdyOftWHbhuVkv/RY5zCYw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8335] libstdc++: Fix constexpr basic_string union member [PR113294] X-Act-Checkin: gcc X-Git-Author: Paul Keir X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 3a72c717b311ce8093042d927a1f2f2b940a969c X-Git-Newrev: ebe00c9d3a0436dec5c354a62d98e444d763ff95 Message-Id: <20240216152111.438F9385829E@sourceware.org> Date: Fri, 16 Feb 2024 15:21:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ebe00c9d3a0436dec5c354a62d98e444d763ff95 commit r13-8335-gebe00c9d3a0436dec5c354a62d98e444d763ff95 Author: Paul Keir Date: Mon Feb 12 18:15:49 2024 +0000 libstdc++: Fix constexpr basic_string union member [PR113294] A call to `basic_string::clear()` in the std::string move assignment operator leads to a constexpr error from an access of inactive union member `_M_local_buf` in the added test (`test_move()`). Changing `__str._M_local_buf` to `__str._M_use_local_data()` in `operator=(basic_string&& __str)` fixes this. PR libstdc++/113294 libstdc++-v3/ChangeLog: * include/bits/basic_string.h (basic_string::operator=): Use _M_use_local_data() instead of _M_local_buf on the moved-from string. * testsuite/21_strings/basic_string/modifiers/constexpr.cc (test_move): New test. Signed-off-by: Paul Keir Reviewed-by: Patrick Palka Reviewed-by: Jonathan Wakely (cherry picked from commit 065dddc6e07a917c57c7955db13b1fe77abbcabc) Diff: --- libstdc++-v3/include/bits/basic_string.h | 2 +- .../21_strings/basic_string/modifiers/constexpr.cc | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index b73991d96da1..36598803f00c 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -904,7 +904,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 __str._M_capacity(__capacity); } else - __str._M_data(__str._M_local_buf); + __str._M_data(__str._M_use_local_data()); } else // Need to do a deep copy assign(__str); diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc index 77fe59bb7858..2c12fdf42409 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/constexpr.cc @@ -51,3 +51,17 @@ test_erasure() } static_assert( test_erasure() ); + +constexpr bool +test_move() +{ + // PR libstdc++/113294 + std::string s1; + std::string s2 = "1234567890123456"; // 16 chars: more than _S_local_capacity + s1 = std::move(s2); + VERIFY( s1 == "1234567890123456" ); + + return true; +} + +static_assert( test_move() );