From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1734) id CF1CC385E012; Wed, 25 May 2022 20:14:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF1CC385E012 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marek Polacek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-770] c++: fix ICE on invalid attributes [PR96637] X-Act-Checkin: gcc X-Git-Author: Marek Polacek X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 34970d08c6297e12f3f9117b6ac19fb2de522e24 X-Git-Newrev: da2c56ee601ac696a76e469e33c88313428c5c5a Message-Id: <20220525201412.CF1CC385E012@sourceware.org> Date: Wed, 25 May 2022 20:14:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2022 20:14:12 -0000 https://gcc.gnu.org/g:da2c56ee601ac696a76e469e33c88313428c5c5a commit r13-770-gda2c56ee601ac696a76e469e33c88313428c5c5a Author: Marek Polacek Date: Thu Apr 28 13:21:41 2022 -0400 c++: fix ICE on invalid attributes [PR96637] When chaining attributes, attr_chainon should be used rather than plain chainon, so that we don't end up with a TREE_LIST where one of the elements is error_mark_node, which causes problems. parser.cc has already been fixed to use attr_chainon, but decl.cc has not. Until now. PR c++/96637 gcc/cp/ChangeLog: * cp-tree.h (attr_chainon): Declare. * decl.cc (start_decl): Use attr_chainon. (grokdeclarator): Likewise. * parser.cc (cp_parser_statement): No longer static. gcc/testsuite/ChangeLog: * g++.dg/parse/error64.C: New test. Diff: --- gcc/cp/cp-tree.h | 1 + gcc/cp/decl.cc | 19 ++++++++++--------- gcc/cp/parser.cc | 2 +- gcc/testsuite/g++.dg/parse/error64.C | 4 ++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index ba986e892b6..d77fd1eb8a9 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7235,6 +7235,7 @@ extern void inject_this_parameter (tree, cp_cv_quals); extern location_t defparse_location (tree); extern void maybe_show_extern_c_location (void); extern bool literal_integer_zerop (const_tree); +extern tree attr_chainon (tree, tree); /* in pt.cc */ extern tree canonical_type_parameter (tree); diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 381259cb9cf..b1ea838ce8b 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -5557,7 +5557,7 @@ start_decl (const cp_declarator *declarator, *pushed_scope_p = NULL_TREE; if (prefix_attributes != error_mark_node) - attributes = chainon (attributes, prefix_attributes); + attributes = attr_chainon (attributes, prefix_attributes); decl = grokdeclarator (declarator, declspecs, NORMAL, initialized, &attributes); @@ -12728,9 +12728,10 @@ grokdeclarator (const cp_declarator *declarator, as a whole. */ late_attrs = splice_template_attributes (&attrs, type); returned_attrs = decl_attributes (&type, - chainon (returned_attrs, attrs), + attr_chainon (returned_attrs, + attrs), attr_flags); - returned_attrs = chainon (late_attrs, returned_attrs); + returned_attrs = attr_chainon (late_attrs, returned_attrs); } inner_declarator = declarator->declarator; @@ -12781,8 +12782,8 @@ grokdeclarator (const cp_declarator *declarator, The optional attribute-specifier-seq appertains to the array. */ - returned_attrs = chainon (returned_attrs, - declarator->std_attributes); + returned_attrs = attr_chainon (returned_attrs, + declarator->std_attributes); break; case cdk_function: @@ -13122,9 +13123,9 @@ grokdeclarator (const cp_declarator *declarator, /* transaction_safe applies to the type, but transaction_safe_dynamic applies to the function. */ if (is_attribute_p ("transaction_safe", tx_qual)) - attrs = chainon (attrs, att); + attrs = attr_chainon (attrs, att); else - returned_attrs = chainon (returned_attrs, att); + returned_attrs = attr_chainon (returned_attrs, att); } if (attrs) /* [dcl.fct]/2: @@ -13438,7 +13439,7 @@ grokdeclarator (const cp_declarator *declarator, if (returned_attrs) { if (attrlist) - *attrlist = chainon (returned_attrs, *attrlist); + *attrlist = attr_chainon (returned_attrs, *attrlist); else attrlist = &returned_attrs; } @@ -13451,7 +13452,7 @@ grokdeclarator (const cp_declarator *declarator, /* [dcl.meaning]/1: The optional attribute-specifier-seq following a declarator-id appertains to the entity that is declared. */ if (declarator->std_attributes != error_mark_node) - *attrlist = chainon (*attrlist, declarator->std_attributes); + *attrlist = attr_chainon (*attrlist, declarator->std_attributes); else /* We should have already diagnosed the issue (c++/78344). */ gcc_assert (seen_error ()); diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 868b8610d60..62aaccda23d 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -12557,7 +12557,7 @@ cp_parser_statement (cp_parser* parser, tree in_statement_expr, /* Append ATTR to attribute list ATTRS. */ -static tree +tree attr_chainon (tree attrs, tree attr) { if (attrs == error_mark_node) diff --git a/gcc/testsuite/g++.dg/parse/error64.C b/gcc/testsuite/g++.dg/parse/error64.C new file mode 100644 index 00000000000..87848a58c27 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error64.C @@ -0,0 +1,4 @@ +// PR c++/96637 +// { dg-do compile } + +void foo(int[] alignas[1] alignas(1)){} // { dg-error "" }