From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 2485E3858D20; Wed, 5 Apr 2023 11:35:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2485E3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (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 4Ps2d82Tcqz9sZP; Wed, 5 Apr 2023 13:35:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1680694556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1yHsltXCn971QDVQaR8q0rqvwSi0ZpN2yAoUANeaTMI=; b=SgCatw7oMs4JTBT9e6YcWAOz2DmWAKBeH3MVarJ1px3FuHWGBmaWiKByxMmPW0WiKM5wV9 3KqGfKiHV0hwAq3+xO86Mh7pSyxKPR9aYEzP9gnK7KbXzA2z0cXMbJadb3/Gj6y0c9oMPY GOt3NCDbtxVBE4XeCPfVrucDWPeNi0RJuHQAM1A2FLBxRR7TxRrGqXR5G9WdQdQ0Lbvj80 e+/iW5U+m6SerPf4+k8RGUVgxL2Hx63DAeXnJn9jB6QBPr6lmZGQUb+QlrOaXyVtKRRHXO i7iXEEygxPTI6OPFL0gYN9+5YmdXpzTPfvRO6N5niB5x0S9R0dZBBykdfeRidw== References: <20230404230950.158556-1-arsen@aarsen.me> From: Arsen =?utf-8?Q?Arsenovi=C4=87?= To: Jonathan Wakely Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH 1/4] libstdc++: Harmonize and other headers Date: Wed, 05 Apr 2023 13:33:05 +0200 In-reply-to: Message-ID: <86lej6a7dx.fsf@aarsen.me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Rspamd-Queue-Id: 4Ps2d82Tcqz9sZP X-Spam-Status: No, score=-10.9 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 List-Id: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jonathan Wakely writes: >> [snip...] >>+/* Duplicate definition with unique_ptr.h. */ >>+#if __cplusplus > 202002L && defined(__cpp_constexpr_dynamic_alloc) >>+# define __cpp_lib_constexpr_memory 202202L >>+#elif __cplusplus > 201703L >>+# include > > Including is unrelated to the FTM, and should always be > done for >=3D C++17, but this change means it's not included for the > first block. > > Please leave the #include with the _Safe_iterator_base declaration. Fixed: diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/= bits/ptr_traits.h index dc42a743c96..8a919ec1090 100644 =2D-- a/libstdc++-v3/include/bits/ptr_traits.h +++ b/libstdc++-v3/include/bits/ptr_traits.h @@ -34,12 +34,15 @@ =20 #include =20 +/* Duplicate definition with unique_ptr.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 + #if __cplusplus > 201703L #include =2D# ifndef __cpp_lib_constexpr_memory =2D// Defined to a newer value in bits/unique_ptr.h for C++23 =2D# define __cpp_lib_constexpr_memory 201811L =2D# endif namespace __gnu_debug { struct _Safe_iterator_base; } #endif >> [snip...] > > Pleae keep them in alphabetical order (within their relevant > blocks/groups). I didn't even notice the ordering - apologies. Updated patch: --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=0001-libstdc-Harmonize-version-and-other-headers.patch Content-Transfer-Encoding: quoted-printable Content-Description: libstdc++: Harmonize and other headers From=2054cdd9aebfe485dc669f5893fe14d4cf7822ed9e Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Arsen=3D20Arsenovi=3DC4=3D87?=3D Date: Wed, 8 Mar 2023 12:04:11 +0100 Subject: [PATCH 1/4] libstdc++: Harmonize and other headers 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. =2D-- libstdc++-v3/include/bits/ptr_traits.h | 11 ++-- libstdc++-v3/include/bits/unique_ptr.h | 11 ++-- libstdc++-v3/include/std/memory | 6 ++ libstdc++-v3/include/std/version | 87 ++++++++++++++------------ 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..8a919ec1090 100644 =2D-- a/libstdc++-v3/include/bits/ptr_traits.h +++ b/libstdc++-v3/include/bits/ptr_traits.h @@ -34,12 +34,15 @@ =20 #include =20 +/* Duplicate definition with unique_ptr.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 + #if __cplusplus > 201703L #include =2D# ifndef __cpp_lib_constexpr_memory =2D// Defined to a newer value in bits/unique_ptr.h for C++23 =2D# define __cpp_lib_constexpr_memory 201811L =2D# endif namespace __gnu_debug { struct _Safe_iterator_base; } #endif =20 diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/= bits/unique_ptr.h index c8daff41865..f0c6d2383b4 100644 =2D-- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -43,12 +43,11 @@ # endif #endif =20 =2D#if __cplusplus > 202002L && __cpp_constexpr_dynamic_alloc =2D# if __cpp_lib_constexpr_memory < 202202L =2D// Defined with older value in bits/ptr_traits.h for C++20 =2D# undef __cpp_lib_constexpr_memory =2D# define __cpp_lib_constexpr_memory 202202L =2D# 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 =20 namespace std _GLIBCXX_VISIBILITY(default) diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/mem= ory index 341f9857730..85c36d67ee1 100644 =2D-- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -91,6 +91,12 @@ # include #endif =20 +/* As a hack, we declare __cpp_lib_atomic_value_initialization here even t= hough + we don't include the bit that actually declares it, for consistency. */ +#if !defined(__cpp_lib_atomic_value_initialization) && __cplusplus >=3D 20= 2002L +# define __cpp_lib_atomic_value_initialization 201911L +#endif + #if __cplusplus >=3D 201103L && __cplusplus <=3D 202002L && _GLIBCXX_HOSTED namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion index a19c39c6cdd..cdd24248c57 100644 =2D-- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -81,18 +81,23 @@ #ifndef _GLIBCXX_DEBUG // PR libstdc++/70303 # define __cpp_lib_null_iterators 201304L #endif +#define __cpp_lib_robust_nonmodifying_seq_ops 201304L #define __cpp_lib_transformation_trait_aliases 201304L #define __cpp_lib_transparent_operators 201510L #define __cpp_lib_tuple_element_t 201402L #define __cpp_lib_tuples_by_type 201304L =20 +#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64 \ + && __SIZE_WIDTH__ >=3D 32 +# define __cpp_lib_to_chars 201611L +#endif + #if _GLIBCXX_HOSTED # define __cpp_lib_chrono_udls 201304L # define __cpp_lib_complex_udls 201309L # define __cpp_lib_generic_associative_lookup 201304L # define __cpp_lib_make_unique 201304L # define __cpp_lib_quoted_string_io 201304L =2D# define __cpp_lib_robust_nonmodifying_seq_ops 201304L # ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_shared_timed_mutex 201402L # endif @@ -108,6 +113,9 @@ #define __cpp_lib_atomic_is_always_lock_free 201603L #define __cpp_lib_bool_constant 201505L #define __cpp_lib_byte 201603L +#define __cpp_lib_clamp 201603L +#define __cpp_lib_gcd 201606L +#define __cpp_lib_gcd_lcm 201606L #ifdef _GLIBCXX_HAVE_BUILTIN_HAS_UNIQ_OBJ_REP # define __cpp_lib_has_unique_object_representations 201606L #endif @@ -123,12 +131,16 @@ #ifdef _GLIBCXX_HAVE_BUILTIN_LAUNDER # define __cpp_lib_launder 201606L #endif +#define __cpp_lib_lcm 201606L #define __cpp_lib_logical_traits 201510L #define __cpp_lib_make_from_tuple 201606L +#define __cpp_lib_nonmember_container_access 201411L #define __cpp_lib_not_fn 201603L #if __cplusplus =3D=3D 201703L // N.B. updated value in C++20 # define __cpp_lib_optional 201606L #endif +#define __cpp_lib_raw_memory_algorithms 201606L +#define __cpp_lib_sample 201603L #define __cpp_lib_type_trait_variable_templates 201510L #define __cpp_lib_uncaught_exceptions 201411L #if !(__cpp_concepts >=3D 202002L && __cpp_constexpr >=3D 201811L) @@ -136,27 +148,23 @@ # define __cpp_lib_variant 202102L #endif #define __cpp_lib_void_t 201411L =2D =2D#if _GLIBCXX_HOSTED #if __cplusplus =3D=3D 201703L // N.B. updated value in C++20 # define __cpp_lib_array_constexpr 201803L #endif =2D#define __cpp_lib_boyer_moore_searcher 201603L =2D#define __cpp_lib_chrono 201611L =2D#define __cpp_lib_clamp 201603L #if __cplusplus =3D=3D 201703L // N.B. updated value in C++20 # if _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED # define __cpp_lib_constexpr_char_traits 201611L # define __cpp_lib_constexpr_string 201611L # endif #endif + +#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 =2D#define __cpp_lib_gcd 201606L =2D#define __cpp_lib_gcd_lcm 201606L #define __cpp_lib_hypot 201603L =2D#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 =2D#define __cpp_lib_nonmember_container_access 201411L #define __cpp_lib_parallel_algorithm 201603L =2D#define __cpp_lib_raw_memory_algorithms 201606L =2D#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 =2D#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64 \ =2D && __SIZE_WIDTH__ >=3D 32 =2D# define __cpp_lib_to_chars 201611L =2D#endif #define __cpp_lib_unordered_map_try_emplace 201411L #endif =20 @@ -224,7 +225,9 @@ #if __cpp_lib_concepts # define __cpp_lib_make_obj_using_allocator 201811L #endif =2D#define __cpp_lib_optional 202106L +#if __cplusplus <=3D 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 >=3D 202002L && __cpp_constexpr >=3D 201811L # define __cpp_lib_variant 202106L #endif =2D =2D#if _GLIBCXX_HOSTED +#define __cpp_lib_constexpr_algorithms 201806L +#define __cpp_lib_constexpr_functional 201907L +#if __cplusplus <=3D 202002L // N.B. updated value in C++23 +# define __cpp_lib_constexpr_memory 201811L +#endif // C++20 +#define __cpp_lib_constexpr_numeric 201911L +#define __cpp_lib_constexpr_tuple 201811L #define __cpp_lib_array_constexpr 201811L +#ifdef __cpp_lib_is_constant_evaluated +# define __cpp_lib_constexpr_char_traits 201811L +#endif +#define __cpp_lib_constexpr_iterator 201811L +#define __cpp_lib_constexpr_utility 201811L +#define __cpp_lib_interpolate 201902L +#if __cpp_lib_concepts +# define __cpp_lib_move_iterator_concept 202207L +# define __cpp_lib_ranges 202110L +#endif +#define __cpp_lib_shift 201806L + +#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 =2D#define __cpp_lib_constexpr_algorithms 201806L =2D#ifdef __cpp_lib_is_constant_evaluated =2D# define __cpp_lib_constexpr_char_traits 201811L =2D#endif #define __cpp_lib_constexpr_complex 201711L #define __cpp_lib_constexpr_dynamic_alloc 201907L =2D#define __cpp_lib_constexpr_functional 201907L =2D#define __cpp_lib_constexpr_iterator 201811L =2D#define __cpp_lib_constexpr_memory 201811L =2D#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 =2D#define __cpp_lib_constexpr_tuple 201811L =2D#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 =2D#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 =2D#if __cpp_lib_concepts =2D# define __cpp_lib_ranges 202110L =2D# define __cpp_lib_move_iterator_concept 202207L =2D#endif #if __cpp_lib_atomic_wait || _GLIBCXX_HAVE_POSIX_SEMAPHORE # define __cpp_lib_semaphore 201907L #endif #define __cpp_lib_shared_ptr_arrays 201707L =2D#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 =2D =2D#if _GLIBCXX_HOSTED =2D#define __cpp_lib_adaptor_iterator_pair_constructor 202106L #if __cpp_constexpr_dynamic_alloc =2D# 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 =2D-=20 2.40.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The testsuite is running on my end, so the above is technically not tested yet, but it should be the same logic unless I reordered something wrong. =2D-=20 Arsen Arsenovi=C4=87 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOYEARYKAI4WIQT+4rPRE/wAoxYtYGFSwpQwHqLEkwUCZC1dGl8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0RkVF MkIzRDExM0ZDMDBBMzE2MkQ2MDYxNTJDMjk0MzAxRUEyQzQ5MxAcYXJzZW5AYWFy c2VuLm1lAAoJEFLClDAeosST4hMA/2c60PofgqUOFJwjslWyQITXaZlDyDaCvALH 0kchBPyCAQDvtNcOTIhEwkAv/Zuqsd09PVMuR6Pwl4ec7+mKV0swDA== =8Ou3 -----END PGP SIGNATURE----- --==-=-=--