From 0795b6f262e37218e80ee03d9c4c2f63541b149b Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 8 Jan 2016 11:01:05 -0500 Subject: [PATCH] PR c++/68983 (FE) PR c++/67557 * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. From-SVN: r232166 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 3 +++ gcc/testsuite/g++.dg/init/elide4.C | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 gcc/testsuite/g++.dg/init/elide4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f33e1dbf4755..33680a4fcd77 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-01-08 Jason Merrill + + PR c++/68983 + PR c++/67557 + * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. + 2016-01-05 Nathan Sidwell PR c++/58583 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 4c3c4154b2a4..ad2c1bc081a4 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 000000000000..f85d6eea40a5 --- /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())) {} -- 2.47.2