[PATCH 1/4] libstdc++: Harmonize <version> and other headers

[PATCH 1/4] libstdc++: Harmonize <version> and other headers

[Arsen Arsenović]

Due to recent, large changes in libstdc++, the feature test macros
declared in <version> 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 <bits/move.h>
 
+/* Duplicate definition with unique_ptr.h.  */
+#if __cplusplus > 202002L && defined(__cpp_constexpr_dynamic_alloc)
+# define __cpp_lib_constexpr_memory 202202L
+#elif __cplusplus > 201703L
+# include <concepts>
+# define __cpp_lib_constexpr_memory 201811L
+#endif
+
 #if __cplusplus > 201703L
-#include <concepts>
-# 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 <bits/uses_allocator_args.h>
 #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
-- 
2.40.0

[PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

[Arsen Arsenović]

This test detects redefinitions by compiling stdc++.h with
-Wsystem-headers.  Thanks Patrick Palka for the suggestion.

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/versionconflict.cc: New test.
---
 libstdc++-v3/testsuite/17_intro/versionconflict.cc | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 libstdc++-v3/testsuite/17_intro/versionconflict.cc

diff --git a/libstdc++-v3/testsuite/17_intro/versionconflict.cc b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
new file mode 100644
index 00000000000..4191c7a2b08
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
@@ -0,0 +1,6 @@
+// { dg-do preprocess }
+// { dg-additional-options "-Wsystem-headers -Werror" }
+
+// Test for redefinitions of FTMs using bits/stdc++.h.
+#include <bits/stdc++.h>
+#include <version>
-- 
2.40.0

[PATCH 3/4] libstdc++: Downgrade DEBUG to ASSERTIONS when !HOSTED

[Arsen Arsenović]

Supporting the debug mode in freestanding is a non-trivial job, so
instead, as a best-effort, enable assertions, which are light and easy.

libstdc++-v3/ChangeLog:

	* include/bits/c++config: When __STDC_HOSTED__ is zero,
	disable _GLIBCXX_DEBUG and, if it was set, enable
	_GLIBCXX_ASSERTIONS.
	* testsuite/lib/libstdc++.exp (check_v3_target_debug_mode):
	Include <bits/c++config.h> when determining whether debug is
	set, in order to inherit the logic from above
---
 libstdc++-v3/include/bits/c++config      | 7 +++++++
 libstdc++-v3/testsuite/lib/libstdc++.exp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 71f2401402f..13892787e09 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -397,6 +397,13 @@ _GLIBCXX_END_NAMESPACE_VERSION
 # define _GLIBCXX_END_INLINE_ABI_NAMESPACE(X)   } // inline namespace X
 #endif
 
+// In the case that we don't have a hosted environment, we can't provide the
+// debugging mode.  Instead, we do our best and downgrade to assertions.
+#if defined(_GLIBCXX_DEBUG) && !__STDC_HOSTED__
+#undef _GLIBCXX_DEBUG
+#define _GLIBCXX_ASSERTIONS 1
+#endif
+
 // Inline namespaces for special modes: debug, parallel.
 #if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
 namespace std
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 98512c973fb..490abd108fa 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -1007,6 +1007,7 @@ proc check_v3_target_debug_mode { } {
     global cxxflags
     return [check_v3_target_prop_cached et_debug_mode {
 	set code "
+	#include <bits/c++config.h>
 	#if ! defined _GLIBCXX_DEBUG
 	# error no debug mode
 	#endif
-- 
2.40.0

[PATCH 4/4] libstdc++: Fix some freestanding test failures

[Arsen Arsenović]

At some point, <charconv> was added to the non-hosted bit of the C++17
block, which induced failures in many tests.

In addition, some tests also lacked a dg-require-effective-target hosted
tag.

libstdc++-v3/ChangeLog:

	* include/precompiled/stdc++.h (C++17): Don't double-include
	<charconv>, once with wrong conditions.
	* testsuite/18_support/96817.cc: Require hosted.
	* testsuite/18_support/bad_exception/59392.cc: Ditto.
	* testsuite/20_util/scoped_allocator/108952.cc: Ditto.
	* testsuite/20_util/uses_allocator/lwg3527.cc: Ditto.
	* testsuite/29_atomics/atomic/operators/pointer_partial_void.cc:
	Ditto.
---
 libstdc++-v3/include/precompiled/stdc++.h                        | 1 -
 libstdc++-v3/testsuite/18_support/96817.cc                       | 1 +
 libstdc++-v3/testsuite/18_support/bad_exception/59392.cc         | 1 +
 libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc        | 1 +
 libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc         | 1 +
 .../29_atomics/atomic/operators/pointer_partial_void.cc          | 1 +
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
index bc011986b53..176ad79ff3c 100644
--- a/libstdc++-v3/include/precompiled/stdc++.h
+++ b/libstdc++-v3/include/precompiled/stdc++.h
@@ -75,7 +75,6 @@
 
 #if __cplusplus >= 201703L
 #include <any>
-#include <charconv>
 // #include <execution>
 #include <optional>
 #include <variant>
diff --git a/libstdc++-v3/testsuite/18_support/96817.cc b/libstdc++-v3/testsuite/18_support/96817.cc
index 70938812bd8..073fc337e8f 100644
--- a/libstdc++-v3/testsuite/18_support/96817.cc
+++ b/libstdc++-v3/testsuite/18_support/96817.cc
@@ -17,6 +17,7 @@
 
 // { dg-do run }
 // { dg-additional-options "-pthread" { target pthread } }
+// { dg-require-effective-target hosted }
 
 // Static init cannot detect recursion for gthreads targets without futexes
 // (and the futex case can only detect it if __libc_single_threaded==true).
diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
index ac64e6eddb2..ae972d0535d 100644
--- a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
+++ b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-Wno-deprecated" }
 // { dg-do run { target c++14_down } }
+// { dg-require-effective-target hosted }
 
 #include <exception>
 #include <cstdlib>
diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
index a6b9c67498c..9342f453bf4 100644
--- a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
+++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
@@ -1,4 +1,5 @@
 // { dg-do compile { target c++11 } }
+// { dg-require-effective-target hosted }
 
 #include <scoped_allocator>
 
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
index ae377f4b5a3..c5a7d513b31 100644
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
@@ -1,5 +1,6 @@
 // { dg-options "-std=gnu++20" }
 // { dg-do compile { target c++20 } }
+// { dg-require-effective-target hosted }
 
 #include <memory>
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
index ddb63233a64..e5d221ed15a 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
@@ -1,5 +1,6 @@
 // { dg-do run { target { c++11_only || c++14_only } } }
 // { dg-require-atomic-builtins "" }
+// { dg-require-effective-target hosted }
 
 // Copyright (C) 2012-2023 Free Software Foundation, Inc.
 //
-- 
2.40.0

Re: [PATCH 1/4] libstdc++: Harmonize <version> and other headers

[Jonathan Wakely]

On 05/04/23 01:09 +0200, Arsen Arsenović wrote:
>Due to recent, large changes in libstdc++, the feature test macros
>declared in <version> 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 <bits/move.h>
>
>+/* Duplicate definition with unique_ptr.h.  */
>+#if __cplusplus > 202002L && defined(__cpp_constexpr_dynamic_alloc)
>+# define __cpp_lib_constexpr_memory 202202L
>+#elif __cplusplus > 201703L
>+# include <concepts>

Including <concepts> is unrelated to the FTM, and should always be
done for >= C++17, but this change means it's not included for the
first block.

Please leave the #include with the _Safe_iterator_base declaration.


>+# define __cpp_lib_constexpr_memory 201811L
>+#endif
>+
> #if __cplusplus > 201703L
>-#include <concepts>
>-# 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 <bits/uses_allocator_args.h>
> #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

Pleae keep them in alphabetical order (within their relevant
blocks/groups).


>+
>+#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

Re: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

[Jonathan Wakely]

On 05/04/23 01:09 +0200, Arsen Arsenović wrote:
>This test detects redefinitions by compiling stdc++.h with
>-Wsystem-headers.  Thanks Patrick Palka for the suggestion.
>
>libstdc++-v3/ChangeLog:
>
>	* testsuite/17_intro/versionconflict.cc: New test.
>---
> libstdc++-v3/testsuite/17_intro/versionconflict.cc | 6 ++++++
> 1 file changed, 6 insertions(+)
> create mode 100644 libstdc++-v3/testsuite/17_intro/versionconflict.cc
>
>diff --git a/libstdc++-v3/testsuite/17_intro/versionconflict.cc b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
>new file mode 100644
>index 00000000000..4191c7a2b08
>--- /dev/null
>+++ b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
>@@ -0,0 +1,6 @@
>+// { dg-do preprocess }
>+// { dg-additional-options "-Wsystem-headers -Werror" }
>+
>+// Test for redefinitions of FTMs using bits/stdc++.h.
>+#include <bits/stdc++.h>
>+#include <version>

I'm concerned that this will fail if libc headers have macro
redefinition errors, or anything else that would usually be ignored.

We could make it more robust by changing <version> like so:

--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -30,7 +30,9 @@
  #ifndef _GLIBCXX_VERSION_INCLUDED
  #define _GLIBCXX_VERSION_INCLUDED
  
+#ifndef _GLIBCXX_TESTING_SYSHDR
  #pragma GCC system_header
+#endif
  
  #include <bits/c++config.h>
  
Then the test could define that macro instead of using -Wsystem-headers.

Could you see if that works?

Re: [PATCH 3/4] libstdc++: Downgrade DEBUG to ASSERTIONS when !HOSTED

[Jonathan Wakely]

On Wed, 5 Apr 2023 at 00:12, Arsen Arsenović via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> Supporting the debug mode in freestanding is a non-trivial job, so
> instead, as a best-effort, enable assertions, which are light and easy.

OK for trunk.


>
> libstdc++-v3/ChangeLog:
>
>         * include/bits/c++config: When __STDC_HOSTED__ is zero,
>         disable _GLIBCXX_DEBUG and, if it was set, enable
>         _GLIBCXX_ASSERTIONS.
>         * testsuite/lib/libstdc++.exp (check_v3_target_debug_mode):
>         Include <bits/c++config.h> when determining whether debug is
>         set, in order to inherit the logic from above
> ---
>  libstdc++-v3/include/bits/c++config      | 7 +++++++
>  libstdc++-v3/testsuite/lib/libstdc++.exp | 1 +
>  2 files changed, 8 insertions(+)
>
> diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
> index 71f2401402f..13892787e09 100644
> --- a/libstdc++-v3/include/bits/c++config
> +++ b/libstdc++-v3/include/bits/c++config
> @@ -397,6 +397,13 @@ _GLIBCXX_END_NAMESPACE_VERSION
>  # define _GLIBCXX_END_INLINE_ABI_NAMESPACE(X)   } // inline namespace X
>  #endif
>
> +// In the case that we don't have a hosted environment, we can't provide the
> +// debugging mode.  Instead, we do our best and downgrade to assertions.
> +#if defined(_GLIBCXX_DEBUG) && !__STDC_HOSTED__
> +#undef _GLIBCXX_DEBUG
> +#define _GLIBCXX_ASSERTIONS 1
> +#endif
> +
>  // Inline namespaces for special modes: debug, parallel.
>  #if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
>  namespace std
> diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
> index 98512c973fb..490abd108fa 100644
> --- a/libstdc++-v3/testsuite/lib/libstdc++.exp
> +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
> @@ -1007,6 +1007,7 @@ proc check_v3_target_debug_mode { } {
>      global cxxflags
>      return [check_v3_target_prop_cached et_debug_mode {
>         set code "
> +       #include <bits/c++config.h>
>         #if ! defined _GLIBCXX_DEBUG
>         # error no debug mode
>         #endif
> --
> 2.40.0
>

Re: [PATCH 4/4] libstdc++: Fix some freestanding test failures

[Jonathan Wakely]

On Wed, 5 Apr 2023 at 00:13, Arsen Arsenović via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> At some point, <charconv> was added to the non-hosted bit of the C++17
> block, which induced failures in many tests.
>
> In addition, some tests also lacked a dg-require-effective-target hosted
> tag.
>
> libstdc++-v3/ChangeLog:
>
>         * include/precompiled/stdc++.h (C++17): Don't double-include
>         <charconv>, once with wrong conditions.
>         * testsuite/18_support/96817.cc: Require hosted.
>         * testsuite/18_support/bad_exception/59392.cc: Ditto.
>         * testsuite/20_util/scoped_allocator/108952.cc: Ditto.
>         * testsuite/20_util/uses_allocator/lwg3527.cc: Ditto.

Maybe this could be adjusted to not use std::allocator.

>         * testsuite/29_atomics/atomic/operators/pointer_partial_void.cc:

This fails because std::abs s not freestanding (which is surprising,
at least for the integral overloads).
We could adjust the test to define its own abs but maybe it's not worth it.

OK for trunk.

>         Ditto.
> ---
>  libstdc++-v3/include/precompiled/stdc++.h                        | 1 -
>  libstdc++-v3/testsuite/18_support/96817.cc                       | 1 +
>  libstdc++-v3/testsuite/18_support/bad_exception/59392.cc         | 1 +
>  libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc        | 1 +
>  libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc         | 1 +
>  .../29_atomics/atomic/operators/pointer_partial_void.cc          | 1 +
>  6 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
> index bc011986b53..176ad79ff3c 100644
> --- a/libstdc++-v3/include/precompiled/stdc++.h
> +++ b/libstdc++-v3/include/precompiled/stdc++.h
> @@ -75,7 +75,6 @@
>
>  #if __cplusplus >= 201703L
>  #include <any>
> -#include <charconv>
>  // #include <execution>
>  #include <optional>
>  #include <variant>
> diff --git a/libstdc++-v3/testsuite/18_support/96817.cc b/libstdc++-v3/testsuite/18_support/96817.cc
> index 70938812bd8..073fc337e8f 100644
> --- a/libstdc++-v3/testsuite/18_support/96817.cc
> +++ b/libstdc++-v3/testsuite/18_support/96817.cc
> @@ -17,6 +17,7 @@
>
>  // { dg-do run }
>  // { dg-additional-options "-pthread" { target pthread } }
> +// { dg-require-effective-target hosted }
>
>  // Static init cannot detect recursion for gthreads targets without futexes
>  // (and the futex case can only detect it if __libc_single_threaded==true).
> diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
> index ac64e6eddb2..ae972d0535d 100644
> --- a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
> +++ b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
> @@ -17,6 +17,7 @@
>
>  // { dg-options "-Wno-deprecated" }
>  // { dg-do run { target c++14_down } }
> +// { dg-require-effective-target hosted }
>
>  #include <exception>
>  #include <cstdlib>
> diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
> index a6b9c67498c..9342f453bf4 100644
> --- a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
> +++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
> @@ -1,4 +1,5 @@
>  // { dg-do compile { target c++11 } }
> +// { dg-require-effective-target hosted }
>
>  #include <scoped_allocator>
>
> diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
> index ae377f4b5a3..c5a7d513b31 100644
> --- a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
> +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
> @@ -1,5 +1,6 @@
>  // { dg-options "-std=gnu++20" }
>  // { dg-do compile { target c++20 } }
> +// { dg-require-effective-target hosted }
>
>  #include <memory>
>
> diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
> index ddb63233a64..e5d221ed15a 100644
> --- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
> +++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
> @@ -1,5 +1,6 @@
>  // { dg-do run { target { c++11_only || c++14_only } } }
>  // { dg-require-atomic-builtins "" }
> +// { dg-require-effective-target hosted }
>
>  // Copyright (C) 2012-2023 Free Software Foundation, Inc.
>  //
> --
> 2.40.0
>

Re: [PATCH 4/4] libstdc++: Fix some freestanding test failures

[Arsen Arsenović]

[-- Attachment #1: Type: text/plain, Size: 4875 bytes --]


Jonathan Wakely <jwakely@redhat.com> writes:

> On Wed, 5 Apr 2023 at 00:13, Arsen Arsenović via Libstdc++
> <libstdc++@gcc.gnu.org> wrote:
>>
>> At some point, <charconv> was added to the non-hosted bit of the C++17
>> block, which induced failures in many tests.
>>
>> In addition, some tests also lacked a dg-require-effective-target hosted
>> tag.
>>
>> libstdc++-v3/ChangeLog:
>>
>>         * include/precompiled/stdc++.h (C++17): Don't double-include
>>         <charconv>, once with wrong conditions.
>>         * testsuite/18_support/96817.cc: Require hosted.
>>         * testsuite/18_support/bad_exception/59392.cc: Ditto.
>>         * testsuite/20_util/scoped_allocator/108952.cc: Ditto.
>>         * testsuite/20_util/uses_allocator/lwg3527.cc: Ditto.
>
> Maybe this could be adjusted to not use std::allocator.
>
>>         * testsuite/29_atomics/atomic/operators/pointer_partial_void.cc:
>
> This fails because std::abs s not freestanding (which is surprising,
> at least for the integral overloads).
> We could adjust the test to define its own abs but maybe it's not worth it.

I can take a look in stage 1.

> OK for trunk.
>
>>         Ditto.
>> ---
>>  libstdc++-v3/include/precompiled/stdc++.h                        | 1 -
>>  libstdc++-v3/testsuite/18_support/96817.cc                       | 1 +
>>  libstdc++-v3/testsuite/18_support/bad_exception/59392.cc         | 1 +
>>  libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc        | 1 +
>>  libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc         | 1 +
>>  .../29_atomics/atomic/operators/pointer_partial_void.cc          | 1 +
>>  6 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
>> index bc011986b53..176ad79ff3c 100644
>> --- a/libstdc++-v3/include/precompiled/stdc++.h
>> +++ b/libstdc++-v3/include/precompiled/stdc++.h
>> @@ -75,7 +75,6 @@
>>
>>  #if __cplusplus >= 201703L
>>  #include <any>
>> -#include <charconv>
>>  // #include <execution>
>>  #include <optional>
>>  #include <variant>
>> diff --git a/libstdc++-v3/testsuite/18_support/96817.cc b/libstdc++-v3/testsuite/18_support/96817.cc
>> index 70938812bd8..073fc337e8f 100644
>> --- a/libstdc++-v3/testsuite/18_support/96817.cc
>> +++ b/libstdc++-v3/testsuite/18_support/96817.cc
>> @@ -17,6 +17,7 @@
>>
>>  // { dg-do run }
>>  // { dg-additional-options "-pthread" { target pthread } }
>> +// { dg-require-effective-target hosted }
>>
>>  // Static init cannot detect recursion for gthreads targets without futexes
>>  // (and the futex case can only detect it if __libc_single_threaded==true).
>> diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
>> index ac64e6eddb2..ae972d0535d 100644
>> --- a/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
>> +++ b/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
>> @@ -17,6 +17,7 @@
>>
>>  // { dg-options "-Wno-deprecated" }
>>  // { dg-do run { target c++14_down } }
>> +// { dg-require-effective-target hosted }
>>
>>  #include <exception>
>>  #include <cstdlib>
>> diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
>> index a6b9c67498c..9342f453bf4 100644
>> --- a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
>> +++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc
>> @@ -1,4 +1,5 @@
>>  // { dg-do compile { target c++11 } }
>> +// { dg-require-effective-target hosted }
>>
>>  #include <scoped_allocator>
>>
>> diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
>> index ae377f4b5a3..c5a7d513b31 100644
>> --- a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
>> +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc
>> @@ -1,5 +1,6 @@
>>  // { dg-options "-std=gnu++20" }
>>  // { dg-do compile { target c++20 } }
>> +// { dg-require-effective-target hosted }
>>
>>  #include <memory>
>>
>> diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
>> index ddb63233a64..e5d221ed15a 100644
>> --- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
>> +++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
>> @@ -1,5 +1,6 @@
>>  // { dg-do run { target { c++11_only || c++14_only } } }
>>  // { dg-require-atomic-builtins "" }
>> +// { dg-require-effective-target hosted }
>>
>>  // Copyright (C) 2012-2023 Free Software Foundation, Inc.
>>  //
>> --
>> 2.40.0
>>


-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

Re: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

[Arsen Arsenović]

[-- Attachment #1.1: Type: text/plain, Size: 1683 bytes --]


Jonathan Wakely <jwakely@redhat.com> writes:

> On 05/04/23 01:09 +0200, Arsen Arsenović wrote:
>>This test detects redefinitions by compiling stdc++.h with
>>-Wsystem-headers.  Thanks Patrick Palka for the suggestion.
>>
>>libstdc++-v3/ChangeLog:
>>
>>	* testsuite/17_intro/versionconflict.cc: New test.
>>---
>> libstdc++-v3/testsuite/17_intro/versionconflict.cc | 6 ++++++
>> 1 file changed, 6 insertions(+)
>> create mode 100644 libstdc++-v3/testsuite/17_intro/versionconflict.cc
>>
>>diff --git a/libstdc++-v3/testsuite/17_intro/versionconflict.cc b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
>>new file mode 100644
>>index 00000000000..4191c7a2b08
>>--- /dev/null
>>+++ b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
>>@@ -0,0 +1,6 @@
>>+// { dg-do preprocess }
>>+// { dg-additional-options "-Wsystem-headers -Werror" }
>>+
>>+// Test for redefinitions of FTMs using bits/stdc++.h.
>>+#include <bits/stdc++.h>
>>+#include <version>
>
> I'm concerned that this will fail if libc headers have macro
> redefinition errors, or anything else that would usually be ignored.
>
> We could make it more robust by changing <version> like so:
>
> --- a/libstdc++-v3/include/std/version
> +++ b/libstdc++-v3/include/std/version
> @@ -30,7 +30,9 @@
>  #ifndef _GLIBCXX_VERSION_INCLUDED
>  #define _GLIBCXX_VERSION_INCLUDED
>  +#ifndef _GLIBCXX_TESTING_SYSHDR
>  #pragma GCC system_header
> +#endif
>    #include <bits/c++config.h>
>  Then the test could define that macro instead of using -Wsystem-headers.
>
> Could you see if that works?

Good idea.  Both the positive and negative cases work when implemented
like this:


[-- Attachment #1.2: (v2) libstdc++: Add a test for <version> FTM redefinitions --]
[-- Type: text/plain, Size: 1684 bytes --]

From 98d302bab9a87d3f2daecf9d54d62f33ba216673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Wed, 8 Mar 2023 17:01:24 +0100
Subject: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

This test detects redefinitions by compiling stdc++.h with
-Wsystem-headers.  Thanks Patrick Palka for the suggestion.

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/versionconflict.cc: New test.
---
 libstdc++-v3/include/std/version                   | 5 ++++-
 libstdc++-v3/testsuite/17_intro/versionconflict.cc | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 libstdc++-v3/testsuite/17_intro/versionconflict.cc

diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index cdd24248c57..1069bc6c9f6 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -30,7 +30,10 @@
 #ifndef _GLIBCXX_VERSION_INCLUDED
 #define _GLIBCXX_VERSION_INCLUDED
 
-#pragma GCC system_header
+// To facilitate testsuite/17_intro/versionconflict.cc
+#ifndef _GLIBCXX_TESTING_SYSHDR
+# pragma GCC system_header
+#endif
 
 #include <bits/c++config.h>
 
diff --git a/libstdc++-v3/testsuite/17_intro/versionconflict.cc b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
new file mode 100644
index 00000000000..6c212980ab0
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/versionconflict.cc
@@ -0,0 +1,7 @@
+// { dg-do preprocess }
+// { dg-additional-options "-Werror" }
+
+// Test for redefinitions of FTMs using bits/stdc++.h.
+#define _GLIBCXX_TESTING_SYSHDR
+#include <bits/stdc++.h>
+#include <version>
-- 
2.40.0


[-- Attachment #1.3: Type: text/plain, Size: 23 bytes --]

-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

Re: [PATCH 1/4] libstdc++: Harmonize <version> and other headers

[Arsen Arsenović]

[-- Attachment #1.1: Type: text/plain, Size: 1510 bytes --]


Jonathan Wakely <jwakely@redhat.com> 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 <concepts>
>
> Including <concepts> is unrelated to the FTM, and should always be
> done for >= 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
--- a/libstdc++-v3/include/bits/ptr_traits.h
+++ b/libstdc++-v3/include/bits/ptr_traits.h
@@ -34,12 +34,15 @@
 
 #include <bits/move.h>
 
+/* 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 <concepts>
-# 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

>> [snip...]
>
> Pleae keep them in alphabetical order (within their relevant
> blocks/groups).

I didn't even notice the ordering - apologies.

Updated patch:


[-- Attachment #1.2: libstdc++: Harmonize <version> and other headers --]
[-- Type: text/plain, Size: 12533 bytes --]

From 54cdd9aebfe485dc669f5893fe14d4cf7822ed9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Wed, 8 Mar 2023 12:04:11 +0100
Subject: [PATCH 1/4] libstdc++: Harmonize <version> and other headers

Due to recent, large changes in libstdc++, the feature test macros
declared in <version> 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.
---
 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
--- a/libstdc++-v3/include/bits/ptr_traits.h
+++ b/libstdc++-v3/include/bits/ptr_traits.h
@@ -34,12 +34,15 @@
 
 #include <bits/move.h>
 
+/* 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 <concepts>
-# 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 <bits/uses_allocator_args.h>
 #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..cdd24248c57 100644
--- 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
 
+#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
 # 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
-# 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 == 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 >= 202002L && __cpp_constexpr >= 201811L)
@@ -136,27 +148,23 @@
 # define __cpp_lib_variant 202102L
 #endif
 #define __cpp_lib_void_t 201411L
-
-#if _GLIBCXX_HOSTED
 #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_clamp 201603L
 #if __cplusplus == 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
-#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_constexpr_algorithms 201806L
+#define __cpp_lib_constexpr_functional 201907L
+#if __cplusplus <= 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
-#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
-- 
2.40.0


[-- Attachment #1.3: Type: text/plain, Size: 176 bytes --]


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.
-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

Re: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

[Arsen Arsenović]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]


Arsen Arsenović via Libstdc++ <libstdc++@gcc.gnu.org> writes:

> Good idea.  Both the positive and negative cases work when implemented
> like this:
>
> From 98d302bab9a87d3f2daecf9d54d62f33ba216673 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
> Date: Wed, 8 Mar 2023 17:01:24 +0100
> Subject: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions
>
> This test detects redefinitions by compiling stdc++.h with
> -Wsystem-headers.  Thanks Patrick Palka for the suggestion.
>
> libstdc++-v3/ChangeLog:
>
> 	* testsuite/17_intro/versionconflict.cc: New test.

I've forgotten to reword this after changing the logic.  New message:

commit dcd7bed33cc274e8f3565ad02fb1fbc04bc845fb
Author: Arsen Arsenović <arsen@aarsen.me>
Date:   Wed Mar 8 17:01:24 2023 +0100

    libstdc++: Add a test for <version> FTM redefinitions
    
    This test detects redefinitions by compiling stdc++.h and <version>,
    by disabling the system_header pragma on the latter, to allow
    warnings in it.  Thanks Patrick Palka for the suggestion.
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/17_intro/versionconflict.cc: New test.


-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

Re: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions

[Jonathan Wakely]

On Wed, 5 Apr 2023 at 12:39, Arsen Arsenović <arsen@aarsen.me> wrote:
>
>
> Arsen Arsenović via Libstdc++ <libstdc++@gcc.gnu.org> writes:
>
> > Good idea.  Both the positive and negative cases work when implemented
> > like this:
> >
> > From 98d302bab9a87d3f2daecf9d54d62f33ba216673 Mon Sep 17 00:00:00 2001
> > From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
> > Date: Wed, 8 Mar 2023 17:01:24 +0100
> > Subject: [PATCH 2/4] libstdc++: Add a test for <version> FTM redefinitions
> >
> > This test detects redefinitions by compiling stdc++.h with
> > -Wsystem-headers.  Thanks Patrick Palka for the suggestion.
> >
> > libstdc++-v3/ChangeLog:
> >
> >       * testsuite/17_intro/versionconflict.cc: New test.
>
> I've forgotten to reword this after changing the logic.  New message:
>
> commit dcd7bed33cc274e8f3565ad02fb1fbc04bc845fb
> Author: Arsen Arsenović <arsen@aarsen.me>
> Date:   Wed Mar 8 17:01:24 2023 +0100
>
>     libstdc++: Add a test for <version> FTM redefinitions
>
>     This test detects redefinitions by compiling stdc++.h and <version>,
>     by disabling the system_header pragma on the latter, to allow
>     warnings in it.  Thanks Patrick Palka for the suggestion.
>
>     libstdc++-v3/ChangeLog:
>
>             * testsuite/17_intro/versionconflict.cc: New test.


OK for trunk, thanks.

Re: [PATCH 1/4] libstdc++: Harmonize <version> and other headers

[Jonathan Wakely]

On Wed, 5 Apr 2023 at 12:36, Arsen Arsenović <arsen@aarsen.me> wrote:
>
>
> Jonathan Wakely <jwakely@redhat.com> 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 <concepts>
> >
> > Including <concepts> is unrelated to the FTM, and should always be
> > done for >= 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
> --- a/libstdc++-v3/include/bits/ptr_traits.h
> +++ b/libstdc++-v3/include/bits/ptr_traits.h
> @@ -34,12 +34,15 @@
>
>  #include <bits/move.h>
>
> +/* 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 <concepts>
> -# 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
>
> >> [snip...]
> >
> > Pleae keep them in alphabetical order (within their relevant
> > blocks/groups).
>
> I didn't even notice the ordering - apologies.
>
> Updated patch:
>
>
> 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.

OK for trunk, thanks

I note that this moves __cpp_lib_to_chars from being defined for C++17
to being defined for C++14. That's OK, because it's actually true for
libstdc++ as noted by the comment at the top of <charconv>.

Re: [PATCH 1/4] libstdc++: Harmonize <version> and other headers

[Jonathan Wakely]

On Wed, 5 Apr 2023 at 13:09, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Wed, 5 Apr 2023 at 12:36, Arsen Arsenović <arsen@aarsen.me> wrote:
> >
> >
> > Jonathan Wakely <jwakely@redhat.com> 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 <concepts>
> > >
> > > Including <concepts> is unrelated to the FTM, and should always be
> > > done for >= 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
> > --- a/libstdc++-v3/include/bits/ptr_traits.h
> > +++ b/libstdc++-v3/include/bits/ptr_traits.h
> > @@ -34,12 +34,15 @@
> >
> >  #include <bits/move.h>
> >
> > +/* 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 <concepts>
> > -# 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
> >
> > >> [snip...]
> > >
> > > Pleae keep them in alphabetical order (within their relevant
> > > blocks/groups).
> >
> > I didn't even notice the ordering - apologies.
> >
> > Updated patch:
> >
> >
> > 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.
>
> OK for trunk, thanks

Oops, I meant to say OK if testing passes, obviously.

>
> I note that this moves __cpp_lib_to_chars from being defined for C++17
> to being defined for C++14. That's OK, because it's actually true for
> libstdc++ as noted by the comment at the top of <charconv>.