diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/new6.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/sizeof-template-argument.C | 4 |
5 files changed, 25 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 781f750..ba5937a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-06-01 Jason Merrill <jason@redhat.com> + PR c++/52725 + * parser.c (cp_parser_binary_expression): Bail early if we're parsing + tentatively and the LHS has a parse error. + PR c++/53137 * pt.c (instantiate_class_template_1): Set LAMBDA_EXPR_THIS_CAPTURE. (instantiate_decl): Don't push_to_top_level for local class methods. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 547f9e2..7f9a94b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -7246,6 +7246,9 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p, current.lhs_type = ERROR_MARK; current.prec = prec; + if (cp_parser_error_occurred (parser)) + return error_mark_node; + for (;;) { /* Get an operator token. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76e4e6b..dd1c651 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-06-01 Jason Merrill <jason@redhat.com> + + PR c++/52725 + * g++.dg/parse/new6.C: New. + * g++.dg/template/sizeof-template-argument.C: Adjust error message. + 2012-06-01 Eric Botcazou <ebotcazou@adacore.com> * c-c++-common/restrict-2.c: Revert previous change. diff --git a/gcc/testsuite/g++.dg/parse/new6.C b/gcc/testsuite/g++.dg/parse/new6.C new file mode 100644 index 0000000..213837c --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/new6.C @@ -0,0 +1,10 @@ +// PR c++/52725 + +struct A { }; + +const int n = 42; + +void f() +{ + A** p = new (A*[n]); +} diff --git a/gcc/testsuite/g++.dg/template/sizeof-template-argument.C b/gcc/testsuite/g++.dg/template/sizeof-template-argument.C index 2cdc328..31aeeec 100644 --- a/gcc/testsuite/g++.dg/template/sizeof-template-argument.C +++ b/gcc/testsuite/g++.dg/template/sizeof-template-argument.C @@ -3,9 +3,9 @@ template<int> struct A {}; -template<typename> struct B : A <sizeof(=)> {}; /* { dg-error "parse error in template argument list" } */ +template<typename> struct B : A <sizeof(=)> {}; /* { dg-error "template argument" } */ -template<typename> struct C : A <sizeof(=)> {}; /* { dg-error "parse error in template argument list" } */ +template<typename> struct C : A <sizeof(=)> {}; /* { dg-error "template argument" } */ int a; |