From 4789c23be4e240285c12aecba22fdc6dfd100d11 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 21 Jun 2019 20:26:54 +0000 Subject: [PATCH] PR c++/64235 - missing syntax error with invalid alignas. * parser.c (cp_parser_std_attribute_spec): Commit to tentative parse if there's a missing close paren. * g++.dg/parse/alignas1.C: New test. From-SVN: r272570 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/alignas1.C | 10 ++++++++++ 4 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/alignas1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0afd0e6debf0..bc4fda7462d7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2019-06-21 Marek Polacek + PR c++/64235 - missing syntax error with invalid alignas. + * parser.c (cp_parser_std_attribute_spec): Commit to tentative parse + if there's a missing close paren. + PR c++/90490 - fix decltype issues in noexcept-specifier. * except.c (build_noexcept_spec): Call instantiate_non_dependent_expr_sfinae before diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 561d0e2d6ee8..5cbc4551d1a3 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -26371,6 +26371,12 @@ cp_parser_std_attribute_spec (cp_parser *parser) if (alignas_expr == error_mark_node) return error_mark_node; + /* Missing ')' means the code cannot possibly be valid; go ahead + and commit to make sure we issue a hard error. */ + if (cp_parser_uncommitted_to_tentative_parse_p (parser) + && cp_lexer_next_token_is_not (parser->lexer, CPP_CLOSE_PAREN)) + cp_parser_commit_to_tentative_parse (parser); + if (!parens.require_close (parser)) return error_mark_node; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 63bb7b94e7b9..44350ee0683c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-06-19 Marek Polacek + + PR c++/64235 - missing syntax error with invalid alignas. + * g++.dg/parse/alignas1.C: New test. + 2019-06-21 Steven G. Kargl PR fortran/67884 diff --git a/gcc/testsuite/g++.dg/parse/alignas1.C b/gcc/testsuite/g++.dg/parse/alignas1.C new file mode 100644 index 000000000000..8f361018f5dc --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/alignas1.C @@ -0,0 +1,10 @@ +// PR c++/64235 +// { dg-do compile { target c++11 } } + +struct S { + double d; +}; + +struct alignas(sizeof(S) S1 { }; // { dg-error "expected '\\)' before 'S1'" } +struct alignas(16 S2 { }; // { dg-error "expected '\\)' before 'S2'" } +struct alignas(int S3 { }; // { dg-error "expected '\\)' before 'S3'" } -- 2.47.2