diff mbox series

[pushed] c++: init-list of uncopyable type [PR110102]

Message ID 20230609153943.3386685-1-jason@redhat.com
State Committed
Commit 35d2c40e4ac9ba57ae82e4722e557a2028d0cf13
Headers
Series [pushed] c++: init-list of uncopyable type [PR110102] |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm fail Patch failed to apply

Commit Message

Jason Merrill June 9, 2023, 3:39 p.m. UTC 
  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


base-commit: 3e12669a0eb968cfcbe9242b382fd8020935edf8
diff mbox series

Patch

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};
+}