From aac39307e8f589dba231083a3e9aa3d0ff302837 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 22 Apr 2020 22:54:35 +0100 Subject: [PATCH] libstdc++: Define __cpp_lib_execution feature test macro This macro has never been defined by libstdc++, despite supporting the parallel algorithms. It should have a different value for C++17 and C++20, because P1001R2 should not be supported in C++17, but unsequenced_policy is defined for C++17 (see PR p4702). * include/std/execution (__cpp_lib_execution): Define to indicate support for P0024R2 and P1001R2. * include/std/version (__cpp_lib_execution): Define. * testsuite/25_algorithms/pstl/feature_test.cc: Only test macro defined by , move other tests to new tests ... * testsuite/25_algorithms/pstl/feature_test-2.cc: New test. * testsuite/25_algorithms/pstl/feature_test-3.cc: New test. * testsuite/25_algorithms/pstl/feature_test-4.cc: New test. * testsuite/25_algorithms/pstl/feature_test-5.cc: New test. --- libstdc++-v3/ChangeLog | 10 +++++++ libstdc++-v3/include/std/execution | 1 + libstdc++-v3/include/std/version | 2 ++ .../testsuite/25_algorithms/pstl/feature_test-2.cc | 27 +++++++++++++++++ .../testsuite/25_algorithms/pstl/feature_test-3.cc | 34 ++++++++++++++++++++++ .../testsuite/25_algorithms/pstl/feature_test-4.cc | 33 +++++++++++++++++++++ .../testsuite/25_algorithms/pstl/feature_test-5.cc | 28 ++++++++++++++++++ .../testsuite/25_algorithms/pstl/feature_test.cc | 27 ++--------------- 8 files changed, 137 insertions(+), 25 deletions(-) create mode 100644 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-4.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cce2549..fb0c1ac 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 2020-04-22 Jonathan Wakely + * include/std/execution (__cpp_lib_execution): Define to indicate + support for P0024R2 and P1001R2. + * include/std/version (__cpp_lib_execution): Define. + * testsuite/25_algorithms/pstl/feature_test.cc: Only test macro + defined by , move other tests to new tests ... + * testsuite/25_algorithms/pstl/feature_test-2.cc: New test. + * testsuite/25_algorithms/pstl/feature_test-3.cc: New test. + * testsuite/25_algorithms/pstl/feature_test-4.cc: New test. + * testsuite/25_algorithms/pstl/feature_test-5.cc: New test. + * include/bits/stl_iterator.h (__cpp_lib_array_constexpr): Define different values for C++17 and C++20, to indicate different feature sets. Update value for C++20 to indicate P1032R1 support. diff --git a/libstdc++-v3/include/std/execution b/libstdc++-v3/include/std/execution index ac78af8..cdd852d 100644 --- a/libstdc++-v3/include/std/execution +++ b/libstdc++-v3/include/std/execution @@ -50,6 +50,7 @@ // Feature test macro for parallel algorithms # define __cpp_lib_parallel_algorithm 201603L +# define __cpp_lib_execution 201902L #endif // C++17 diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 57a0525..3024f1c 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -127,6 +127,7 @@ #define __cpp_lib_clamp 201603 #define __cpp_lib_constexpr_char_traits 201611 #define __cpp_lib_enable_shared_from_this 201603 +#define __cpp_lib_execution 201902L // FIXME: should be 201603L #define __cpp_lib_filesystem 201703 #define __cpp_lib_gcd 201606 #define __cpp_lib_gcd_lcm 201606 @@ -188,6 +189,7 @@ #define __cpp_lib_array_constexpr 201811L #define __cpp_lib_assume_aligned 201811L #define __cpp_lib_bind_front 201907L +// FIXME: #define __cpp_lib_execution 201902L #define __cpp_lib_integer_comparison_functions 202002L #define __cpp_lib_constexpr_algorithms 201806L #define __cpp_lib_constexpr_complex 201711L diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc new file mode 100644 index 0000000..3e74f89 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-2.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do preprocess { target c++17 } } + +#include + +#ifndef __cpp_lib_parallel_algorithm +# error "Feature-test macro for parallel algorithms missing in " +#elif __cpp_lib_parallel_algorithm != 201603L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc new file mode 100644 index 0000000..7693fe0 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-3.cc @@ -0,0 +1,34 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do preprocess { target c++17 } } + +#include + +#ifndef __cpp_lib_execution +# error "Feature-test macro for execution policies is missing in " +#elif __cpp_lib_execution != 201902L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif + +// Neither SD-6 nor C++20 requires this macro to be defined in . +#ifndef __cpp_lib_parallel_algorithm +# error "Feature-test macro for parallel algorithms missing in " +#elif __cpp_lib_parallel_algorithm != 201603L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-4.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-4.cc new file mode 100644 index 0000000..e7bbf92 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-4.cc @@ -0,0 +1,33 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do preprocess { target c++17 } } + +#include + +#ifndef __cpp_lib_parallel_algorithm +# error "Feature-test macro for parallel algorithms missing in " +#elif __cpp_lib_parallel_algorithm != 201603L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif + +#ifndef __cpp_lib_execution +# error "Feature-test macro for execution policies is missing in " +#elif __cpp_lib_execution != 201902L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc new file mode 100644 index 0000000..2d99195 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test-5.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do preprocess { target c++17 } } + +#include + +// Neither SD-6 nor C++20 requires this macro to be defined in . +#ifndef __cpp_lib_parallel_algorithm +# error "Feature-test macro for parallel algorithms missing in " +#elif __cpp_lib_parallel_algorithm != 201603L +# error "Feature-test macro for parallel algorithms has wrong value in " +#endif diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc index ce41f53..c3a9be5 100644 --- a/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/feature_test.cc @@ -19,32 +19,9 @@ // { dg-do preprocess { target c++17 } } #include + #ifndef __cpp_lib_parallel_algorithm -# error "Feature-test macro for parallel algorithms missing" +# error "Feature-test macro for parallel algorithms missing in " #elif __cpp_lib_parallel_algorithm != 201603L # error "Feature-test macro for parallel algorithms has wrong value in " #endif - -#include -#if __cpp_lib_parallel_algorithm != 201603L -# error "Feature-test macro for parallel algorithms has wrong value in " -#endif - -#include -#if __cpp_lib_parallel_algorithm != 201603L -# error "Feature-test macro for parallel algorithms has wrong value in " -#endif - -// The N4810 draft does not require the macro to be defined in . -#include -#if __cpp_lib_parallel_algorithm != 201603L -# error "Feature-test macro for parallel algorithms has wrong value in " -#endif - -// The N4810 draft does not require the macro to be defined in . -// Include this last, because it will trigger the inclusion of TBB headers, -// which then include , so we need to have already checked . -#include -#if __cpp_lib_parallel_algorithm != 201603L -# error "Feature-test macro for parallel algorithms has wrong value in " -#endif -- 2.7.4