From patchwork Tue Apr 4 23:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 79412 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp212485vqo; Tue, 4 Apr 2023 16:13:46 -0700 (PDT) X-Google-Smtp-Source: AKy350aOTcG5/zoM29NwdggVy4/ccTmQOiR6py/eDnlGf7h6cdsf2Kcqh5NOJjZhf2S0MJuiHDGP X-Received: by 2002:a50:ec9a:0:b0:4fb:78a0:eabe with SMTP id e26-20020a50ec9a000000b004fb78a0eabemr238310edr.14.1680650026405; Tue, 04 Apr 2023 16:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680650026; cv=none; d=google.com; s=arc-20160816; b=C2yft0V3pECWBEX1xpszLVkoHd4y8JB3V0Hcpb6wEAXigIGFmVUEZpyFcezt18X6TK tB5TPNvomGRV0LBlFgtyqY2PKYpuYEdUXrHLpXkJ8nNngjhcA5jW5MNcc91wp1CDlFs5 Fp5qKUMEvpD8R/IK+IdABXVH7zAFez1K/XsmzgQhDXg+58KNbQUr9Y/gh/ihoxxqwe3p 72pyGshFP9PRI368hpCowVe+CFyN02W/buzSYu4yWS02/L/yZdbWIP+RlO5Aw3761Be6 evrosLognoiEcHWCSbh7ollkHhd7INO5CFhXVGU9VzecAy3YvdgkRUmIIBSMZkWPfEKn ISSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=PZDHckKBTOtPd74ZoVPq8lKNYmbyHvP3XtX5E9j7lWk=; b=veAZNyvD5hMEbt6U534Bei7vkpulpfqdtjOljJkouH7fqyVF4kDBUG4+gh3SbzzesS qVAPNjKn+V1v9izjInUq/bliqlPzgjCzT7birei5oenCxNFQVtns12UcxY+w+XAfcykt Laeb2zFDxsp9Zx7V07QxoupxhcHJlZD6HGO8e4Sy0XEsaS5CyXuUYtPIupz44CrcG7YU Uo1i2VPwWnluxgjJwq+x50zUj5cfXjbFOxgwFl4XcXbqet2ExfoeiliVTThn8bpLZUMy U16QJ9J6Y8n2r9tzmqSyV4R9skVcF68MkBkiZXYagRi/p0wUz3PC5cUXxKKlrZdz85v2 aetQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=HGfOt4IS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j6-20020aa7c0c6000000b004af6a174397si2717857edp.231.2023.04.04.16.13.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 16:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=HGfOt4IS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 386D93871013 for ; Tue, 4 Apr 2023 23:12:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 386D93871013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680649958; bh=PZDHckKBTOtPd74ZoVPq8lKNYmbyHvP3XtX5E9j7lWk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=HGfOt4ISXlv3Sc05sd6rLuRU6x3yoV4DbXAnDAhua4F+i7zSmH26U3DUTUIJeAnem IWwiHoZkwdHuQg0i4k67IaEjVvChd79u85nqOnKhLCLx/YsU46/nYWEkVI2SFDlVma cipu49x2kuTMkYO+4Rbn7wd3k81MsX0C2oVqWCCQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) by sourceware.org (Postfix) with ESMTPS id B43173858C50; Tue, 4 Apr 2023 23:10:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B43173858C50 Received: from smtp1.mailbox.org (unknown [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Prk5P21Mcz9sTM; Wed, 5 Apr 2023 01:10:49 +0200 (CEST) To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, =?utf-8?q?Arsen_Arsenovi=C4=87?= Subject: [PATCH 1/4] libstdc++: Harmonize and other headers Date: Wed, 5 Apr 2023 01:09:47 +0200 Message-Id: <20230404230950.158556-1-arsen@aarsen.me> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP 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: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Gcc-patches?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762289281880089079?= X-GMAIL-MSGID: =?utf-8?q?1762289281880089079?= Due to recent, large changes in libstdc++, the feature test macros declared in got out of sync with the other headers that possibly declare them. libstdc++-v3/ChangeLog: * include/bits/unique_ptr.h (__cpp_lib_constexpr_memory): Synchronize the definition block with... * include/bits/ptr_traits.h (__cpp_lib_constexpr_memory): ... this one here. Also define the 202202L value, rather than leaving it up to purely unique_ptr.h, so that the value is synchronized across all headers. (__gnu_debug::_Safe_iterator_base): Move into new conditional block. * include/std/memory (__cpp_lib_atomic_value_initialization): Define on freestanding under the same conditions as in atomic_base.h. * include/std/version (__cpp_lib_robust_nonmodifying_seq_ops): Also define on freestanding. (__cpp_lib_to_chars): Ditto. (__cpp_lib_gcd): Ditto. (__cpp_lib_gcd_lcm): Ditto. (__cpp_lib_raw_memory_algorithms): Ditto. (__cpp_lib_array_constexpr): Ditto. (__cpp_lib_nonmember_container_access): Ditto. (__cpp_lib_clamp): Ditto. (__cpp_lib_constexpr_char_traits): Ditto. (__cpp_lib_constexpr_string): Ditto. (__cpp_lib_sample): Ditto. (__cpp_lib_lcm): Ditto. (__cpp_lib_constexpr_iterator): Ditto. (__cpp_lib_constexpr_char_traits): Ditto. (__cpp_lib_interpolate): Ditto. (__cpp_lib_constexpr_utility): Ditto. (__cpp_lib_shift): Ditto. (__cpp_lib_ranges): Ditto. (__cpp_lib_move_iterator_concept): Ditto. (__cpp_lib_constexpr_numeric): Ditto. (__cpp_lib_constexpr_functional): Ditto. (__cpp_lib_constexpr_algorithms): Ditto. (__cpp_lib_constexpr_tuple): Ditto. (__cpp_lib_constexpr_memory): Ditto. --- Evening, This patchset is a replacement to and extension of the one presented at https://inbox.sourceware.org/libstdc++/20230309222626.4008373-1-arsen@aarsen.me/ ... that has been rebased as to include newer additions, and extended to cover some regressions that seem to have occurred recently in freestanding mode. Tested on x86_64-pc-linux-gnu. OK for trunk? Thanks in advance, have a lovely night. libstdc++-v3/include/bits/ptr_traits.h | 13 ++-- libstdc++-v3/include/bits/unique_ptr.h | 11 ++-- libstdc++-v3/include/std/memory | 6 ++ libstdc++-v3/include/std/version | 85 ++++++++++++++------------ 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/bits/ptr_traits.h index dc42a743c96..f6cc6b65f93 100644 --- a/libstdc++-v3/include/bits/ptr_traits.h +++ b/libstdc++-v3/include/bits/ptr_traits.h @@ -34,12 +34,15 @@ #include +/* Duplicate definition with unique_ptr.h. */ +#if __cplusplus > 202002L && defined(__cpp_constexpr_dynamic_alloc) +# define __cpp_lib_constexpr_memory 202202L +#elif __cplusplus > 201703L +# include +# define __cpp_lib_constexpr_memory 201811L +#endif + #if __cplusplus > 201703L -#include -# ifndef __cpp_lib_constexpr_memory -// Defined to a newer value in bits/unique_ptr.h for C++23 -# define __cpp_lib_constexpr_memory 201811L -# endif namespace __gnu_debug { struct _Safe_iterator_base; } #endif diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index c8daff41865..f0c6d2383b4 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -43,12 +43,11 @@ # endif #endif -#if __cplusplus > 202002L && __cpp_constexpr_dynamic_alloc -# if __cpp_lib_constexpr_memory < 202202L -// Defined with older value in bits/ptr_traits.h for C++20 -# undef __cpp_lib_constexpr_memory -# define __cpp_lib_constexpr_memory 202202L -# endif +/* Duplicate definition with ptr_traits.h. */ +#if __cplusplus > 202002L && defined(__cpp_constexpr_dynamic_alloc) +# define __cpp_lib_constexpr_memory 202202L +#elif __cplusplus > 201703L +# define __cpp_lib_constexpr_memory 201811L #endif namespace std _GLIBCXX_VISIBILITY(default) diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 341f9857730..85c36d67ee1 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -91,6 +91,12 @@ # include #endif +/* As a hack, we declare __cpp_lib_atomic_value_initialization here even though + we don't include the bit that actually declares it, for consistency. */ +#if !defined(__cpp_lib_atomic_value_initialization) && __cplusplus >= 202002L +# define __cpp_lib_atomic_value_initialization 201911L +#endif + #if __cplusplus >= 201103L && __cplusplus <= 202002L && _GLIBCXX_HOSTED namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index a19c39c6cdd..0239fcea813 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -85,6 +85,12 @@ #define __cpp_lib_transparent_operators 201510L #define __cpp_lib_tuple_element_t 201402L #define __cpp_lib_tuples_by_type 201304L +#define __cpp_lib_robust_nonmodifying_seq_ops 201304L + +#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64 \ + && __SIZE_WIDTH__ >= 32 +# define __cpp_lib_to_chars 201611L +#endif #if _GLIBCXX_HOSTED # define __cpp_lib_chrono_udls 201304L @@ -92,7 +98,6 @@ # define __cpp_lib_generic_associative_lookup 201304L # define __cpp_lib_make_unique 201304L # define __cpp_lib_quoted_string_io 201304L -# define __cpp_lib_robust_nonmodifying_seq_ops 201304L # ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_shared_timed_mutex 201402L # endif @@ -136,13 +141,13 @@ # define __cpp_lib_variant 202102L #endif #define __cpp_lib_void_t 201411L - -#if _GLIBCXX_HOSTED +#define __cpp_lib_gcd 201606L +#define __cpp_lib_gcd_lcm 201606L +#define __cpp_lib_raw_memory_algorithms 201606L #if __cplusplus == 201703L // N.B. updated value in C++20 # define __cpp_lib_array_constexpr 201803L #endif -#define __cpp_lib_boyer_moore_searcher 201603L -#define __cpp_lib_chrono 201611L +#define __cpp_lib_nonmember_container_access 201411L #define __cpp_lib_clamp 201603L #if __cplusplus == 201703L // N.B. updated value in C++20 # if _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED @@ -150,13 +155,16 @@ # define __cpp_lib_constexpr_string 201611L # endif #endif +#define __cpp_lib_sample 201603L +#define __cpp_lib_lcm 201606L + +#if _GLIBCXX_HOSTED +#define __cpp_lib_boyer_moore_searcher 201603L +#define __cpp_lib_chrono 201611L #define __cpp_lib_enable_shared_from_this 201603L #define __cpp_lib_execution 201902L // FIXME: should be 201603L #define __cpp_lib_filesystem 201703L -#define __cpp_lib_gcd 201606L -#define __cpp_lib_gcd_lcm 201606L #define __cpp_lib_hypot 201603L -#define __cpp_lib_lcm 201606L #define __cpp_lib_map_try_emplace 201411L #define __cpp_lib_math_special_functions 201603L #ifdef _GLIBCXX_HAS_GTHREADS @@ -165,20 +173,13 @@ # define __cpp_lib_memory_resource 1 #endif #define __cpp_lib_node_extract 201606L -#define __cpp_lib_nonmember_container_access 201411L #define __cpp_lib_parallel_algorithm 201603L -#define __cpp_lib_raw_memory_algorithms 201606L -#define __cpp_lib_sample 201603L #ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_scoped_lock 201703L # define __cpp_lib_shared_mutex 201505L #endif #define __cpp_lib_shared_ptr_weak_type 201606L #define __cpp_lib_string_view 201803L -#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64 \ - && __SIZE_WIDTH__ >= 32 -# define __cpp_lib_to_chars 201611L -#endif #define __cpp_lib_unordered_map_try_emplace 201411L #endif @@ -224,7 +225,9 @@ #if __cpp_lib_concepts # define __cpp_lib_make_obj_using_allocator 201811L #endif -#define __cpp_lib_optional 202106L +#if __cplusplus <= 202002L // N.B. updated value in C++23 +# define __cpp_lib_optional 202106L +#endif #define __cpp_lib_remove_cvref 201711L #if __has_builtin(__builtin_source_location) # define __cpp_lib_source_location 201907L @@ -243,9 +246,27 @@ #if __cpp_concepts >= 202002L && __cpp_constexpr >= 201811L # define __cpp_lib_variant 202106L #endif - -#if _GLIBCXX_HOSTED #define __cpp_lib_array_constexpr 201811L +#define __cpp_lib_constexpr_iterator 201811L +#ifdef __cpp_lib_is_constant_evaluated +# define __cpp_lib_constexpr_char_traits 201811L +#endif +#define __cpp_lib_interpolate 201902L +#define __cpp_lib_constexpr_utility 201811L +#define __cpp_lib_shift 201806L +#if __cpp_lib_concepts +# define __cpp_lib_move_iterator_concept 202207L +# define __cpp_lib_ranges 202110L +#endif +#define __cpp_lib_constexpr_numeric 201911L +#define __cpp_lib_constexpr_functional 201907L +#define __cpp_lib_constexpr_algorithms 201806L +#define __cpp_lib_constexpr_tuple 201811L +#if __cplusplus <= 202002L // N.B. updated value in C++23 +# define __cpp_lib_constexpr_memory 201811L +#endif // C++20 + +#if _GLIBCXX_HOSTED #define __cpp_lib_atomic_shared_ptr 201711L #if defined _GLIBCXX_HAS_GTHREADS || defined _GLIBCXX_HAVE_LINUX_FUTEX # define __cpp_lib_atomic_wait 201907L @@ -256,16 +277,9 @@ // #undef __cpp_lib_chrono // #define __cpp_lib_chrono 201907L // FIXME: #define __cpp_lib_execution 201902L -#define __cpp_lib_constexpr_algorithms 201806L -#ifdef __cpp_lib_is_constant_evaluated -# define __cpp_lib_constexpr_char_traits 201811L -#endif #define __cpp_lib_constexpr_complex 201711L #define __cpp_lib_constexpr_dynamic_alloc 201907L -#define __cpp_lib_constexpr_functional 201907L -#define __cpp_lib_constexpr_iterator 201811L -#define __cpp_lib_constexpr_memory 201811L -#define __cpp_lib_constexpr_numeric 201911L +#define __cpp_lib_constexpr_tuple 201811L #ifdef __cpp_lib_is_constant_evaluated # if _GLIBCXX_USE_CXX11_ABI # define __cpp_lib_constexpr_string 201907L @@ -273,13 +287,10 @@ # define __cpp_lib_constexpr_string 201811L # endif #endif -#define __cpp_lib_constexpr_tuple 201811L -#define __cpp_lib_constexpr_utility 201811L #define __cpp_lib_constexpr_vector 201907L #define __cpp_lib_erase_if 202002L #define __cpp_lib_format 202106L #define __cpp_lib_generic_unordered_lookup 201811L -#define __cpp_lib_interpolate 201902L #ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_jthread 201911L #endif @@ -288,15 +299,10 @@ #endif #define __cpp_lib_list_remove_return_type 201806L #define __cpp_lib_polymorphic_allocator 201902L -#if __cpp_lib_concepts -# define __cpp_lib_ranges 202110L -# define __cpp_lib_move_iterator_concept 202207L -#endif #if __cpp_lib_atomic_wait || _GLIBCXX_HAVE_POSIX_SEMAPHORE # define __cpp_lib_semaphore 201907L #endif #define __cpp_lib_shared_ptr_arrays 201707L -#define __cpp_lib_shift 201806L #define __cpp_lib_smart_ptr_for_overwrite 202002L # if _GLIBCXX_USE_CXX11_ABI // Only supported with cxx11-abi @@ -330,14 +336,17 @@ #define __cpp_lib_ranges_stride 202207L #define __cpp_lib_ranges_cartesian_product 202207L #define __cpp_lib_ranges_as_rvalue 202207L - -#if _GLIBCXX_HOSTED -#define __cpp_lib_adaptor_iterator_pair_constructor 202106L #if __cpp_constexpr_dynamic_alloc -# define __cpp_lib_constexpr_bitset 202202L +# if _GLIBCXX_HOSTED +# define __cpp_lib_constexpr_bitset 202202L +# endif # undef __cpp_lib_constexpr_memory # define __cpp_lib_constexpr_memory 202202L #endif +#define __cpp_lib_stdatomic_h 202011L + +#if _GLIBCXX_HOSTED +#define __cpp_lib_adaptor_iterator_pair_constructor 202106L #define __cpp_lib_ios_noreplace 202207L #define __cpp_lib_move_only_function 202110L #if __cpp_lib_span