Revert "[libc++] P1645 constexpr for <numeric>"

This reverts commit eb9b063. The commit fails to build on build bots using LLVM 8.
llvm · Nov 25, 2020 · ecabb39 · ecabb39
1 parent ed242da
commit ecabb39
Show file tree

Hide file tree

Showing 30 changed files with 245 additions and 804 deletions.
diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst
@@ -196,8 +196,6 @@ Status
     ------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_misc``                      *unimplemented*
     ------------------------------------------------- -----------------
-    ``__cpp_lib_constexpr_numeric``                   ``201911L``
-    ------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_swap_algorithms``           *unimplemented*
     ------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_utility``                   ``201811L``

diff --git a/libcxx/include/numeric b/libcxx/include/numeric
diff --git a/libcxx/include/version b/libcxx/include/version
@@ -48,7 +48,6 @@ __cpp_lib_concepts                                      201806L <concepts>
 __cpp_lib_constexpr_dynamic_alloc                       201907L <memory>
 __cpp_lib_constexpr_misc                                201811L <array> <functional> <iterator>
                                                                 <string_view> <tuple> <utility>
-__cpp_lib_constexpr_numeric                             201911L <numeric>
 __cpp_lib_constexpr_swap_algorithms                     201806L <algorithm>
 __cpp_lib_constexpr_utility                             201811L <utility>
 __cpp_lib_destroying_delete                             201806L <new>
@@ -255,7 +254,6 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_concepts                             201806L
 # define __cpp_lib_constexpr_dynamic_alloc              201907L
 // # define __cpp_lib_constexpr_misc                       201811L
-# define __cpp_lib_constexpr_numeric                    201911L
 // # define __cpp_lib_constexpr_swap_algorithms            201806L
 # define __cpp_lib_constexpr_utility                    201811L
 # if _LIBCPP_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L

