From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 08D503858430; Thu, 27 Jan 2022 21:55:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08D503858430 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6904] c++: dependent and non-dependent attributes [PR104245] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: ae1b50e2e03aad06408b64c876f5d0511121de0d X-Git-Newrev: 66b86171188dcb61d2d0e0a4a98a7467e58a84a7 Message-Id: <20220127215548.08D503858430@sourceware.org> Date: Thu, 27 Jan 2022 21:55:48 +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: Thu, 27 Jan 2022 21:55:48 -0000 https://gcc.gnu.org/g:66b86171188dcb61d2d0e0a4a98a7467e58a84a7 commit r12-6904-g66b86171188dcb61d2d0e0a4a98a7467e58a84a7 Author: Jason Merrill Date: Thu Jan 27 16:12:18 2022 -0500 c++: dependent and non-dependent attributes [PR104245] A flaw in my patch for PR51344 was that cplus_decl_attributes calls decl_attributes after save_template_attributes, which messes up the ordering that save_template_attributes set up. Fixed by splitting save_template_attributes around the call to decl_attributes. PR c++/104245 PR c++/51344 gcc/cp/ChangeLog: * decl2.cc (save_template_attributes): Take late attrs as parm. (cplus_decl_attributes): Call it after decl_attributes, splice_template_attributes before. gcc/testsuite/ChangeLog: * g++.dg/lto/alignas1_0.C: New test. Diff: --- gcc/cp/decl2.cc | 17 ++++++++--------- gcc/testsuite/g++.dg/lto/alignas1_0.C | 7 +++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index b68cf96fa81..a2aa5f1de4e 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -1352,18 +1352,14 @@ splice_template_attributes (tree *attr_p, tree decl) return late_attrs; } -/* Remove any late attributes from the list in ATTR_P and attach them to - DECL_P. */ +/* Attach any LATE_ATTRS to DECL_P, after the non-dependent attributes have + been applied by a previous call to decl_attributes. */ static void -save_template_attributes (tree *attr_p, tree *decl_p, int flags) +save_template_attributes (tree late_attrs, tree *decl_p, int flags) { tree *q; - if (attr_p && *attr_p == error_mark_node) - return; - - tree late_attrs = splice_template_attributes (attr_p, *decl_p); if (!late_attrs) return; @@ -1666,12 +1662,12 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags) } } + tree late_attrs = NULL_TREE; if (processing_template_decl) { if (check_for_bare_parameter_packs (attributes)) return; - - save_template_attributes (&attributes, decl, flags); + late_attrs = splice_template_attributes (&attributes, *decl); } cp_check_const_attributes (attributes); @@ -1717,6 +1713,9 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags) decl_attributes (decl, attributes, flags, last_decl); } + if (late_attrs) + save_template_attributes (late_attrs, decl, flags); + /* Propagate deprecation out to the template. */ if (TREE_DEPRECATED (*decl)) if (tree ti = get_template_info (*decl)) diff --git a/gcc/testsuite/g++.dg/lto/alignas1_0.C b/gcc/testsuite/g++.dg/lto/alignas1_0.C new file mode 100644 index 00000000000..a2fc72ad894 --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/alignas1_0.C @@ -0,0 +1,7 @@ +// PR c++/104245 +// { dg-lto-do assemble } +// { dg-require-effective-target c++11 } + +template struct A { alignas(T) alignas(int) int a; }; +struct B { B(const char *, const char *, int, int); A b; }; +B c {"", "", 0, 0};