diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2017-06-01 14:09:41 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2017-06-01 14:09:41 +0300 |
| commit | e257141f075b6764ea5a1c1d7b1f2d364bf241a2 (patch) | |
| tree | d0b29da84cf2665ab1bb708eb2416279fe33f6bd | |
| parent | 2d16708fa186148ca13f375c18e05abb806508eb (diff) | |
| download | gcc-e257141f075b6764ea5a1c1d7b1f2d364bf241a2.zip gcc-e257141f075b6764ea5a1c1d7b1f2d364bf241a2.tar.gz gcc-e257141f075b6764ea5a1c1d7b1f2d364bf241a2.tar.bz2 | |
re PR c++/80812 (ICE: in build_value_init_noctor, at cp/init.c:483)
PR c++/80812
cp/
PR c++/80812
* method.c (constructible_expr): Strip array types before calling
build_value_init.
libstdc++/
PR c++/80812
* testsuite/20_util/is_constructible/80812.cc: New.
From-SVN: r248788
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/is_constructible/80812.cc | 29 |
3 files changed, 36 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 60fe1a5..64f476a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-06-01 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/80812 + * method.c (constructible_expr): Strip array types before calling + build_value_init. + 2017-06-01 Paolo Carlini <paolo.carlini@oracle.com> PR c++/80896 diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 8aa4f3e..aa607d5 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1188,7 +1188,7 @@ constructible_expr (tree to, tree from) else { if (from == NULL_TREE) - return build_value_init (to, tf_none); + return build_value_init (strip_array_types (to), tf_none); else if (TREE_CHAIN (from)) return error_mark_node; // too many initializers from = build_stub_object (TREE_VALUE (from)); diff --git a/libstdc++-v3/testsuite/20_util/is_constructible/80812.cc b/libstdc++-v3/testsuite/20_util/is_constructible/80812.cc new file mode 100644 index 0000000..17af9ae --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/is_constructible/80812.cc @@ -0,0 +1,29 @@ +// { dg-do compile { target c++11 } } +// Copyright (C) 2017 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 +// <http://www.gnu.org/licenses/>. + +#include <type_traits> + +struct X +{ + X() {} +}; + +void test01() +{ + static_assert(std::is_constructible<X[4]>::value); +} |