* [pushed] c++: init-list of uncopyable type [PR110102]
@ 2023-06-09 15:39 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2023-06-09 15:39 UTC (permalink / raw)
To: gcc-patches
Tested x86_64-pc-linux-gnu, applying to trunk.
-- 8< --
The maybe_init_list_as_range optimization is a form of copy elision, but we
can only elide well-formed copies.
PR c++/110102
gcc/cp/ChangeLog:
* call.cc (maybe_init_list_as_array): Check that the element type is
copyable.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/initlist-opt1.C: New test.
---
gcc/cp/call.cc | 8 ++++++++
gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C | 15 +++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-opt1.C
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index d6154f1a319..354773f00c6 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 00000000000..56de4bc0092
--- /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};
+}
base-commit: 3e12669a0eb968cfcbe9242b382fd8020935edf8
--
2.31.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-09 15:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-09 15:39 [pushed] c++: init-list of uncopyable type [PR110102] Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).