From patchwork Thu May 26 21:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 54432 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 F2C6A382F9B7 for ; Thu, 26 May 2022 21:32:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2C6A382F9B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1653600747; bh=HAA1P2w8jNE4aD83zRpSpHCLVqIPzmQz/7150RRMZOg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=deXgfyjslAQVDxTtEq3CbF823eNMazAB0QXKpKp5jh3y7SNJglNiG2RnRB8uvMQUc 4CUiHI2VhcP0OcEev2SSI9KaqgUyPAaM31TpS6TAXoh1jxSZYyFGDWsMhfknd+mtt7 N2yGm2ySpwVsrSGvwvvzP+GT4zDFczD9YIarUIpA= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 610FF382E90E for ; Thu, 26 May 2022 21:31:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 610FF382E90E Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-186-YZGmh1iPPB2nNeaVIt2M7w-1; Thu, 26 May 2022 17:31:42 -0400 X-MC-Unique: YZGmh1iPPB2nNeaVIt2M7w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 970CB294EDC3; Thu, 26 May 2022 21:31:42 +0000 (UTC) Received: from localhost (unknown [10.33.36.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CE0663F54; Thu, 26 May 2022 21:31:42 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Move std::iostream_category() definition to new file Date: Thu, 26 May 2022 22:31:41 +0100 Message-Id: <20220526213141.1314021-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 x86_64-linux, pushed to trunk. -- >8 -- This fixes a missing symbol when the dual ABI is disabled, e.g. for the versioned namespace build. libstdc++-v3/ChangeLog: * src/c++11/Makefile.am: Add new source file. * src/c++11/Makefile.in: Regenerate. * src/c++11/cxx11-ios_failure.cc (iostream_category): Move to ... * src/c++11/ios_errcat.cc: New file. * testsuite/27_io/ios_base/failure/error_code.cc: Check that std::iostream_category() is defined and used for std::io_errc. --- libstdc++-v3/src/c++11/Makefile.am | 1 + libstdc++-v3/src/c++11/Makefile.in | 8 +- libstdc++-v3/src/c++11/cxx11-ios_failure.cc | 47 ----------- libstdc++-v3/src/c++11/ios_errcat.cc | 84 +++++++++++++++++++ .../27_io/ios_base/failure/error_code.cc | 13 +++ 5 files changed, 103 insertions(+), 50 deletions(-) create mode 100644 libstdc++-v3/src/c++11/ios_errcat.cc diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 222e2a8c618..ecd46aafc01 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -65,6 +65,7 @@ sources = \ hash_c++0x.cc \ hashtable_c++0x.cc \ ios.cc \ + ios_errcat.cc \ limits.cc \ mutex.cc \ placeholders.cc \ diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 892c505eddc..4db28bd8515 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -130,9 +130,10 @@ am__objects_2 = ctype_configure_char.lo ctype_members.lo am__objects_3 = chrono.lo codecvt.lo condition_variable.lo \ cow-stdexcept.lo ctype.lo debug.lo functexcept.lo \ functional.lo futex.lo future.lo hash_c++0x.lo \ - hashtable_c++0x.lo ios.lo limits.lo mutex.lo placeholders.lo \ - random.lo regex.lo shared_ptr.lo snprintf_lite.lo \ - system_error.lo thread.lo $(am__objects_1) $(am__objects_2) + hashtable_c++0x.lo ios.lo ios_errcat.lo limits.lo mutex.lo \ + placeholders.lo random.lo regex.lo shared_ptr.lo \ + snprintf_lite.lo system_error.lo thread.lo $(am__objects_1) \ + $(am__objects_2) @ENABLE_DUAL_ABI_TRUE@am__objects_4 = cow-fstream-inst.lo \ @ENABLE_DUAL_ABI_TRUE@ cow-sstream-inst.lo cow-string-inst.lo \ @ENABLE_DUAL_ABI_TRUE@ cow-string-io-inst.lo \ @@ -479,6 +480,7 @@ sources = \ hash_c++0x.cc \ hashtable_c++0x.cc \ ios.cc \ + ios_errcat.cc \ limits.cc \ mutex.cc \ placeholders.cc \ diff --git a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc index 14a7f9cfcb1..0a81e15e4c0 100644 --- a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc +++ b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc @@ -42,57 +42,10 @@ # error This file should not be compiled for this configuration. #endif -#if __has_cpp_attribute(clang::require_constant_initialization) -# define __constinit [[clang::require_constant_initialization]] -#endif - -namespace -{ - struct io_error_category final : std::error_category - { - const char* - name() const noexcept final - { return "iostream"; } - - _GLIBCXX_DEFAULT_ABI_TAG - std::string - message(int __ec) const final - { - std::string __msg; - switch (std::io_errc(__ec)) - { - case std::io_errc::stream: - __msg = "iostream error"; - break; - default: - __msg = "Unknown error"; - break; - } - return __msg; - } - }; - - struct constant_init - { - 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) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - const error_category& - iostream_category() noexcept - { 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/ios_errcat.cc b/libstdc++-v3/src/c++11/ios_errcat.cc new file mode 100644 index 00000000000..12192447b8b --- /dev/null +++ b/libstdc++-v3/src/c++11/ios_errcat.cc @@ -0,0 +1,84 @@ +// std::iostream_category() definition -*- C++ -*- + +// Copyright (C) 2014-2022 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +// +// ISO C++ 14882:2011: 27.5.6.5 Error reporting [error.reporting] +// + +#define _GLIBCXX_USE_CXX11_ABI 1 +#include + +#if __has_cpp_attribute(clang::require_constant_initialization) +# define __constinit [[clang::require_constant_initialization]] +#endif + +namespace +{ + struct io_error_category final : std::error_category + { + const char* + name() const noexcept final + { return "iostream"; } + + _GLIBCXX_DEFAULT_ABI_TAG + std::string + message(int __ec) const final + { + std::string __msg; + switch (std::io_errc(__ec)) + { + case std::io_errc::stream: + __msg = "iostream error"; + break; + default: + __msg = "Unknown error"; + break; + } + return __msg; + } + }; + + struct constant_init + { + 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) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + const error_category& + iostream_category() noexcept + { return io_category_instance.cat; } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace diff --git a/libstdc++-v3/testsuite/27_io/ios_base/failure/error_code.cc b/libstdc++-v3/testsuite/27_io/ios_base/failure/error_code.cc index 169647a0b33..69697657394 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/failure/error_code.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/failure/error_code.cc @@ -41,8 +41,21 @@ test01() VERIFY( e4.code() == ec ); } +[[gnu::noinline,gnu::noipa]] +const std::error_category& +get_iostream_category() +{ return std::iostream_category(); } + +void +test02() +{ + auto ec = std::make_error_code(std::io_errc::stream); + VERIFY( ec.category() == get_iostream_category() ); +} + int main() { test01(); + test02(); }