From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 004C13888C43; Thu, 21 Apr 2022 12:33:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 004C13888C43 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 r11-9917] libstdc++: Fix tests that fail with fully-dynamic-string X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: cd9d46de26a49157e83331da59ac9255302401f3 X-Git-Newrev: 826992807570ebb7e4caee77e6035d82d4b952d9 Message-Id: <20220421123355.004C13888C43@sourceware.org> Date: Thu, 21 Apr 2022 12:33:54 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2022 12:33:55 -0000 https://gcc.gnu.org/g:826992807570ebb7e4caee77e6035d82d4b952d9 commit r11-9917-g826992807570ebb7e4caee77e6035d82d4b952d9 Author: Jonathan Wakely Date: Tue Nov 30 16:07:21 2021 +0000 libstdc++: Fix tests that fail with fully-dynamic-string Fix some tests that assume that a moved-from string is empty, or that default constructing a string doesn't allocate. libstdc++-v3/ChangeLog: * testsuite/21_strings/basic_string/cons/char/moveable.cc: Allow moved-from string to be non-empty. * testsuite/21_strings/basic_string/cons/char/moveable2.cc: Likewise. * testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc: Likewise. * testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc: Construct empty string before setting oom flag. * testsuite/21_strings/basic_string/modifiers/assign/wchar_t/87749.cc: Likewise. (cherry picked from commit be30fc4ce085ef786f104c6a407ccd44e554cd54) Diff: --- libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc | 4 +++- libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc | 4 +++- .../testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc | 4 +++- .../testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc | 4 +++- .../testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc | 4 +++- .../testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc | 4 +++- .../testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc | 2 +- .../21_strings/basic_string/modifiers/assign/wchar_t/87749.cc | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc index 5de2a5f9330..3ba39ec432d 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc @@ -35,7 +35,9 @@ void test01() std::string c(std::move(b)); VERIFY( c.size() == 1 && c[0] == '1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc index fe91c5ab539..5804ccb6bf8 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc @@ -44,7 +44,9 @@ void test01() tstring c(std::move(b)); VERIFY( c.size() == 1 && c[0] == '1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc index 1caedcccfce..59d1d775134 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc @@ -42,7 +42,9 @@ void test01() tstring c(std::move(b)); VERIFY( c.size() == 1 && c[0] == '1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc index d05afb7d466..67e25de2916 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc @@ -35,7 +35,9 @@ void test01() std::wstring c(std::move(b)); VERIFY( c.size() == 1 && c[0] == L'1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc index e301984612d..c72eb9bfddb 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc @@ -44,7 +44,9 @@ void test01() twstring c(std::move(b)); VERIFY( c.size() == 1 && c[0] == L'1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc index d3e4744ff34..6a2bc2714b5 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc @@ -42,7 +42,9 @@ void test01() tstring c(std::move(b)); VERIFY( c.size() == 1 && c[0] == L'1' ); - VERIFY( b.size() == 0 ); +#if ! _GLIBCXX_FULLY_DYNAMIC_STRING + VERIFY( b.size() == 0 ); // not guaranteed by the standard +#endif } int main() diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc index 87d8c2f4068..6a3ed55f557 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/87749.cc @@ -71,8 +71,8 @@ int main() string s = "PR libstdc++/87749 a string that is longer than a short string"; const auto ptr = s.c_str(); - oom = true; string ss; + oom = true; ss = std::move(s); // allocators are equal, should not allocate new storage VERIFY( ss.c_str() == ptr ); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/87749.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/87749.cc index 4d744f8a411..536ca6153d3 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/87749.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/87749.cc @@ -72,8 +72,8 @@ int main() string s = L"PR libstdc++/87749 a string that is longer than a short string"; const auto ptr = s.c_str(); - oom = true; string ss; + oom = true; ss = std::move(s); // allocators are equal, should not allocate new storage VERIFY( ss.c_str() == ptr ); }