From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 665053888C5C; Thu, 21 Apr 2022 12:33:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 665053888C5C 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-9912] libstdc++: Improvements to standard error category objects (part deux) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 2b0ddcec0e4cc46852e0a4dd7d00307d46233ec0 X-Git-Newrev: 948ee24748520f2793d879254ad56e2a0cafdb1d Message-Id: <20220421123329.665053888C5C@sourceware.org> Date: Thu, 21 Apr 2022 12:33:29 +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:29 -0000 https://gcc.gnu.org/g:948ee24748520f2793d879254ad56e2a0cafdb1d commit r11-9912-g948ee24748520f2793d879254ad56e2a0cafdb1d Author: Jonathan Wakely Date: Wed Sep 22 13:56:21 2021 +0100 libstdc++: Improvements to standard error category objects (part deux) In r12-3860 the error categories in were made final and immortal, but I missed the categories for and . This makes the same changes to those. libstdc++-v3/ChangeLog: * src/c++11/cxx11-ios_failure.cc (io_error_category): Define class and virtual functions as 'final'. (io_category_instance): Use constinit union to make the object immortal. * src/c++11/future.cc (future_error_category): Define class and virtual functions as 'final'. (future_category_instance): Use constinit union. (cherry picked from commit 096228d84e9238d97fe115623126373f5b67bdc1) Diff: --- libstdc++-v3/src/c++11/cxx11-ios_failure.cc | 25 +++++++++++++++---------- libstdc++-v3/src/c++11/future.cc | 26 ++++++++++++++++---------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc index a918ab21015..e40685bf45a 100644 --- a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc +++ b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc @@ -44,14 +44,15 @@ namespace { - struct io_error_category : std::error_category + struct io_error_category final : std::error_category { - virtual const char* - name() const noexcept + const char* + name() const noexcept final { return "iostream"; } _GLIBCXX_DEFAULT_ABI_TAG - virtual std::string message(int __ec) const + std::string + message(int __ec) const final { std::string __msg; switch (std::io_errc(__ec)) @@ -67,13 +68,17 @@ namespace } }; - const io_error_category& - __io_category_instance() noexcept + struct constant_init { - static const io_error_category __ec{}; - return __ec; - } + union { + unsigned char unused; + io_error_category cat; + }; + constexpr constant_init() : cat() { } + ~constant_init() { /* do nothing, union member is not destroyed */ } + }; + __constinit constant_init io_category_instance{}; } // namespace namespace std _GLIBCXX_VISIBILITY(default) @@ -82,7 +87,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const error_category& iostream_category() noexcept - { return __io_category_instance(); } + { return io_category_instance.cat; } ios_base::failure::failure(const string& __str) : system_error(io_errc::stream, __str) { } diff --git a/libstdc++-v3/src/c++11/future.cc b/libstdc++-v3/src/c++11/future.cc index c1a1a828e27..75f832ec1c5 100644 --- a/libstdc++-v3/src/c++11/future.cc +++ b/libstdc++-v3/src/c++11/future.cc @@ -27,14 +27,15 @@ namespace { - struct future_error_category : public std::error_category + struct future_error_category final : public std::error_category { - virtual const char* - name() const noexcept + const char* + name() const noexcept final { return "future"; } _GLIBCXX_DEFAULT_ABI_TAG - virtual std::string message(int __ec) const + std::string + message(int __ec) const final { std::string __msg; switch (std::future_errc(__ec)) @@ -59,12 +60,17 @@ namespace } }; - const future_error_category& - __future_category_instance() noexcept + struct constant_init { - static const future_error_category __fec{}; - return __fec; - } + union { + unsigned char unused; + future_error_category cat; + }; + constexpr constant_init() : cat() { } + ~constant_init() { /* do nothing, union member is not destroyed */ } + }; + + __constinit constant_init future_category_instance{}; } namespace std _GLIBCXX_VISIBILITY(default) @@ -76,7 +82,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _GLIBCXX_THROW_OR_ABORT(future_error(make_error_code(future_errc(__i)))); } const error_category& future_category() noexcept - { return __future_category_instance(); } + { return future_category_instance.cat; } future_error::~future_error() noexcept { }