diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-09-19 19:35:19 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-09-19 19:35:19 +0000 |
| commit | ff5c3c9d38ec89c2fdab4b947676e45f4ffdf61e (patch) | |
| tree | c5d92913d65732a061312555b82e098fedfdd312 | |
| parent | ad9fe5f344c6ade92a8efab3202be356c94d5733 (diff) | |
| download | gcc-ff5c3c9d38ec89c2fdab4b947676e45f4ffdf61e.zip gcc-ff5c3c9d38ec89c2fdab4b947676e45f4ffdf61e.tar.gz gcc-ff5c3c9d38ec89c2fdab4b947676e45f4ffdf61e.tar.bz2 | |
re PR c++/87324 (g++ ICE with overriding initializers: Segmentation fault)
/cp
2018-09-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/87324
* parser.c (cp_parser_initializer_list): Assign error_mark_node
to the index upon error.
/testsuite
2018-09-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/87324
* g++.dg/cpp0x/desig5.C: New.
From-SVN: r264428
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/desig5.C | 13 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7fcb346..546943c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-09-19 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/87324 + * parser.c (cp_parser_initializer_list): Assign error_mark_node + to the index upon error. + 2018-09-19 Marek Polacek <polacek@redhat.com> PR c++/87357 - missing -Wconversion warning diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f5e4fa4..6e68f2c 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -22394,7 +22394,7 @@ cp_parser_initializer_list (cp_parser* parser, bool* non_constant_p) "%<.%s%> designator used multiple times in " "the same initializer list", IDENTIFIER_POINTER (designator)); - (*v)[i].index = NULL_TREE; + (*v)[i].index = error_mark_node; } else IDENTIFIER_MARKED (designator) = 1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4631448..f3b55d1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-09-19 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/87324 + * g++.dg/cpp0x/desig5.C: New. + 2018-09-19 Paul Thomas <pault@gcc.gnu.org> PR fortran/84109 diff --git a/gcc/testsuite/g++.dg/cpp0x/desig5.C b/gcc/testsuite/g++.dg/cpp0x/desig5.C new file mode 100644 index 0000000..ed27629 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/desig5.C @@ -0,0 +1,13 @@ +// PR c++/87324 +// { dg-do compile { target c++11 } } +// { dg-options "-Wno-pedantic" } + +struct { + struct { + double a; + struct { + short b; + }; + }; + int c; +} d{.a = 7, .a = 8.09}; // { dg-error "designator used multiple times in the same initializer list" } |