diff --git a/.../test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp b/.../test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
@@ -14,7 +14,6 @@
 // Test the feature test macros defined by <numeric>
 
 /*  Constant                        Value
-    __cpp_lib_constexpr_numeric     201911L [C++2a]
     __cpp_lib_gcd_lcm               201606L [C++17]
     __cpp_lib_interpolate           201902L [C++2a]
     __cpp_lib_parallel_algorithm    201603L [C++17]
@@ -25,10 +24,6 @@
 
 #if TEST_STD_VER < 14
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifdef __cpp_lib_gcd_lcm
 #   error "__cpp_lib_gcd_lcm should not be defined before c++17"
 # endif
@@ -43,10 +38,6 @@
 
 #elif TEST_STD_VER == 14
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifdef __cpp_lib_gcd_lcm
 #   error "__cpp_lib_gcd_lcm should not be defined before c++17"
 # endif
@@ -61,10 +52,6 @@
 
 #elif TEST_STD_VER == 17
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifndef __cpp_lib_gcd_lcm
 #   error "__cpp_lib_gcd_lcm should be defined in c++17"
 # endif
@@ -91,13 +78,6 @@
 
 #elif TEST_STD_VER > 17
 
-# ifndef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should be defined in c++2a"
-# endif
-# if __cpp_lib_constexpr_numeric != 201911L
-#   error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2a"
-# endif
-
 # ifndef __cpp_lib_gcd_lcm
 #   error "__cpp_lib_gcd_lcm should be defined in c++2a"
 # endif

diff --git a/.../test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/.../test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
@@ -42,7 +42,6 @@
     __cpp_lib_concepts                             201806L [C++2a]
     __cpp_lib_constexpr_dynamic_alloc              201907L [C++2a]
     __cpp_lib_constexpr_misc                       201811L [C++2a]
-    __cpp_lib_constexpr_numeric                    201911L [C++2a]
     __cpp_lib_constexpr_swap_algorithms            201806L [C++2a]
     __cpp_lib_constexpr_utility                    201811L [C++2a]
     __cpp_lib_destroying_delete                    201806L [C++2a]
@@ -228,10 +227,6 @@
 #   error "__cpp_lib_constexpr_misc should not be defined before c++2a"
 # endif
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifdef __cpp_lib_constexpr_swap_algorithms
 #   error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a"
 # endif
@@ -624,10 +619,6 @@
 #   error "__cpp_lib_constexpr_misc should not be defined before c++2a"
 # endif
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifdef __cpp_lib_constexpr_swap_algorithms
 #   error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a"
 # endif
@@ -1134,10 +1125,6 @@
 #   error "__cpp_lib_constexpr_misc should not be defined before c++2a"
 # endif
 
-# ifdef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should not be defined before c++2a"
-# endif
-
 # ifdef __cpp_lib_constexpr_swap_algorithms
 #   error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a"
 # endif
@@ -1923,13 +1910,6 @@
 #   endif
 # endif
 
-# ifndef __cpp_lib_constexpr_numeric
-#   error "__cpp_lib_constexpr_numeric should be defined in c++2a"
-# endif
-# if __cpp_lib_constexpr_numeric != 201911L
-#   error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2a"
-# endif
-
 # if !defined(_LIBCPP_VERSION)
 #   ifndef __cpp_lib_constexpr_swap_algorithms
 #     error "__cpp_lib_constexpr_swap_algorithms should be defined in c++2a"

diff --git a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp
@@ -8,7 +8,6 @@
 
 // <numeric>
 
-// Became constexpr in C++20
 // template <InputIterator Iter, MoveConstructible T>
 //   requires HasPlus<T, Iter::reference>
 //         && HasAssign<T, HasPlus<T, Iter::reference>::result_type>
@@ -22,14 +21,14 @@
 #include "test_iterators.h"
 
 template <class Iter, class T>
-TEST_CONSTEXPR_CXX20 void
+void
 test(Iter first, Iter last, T init, T x)
 {
     assert(std::accumulate(first, last, init) == x);
 }
 
 template <class Iter>
-TEST_CONSTEXPR_CXX20 void
+void
 test()
 {
     int ia[] = {1, 2, 3, 4, 5, 6};
@@ -44,23 +43,13 @@ test()
     test(Iter(ia), Iter(ia+sa), 10, 31);
 }
 
-TEST_CONSTEXPR_CXX20 bool
-test()
+int main(int, char**)
 {
     test<input_iterator<const int*> >();
     test<forward_iterator<const int*> >();
     test<bidirectional_iterator<const int*> >();
     test<random_access_iterator<const int*> >();
     test<const int*>();
 
-    return true;
-}
-
-int main(int, char**)
-{
-    test();
-#if TEST_STD_VER > 17
-    static_assert(test());
-#endif
-    return 0;
+  return 0;
 }
diff --git a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
@@ -8,7 +8,6 @@
 
 // <numeric>
 
-// Became constexpr in C++20
 // template <InputIterator Iter, MoveConstructible T,
 //           Callable<auto, const T&, Iter::reference> BinaryOperation>
 //   requires HasAssign<T, BinaryOperation::result_type>
@@ -24,14 +23,14 @@
 #include "test_iterators.h"
 
 template <class Iter, class T>
-TEST_CONSTEXPR_CXX20 void
+void
 test(Iter first, Iter last, T init, T x)
 {
     assert(std::accumulate(first, last, init, std::multiplies<T>()) == x);
 }
 
 template <class Iter>
-TEST_CONSTEXPR_CXX20 void
+void
 test()
 {
     int ia[] = {1, 2, 3, 4, 5, 6};
@@ -46,23 +45,13 @@ test()
     test(Iter(ia), Iter(ia+sa), 10, 7200);
 }
 
-TEST_CONSTEXPR_CXX20 bool
-test()
+int main(int, char**)
 {
     test<input_iterator<const int*> >();
     test<forward_iterator<const int*> >();
     test<bidirectional_iterator<const int*> >();
     test<random_access_iterator<const int*> >();
     test<const int*>();
 
-    return true;
-}
-
-int main(int, char**)
-{
-    test();
-#if TEST_STD_VER > 17
-    static_assert(test());
-#endif
-    return 0;
+  return 0;
 }
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
@@ -8,7 +8,6 @@
 
 // <numeric>
 
-// Became constexpr in C++20
 // template <InputIterator InIter,
 //           OutputIterator<auto, const InIter::value_type&> OutIter>
 //   requires HasMinus<InIter::value_type, InIter::value_type>
@@ -26,7 +25,7 @@
 #include "test_iterators.h"
 
 template <class InIter, class OutIter>
-TEST_CONSTEXPR_CXX20 void
+void
 test()
 {
     int ia[] = {15, 10, 6, 3, 1};
@@ -47,18 +46,18 @@ class X
 {
     int i_;
 
-    TEST_CONSTEXPR_CXX20 X& operator=(const X&);
+    X& operator=(const X&);
 public:
-    TEST_CONSTEXPR_CXX20 explicit X(int i) : i_(i) {}
-    TEST_CONSTEXPR_CXX20 X(const X& x) : i_(x.i_) {}
-    TEST_CONSTEXPR_CXX20 X& operator=(X&& x)
+    explicit X(int i) : i_(i) {}
+    X(const X& x) : i_(x.i_) {}
+    X& operator=(X&& x)
     {
         i_ = x.i_;
         x.i_ = -1;
         return *this;
     }
 
-    TEST_CONSTEXPR_CXX20 friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
+    friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
 
     friend class Y;
 };
@@ -67,17 +66,16 @@ class Y
 {
     int i_;
 
-    TEST_CONSTEXPR_CXX20 Y& operator=(const Y&);
+    Y& operator=(const Y&);
 public:
-    TEST_CONSTEXPR_CXX20 explicit Y(int i) : i_(i) {}
-    TEST_CONSTEXPR_CXX20 Y(const Y& y) : i_(y.i_) {}
-    TEST_CONSTEXPR_CXX20 void operator=(const X& x) {i_ = x.i_;}
+    explicit Y(int i) : i_(i) {}
+    Y(const Y& y) : i_(y.i_) {}
+    void operator=(const X& x) {i_ = x.i_;}
 };
 
 #endif
 
-TEST_CONSTEXPR_CXX20 bool
-test()
+int main(int, char**)
 {
     test<input_iterator<const int*>, output_iterator<int*> >();
     test<input_iterator<const int*>, forward_iterator<int*> >();
@@ -115,14 +113,5 @@ test()
     std::adjacent_difference(x, x+3, y);
 #endif
 
-    return true;
-}
-
-int main(int, char**)
-{
-    test();
-#if TEST_STD_VER > 17
-    static_assert(test());
-#endif
-    return 0;
+  return 0;
 }
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
@@ -8,7 +8,6 @@
 
 // <numeric>
 
-// Became constexpr in C++20
 // template <InputIterator InIter,
 //           OutputIterator<auto, const InIter::value_type&> OutIter,
 //           Callable<auto, const InIter::value_type&, const InIter::value_type&> BinaryOperation>
@@ -27,7 +26,7 @@
 #include "test_iterators.h"
 
 template <class InIter, class OutIter>
-TEST_CONSTEXPR_CXX20 void
+void
 test()
 {
     int ia[] = {15, 10, 6, 3, 1};
@@ -49,18 +48,18 @@ class X
 {
     int i_;
 
-    TEST_CONSTEXPR_CXX20 X& operator=(const X&);
+    X& operator=(const X&);
 public:
-    TEST_CONSTEXPR_CXX20 explicit X(int i) : i_(i) {}
-    TEST_CONSTEXPR_CXX20 X(const X& x) : i_(x.i_) {}
-    TEST_CONSTEXPR_CXX20 X& operator=(X&& x)
+    explicit X(int i) : i_(i) {}
+    X(const X& x) : i_(x.i_) {}
+    X& operator=(X&& x)
     {
         i_ = x.i_;
         x.i_ = -1;
         return *this;
     }
 
-    TEST_CONSTEXPR_CXX20 friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
+    friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
 
     friend class Y;
 };
@@ -69,18 +68,17 @@ class Y
 {
     int i_;
 
-    TEST_CONSTEXPR_CXX20 Y& operator=(const Y&);
+    Y& operator=(const Y&);
 public:
-    TEST_CONSTEXPR_CXX20 explicit Y(int i) : i_(i) {}
-    TEST_CONSTEXPR_CXX20 Y(const Y& y) : i_(y.i_) {}
-    TEST_CONSTEXPR_CXX20 void operator=(const X& x) {i_ = x.i_;}
+    explicit Y(int i) : i_(i) {}
+    Y(const Y& y) : i_(y.i_) {}
+    void operator=(const X& x) {i_ = x.i_;}
 };
 
 #endif
 
 
-TEST_CONSTEXPR_CXX20 bool
-test()
+int main(int, char**)
 {
     test<input_iterator<const int*>, output_iterator<int*> >();
     test<input_iterator<const int*>, forward_iterator<int*> >();
@@ -118,14 +116,5 @@ test()
     std::adjacent_difference(x, x+3, y, std::minus<X>());
 #endif
 
-    return true;
-}
-
-int main(int, char**)
-{
-    test();
-#if TEST_STD_VER > 17
-    static_assert(test());
-#endif
-    return 0;
+  return 0;
 }