diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/invisiref2.C | 14 |
3 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bdf717f..595a08f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-06-11 Jason Merrill <jason@redhat.com> + + PR c++/86094 - wrong code with defaulted move ctor. + * tree.c (type_has_nontrivial_copy_init): Fix move ctor handling. + 2018-06-10 Paolo Carlini <paolo.carlini@oracle.com> * decl.c (grokfndecl): Use the location_t argument in two more places. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index bbbda7e..156d1e4 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -4135,7 +4135,7 @@ type_has_nontrivial_copy_init (const_tree type) for (ovl_iterator iter (CLASSTYPE_CONSTRUCTORS (t)); iter; ++iter) { tree fn = *iter; - if (copy_fn_p (fn)) + if (copy_fn_p (fn) || move_fn_p (fn)) { saw_copy = true; if (!DECL_DELETED_FN (fn)) diff --git a/gcc/testsuite/g++.dg/abi/invisiref2.C b/gcc/testsuite/g++.dg/abi/invisiref2.C new file mode 100644 index 0000000..592d212 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/invisiref2.C @@ -0,0 +1,14 @@ +// PR c++/86094 +// { dg-do compile { target c++11 } } +// { dg-additional-options "-Wabi=11 -fdump-tree-gimple" } +// { dg-final { scan-tree-dump-not "struct S &" "gimple" } } + +struct S { + S(S&&) = default; + int i; +}; + +S foo(S s) +{ + return s; +} |