From patchwork Thu Apr 14 10:48:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1617156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=XMHR1HK/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KfGTn133bz9sFr for ; Thu, 14 Apr 2022 20:51:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2F1113857C48 for ; Thu, 14 Apr 2022 10:51:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F1113857C48 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649933465; bh=A/8ZEVFboTImq+Uzoeh4VJxIJMAKiTDgJ+HRO3tRB9M=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=XMHR1HK/rSBeXLdZ1wCmTaBUKkehou9vfoQCUULM9gcOAmperC+A8yZLOBrykOeCN synb2lRKW1j2fBrVb2d0dN757xOis5/05ktZpW2sz3afSUxrLrU0TdjmtJB6Z85sNH gfmFZyHIEvNTjxDnDYbOewLdQAh6mvdOmA2CKtso= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A86783858C54 for ; Thu, 14 Apr 2022 10:48:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A86783858C54 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-KzlI8e2ZNzSW148w1w-BkA-1; Thu, 14 Apr 2022 06:48:50 -0400 X-MC-Unique: KzlI8e2ZNzSW148w1w-BkA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EA43803D7C; Thu, 14 Apr 2022 10:48:50 +0000 (UTC) Received: from localhost (unknown [10.33.36.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A71416141; Thu, 14 Apr 2022 10:48:49 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix missing and incorrect feature test macros [PR105269] Date: Thu, 14 Apr 2022 11:48:49 +0100 Message-Id: <20220414104849.682652-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested powerpc64le-linux, pushed to trunk. -- >8 -- 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 ++++- .../testsuite/20_util/optional/monadic/and_then.cc | 4 +--- .../testsuite/20_util/optional/monadic/version.cc | 10 ---------- .../testsuite/20_util/optional/requirements.cc | 4 +++- libstdc++-v3/testsuite/20_util/optional/version.cc | 4 +++- .../testsuite/23_containers/vector/cons/constexpr.cc | 7 +++++++ .../23_containers/vector/requirements/version.cc | 10 ++++++++++ .../29_atomics/headers/stdatomic.h/c_compat.cc | 6 ++++++ .../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 8e2fcc6f49b..b4ff3989a5d 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 c97cbac984e..a51a84c2054 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 d6aece45fbf..791ef6f1994 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 51f2110b68e..d8ec658484f 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 7cbec330ea0..c7e54efafee 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 90b2a90a5df..00000000000 --- 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 d6a81529c74..a56680a6fb1 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 c18ecb8d48d..2fd52f7c194 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 f5d2f08faf2..e6324ad4a0a 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 00000000000..c85e060f048 --- /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 6dd4f5b00ca..edf19960cbb 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 00000000000..dbaf6bc59d3 --- /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