From 24b54628cfa95194a8de4071c28cb56e6e81c08e Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Mon, 29 Jun 2020 00:36:38 +0300 Subject: [PATCH] PR libstdc++/95915 PR libstdc++/95915 * include/std/type_traits (is_literal_type, is_literal_type_v): Deprecate in C++17. * include/std/variant (_Uninitialized): Adjust the condition and the comment. * testsuite/20_util/is_literal_type/deprecated-1z.cc: New. * testsuite/20_util/is_literal_type/requirements/explicit_instantiation.cc: Adjust. * testsuite/20_util/is_literal_type/requirements/typedefs.cc: Likewise. * testsuite/20_util/is_literal_type/value.cc: Likewise. * testsuite/20_util/optional/constexpr/nullopt.cc: Use __is_literal_type directly. * testsuite/20_util/optional/nullopt.cc: Likewise. * testsuite/20_util/variable_templates_for_traits.cc: Adjust. * testsuite/20_util/variant/95915.cc: New. * testsuite/20_util/variant/compile.cc: Add new test. * testsuite/experimental/optional/constexpr/nullopt.cc: Use __is_literal_type directly. * testsuite/experimental/optional/nullopt.cc: Likewise. * testsuite/experimental/type_traits/value.cc: Adjust. * testsuite/util/testsuite_common_types.h: Use __is_literal_type directly. --- libstdc++-v3/include/std/type_traits | 9 +++-- libstdc++-v3/include/std/variant | 12 ++----- .../20_util/is_literal_type/deprecated-1z.cc | 26 ++++++++++++++ .../requirements/explicit_instantiation.cc | 1 + .../is_literal_type/requirements/typedefs.cc | 1 + .../20_util/is_literal_type/value.cc | 1 + .../20_util/optional/constexpr/nullopt.cc | 2 +- .../testsuite/20_util/optional/nullopt.cc | 2 +- .../20_util/variable_templates_for_traits.cc | 3 ++ .../testsuite/20_util/variant/95915.cc | 35 +++++++++++++++++++ .../testsuite/20_util/variant/compile.cc | 7 ++++ .../optional/constexpr/nullopt.cc | 2 +- .../experimental/optional/nullopt.cc | 2 +- .../experimental/type_traits/value.cc | 3 ++ .../testsuite/util/testsuite_common_types.h | 4 +-- 15 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/is_literal_type/deprecated-1z.cc create mode 100644 libstdc++-v3/testsuite/20_util/variant/95915.cc diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index bc9a45b3746..9cd3a2df41a 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -703,7 +703,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// is_literal_type template - struct is_literal_type + struct + _GLIBCXX17_DEPRECATED + is_literal_type : public integral_constant { static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}), @@ -3085,10 +3087,11 @@ template template _GLIBCXX20_DEPRECATED("use is_standard_layout_v && is_trivial_v instead") inline constexpr bool is_pod_v = is_pod<_Tp>::value; -#pragma GCC diagnostic pop template + _GLIBCXX17_DEPRECATED inline constexpr bool is_literal_type_v = is_literal_type<_Tp>::value; -template +#pragma GCC diagnostic pop + template inline constexpr bool is_empty_v = is_empty<_Tp>::value; template inline constexpr bool is_polymorphic_v = is_polymorphic<_Tp>::value; diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 6eeb3c80ec2..c9504914365 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -202,15 +202,9 @@ namespace __variant std::forward<_Variants>(__variants)...); } - // _Uninitialized is guaranteed to be a literal type, even if T is not. - // We have to do this, because [basic.types]p10.5.3 (n4606) is not implemented - // yet. When it's implemented, _Uninitialized can be changed to the alias - // to T, therefore equivalent to being removed entirely. - // - // Another reason we may not want to remove _Uninitialzied may be that, we - // want _Uninitialized to be trivially destructible, no matter whether T - // is; but we will see. - template> + // _Uninitialized is guaranteed to be a trivially destructible type, + // even if T is not. + template> struct _Uninitialized; template diff --git a/libstdc++-v3/testsuite/20_util/is_literal_type/deprecated-1z.cc b/libstdc++-v3/testsuite/20_util/is_literal_type/deprecated-1z.cc new file mode 100644 index 00000000000..a91ff56dcf6 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_literal_type/deprecated-1z.cc @@ -0,0 +1,26 @@ +// 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 compile { target c++17 } } + +#include + +static_assert(std::is_literal_type::value); // { dg-warning "is deprecated" } +static_assert(std::is_literal_type_v); // { dg-warning "is deprecated" } + +// { dg-prune-output "declared here" } diff --git a/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/explicit_instantiation.cc index d0a20f3cf4e..aa2a80e84e4 100644 --- a/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/explicit_instantiation.cc @@ -1,3 +1,4 @@ +// { dg-additional-options "-Wno-deprecated" { target c++17 } } // { dg-do compile { target c++11 } } // 2010-02-21 Paolo Carlini diff --git a/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/typedefs.cc index 9b7ae894725..2bb75544280 100644 --- a/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/20_util/is_literal_type/requirements/typedefs.cc @@ -1,3 +1,4 @@ +// { dg-additional-options "-Wno-deprecated" { target c++17 } } // { dg-do compile { target c++11 } } // 2010-02-21 Paolo Carlini diff --git a/libstdc++-v3/testsuite/20_util/is_literal_type/value.cc b/libstdc++-v3/testsuite/20_util/is_literal_type/value.cc index a6624774ef0..56c5b8d268f 100644 --- a/libstdc++-v3/testsuite/20_util/is_literal_type/value.cc +++ b/libstdc++-v3/testsuite/20_util/is_literal_type/value.cc @@ -1,3 +1,4 @@ +// { dg-additional-options "-Wno-deprecated" { target c++17 } } // { dg-do compile { target c++11 } } // 2010-03-23 Paolo Carlini diff --git a/libstdc++-v3/testsuite/20_util/optional/constexpr/nullopt.cc b/libstdc++-v3/testsuite/20_util/optional/constexpr/nullopt.cc index 62b66814e97..d66728e3700 100644 --- a/libstdc++-v3/testsuite/20_util/optional/constexpr/nullopt.cc +++ b/libstdc++-v3/testsuite/20_util/optional/constexpr/nullopt.cc @@ -26,7 +26,7 @@ int main() // [20.5.6] Disengaged state indicator static_assert( std::is_same(), "" ); static_assert( std::is_empty(), "" ); - static_assert( std::is_literal_type(), "" ); + static_assert( __is_literal_type(std::nullopt_t), "" ); static_assert( !std::is_default_constructible(), "" ); { diff --git a/libstdc++-v3/testsuite/20_util/optional/nullopt.cc b/libstdc++-v3/testsuite/20_util/optional/nullopt.cc index c0b2184aa58..325e52802b9 100644 --- a/libstdc++-v3/testsuite/20_util/optional/nullopt.cc +++ b/libstdc++-v3/testsuite/20_util/optional/nullopt.cc @@ -26,7 +26,7 @@ int main() // [20.5.6] Disengaged state indicator static_assert( std::is_same(), "" ); static_assert( std::is_empty(), "" ); - static_assert( std::is_literal_type(), "" ); + static_assert( __is_literal_type(std::nullopt_t), "" ); static_assert( !std::is_default_constructible(), "" ); { diff --git a/libstdc++-v3/testsuite/20_util/variable_templates_for_traits.cc b/libstdc++-v3/testsuite/20_util/variable_templates_for_traits.cc index 40a3f41e0e5..0f1625a8cb6 100644 --- a/libstdc++-v3/testsuite/20_util/variable_templates_for_traits.cc +++ b/libstdc++-v3/testsuite/20_util/variable_templates_for_traits.cc @@ -147,10 +147,13 @@ static_assert(is_pod_v static_assert(!is_pod_v && !is_pod::value, ""); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" static_assert(is_literal_type_v && is_literal_type::value, ""); static_assert(!is_literal_type_v && !is_literal_type::value, ""); +#pragma GCC diagnostic pop static_assert(is_empty_v && is_empty::value, ""); diff --git a/libstdc++-v3/testsuite/20_util/variant/95915.cc b/libstdc++-v3/testsuite/20_util/variant/95915.cc new file mode 100644 index 00000000000..411ff2d36ae --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/variant/95915.cc @@ -0,0 +1,35 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +// 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 +// . + +#include + +using namespace std; + +struct virtual_default_dtor { + virtual ~virtual_default_dtor() = default; +}; + +void default_ctor() +{ + { + variant a; + } +} + diff --git a/libstdc++-v3/testsuite/20_util/variant/compile.cc b/libstdc++-v3/testsuite/20_util/variant/compile.cc index b2b60d1cf10..5f681754b5f 100644 --- a/libstdc++-v3/testsuite/20_util/variant/compile.cc +++ b/libstdc++-v3/testsuite/20_util/variant/compile.cc @@ -84,6 +84,10 @@ struct nonliteral bool operator>(const nonliteral&) const; }; +struct virtual_default_dtor { + virtual ~virtual_default_dtor() = default; +}; + void default_ctor() { static_assert(is_default_constructible_v>); @@ -95,6 +99,9 @@ void default_ctor() static_assert(noexcept(variant())); static_assert(!noexcept(variant())); static_assert(noexcept(variant())); + { + variant a; + } } void copy_ctor() diff --git a/libstdc++-v3/testsuite/experimental/optional/constexpr/nullopt.cc b/libstdc++-v3/testsuite/experimental/optional/constexpr/nullopt.cc index 3aa9d0c4c33..6fe9a2a051d 100644 --- a/libstdc++-v3/testsuite/experimental/optional/constexpr/nullopt.cc +++ b/libstdc++-v3/testsuite/experimental/optional/constexpr/nullopt.cc @@ -25,7 +25,7 @@ int main() // [20.5.6] Disengaged state indicator static_assert( std::is_same(), "" ); static_assert( std::is_empty(), "" ); - static_assert( std::is_literal_type(), "" ); + static_assert( __is_literal_type(std::experimental::nullopt_t), "" ); static_assert( !std::is_default_constructible(), "" ); { diff --git a/libstdc++-v3/testsuite/experimental/optional/nullopt.cc b/libstdc++-v3/testsuite/experimental/optional/nullopt.cc index e31fc379e9e..73f6b534b87 100644 --- a/libstdc++-v3/testsuite/experimental/optional/nullopt.cc +++ b/libstdc++-v3/testsuite/experimental/optional/nullopt.cc @@ -25,7 +25,7 @@ int main() // [20.5.6] Disengaged state indicator static_assert( std::is_same(), "" ); static_assert( std::is_empty(), "" ); - static_assert( std::is_literal_type(), "" ); + static_assert( __is_literal_type(std::experimental::nullopt_t), "" ); static_assert( !std::is_default_constructible(), "" ); { diff --git a/libstdc++-v3/testsuite/experimental/type_traits/value.cc b/libstdc++-v3/testsuite/experimental/type_traits/value.cc index 0e1176dd14a..52a6e69cc55 100644 --- a/libstdc++-v3/testsuite/experimental/type_traits/value.cc +++ b/libstdc++-v3/testsuite/experimental/type_traits/value.cc @@ -214,10 +214,13 @@ static_assert(is_pod_v static_assert(!is_pod_v && !is_pod::value, ""); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" static_assert(is_literal_type_v && is_literal_type::value, ""); static_assert(!is_literal_type_v && !is_literal_type::value, ""); +#pragma GCC diagnostic pop static_assert(is_empty_v && is_empty::value, ""); diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h index 2795df36ca3..92af3af7773 100644 --- a/libstdc++-v3/testsuite/util/testsuite_common_types.h +++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h @@ -749,7 +749,7 @@ namespace __gnu_test // Generator to test default constructor. struct constexpr_default_constructible { - template::value> + template struct _Concept; // NB: _Tp must be a literal type. @@ -801,7 +801,7 @@ namespace __gnu_test struct constexpr_single_value_constructible { template::value> + bool _IsLitp = __is_literal_type(_Ttesttype)> struct _Concept; // NB: _Tvaluetype and _Ttesttype must be literal types. -- 2.30.2