From 1c09b66494991a4ac63aaf34c0ca1081b887284c Mon Sep 17 00:00:00 2001 From: Edward Smith-Rowland <3dw4rd@verizon.net> Date: Fri, 15 Nov 2019 00:09:49 +0000 Subject: [PATCH] Implement the part of C++20 p1032 Misc constexpr bits. 2019-11-14 Edward Smith-Rowland <3dw4rd@verizon.net> Implement the part of C++20 p1032 Misc constexpr bits. * include/std/array (fill, swap): Make constexpr. * testsuite/23_containers/array/requirements/constexpr_fill.cc: New. * testsuite/23_containers/array/requirements/constexpr_swap.cc: New. From-SVN: r278269 --- libstdc++-v3/ChangeLog | 7 +++ libstdc++-v3/include/std/array | 6 +-- .../array/requirements/constexpr_fill.cc | 36 ++++++++++++++++ .../array/requirements/constexpr_swap.cc | 43 +++++++++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc create mode 100644 libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3714e74bb23..13cca24e368 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-11-14 Edward Smith-Rowland <3dw4rd@verizon.net> + + Implement the part of C++20 p1032 Misc constexpr bits. + * include/std/array (fill, swap): Make constexpr. + * testsuite/23_containers/array/requirements/constexpr_fill.cc: New. + * testsuite/23_containers/array/requirements/constexpr_swap.cc: New. + 2019-11-14 Jonathan Wakely * include/bits/iterator_concepts.h (__iter_concept_impl): Add diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index b1dc8887787..9ad1e652b6c 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -112,11 +112,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // No explicit construct/copy/destroy for aggregate type. // DR 776. - void + _GLIBCXX20_CONSTEXPR void fill(const value_type& __u) { std::fill_n(begin(), size(), __u); } - void + _GLIBCXX20_CONSTEXPR void swap(array& __other) noexcept(_AT_Type::_Is_nothrow_swappable::value) { std::swap_ranges(begin(), end(), __other.begin()); } @@ -288,6 +288,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // Specialized algorithms. template + _GLIBCXX20_CONSTEXPR inline #if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11 // Constrained free swap overload, see p0185r1 @@ -295,7 +296,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::_Is_swappable::value >::type #else - _GLIBCXX20_CONSTEXPR void #endif swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two) diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc new file mode 100644 index 00000000000..30a1555d43b --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_fill.cc @@ -0,0 +1,36 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } +// +// Copyright (C) 2019 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 +// . + +#include + +constexpr bool +test_array() +{ + auto ok = true; + + std::array fa{}; + fa.fill(3.333f); + + ok = ok && (fa[0] == fa[2]); + + return ok; +} + +static_assert(test_array()); diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc new file mode 100644 index 00000000000..3d5d81d069e --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_swap.cc @@ -0,0 +1,43 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } +// +// Copyright (C) 2019 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 +// . + +#include + +constexpr bool +test_array() +{ + auto ok = true; + + std::array fa{{1.1f, 2.2f, 3.3f}}; + + std::array fb{{4.4f, 5.5f, 6.6f}}; + + fb.swap(fa); + + ok = ok && (fa[0] == 4.4f); + + std::swap(fa, fb); + + ok = ok && (fa[0] == 1.1f); + + return ok; +} + +static_assert(test_array()); -- 2.30.2