From patchwork Tue Nov 30 23:11:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 48317 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D5EF8385AC3A for ; Tue, 30 Nov 2021 23:14:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D5EF8385AC3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638314067; bh=KeVwUqJI6rZkJuMXie1tJWAVnv6N1+e6PpHxdsAcRag=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=s31fvuMSGeQnV84sp6JUy8ErBg++qWUSX/qKa+hacdsWFCU5XDqcYTCk+MP4WmCgq YUo/PliAgy46dlfyVFXdWNb+RMP0Ds87Be9NT8ZMzP1n/kZkKDu9ynWv8xAV676cJr 4vsqT5E/uX23mz0sAwAmM+S/+EYIMFM9LIyyqjFw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 55A1F385AC22 for ; Tue, 30 Nov 2021 23:11:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55A1F385AC22 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-287-S07PF4ZdMQ-r7sRGZfVJJw-1; Tue, 30 Nov 2021 18:11:25 -0500 X-MC-Unique: S07PF4ZdMQ-r7sRGZfVJJw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 950EF100CE85; Tue, 30 Nov 2021 23:11:24 +0000 (UTC) Received: from localhost (unknown [10.33.36.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4164A60C0F; Tue, 30 Nov 2021 23:11:24 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix tests that fail with fully-dynamic-string Date: Tue, 30 Nov 2021 23:11:23 +0000 Message-Id: <20211130231123.154260-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested powerpc64le-linux (old ABI) and x86_64-linux (new ABI), pushed to trunk. 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. --- .../testsuite/21_strings/basic_string/cons/char/moveable.cc | 4 +++- .../testsuite/21_strings/basic_string/cons/char/moveable2.cc | 4 +++- .../21_strings/basic_string/cons/char/moveable2_c++17.cc | 4 +++- .../21_strings/basic_string/cons/wchar_t/moveable.cc | 4 +++- .../21_strings/basic_string/cons/wchar_t/moveable2.cc | 4 +++- .../21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc | 4 +++- .../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 ); }