From d8acda95a8a5c5d93dbc4d89c2d4ecaf11f1819a Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 2 Feb 2009 00:41:52 +0000 Subject: [PATCH] /cp 2009-02-01 Paolo Carlini PR c++/39053 * parser.c (cp_parser_pure_specifier): If there are no tokens left do not call cp_lexer_consume_token. /testsuite 2009-02-01 Paolo Carlini PR c++/39053 * g++.dg/parse/crash52.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143861 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 8 +++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/crash52.C | 3 +++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/crash52.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f48474c..eeec03d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-02-01 Paolo Carlini + + PR c++/39053 + * parser.c (cp_parser_pure_specifier): If there are no tokens left + do not call cp_lexer_consume_token. + 2009-01-30 Jakub Jelinek PR c++/39028 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5be2318..5675e9b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -15997,7 +15997,13 @@ cp_parser_pure_specifier (cp_parser* parser) if (!cp_parser_require (parser, CPP_EQ, "%<=%>")) return error_mark_node; /* Look for the `0' token. */ - token = cp_lexer_consume_token (parser->lexer); + token = cp_lexer_peek_token (parser->lexer); + + if (token->type == CPP_EOF + || token->type == CPP_PRAGMA_EOL) + return error_mark_node; + + cp_lexer_consume_token (parser->lexer); /* Accept = default or = delete in c++0x mode. */ if (token->keyword == RID_DEFAULT diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 02244e5..d504006 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-01 Paolo Carlini + + PR c++/39053 + * g++.dg/parse/crash52.C: New. + 2009-01-30 Richard Guenther PR tree-optimization/39041 diff --git a/gcc/testsuite/g++.dg/parse/crash52.C b/gcc/testsuite/g++.dg/parse/crash52.C new file mode 100644 index 0000000..bc7f03c --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash52.C @@ -0,0 +1,3 @@ +// PR c++/39053 + +void foo() = // { dg-error "initialized|expected" } -- 2.7.4