From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id CB446385780F for ; Tue, 31 Aug 2021 16:49:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB446385780F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-591-Vxvf-L9IM9WN7DAuv4DkMA-1; Tue, 31 Aug 2021 12:49:48 -0400 X-MC-Unique: Vxvf-L9IM9WN7DAuv4DkMA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AE9D107ACF5; Tue, 31 Aug 2021 16:49:47 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37A115C1A1; Tue, 31 Aug 2021 16:49:47 +0000 (UTC) Date: Tue, 31 Aug 2021 17:49:46 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove redundant noexcept-specifier on definitions Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="t58aX/q9RIjQNBlv" Content-Disposition: inline X-Spam-Status: No, score=-14.1 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_H2, 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: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2021 16:50:01 -0000 --t58aX/q9RIjQNBlv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline These destructors are noexcept anyway. I removed the redundant noexcept from the error_category destructor's declaration in r0-123475, but didn't remove it from the defaulted definition in system_error.cc. That causes warnings if the library is built with Clang. This removes the redundant noexcept from ~error_category and ~system_error and adds tests to ensure they really are noexcept. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/c++11/system_error.cc (error_category::~error_category()): Remove noexcept-specifier. (system_error::~system_error()): Likewise. * testsuite/19_diagnostics/error_category/noexcept.cc: New test. * testsuite/19_diagnostics/system_error/noexcept.cc: New test. Tested powerpc64le-linux. Committed to trunk. --t58aX/q9RIjQNBlv Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit f63e86f797d82772c62a7475dbc6e881727b666f Author: Jonathan Wakely Date: Tue Aug 31 16:30:01 2021 libstdc++: Remove redundant noexcept-specifier on definitions These destructors are noexcept anyway. I removed the redundant noexcept from the error_category destructor's declaration in r0-123475, but didn't remove it from the defaulted definition in system_error.cc. That causes warnings if the library is built with Clang. This removes the redundant noexcept from ~error_category and ~system_error and adds tests to ensure they really are noexcept. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/c++11/system_error.cc (error_category::~error_category()): Remove noexcept-specifier. (system_error::~system_error()): Likewise. * testsuite/19_diagnostics/error_category/noexcept.cc: New test. * testsuite/19_diagnostics/system_error/noexcept.cc: New test. diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index 23fb6182825..f12290adaee 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -338,7 +338,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_THROW_OR_ABORT(system_error(error_code(__i, generic_category()))); } - error_category::~error_category() noexcept = default; + error_category::~error_category() = default; const error_category& _V2::system_category() noexcept { return system_category_instance; } @@ -346,7 +346,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const error_category& _V2::generic_category() noexcept { return generic_category_instance; } - system_error::~system_error() noexcept = default; + system_error::~system_error() = default; error_condition error_category::default_error_condition(int __i) const noexcept diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/noexcept.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/noexcept.cc new file mode 100644 index 00000000000..210344c7607 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/noexcept.cc @@ -0,0 +1,13 @@ +// { dg-do compile { target c++11 } } +#include + +extern const std::error_category& cat; + +static_assert(std::is_nothrow_destructible::value, ""); +static_assert(noexcept(cat.name()), ""); +static_assert(noexcept(cat.default_error_condition(1)), ""); +static_assert(noexcept(cat.equivalent(1, {})), ""); +static_assert(noexcept(cat.equivalent({}, 1)), ""); +static_assert(noexcept(cat == cat), ""); +static_assert(noexcept(cat != cat), ""); +static_assert(noexcept(cat < cat), ""); diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/noexcept.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/noexcept.cc new file mode 100644 index 00000000000..853b7f922b6 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/noexcept.cc @@ -0,0 +1,6 @@ +// { dg-do compile { target c++11 } } +#include + +static_assert(std::is_nothrow_destructible::value, ""); +static_assert(noexcept(std::declval().code()), ""); +static_assert(noexcept(std::declval().what()), ""); --t58aX/q9RIjQNBlv--