backport: re PR c++/84874 (internal compiler error: in reshape_init_class, at cp...

	Backported from mainline
	2018-03-16  Jakub Jelinek  <jakub@redhat.com>

	PR c++/84874
	* decl.c (reshape_init_class): Don't assert d->cur->index == field
	if d->cur->index is a FIELD_DECL, instead set field to d->cur->index.

	* g++.dg/cpp1z/desig7.C: New test.

From-SVN: r262077

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 99f8f149a1e0489e8bd51f897dfe5f876fbca0c3..c831f14f09c4dd82c899a2bc92a0e5e9677fba91 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/84874
+       * decl.c (reshape_init_class): Don't assert d->cur->index == field
+       if d->cur->index is a FIELD_DECL, instead set field to d->cur->index.
+
        2018-03-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/84222

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b86dabf24237a4be1df9d62e7c18d4885324e862..13b7000d6b47a5545acd938b22f3412c4a7a83d2 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5652,8 +5652,18 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p,
            return error_mark_node;
 
          if (TREE_CODE (d->cur->index) == FIELD_DECL)
-           /* We already reshaped this.  */
-           gcc_assert (d->cur->index == field);
+           {
+             /* We already reshaped this.  */
+             if (field != d->cur->index)
+               {
+                 tree id = DECL_NAME (d->cur->index);
+                 gcc_assert (id);
+                 gcc_checking_assert (lookup_field_1 (type, id,
+                                                      /*want_type=*/false)
+                                      == d->cur->index);
+                 field = d->cur->index;
+               }
+           }
          else if (TREE_CODE (d->cur->index) == IDENTIFIER_NODE)
            field = lookup_field_1 (type, d->cur->index, /*want_type=*/false);
          else

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 818d6b60c4c297728bd1ce2c25474356d1b76f8d..65efe2139901987cf5be9c793bb9436620653174 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/84874
+       * g++.dg/cpp1z/desig7.C: New test.
+
        2018-03-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/79085

diff --git a/gcc/testsuite/g++.dg/cpp1z/desig7.C b/gcc/testsuite/g++.dg/cpp1z/desig7.C
new file mode 100644 (file)
index 0000000..8368837
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/desig7.C
@@ -0,0 +1,18 @@
+// PR c++/84874
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+struct A { int a, b; };
+struct B { A d; };
+
+void
+foo (B *x)
+{
+  *x = { .d = { .b = 5 } };    // { dg-message "non-trivial designated initializers not supported" }
+}
+
+void
+bar (A *x)
+{
+  *x = { .b = 6 };             // { dg-message "non-trivial designated initializers not supported" }
+}