From 289fb62de560adc4ccce4d183ea0e7cc6f8dd9b5 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 8 Jan 2016 11:02:10 -0500 Subject: [PATCH] re PR middle-end/68983 (ICE: in store_field, at expr.c:6659) PR c++/68983 PR c++/67557 * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. From-SVN: r232171 --- 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 821cee066c8f..1b01f4bf1aca 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-01-07 Jason Merrill + + PR c++/68983 + PR c++/67557 + * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR. + 2015-12-21 Jason Merrill PR c++/66921 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 5c500ef70eb9..d2de2abf503f 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -6763,6 +6763,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