diff options
| author | Jason Merrill <jason@redhat.com> | 2015-06-23 10:08:25 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-06-23 10:08:25 -0400 |
| commit | 115ef7c52e7cae6101df2f062b4650c82e50072d (patch) | |
| tree | 44310bb83003aec8c18da2121e39487979170bd2 /gcc/cp | |
| parent | d4c9e7f92225d829ad1d18c950066cf99fc58cc7 (diff) | |
| download | gcc-115ef7c52e7cae6101df2f062b4650c82e50072d.zip gcc-115ef7c52e7cae6101df2f062b4650c82e50072d.tar.gz gcc-115ef7c52e7cae6101df2f062b4650c82e50072d.tar.bz2 | |
re PR c++/66501 (Default move assignment does not move array members)
PR c++/66501
* class.c (type_has_nontrivial_assignment): New.
* init.c (build_vec_init): Use it.
* cp-tree.h: Declare it.
* method.c (trivial_fn_p): Templates aren't trivial.
From-SVN: r224843
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 18 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 1 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 |
5 files changed, 28 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 194d764..de8fdac 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2015-06-23 Jason Merrill <jason@redhat.com> + PR c++/66501 + * class.c (type_has_nontrivial_assignment): New. + * init.c (build_vec_init): Use it. + * cp-tree.h: Declare it. + * method.c (trivial_fn_p): Templates aren't trivial. + PR c++/66542 * decl.c (expand_static_init): Make sure the destructor is callable here even if we have an initializer. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 9da532e..88f1022 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5136,6 +5136,24 @@ type_has_non_user_provided_default_constructor (tree t) return false; } +/* Return true if TYPE has some non-trivial assignment operator. */ + +bool +type_has_nontrivial_assignment (tree type) +{ + gcc_assert (TREE_CODE (type) != ARRAY_TYPE); + if (CLASS_TYPE_P (type)) + for (tree fns + = lookup_fnfields_slot_nolazy (type, ansi_assopname (NOP_EXPR)); + fns; fns = OVL_NEXT (fns)) + { + tree fn = OVL_CURRENT (fns); + if (!trivial_fn_p (fn)) + return true; + } + return false; +} + /* TYPE is being used as a virtual base, and has a non-trivial move assignment. Return true if this is due to there being a user-provided move assignment in TYPE or one of its subobjects; if there isn't, then diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index b53aa90..8eb7474 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5295,6 +5295,7 @@ extern tree in_class_defaulted_default_constructor (tree); extern bool user_provided_p (tree); extern bool type_has_user_provided_constructor (tree); extern bool type_has_non_user_provided_default_constructor (tree); +extern bool type_has_nontrivial_assignment (tree); extern bool vbase_has_user_provided_move_assign (tree); extern tree default_init_uninitialized_part (tree); extern bool trivial_default_constructor_is_constexpr (tree); diff --git a/gcc/cp/init.c b/gcc/cp/init.c index fc30fef..08c6c0e 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -3460,8 +3460,7 @@ build_vec_init (tree base, tree maxindex, tree init, && TREE_CODE (atype) == ARRAY_TYPE && TREE_CONSTANT (maxindex) && (from_array == 2 - ? (!CLASS_TYPE_P (inner_elt_type) - || !TYPE_HAS_COMPLEX_COPY_ASSIGN (inner_elt_type)) + ? !type_has_nontrivial_assignment (inner_elt_type) : !TYPE_NEEDS_CONSTRUCTING (type)) && ((TREE_CODE (init) == CONSTRUCTOR /* Don't do this if the CONSTRUCTOR might contain something diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 79e4bbc..da03c36 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -476,6 +476,8 @@ type_set_nontrivial_flag (tree ctype, special_function_kind sfk) bool trivial_fn_p (tree fn) { + if (TREE_CODE (fn) == TEMPLATE_DECL) + return false; if (!DECL_DEFAULTED_FN (fn)) return false; |