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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 821cee066c8f3b75b0e7595622ccb3fa842c9a33..1b01f4bf1aca4393511c4019b59f51313a867c8a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-07  Jason Merrill  <jason@redhat.com>
+
+       PR c++/68983
+       PR c++/67557
+       * call.c (unsafe_copy_elision_p): Look through COMPOUND_EXPR.
+
 2015-12-21  Jason Merrill  <jason@redhat.com>
 
        PR c++/66921

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5c500ef70eb99559db5d7ee4aa86bd1964576489..d2de2abf503f507b94003eb1bf2a0efa425b2f8e 100644 (file)
--- 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 (file)
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())) {}