parser.c (cp_parser_std_attribute_spec): When token_pair::require_open / require_clos...

2018-01-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* parser.c (cp_parser_std_attribute_spec): When
        token_pair::require_open / require_close return false simply
	return error_mark_node, avoid duplicate cp_parser_error about
	expected '(' / ')', respectively.

From-SVN: r256451

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d24c9343620a668275bde875640863479e025257..af3711253b321a411c65d0a07b57184571dcf3e2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * parser.c (cp_parser_std_attribute_spec): When
+        token_pair::require_open / require_close return false simply
+       return error_mark_node, avoid duplicate cp_parser_error about
+       expected '(' / ')', respectively.
+
 2018-01-10  David Malcolm  <dmalcolm@redhat.com>
 
        PR c++/43486

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b16597ce9b78af2ca906b50fb6a37686bb5c27e0..80d65a84af09292639260ae1e4df041934fde5be 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25321,10 +25321,7 @@ cp_parser_std_attribute_spec (cp_parser *parser)
 
       matching_parens parens;
       if (!parens.require_open (parser))
-       {
-         cp_parser_error (parser, "expected %<(%>");
-         return error_mark_node;
-       }
+       return error_mark_node;
 
       cp_parser_parse_tentatively (parser);
       alignas_expr = cp_parser_type_id (parser);
@@ -25354,10 +25351,7 @@ cp_parser_std_attribute_spec (cp_parser *parser)
        return error_mark_node;
 
       if (!parens.require_close (parser))
-       {
-         cp_parser_error (parser, "expected %<)%>");
-         return error_mark_node;
-       }
+       return error_mark_node;
 
       /* Build the C++-11 representation of an 'aligned'
         attribute.  */