From patchwork Tue Nov 30 23:11:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 48316 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 2052C385840A for ; Tue, 30 Nov 2021 23:13:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2052C385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638314007; bh=po1gzA2hhxrKNdNOKXRT4nogH5ciGnWPesUCS3dUZe4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Ux3bKcQyRA8nQuUhp+isAhHKvwsZxYmpUj4So2biCYNdz88iRok3WaPRoZpNPRRu+ +OiOVCOFjPlp9gKCizfC/x4Ol/lRti49eVlFCoUT1r0cf2C+S8EnHn06+5VV1N5LcD YunpI2rgfpM+WK3P7cmLNFMav5s3cKt4NMIGz06I= 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 F3F94385801B for ; Tue, 30 Nov 2021 23:11:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F3F94385801B 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-61-p0py9RK-NLmMc5DkVHZJXw-1; Tue, 30 Nov 2021 18:11:20 -0500 X-MC-Unique: p0py9RK-NLmMc5DkVHZJXw-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 309D984B9A3; Tue, 30 Nov 2021 23:11:19 +0000 (UTC) Received: from localhost (unknown [10.33.36.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id D511960C05; Tue, 30 Nov 2021 23:11:18 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix fully-dynamic-string build Date: Tue, 30 Nov 2021 23:11:18 +0000 Message-Id: <20211130231118.154198-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=unavailable 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. 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. --- libstdc++-v3/include/bits/cow_string.h | 8 +++----- .../basic_string/cons/char/noexcept_move_construct.cc | 1 - .../basic_string/cons/wchar_t/noexcept_move_construct.cc | 1 - 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 bafca7bb313..ced395b80b8 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 f04a491370d..74b0ed3910c 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::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 d5dbf561ec0..53cb81d8aee 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::value, "Error"); // True for std::allocator because is_always_equal, but not true in general: