From 7875b41f1d0137005d87cc5dd12b2a7df2f30c5e Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Tue, 30 Aug 2016 21:46:11 +0300 Subject: [PATCH] re PR libstdc++/77395 (std::is_constructible is false for type constructible via implicit conversion operator affecting std::tuple) PR libstdc++/77395 * include/std/type_traits (is_constructible): Forward-declare... (__is_base_to_derived_ref): ...and use here. * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. * testsuite/20_util/is_constructible/77395.cc: New. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Likewise. * testsuite/20_util/tuple/77395.cc: New. From-SVN: r239870 --- libstdc++-v3/ChangeLog | 12 +++++ libstdc++-v3/include/std/type_traits | 6 ++- .../20_util/declval/requirements/1_neg.cc | 2 +- .../20_util/is_constructible/77395.cc | 54 +++++++++++++++++++ .../make_signed/requirements/typedefs_neg.cc | 2 +- .../requirements/typedefs_neg.cc | 4 +- libstdc++-v3/testsuite/20_util/tuple/77395.cc | 46 ++++++++++++++++ 7 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/is_constructible/77395.cc create mode 100644 libstdc++-v3/testsuite/20_util/tuple/77395.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index adf2fc7f786..dc9ee9f5f1c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2016-08-30 Ville Voutilainen + + PR libstdc++/77395 + * include/std/type_traits (is_constructible): Forward-declare... + (__is_base_to_derived_ref): ...and use here. + * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. + * testsuite/20_util/is_constructible/77395.cc: New. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: + Likewise. + * testsuite/20_util/tuple/77395.cc: New. + 2016-08-30 Uros Bizjak * testsuite/22_locale/time_get/get/char/2.cc: Move dg-do run diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index baa4d1ffe96..5085196f654 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1007,6 +1007,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION is_function<_From>>>::value> struct __is_base_to_derived_ref; + template + struct is_constructible; + // Detect whether we have a downcast situation during // reference binding. template @@ -1017,7 +1020,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef typename remove_cv::type>::type __dst_t; typedef __and_<__not_>, - is_base_of<__src_t, __dst_t>> type; + is_base_of<__src_t, __dst_t>, + __not_>> type; static constexpr bool value = type::value; }; diff --git a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc index 51aa6bbacbc..2048e0d7cff 100644 --- a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc +++ b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc @@ -18,7 +18,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-error "static assertion failed" "" { target *-*-* } 2255 } +// { dg-error "static assertion failed" "" { target *-*-* } 2259 } #include diff --git a/libstdc++-v3/testsuite/20_util/is_constructible/77395.cc b/libstdc++-v3/testsuite/20_util/is_constructible/77395.cc new file mode 100644 index 00000000000..b1fe8a0399b --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_constructible/77395.cc @@ -0,0 +1,54 @@ +// { dg-do compile { target c++11 } } + +// Copyright (C) 2016 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 + +struct derived; +struct base +{ + operator derived & () &; + operator derived const & () const &; + operator derived && () &&; +}; + +struct derived : base {}; + +base::operator derived & () & +{ + return *static_cast(this); +} + +base::operator derived const & () const & +{ + return *static_cast(this); +} + +base::operator derived && () && +{ + return std::move(*static_cast(this)); +} + +int main() +{ + base b; + derived&& d(static_cast(std::move(b))); + derived&& d2(std::move(b)); + static_assert(std::is_constructible::value, ""); +} diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index d22ac960654..4f0720af412 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -47,4 +47,4 @@ void test01() // { dg-error "required from here" "" { target *-*-* } 39 } // { dg-error "required from here" "" { target *-*-* } 41 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1920 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1924 } diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index 2c46dfaaca0..8eea6b967f3 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -47,5 +47,5 @@ void test01() // { dg-error "required from here" "" { target *-*-* } 39 } // { dg-error "required from here" "" { target *-*-* } 41 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1816 } -// { dg-error "declaration of" "" { target *-*-* } 1773 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1820 } +// { dg-error "declaration of" "" { target *-*-* } 1777 } diff --git a/libstdc++-v3/testsuite/20_util/tuple/77395.cc b/libstdc++-v3/testsuite/20_util/tuple/77395.cc new file mode 100644 index 00000000000..26501bfcc11 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/tuple/77395.cc @@ -0,0 +1,46 @@ +// { dg-do compile { target c++11 } } + +// Copyright (C) 2016 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 + +struct derived; +struct base +{ + operator derived & () &; + operator derived const & () const &; + operator derived && () &&; +}; + +struct derived : base {}; + +base::operator derived & () & { return *static_cast(this); } +base::operator derived const & () const & { return *static_cast(this); } +base::operator derived && () && { return std::move(*static_cast(this)); } + +std::tuple test(base && b) +{ + return std::tuple(std::move(b)); +} + +int main(int,char**) +{ + auto d = std::get<0>(test(derived{})); + return 0; +} -- 2.30.2