diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2019-03-04 23:49:23 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2019-03-04 23:49:23 +0000 |
| commit | b65e6a997761f03fe84ebe837201c51fe8bc2e2f (patch) | |
| tree | a01482fe5fb526b640a1522087b39934b0b6b2c5 /gcc | |
| parent | 94014ee95b2594859168baac31da4c846a256807 (diff) | |
| download | gcc-b65e6a997761f03fe84ebe837201c51fe8bc2e2f.zip gcc-b65e6a997761f03fe84ebe837201c51fe8bc2e2f.tar.gz gcc-b65e6a997761f03fe84ebe837201c51fe8bc2e2f.tar.bz2 | |
re PR c++/84605 (internal compiler error: in xref_basetypes, at cp/decl.c:13818)
/cp
2019-03-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84605
* parser.c (cp_parser_class_head): Reject TYPE_BEING_DEFINED too.
/testsuite
2019-03-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84605
* g++.dg/parse/crash69.C: New.
From-SVN: r269378
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/crash69.C | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8c0bfd9..6997180 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-03-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84605 + * parser.c (cp_parser_class_head): Reject TYPE_BEING_DEFINED too. + 2019-03-04 Jakub Jelinek <jakub@redhat.com> PR c++/71446 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5804267..155e350 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -24021,8 +24021,11 @@ cp_parser_class_head (cp_parser* parser, cp_parser_check_class_key (class_key, type); /* If this type was already complete, and we see another definition, - that's an error. */ - if (type != error_mark_node && COMPLETE_TYPE_P (type)) + that's an error. Likewise if the type is already being defined: + this can happen, eg, when it's defined from within an expression + (c++/84605). */ + if (type != error_mark_node + && (COMPLETE_TYPE_P (type) || TYPE_BEING_DEFINED (type))) { error_at (type_start_token->location, "redefinition of %q#T", type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3186805c..c06d63a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84605 + * g++.dg/parse/crash69.C: New. + 2019-03-04 Jakub Jelinek <jakub@redhat.com> PR c++/71446 diff --git a/gcc/testsuite/g++.dg/parse/crash69.C b/gcc/testsuite/g++.dg/parse/crash69.C new file mode 100644 index 0000000..a85bbee --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash69.C @@ -0,0 +1,11 @@ +// PR c++/84605 + +struct b { + int x(((struct b {}))); // { dg-error "expected|redefinition" } +}; + +struct c { + struct d { + int x(((struct c {}))); // { dg-error "expected|redefinition" } + }; +}; |