diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-11-30 12:54:10 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-11-30 23:10:03 +0000 |
| commit | 675afa21244d58640876da3287d303e376a3b59a (patch) | |
| tree | 7391a3e9a81328161eba6ad3da42aeef96fa18d3 | |
| parent | 56b07badf052fb140c4636f6d77cfc02d1ac357c (diff) | |
| download | gcc-675afa21244d58640876da3287d303e376a3b59a.zip gcc-675afa21244d58640876da3287d303e376a3b59a.tar.gz gcc-675afa21244d58640876da3287d303e376a3b59a.tar.bz2 | |
libstdc++: Fix fully-dynamic-string build
My last change to the fully-dynamic-string actually broke it. This fixes
the move constructor so it builds, and simplifies it slightly so that
more code is common between the fully-dynamic enabled/disabled cases.
libstdc++-v3/ChangeLog:
* include/bits/cow_string.h (basic_string(basic_string&&)): Fix
mem-initializer for _GLIBCXX_FULLY_DYNAMIC_STRING==0 case.
* testsuite/21_strings/basic_string/cons/char/noexcept_move_construct.cc:
Remove outdated comment.
* testsuite/21_strings/basic_string/cons/wchar_t/noexcept_move_construct.cc:
Likewise.
3 files changed, 3 insertions, 7 deletions
diff --git a/libstdc++-v3/include/bits/cow_string.h b/libstdc++-v3/include/bits/cow_string.h index bafca7b..ced395b 100644 --- a/libstdc++-v3/include/bits/cow_string.h +++ b/libstdc++-v3/include/bits/cow_string.h @@ -621,14 +621,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @a __str is a valid, but unspecified string. */ basic_string(basic_string&& __str) noexcept -#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0 : _M_dataplus(std::move(__str._M_dataplus)) { +#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0 + // Make __str use the shared empty string rep. __str._M_data(_S_empty_rep()._M_refdata()); - } #else - : _M_dataplus(__str._M_rep()) - { // Rather than allocate an empty string for the rvalue string, // just share ownership with it by incrementing the reference count. // If the rvalue string was "leaked" then it was the unique owner, @@ -637,8 +635,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __gnu_cxx::__atomic_add_dispatch(&_M_rep()->_M_refcount, 2); else __gnu_cxx::__atomic_add_dispatch(&_M_rep()->_M_refcount, 1); - } #endif + } /** * @brief Construct string from an initializer %list. diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/noexcept_move_construct.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/noexcept_move_construct.cc index f04a491..74b0ed3 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/noexcept_move_construct.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/noexcept_move_construct.cc @@ -23,7 +23,6 @@ typedef std::string stype; -// True except for COW strings with _GLIBCXX_FULLY_DYNAMIC_STRING: static_assert(std::is_nothrow_move_constructible<stype>::value, "Error"); // True for std::allocator because is_always_equal, but not true in general: diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/noexcept_move_construct.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/noexcept_move_construct.cc index d5dbf56..53cb81d 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/noexcept_move_construct.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/noexcept_move_construct.cc @@ -23,7 +23,6 @@ typedef std::wstring wstype; -// True except for COW strings with _GLIBCXX_FULLY_DYNAMIC_STRING: static_assert(std::is_nothrow_move_constructible<wstype>::value, "Error"); // True for std::allocator because is_always_equal, but not true in general: |