From d2f8208e9add01fe10ee56307cc79631b9995f74 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 14 Apr 2022 10:28:03 +0100 Subject: [PATCH] libstdc++: Fix missing and incorrect feature test macros [PR105269] libstdc++-v3/ChangeLog: PR libstdc++/105269 * include/bits/stl_vector.h (__cpp_lib_constexpr_vector): Define. * include/c_compatibility/stdatomic.h (__cpp_lib_stdatomic_h): Define. * include/std/optional (__cpp_lib_optional): Define new value for C++23. (__cpp_lib_monadic_optional): Remove. * include/std/version (__cpp_lib_constexpr_vector): Define. (__cpp_lib_stdatomic_h): Define. (__cpp_lib_optional): Define new value for C++23. (__cpp_lib_monadic_optional): Remove. * testsuite/20_util/optional/monadic/and_then.cc: Adjust. * testsuite/20_util/optional/requirements.cc: Adjust for C++23. * testsuite/20_util/optional/version.cc: Likewise. * testsuite/23_containers/vector/cons/constexpr.cc: Check feature test macro. * testsuite/29_atomics/headers/stdatomic.h/c_compat.cc: Likewise. * testsuite/20_util/optional/monadic/version.cc: Removed. * testsuite/23_containers/vector/requirements/version.cc: New test. * testsuite/29_atomics/headers/stdatomic.h/version.cc: New test. --- libstdc++-v3/include/bits/stl_vector.h | 3 ++- libstdc++-v3/include/c_compatibility/stdatomic.h | 2 ++ libstdc++-v3/include/std/optional | 12 ++++++------ libstdc++-v3/include/std/version | 5 ++++- libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc | 4 +--- libstdc++-v3/testsuite/20_util/optional/monadic/version.cc | 10 ---------- libstdc++-v3/testsuite/20_util/optional/requirements.cc | 4 +++- libstdc++-v3/testsuite/20_util/optional/version.cc | 4 +++- .../testsuite/23_containers/vector/cons/constexpr.cc | 7 +++++++ .../testsuite/23_containers/vector/requirements/version.cc | 10 ++++++++++ .../testsuite/29_atomics/headers/stdatomic.h/c_compat.cc | 6 ++++++ .../testsuite/29_atomics/headers/stdatomic.h/version.cc | 10 ++++++++++ 12 files changed, 54 insertions(+), 23 deletions(-) delete mode 100644 libstdc++-v3/testsuite/20_util/optional/monadic/version.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc create mode 100644 libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 8e2fcc6..b4ff398 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -62,8 +62,9 @@ #if __cplusplus >= 201103L #include #endif -#if __cplusplus > 201703L +#if __cplusplus >= 202002L # include +#define __cpp_lib_constexpr_vector 201907L #endif #include diff --git a/libstdc++-v3/include/c_compatibility/stdatomic.h b/libstdc++-v3/include/c_compatibility/stdatomic.h index c97cbac..a51a84c 100644 --- a/libstdc++-v3/include/c_compatibility/stdatomic.h +++ b/libstdc++-v3/include/c_compatibility/stdatomic.h @@ -32,6 +32,8 @@ #if __cplusplus > 202002L #include +#define __cpp_lib_stdatomic_h 202011L + #define _Atomic(_Tp) std::atomic<_Tp> using std::memory_order; diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index d6aece4..791ef6f 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -60,10 +60,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @{ */ -#if __cplusplus == 201703L -# define __cpp_lib_optional 201606L -#else +#if __cplusplus > 202002L && __cpp_lib_concepts +# define __cpp_lib_optional 202110L +#elif __cplusplus >= 202002L # define __cpp_lib_optional 202106L +#else +# define __cpp_lib_optional 201606L #endif template @@ -1043,9 +1045,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return static_cast<_Tp>(std::forward<_Up>(__u)); } -#if __cplusplus > 202002L && __cpp_lib_concepts -#define __cpp_lib_monadic_optional 202110L - +#if __cpp_lib_optional >= 202110L // [optional.monadic] template diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 51f2110..d8ec658 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -257,6 +257,7 @@ #define __cpp_lib_constexpr_string_view 201811L #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_generic_unordered_lookup 201811L #define __cpp_lib_interpolate 201902L @@ -312,7 +313,8 @@ #define __cpp_lib_invoke_r 202106L #define __cpp_lib_ios_noreplace 202200L #if __cpp_lib_concepts -# define __cpp_lib_monadic_optional 202110L +# undef __cpp_lib_optional +# define __cpp_lib_optional 202110L #endif #define __cpp_lib_move_only_function 202110L #if __cpp_lib_span @@ -321,6 +323,7 @@ #if _GLIBCXX_HAVE_STACKTRACE # define __cpp_lib_stacktrace 202011L #endif +#define __cpp_lib_stdatomic_h 202011L #define __cpp_lib_string_contains 202011L #if _GLIBCXX_USE_CXX11_ABI // Only supported with cxx11-abi # define __cpp_lib_string_resize_and_overwrite 202110L diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc index 7cbec33..c7e54ef 100644 --- a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc +++ b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc @@ -3,9 +3,7 @@ #include -#ifndef __cpp_lib_monadic_optional -# error "Feature test macro for monadic optional is missing in " -#elif __cpp_lib_monadic_optional < 202110L +#if __cpp_lib_optional < 202110L # error "Feature test macro for monadic optional has wrong value in " #endif diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/version.cc b/libstdc++-v3/testsuite/20_util/optional/monadic/version.cc deleted file mode 100644 index 90b2a90..0000000 --- a/libstdc++-v3/testsuite/20_util/optional/monadic/version.cc +++ /dev/null @@ -1,10 +0,0 @@ -// { dg-options "-std=gnu++23" } -// { dg-do preprocess { target c++23 } } - -#include - -#ifndef __cpp_lib_monadic_optional -# error "Feature test macro for monadic optional is missing in " -#elif __cpp_lib_monadic_optional < 202110L -# error "Feature test macro for monadic optional has wrong value in " -#endif diff --git a/libstdc++-v3/testsuite/20_util/optional/requirements.cc b/libstdc++-v3/testsuite/20_util/optional/requirements.cc index d6a8152..a56680a 100644 --- a/libstdc++-v3/testsuite/20_util/optional/requirements.cc +++ b/libstdc++-v3/testsuite/20_util/optional/requirements.cc @@ -23,8 +23,10 @@ # error "Feature test macro for optional is missing in " #elif __cpp_lib_optional < 201606L # error "Feature test macro for optional has wrong value in " -#elif __cplusplus >= 202002L && __cpp_lib_optional < 202106L +#elif __cplusplus == 202002L && __cpp_lib_optional != 202106L # error "Feature test macro for optional has wrong value for C++20 in " +#elif __cplusplus > 202002L && __cpp_lib_optional != 202110L +# error "Feature test macro for optional has wrong value for C++23 in " #endif #include diff --git a/libstdc++-v3/testsuite/20_util/optional/version.cc b/libstdc++-v3/testsuite/20_util/optional/version.cc index c18ecb8..2fd52f7 100644 --- a/libstdc++-v3/testsuite/20_util/optional/version.cc +++ b/libstdc++-v3/testsuite/20_util/optional/version.cc @@ -6,6 +6,8 @@ # error "Feature test macro for optional is missing in " #elif __cplusplus == 201703L && __cpp_lib_optional != 201606L # error "Feature test macro for optional has wrong value for C++17 in " -#elif __cplusplus >= 202002L && __cpp_lib_optional < 202106L +#elif __cplusplus == 202002L && __cpp_lib_optional != 202106L # error "Feature test macro for optional has wrong value for C++20 in " +#elif __cplusplus > 202002L && __cpp_lib_optional != 202110L +# error "Feature test macro for optional has wrong value for C++23 in " #endif diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc index f5d2f08..e6324ad 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/constexpr.cc @@ -3,6 +3,13 @@ // { dg-xfail-if "not supported" { debug_mode } } #include + +#ifndef __cpp_lib_constexpr_vector +# error "Feature test macro for constexpr vector is missing in " +#elif __cpp_lib_constexpr_vector != 201907L +# error "Feature test macro for constexpr vector has wrong value in " +#endif + #include #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc new file mode 100644 index 0000000..c85e060 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/version.cc @@ -0,0 +1,10 @@ +// { dg-options "-std=gnu++20" } +// { dg-do preprocess { target c++20 } } + +#include + +#ifndef __cpp_lib_constexpr_vector +# error "Feature test macro for constexpr vector is missing in " +#elif __cpp_lib_constexpr_vector != 201907L +# error "Feature test macro for constexpr vector has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc index 6dd4f5b..edf1996 100644 --- a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc +++ b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/c_compat.cc @@ -3,6 +3,12 @@ #include +#ifndef __cpp_lib_stdatomic_h +# error "Feature test macro for stdatomic.h is missing in " +#elif __cpp_lib_stdatomic_h != 202011L +# error "Feature test macro for stdatomic.h has wrong value in " +#endif + #ifndef ATOMIC_BOOL_LOCK_FREE #error ATOMIC_BOOL_LOCK_FREE is not defined in #endif diff --git a/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc new file mode 100644 index 0000000..dbaf6bc --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/headers/stdatomic.h/version.cc @@ -0,0 +1,10 @@ +// { dg-options "-std=gnu++23" } +// { dg-do preprocess { target c++23 } } + +#include + +#ifndef __cpp_lib_stdatomic_h +# error "Feature test macro for stdatomic.h is missing in " +#elif __cpp_lib_stdatomic_h != 202011L +# error "Feature test macro for stdatomic.h has wrong value in " +#endif -- 2.7.4