https://gcc.gnu.org/g:49625b429b146235caf9066c54e106580935b9f8
commit r17-6175-g49625b429b146235caf9066c54e106580935b9f8 Author: Jason Merrill <[email protected]> Date: Sat Nov 7 17:30:14 2026 -0500 c++: aggregate init issues A couple of cases where the asserts need loosening. Thanks to Marek for suggesting the fix for 127516. PR c++/128532 PR c++/127516 gcc/cp/ChangeLog: * decl.cc (reshape_init_r): Also treat a vector as aggregate. (reshape_init): The old designated initializer extension allows designators with brace elision. gcc/testsuite/ChangeLog: * g++.dg/ext/desig12.C: New test. * g++.dg/ext/desig13.C: New test. Diff: --- gcc/cp/decl.cc | 5 ++++- gcc/testsuite/g++.dg/ext/desig12.C | 9 +++++++++ gcc/testsuite/g++.dg/ext/desig13.C | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index a53ae4a00a71..d45730a13f6b 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8269,7 +8269,7 @@ reshape_init_r (tree type, reshape_iter *d, tree first_initializer_p, { /* Deliberately not CP_AGGREGATE_TYPE_P to get a better diagnostic for trying to designate a member of a non-aggregate class. */ - if (AGGREGATE_TYPE_P (type)) + if (AGGREGATE_TYPE_P (type) || gnu_vector_type_p (type)) goto skip_single; else gcc_checking_assert (seen_error ()); @@ -8548,6 +8548,9 @@ reshape_init (tree type, tree init, tsubst_flags_t complain) if (CONSTRUCTOR_IS_DESIGNATED_INIT (init) && BRACE_ENCLOSED_INITIALIZER_P (new_init)) gcc_checking_assert (CONSTRUCTOR_IS_DESIGNATED_INIT (new_init) + /* The old extension allows brace elision + (128532). */ + || cxx_dialect < cxx20 || seen_error ()); return new_init; diff --git a/gcc/testsuite/g++.dg/ext/desig12.C b/gcc/testsuite/g++.dg/ext/desig12.C new file mode 100644 index 000000000000..ffa694da8852 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/desig12.C @@ -0,0 +1,9 @@ +// PR c++/128532 +// The pre-C++20 designated initializer extension was more flexible than what +// was standardized. + +// { dg-additional-options -Wno-c++20-extensions } + +struct A { int a, b; }; +struct S { A x; int c; }; +S s = { 1, .b = 2 }; // { dg-error "designated" "" { target c++20 } } diff --git a/gcc/testsuite/g++.dg/ext/desig13.C b/gcc/testsuite/g++.dg/ext/desig13.C new file mode 100644 index 000000000000..41102ac48454 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/desig13.C @@ -0,0 +1,6 @@ +// PR c++/127516 +// This shouldn't ICE. + +typedef int __attribute__((vector_size(8))) V; + +V v = { .v = 42 }; // { dg-error "designated" }
