diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/elide4.C | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f33e1db..33680a4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-01-08 Jason Merrill <jason@redhat.com> + + PR c++/68983 + PR c++/67557 + * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. + 2016-01-05 Nathan Sidwell <nathan@acm.org> PR c++/58583 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 4c3c415..ad2c1bc 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -7161,6 +7161,9 @@ unsafe_copy_elision_p (tree target, tree exp) && resolves_to_fixed_type_p (target, NULL)) return false; tree init = TARGET_EXPR_INITIAL (exp); + /* build_compound_expr pushes COMPOUND_EXPR inside TARGET_EXPR. */ + while (TREE_CODE (init) == COMPOUND_EXPR) + init = TREE_OPERAND (init, 1); return (TREE_CODE (init) == AGGR_INIT_EXPR && !AGGR_INIT_VIA_CTOR_P (init)); } diff --git a/gcc/testsuite/g++.dg/init/elide4.C b/gcc/testsuite/g++.dg/init/elide4.C new file mode 100644 index 0000000..f85d6ee --- /dev/null +++ b/gcc/testsuite/g++.dg/init/elide4.C @@ -0,0 +1,13 @@ +// PR c++/67557 + +class A { +public: + A m_fn1(); + A(A const &); + int *L; + int ref; +}; +struct B : A { + B(); +}; +B::B() : A((0, m_fn1())) {} |