From 21eb631b826dd6512cc47013a990a471cdcc1008 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 16 Dec 2003 01:49:41 +0000 Subject: [PATCH] re PR c++/13269 (compiler hangs on invalid code) PR c++/13269 * parser.c (cp_parser_function_definition_after_declarator): Stop scanning tokens when reaching EOF. PR c++/13269 * g++.dg/parse/error5.C: New test. From-SVN: r74661 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 3 ++- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/parse/error5.C | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/error5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 43389e8cbe2..d00f67cc5ec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2003-12-15 Mark Mitchell + PR c++/13269 + * parser.c (cp_parser_function_definition_after_declarator): Stop + scanning tokens when reaching EOF. + PR c++/12989 * typeck.c (cxx_sizeof_or_alignof_expr): Robustify. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index a74e33a59e9..fd25aa2a7a9 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -13807,7 +13807,8 @@ cp_parser_function_definition_after_declarator (cp_parser* parser, /* Issue an error message. */ error ("named return values are no longer supported"); /* Skip tokens until we reach the start of the function body. */ - while (cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_BRACE)) + while (cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_BRACE) + && cp_lexer_next_token_is_not (parser->lexer, CPP_EOF)) cp_lexer_consume_token (parser->lexer); } /* The `extern' in `extern "C" void f () { ... }' does not apply to diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 83352dcfb70..8862f109ff2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2003-12-15 Mark Mitchell + PR c++/13269 + * g++.dg/parse/error5.C: New test. + PR c++/12989 * g++.dg/expr/sizeof1.C: New test. diff --git a/gcc/testsuite/g++.dg/parse/error5.C b/gcc/testsuite/g++.dg/parse/error5.C new file mode 100644 index 00000000000..81356ced1b0 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error5.C @@ -0,0 +1,4 @@ +// PR c++/13269 + +class Foo { int foo() return 0; } }; // { dg-error "" } + -- 2.30.2