diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-07-31 18:28:16 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-07-31 18:28:16 +0000 |
commit | 0b57d5fa438c9f0d5c802963ef7bd4b3179a7f32 (patch) | |
tree | 2767fbda66c7d9385881cd79735e6b44b304bee8 /gcc/cp | |
parent | 4333e4dcf71fae98cdbe872ce95aa3b11a128549 (diff) | |
download | gcc-0b57d5fa438c9f0d5c802963ef7bd4b3179a7f32.zip gcc-0b57d5fa438c9f0d5c802963ef7bd4b3179a7f32.tar.gz gcc-0b57d5fa438c9f0d5c802963ef7bd4b3179a7f32.tar.bz2 |
parser.c (cp_parser_sizeof_pack): Check cp_parser_identifier return value for error_mark_node.
2013-07-31 Paolo Carlini <paolo.carlini@oracle.com>
* parser.c (cp_parser_sizeof_pack): Check cp_parser_identifier
return value for error_mark_node.
From-SVN: r201379
Diffstat (limited to 'gcc/cp')
-rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/cp/parser.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cc2cc54..c275274 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-31 Paolo Carlini <paolo.carlini@oracle.com> + + * parser.c (cp_parser_sizeof_pack): Check cp_parser_identifier + return value for error_mark_node. + 2013-07-30 Paolo Carlini <paolo.carlini@oracle.com> PR c++/57673 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 7f4ad1c..e8dea33 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -23140,6 +23140,8 @@ cp_parser_sizeof_pack (cp_parser *parser) cp_token *token = cp_lexer_peek_token (parser->lexer); tree name = cp_parser_identifier (parser); + if (name == error_mark_node) + return error_mark_node; /* The name is not qualified. */ parser->scope = NULL_TREE; parser->qualifying_scope = NULL_TREE; |