From 60ff8e1654dd0ed9963a6aef8bdbef5f5810e1fb Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 30 Apr 2014 10:23:18 -0400 Subject: [PATCH] re PR c++/60980 (ICE in build_special_member_call, at cp/call.c:7447) PR c++/60980 * init.c (build_value_init): Don't try to call an array constructor. From-SVN: r209934 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/init.c | 3 ++- gcc/testsuite/g++.dg/cpp0x/defaulted49.C | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted49.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a3878830a6e..c078e0685cc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2014-04-30 Jason Merrill + PR c++/60980 + * init.c (build_value_init): Don't try to call an array constructor. + PR c++/60951 * typeck2.c (massage_init_elt): Use maybe_constant_init. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 8b9405c54ed..46422a52304 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -339,7 +339,8 @@ build_value_init (tree type, tsubst_flags_t complain) gcc_assert (!processing_template_decl || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)); - if (type_build_ctor_call (type)) + if (CLASS_TYPE_P (type) + && type_build_ctor_call (type)) { tree ctor = build_aggr_init_expr (type, diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted49.C b/gcc/testsuite/g++.dg/cpp0x/defaulted49.C new file mode 100644 index 00000000000..357be419db7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted49.C @@ -0,0 +1,15 @@ +// PR c++/60980 +// { dg-do compile { target c++11 } } + +struct x0 +{ + x0 () = default; +}; +struct x1 +{ + x0 x2[2]; + void x3 () + { + x1 (); + } +};