From: Jonathan Wakely Date: Tue, 21 Apr 2020 21:18:51 +0000 (+0100) Subject: libstdc++: Support arrays in std::is_nothrow_constructible (PR 94149) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d76925e46fad09fc9be67;p=gcc.git libstdc++: Support arrays in std::is_nothrow_constructible (PR 94149) The front end now supports parenthesized initialization for arrays in C++20, so extend std::is_nothrow_constructible to support them too. gcc/testsuite: PR c++/94149 * g++.dg/cpp2a/paren-init24.C: Fix FIXMEs. libstdc++-v3: PR c++/94149 * include/std/type_traits (__is_nt_constructible_impl): Add partial specializations for bounded arrays with non-empty initializers. * testsuite/20_util/is_nothrow_constructible/value_c++20.cc: New test. --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bd196966e6c..91fe0587a95 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -67,6 +67,11 @@ * g++.dg/coroutines/ramp-return-b.C: New test. * g++.dg/coroutines/ramp-return-c.C: New test. +2020-04-21 Jonathan Wakely + + PR c++/94149 + * g++.dg/cpp2a/paren-init24.C: Fix FIXMEs. + 2020-04-17 Marek Polacek PR c++/94592 diff --git a/gcc/testsuite/g++.dg/cpp2a/paren-init24.C b/gcc/testsuite/g++.dg/cpp2a/paren-init24.C index a636a28ee6d..4e97bbc5b56 100644 --- a/gcc/testsuite/g++.dg/cpp2a/paren-init24.C +++ b/gcc/testsuite/g++.dg/cpp2a/paren-init24.C @@ -11,8 +11,7 @@ int main() static_assert(__is_constructible(T, int)); static_assert(!__is_constructible(T, int, int)); static_assert(std::is_constructible_v); - //FIXME: libstdc++ problem? - //static_assert(std::is_nothrow_constructible_v); + static_assert(std::is_nothrow_constructible_v); using T2 = int[2]; T2 t2(1); @@ -21,6 +20,5 @@ int main() static_assert(__is_constructible(T2, int)); static_assert(__is_constructible(T2, int, int)); static_assert(std::is_constructible_v); - // FIXME libstdc++ problem? - //static_assert(std::is_nothrow_constructible_v); + static_assert(std::is_nothrow_constructible_v); } diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d09d114d948..80c14a7f45b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2020-04-21 Jonathan Wakely + + PR c++/94149 + * include/std/type_traits (__is_nt_constructible_impl): Add partial + specializations for bounded arrays with non-empty initializers. + * testsuite/20_util/is_nothrow_constructible/value_c++20.cc: New test. + 2020-04-20 Thomas Rodgers * testsuite/lib/libstdc++.exp: Add additional_flags= diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 65b9902b56d..f96b5297b83 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -986,6 +986,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public __bool_constant::type())> { }; +#if __cpp_aggregate_paren_init + template + struct __is_nt_constructible_impl + : public __is_nt_constructible_impl + { }; + + template + struct __is_nt_constructible_impl + : public __and_<__is_nt_constructible_impl...> + { }; +#endif + template using __is_nothrow_constructible_impl = __is_nt_constructible_impl<__is_constructible(_Tp, _Args...), diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_constructible/value_c++20.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_constructible/value_c++20.cc new file mode 100644 index 00000000000..6bf0a513b14 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_constructible/value_c++20.cc @@ -0,0 +1,69 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +// 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 + +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); + +struct X +{ + X() = default; + X(int) noexcept { } + X(double) { } +}; + +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); + +struct Y +{ + int i; + X x; +}; + +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); + +struct Z : Y { }; + +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v ); +static_assert( ! std::is_nothrow_constructible_v );