]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: anon union designated init [PR105925]
authorJason Merrill <jason@redhat.com>
Thu, 23 Jun 2022 20:04:02 +0000 (16:04 -0400)
committerJason Merrill <jason@redhat.com>
Thu, 23 Jun 2022 21:38:15 +0000 (17:38 -0400)
This testcase was failing because CONSTRUCTOR_IS_DESIGNATED_INIT wasn't
getting set on the introduced CONSTRUCTOR for the anonymous union, and
build_aggr_conv uses that flag to decide whether to pay attention to the
indexes of the CONSTRUCTOR.  So set the flag when we see a designator rather
than relying on copying it from another CONSTRUCTOR.

PR c++/105925

gcc/cp/ChangeLog:

* decl.cc (reshape_init_array_1): Set
CONSTRUCTOR_IS_DESIGNATED_INIT here.
(reshape_init_class): And here.

gcc/testsuite/ChangeLog:

* g++.dg/cpp2a/desig26.C: New test.

gcc/cp/decl.cc
gcc/testsuite/g++.dg/cpp2a/desig26.C [new file with mode: 0644]

index 66d62af58f1c9104602290a82aa67a4cf068b7d5..42c8d0b32e9984242f8653170e1e4a860d61ce21 100644 (file)
@@ -6503,6 +6503,8 @@ reshape_init_array_1 (tree elt_type, tree max_index, reshape_iter *d,
       tree elt_init;
       constructor_elt *old_cur = d->cur;
 
+      if (d->cur->index)
+       CONSTRUCTOR_IS_DESIGNATED_INIT (new_init) = true;
       check_array_designated_initializer (d->cur, index);
       elt_init = reshape_init_r (elt_type, d,
                                 /*first_initializer_p=*/NULL_TREE,
@@ -6670,6 +6672,7 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p,
            }
          else if (TREE_CODE (d->cur->index) == IDENTIFIER_NODE)
            {
+             CONSTRUCTOR_IS_DESIGNATED_INIT (new_init) = true;
              field = get_class_binding (type, d->cur->index);
              direct_desig = true;
            }
diff --git a/gcc/testsuite/g++.dg/cpp2a/desig26.C b/gcc/testsuite/g++.dg/cpp2a/desig26.C
new file mode 100644 (file)
index 0000000..443fa3d
--- /dev/null
@@ -0,0 +1,22 @@
+// PR c++/105925
+// { dg-do compile { target c++20 } }
+
+struct V
+{
+    int i;
+    double d;
+};
+
+struct X
+{
+    union
+    {
+        int x;
+        V y;
+    };
+};
+
+X foo()
+{
+    return {.y = {0, 0.0}};
+}