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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0afd0e6debf03c172ffdbe32643073224a98f798..bc4fda7462d76b11fc270a6677bd263005b1022e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2019-06-21  Marek Polacek  <polacek@redhat.com>
 
+       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 561d0e2d6ee8ece6eccd5f7ad6e89bf98fbcc5d2..5cbc4551d1a335c767abc96492d921db18c97210 100644 (file)
--- 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 63bb7b94e7b91d0ef5784b7432de1e40ca3ea052..44350ee0683c97f788480859bdae35c823ac8b46 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-19  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/64235 - missing syntax error with invalid alignas.
+       * g++.dg/parse/alignas1.C: New test.
+
 2019-06-21  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        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 (file)
index 0000000..8f36101
--- /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'" }