diff options
author | Roger Sayle <roger@nextmovesoftware.com> | 2022-03-08 23:18:34 +0000 |
---|---|---|
committer | Roger Sayle <roger@nextmovesoftware.com> | 2022-03-08 23:18:34 +0000 |
commit | 8ab72ec7c456c92989276f17fe0ae90a56932149 (patch) | |
tree | a9b1ad12e782bf0ee691f8d9c76ed800a543a903 /gcc | |
parent | d54ce4641ed106666208be36fd514cae8ff1153c (diff) | |
download | gcc-8ab72ec7c456c92989276f17fe0ae90a56932149.zip gcc-8ab72ec7c456c92989276f17fe0ae90a56932149.tar.gz gcc-8ab72ec7c456c92989276f17fe0ae90a56932149.tar.bz2 |
PR c++/96329: ICE-on-invalid-code error recovery.
This patch fixes PR c++/96329 which is an ICE-on-invalid-code regression
affecting mainline.
2022-03-08 Roger Sayle <roger@nextmovesoftware.com>
gcc/cp/ChangeLog
PR c++/96329
* parser.cc (cp_parser_linkage_specification): Treat the case where
linkage is error_mark_node as "invalid linkage-specification".
gcc/testsuite/ChangeLog
PR c++/96329
* g++.dg/template/pr96329.C: New test case.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/parser.cc | 5 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/pr96329.C | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 20aab5e..dc2d39a 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -16148,8 +16148,9 @@ cp_parser_linkage_specification (cp_parser* parser, tree prefix_attr) /* Transform the literal into an identifier. If the literal is a wide-character string, or contains embedded NULs, then we can't handle it as the user wants. */ - if (strlen (TREE_STRING_POINTER (linkage)) - != (size_t) (TREE_STRING_LENGTH (linkage) - 1)) + if (linkage == error_mark_node + || strlen (TREE_STRING_POINTER (linkage)) + != (size_t) (TREE_STRING_LENGTH (linkage) - 1)) { cp_parser_error (parser, "invalid linkage-specification"); /* Assume C++ linkage. */ diff --git a/gcc/testsuite/g++.dg/template/pr96329.C b/gcc/testsuite/g++.dg/template/pr96329.C new file mode 100644 index 0000000..3664322 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr96329.C @@ -0,0 +1,4 @@ +/* { dg-do compile } */ +/* { dg-excess-errors "" } */ + +extern "C" ""a |