From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 27BEF3857023; Fri, 13 May 2022 16:28:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27BEF3857023 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 r11-9993] c++: alignment of local typedef in template [PR65211] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: f705d0f2d03cc4d9f890832798b3352553f2262f X-Git-Newrev: e60f7127b3282e0201a1bba8ff550dc3c3fdbe61 Message-Id: <20220513162814.27BEF3857023@sourceware.org> Date: Fri, 13 May 2022 16:28:14 +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: Fri, 13 May 2022 16:28:14 -0000 https://gcc.gnu.org/g:e60f7127b3282e0201a1bba8ff550dc3c3fdbe61 commit r11-9993-ge60f7127b3282e0201a1bba8ff550dc3c3fdbe61 Author: Jason Merrill Date: Wed Apr 13 21:56:03 2022 -0400 c++: alignment of local typedef in template [PR65211] Because common_handle_aligned_attribute only applies the alignment to the TREE_TYPE of a typedef, not the DECL_ORIGINAL_TYPE, we need to copy it explicitly in tsubst. PR c++/65211 gcc/cp/ChangeLog: * pt.c (tsubst_decl) [TYPE_DECL]: Copy TYPE_ALIGN. gcc/testsuite/ChangeLog: * g++.target/i386/vec-tmpl1.C: New test. Diff: --- gcc/cp/pt.c | 6 ++++++ gcc/testsuite/g++.target/i386/vec-tmpl1.C | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ba505820c6a..f5154418594 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15117,6 +15117,12 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) { DECL_ORIGINAL_TYPE (r) = NULL_TREE; set_underlying_type (r); + + /* common_handle_aligned_attribute doesn't apply the alignment + to DECL_ORIGINAL_TYPE. */ + if (TYPE_USER_ALIGN (TREE_TYPE (t))) + TREE_TYPE (r) = build_aligned_type (TREE_TYPE (r), + TYPE_ALIGN (TREE_TYPE (t))); } layout_decl (r, 0); diff --git a/gcc/testsuite/g++.target/i386/vec-tmpl1.C b/gcc/testsuite/g++.target/i386/vec-tmpl1.C new file mode 100644 index 00000000000..e0865e3515b --- /dev/null +++ b/gcc/testsuite/g++.target/i386/vec-tmpl1.C @@ -0,0 +1,17 @@ +// PR c++/65211 +// { dg-additional-options "-Wno-psabi" } +// { dg-final { scan-assembler-not "movdqa" } } + +typedef unsigned v4ui __attribute__ ((vector_size(16), aligned (16))); + +template +static v4ui t1(unsigned *dest_data) +{ + typedef unsigned v4ui_1 __attribute__ ((vector_size (16), aligned (4))); + return ((const v4ui_1*)dest_data)[0]; +} + +v4ui f(unsigned int *array) +{ + return t1<1>(array+7); +}