From 01290963d131b098cc4b0f3f5d3401e976eb8d6e Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 6 Dec 2012 23:53:46 -0500 Subject: [PATCH] re PR c++/55249 (Multiple copy constructors for template class lead to link errors) PR c++/55249 * tree.c (build_vec_init_elt): Use the type of the initializer. From-SVN: r194281 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/tree.c | 3 ++- gcc/testsuite/g++.dg/template/array25.C | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/array25.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bcad0c24636..22bdb505942 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-12-06 Jason Merrill + PR c++/55249 + * tree.c (build_vec_init_elt): Use the type of the initializer. + PR c++/54744 * pt.c (resolve_typename_type): Check TYPENAME_IS_RESOLVING_P on scope. * init.c (expand_member_init): Check for being in a template first. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 58725f3bd58..28ff0f20eb1 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -524,7 +524,8 @@ build_vec_init_elt (tree type, tree init, tsubst_flags_t complain) argvec = make_tree_vector (); if (init) { - tree dummy = build_dummy_object (inner_type); + tree init_type = strip_array_types (TREE_TYPE (init)); + tree dummy = build_dummy_object (init_type); if (!real_lvalue_p (init)) dummy = move (dummy); argvec->quick_push (dummy); diff --git a/gcc/testsuite/g++.dg/template/array25.C b/gcc/testsuite/g++.dg/template/array25.C new file mode 100644 index 00000000000..4f3ccbf702d --- /dev/null +++ b/gcc/testsuite/g++.dg/template/array25.C @@ -0,0 +1,18 @@ +// PR c++/55249 + +template struct A +{ + _Tp _M_instance[1]; +}; +template struct inner_type +{ + inner_type () {} + inner_type (inner_type &); + inner_type (const inner_type &) {} +}; + +int +main () +{ + A > a, b = a; +} -- 2.30.2