From 17d780c2a834a911089cf96cf2c5379a8ae7301f Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 2 Mar 2011 13:46:01 -0500 Subject: [PATCH] re PR c++/46159 (Bogus warning about lambdas) PR c++/46159 * parser.c (cp_parser_primary_expression): Don't warn about a failed tentative parse. From-SVN: r170622 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 10 ++++++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-98.C | 8 ++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-98.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 663d4caaaa6f..44dd46251def 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-01 Jason Merrill + + PR c++/46159 + * parser.c (cp_parser_primary_expression): Don't warn about a + failed tentative parse. + 2011-02-26 Jason Merrill PR c++/47904 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f1f44d910c2d..ca6eda756089 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3341,8 +3341,14 @@ cp_parser_primary_expression (cp_parser *parser, if (c_dialect_objc ()) /* We have an Objective-C++ message. */ return cp_parser_objc_expression (parser); - maybe_warn_cpp0x (CPP0X_LAMBDA_EXPR); - return cp_parser_lambda_expression (parser); + { + tree lam = cp_parser_lambda_expression (parser); + /* Don't warn about a failed tentative parse. */ + if (cp_parser_error_occurred (parser)) + return error_mark_node; + maybe_warn_cpp0x (CPP0X_LAMBDA_EXPR); + return lam; + } case CPP_OBJC_STRING: if (c_dialect_objc ()) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 14e8f40f1431..421912e1386e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-01 Jason Merrill + + * g++.dg/cpp0x/lambda/lambda-98.C: New. + 2011-03-02 Richard Guenther Backport from mainline diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-98.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-98.C new file mode 100644 index 000000000000..ff1085f30c22 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-98.C @@ -0,0 +1,8 @@ +// PR c++/46159 +// { dg-options -std=c++98 } + +void +f() +{ + int **p = new(int(*[2])); +} -- 2.47.2