diff options
| -rw-r--r-- | gcc/cp/call.cc | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index d6154f1..354773f 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -4272,6 +4272,14 @@ maybe_init_list_as_array (tree elttype, tree init) if (has_non_trivial_temporaries (first)) return NULL_TREE; + /* We can't do this if copying from the initializer_list would be + ill-formed. */ + tree copy_argtypes = make_tree_vec (1); + TREE_VEC_ELT (copy_argtypes, 0) + = cp_build_qualified_type (elttype, TYPE_QUAL_CONST); + if (!is_xible (INIT_EXPR, elttype, copy_argtypes)) + return NULL_TREE; + init_elttype = cp_build_qualified_type (init_elttype, TYPE_QUAL_CONST); tree arr = build_array_of_n_type (init_elttype, CONSTRUCTOR_NELTS (init)); arr = finish_compound_literal (arr, init, tf_none); diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C new file mode 100644 index 0000000..56de4bc --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C @@ -0,0 +1,15 @@ +// PR c++/110102 +// { dg-do compile { target c++11 } } + +// { dg-error "deleted|construct_at" "" { target *-*-* } 0 } + +#include <list> + +struct A { + A(int) {} + A(const A&) = delete; // { dg-message "declared here" } + A(A&&) {} +}; +int main() { + std::list<A> v = {1,2,3}; +} |