From: Jonathan Wakely Date: Wed, 6 Mar 2019 12:13:14 +0000 (+0000) Subject: Add C++20 Traits for [Un]bounded Arrays (P1357R1) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28d85efbfbcac8fc27e0ab4d4e27e5df8bdb402c;p=gcc.git Add C++20 Traits for [Un]bounded Arrays (P1357R1) * include/std/type_traits [C++20] (is_bounded_array) (is_unbounded_array, is_bounded_array_v, is_unbounded_array_v): Define. * testsuite/20_util/is_bounded_array/requirements/ explicit_instantiation.cc: New test. * testsuite/20_util/is_bounded_array/requirements/typedefs.cc: New test. * testsuite/20_util/is_bounded_array/value.cc: New test. * testsuite/20_util/is_unbounded_array/requirements/ explicit_instantiation.cc: New test. * testsuite/20_util/is_unbounded_array/requirements/typedefs.cc: New * test. * testsuite/20_util/is_unbounded_array/value.cc: New test. From-SVN: r269420 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 053da2c25d8..989ba25229f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,19 @@ 2019-03-06 Jonathan Wakely + * include/std/type_traits [C++20] (is_bounded_array) + (is_unbounded_array, is_bounded_array_v, is_unbounded_array_v): + Define. + * testsuite/20_util/is_bounded_array/requirements/ + explicit_instantiation.cc: New test. + * testsuite/20_util/is_bounded_array/requirements/typedefs.cc: New + test. + * testsuite/20_util/is_bounded_array/value.cc: New test. + * testsuite/20_util/is_unbounded_array/requirements/ + explicit_instantiation.cc: New test. + * testsuite/20_util/is_unbounded_array/requirements/typedefs.cc: New + * test. + * testsuite/20_util/is_unbounded_array/value.cc: New test. + * include/bits/ptr_traits.h [C++20] (pointer_traits::pointer_to): Add constexpr. * testsuite/20_util/pointer_traits/pointer_to_constexpr.cc: New test. diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 977ca0e1350..a1161d50399 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3074,6 +3074,26 @@ template template using unwrap_ref_decay_t = typename unwrap_ref_decay<_Tp>::type; + /// True for a type that is an array of known bound. + template + struct is_bounded_array + : public __is_array_known_bounds<_Tp> + { }; + + /// True for a type that is an array of unknown bound. + template + struct is_unbounded_array + : public __is_array_unknown_bounds<_Tp> + { }; + + template + inline constexpr bool is_bounded_array_v + = is_bounded_array<_Tp>::value; + + template + inline constexpr bool is_unbounded_array_v + = is_unbounded_array<_Tp>::value; + #ifdef _GLIBCXX_HAVE_BUILTIN_IS_CONSTANT_EVALUATED #define __cpp_lib_is_constant_evaluated 201811L diff --git a/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/explicit_instantiation.cc new file mode 100644 index 00000000000..d7417a9f26c --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/explicit_instantiation.cc @@ -0,0 +1,29 @@ +// { 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +namespace std +{ + typedef short test_type; + template struct is_bounded_array; +} diff --git a/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/typedefs.cc new file mode 100644 index 00000000000..abe430a6554 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_bounded_array/requirements/typedefs.cc @@ -0,0 +1,33 @@ +// { 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +void test01() +{ + // Check for required typedefs + typedef std::is_bounded_array test_type; + typedef test_type::value_type value_type; + typedef test_type::type type; + typedef test_type::type::value_type type_value_type; + typedef test_type::type::type type_type; +} diff --git a/libstdc++-v3/testsuite/20_util/is_bounded_array/value.cc b/libstdc++-v3/testsuite/20_util/is_bounded_array/value.cc new file mode 100644 index 00000000000..9f37d36e532 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_bounded_array/value.cc @@ -0,0 +1,68 @@ +// { 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 +#include + +void test01() +{ + using std::is_bounded_array; + using namespace __gnu_test; + + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + + // Sanity check. + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); +} + +template void pos() +{ + static_assert((std::is_bounded_array_v &&...)); +} + +template void neg() +{ + static_assert((!std::is_bounded_array_v &&...)); +} + +void test02() +{ + using namespace __gnu_test; + pos(); + neg(); +} diff --git a/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/explicit_instantiation.cc new file mode 100644 index 00000000000..59cde808ffa --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/explicit_instantiation.cc @@ -0,0 +1,29 @@ +// { 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +namespace std +{ + typedef short test_type; + template struct is_unbounded_array; +} diff --git a/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/typedefs.cc new file mode 100644 index 00000000000..abe430a6554 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_unbounded_array/requirements/typedefs.cc @@ -0,0 +1,33 @@ +// { 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 +// . + +// NB: This file is for testing type_traits with NO OTHER INCLUDES. + +#include + +void test01() +{ + // Check for required typedefs + typedef std::is_bounded_array test_type; + typedef test_type::value_type value_type; + typedef test_type::type type; + typedef test_type::type::value_type type_value_type; + typedef test_type::type::type type_type; +} diff --git a/libstdc++-v3/testsuite/20_util/is_unbounded_array/value.cc b/libstdc++-v3/testsuite/20_util/is_unbounded_array/value.cc new file mode 100644 index 00000000000..28a77b21da2 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_unbounded_array/value.cc @@ -0,0 +1,67 @@ +// { 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 +#include + +void test01() +{ + using std::is_unbounded_array; + using namespace __gnu_test; + + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(true), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + static_assert(test_category(false), ""); + + // Sanity check. + static_assert(test_category(false), ""); +} + +template void pos() +{ + static_assert((std::is_unbounded_array_v &&...)); +} + +template void neg() +{ + static_assert((!std::is_unbounded_array_v &&...)); +} + +void test02() +{ + using namespace __gnu_test; + pos(); + neg(); +}