Commit: 1bdbef090299990b1fdef6323bb3daa48acf9349 - gcc_os216 (git)

GCC with patches for OS216

Commit MetaInfo

• Revision: 1bdbef090299990b1fdef6323bb3daa48acf9349 (tree)
• Time: 2018-03-21 16:09:22
• Author: Marek Polacek <polacek@redh...>
• Commiter: Marek Polacek

Log Message

PR c++/71638, ICE with NSDMI and reference.

* constexpr.c (cxx_eval_bare_aggregate): Update constructor's flags
even when we replace an element.

* g++.dg/cpp0x/nsdmi14.C: New test.
* g++.dg/cpp1y/nsdmi-aggr10.C: New test.

From-SVN: r258703

Change Summary

• modified: gcc/cp/ChangeLog
• modified: gcc/cp/constexpr.c
• modified: gcc/testsuite/ChangeLog
• add: gcc/testsuite/g++.dg/cpp0x/nsdmi14.C
• add: gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr10.C

Incremental Difference

--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Marek Polacek  <[e-mail]>
+
+	PR c++/71638, ICE with NSDMI and reference.
+	* constexpr.c (cxx_eval_bare_aggregate): Update constructor's flags
+	even when we replace an element.
+
 2018-03-20  Marek Polacek  <[e-mail]>
 
 	PR c++/84978, ICE with NRVO.

--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -2873,16 +2873,17 @@ cxx_eval_bare_aggregate (const constexpr_ctx *ctx, tree t,
 	  gcc_assert (is_empty_class (TREE_TYPE (TREE_TYPE (index))));
 	  changed = true;
 	}
-      else if (new_ctx.ctor != ctx->ctor)
-	{
-	  /* We appended this element above; update the value.  */
-	  gcc_assert ((*p)->last().index == index);
-	  (*p)->last().value = elt;
-	}
       else
 	{
-	  CONSTRUCTOR_APPEND_ELT (*p, index, elt);
-	  /* Adding an element might change the ctor's flags.  */
+	  if (new_ctx.ctor != ctx->ctor)
+	    {
+	      /* We appended this element above; update the value.  */
+	      gcc_assert ((*p)->last().index == index);
+	      (*p)->last().value = elt;
+	    }
+	  else
+	    CONSTRUCTOR_APPEND_ELT (*p, index, elt);
+	  /* Adding or replacing an element might change the ctor's flags.  */
 	  TREE_CONSTANT (ctx->ctor) = constant_p;
 	  TREE_SIDE_EFFECTS (ctx->ctor) = side_effects_p;
 	}

--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Marek Polacek  <[e-mail]>
+
+	PR c++/71638, ICE with NSDMI and reference.
+	* g++.dg/cpp0x/nsdmi14.C: New test.
+	* g++.dg/cpp1y/nsdmi-aggr10.C: New test.
+
 2018-03-21  Chenghua Xu  <[e-mail]>
 
 	* gcc.dg/vect/vect-strided-shift-1.c: Add dg-skip-if for

--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi14.C
@@ -0,0 +1,19 @@
+// PR c++/71638
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wall" }
+
+struct A {
+  struct {
+    int i;
+    int &j = i;
+  } b;
+  int a = b.j;
+};
+
+void bar (A);
+
+void
+foo ()
+{
+  bar (A{});
+}

--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr10.C
@@ -0,0 +1,7 @@
+// PR c++/71638
+// { dg-do compile { target c++14 } }
+
+struct {
+  int &&a;
+  int b{a};
+} c[] { { 2 } };