OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/35074 (ICE with attribute "aligned" for template classes) 

2008-02-05  Douglas Gregor  <doug.gregor@gmail.com>

	PR c++/35074
	* decl2.c (save_template_attributes): When we're modifying the
	TYPE_MAIN_VARIANT to add new attributes, be sure to also modify
	all of the other variants to add those same attributes. Otherwise,
	the main variant will be inconsistent with those other variants.
	
2008-02-05  Douglas Gregor  <doug.gregor@gmail.com>

	PR c++/35074
	* g++.dg/ext/attrib30.C: New.

From-SVN: r132120
This commit is contained in:
Douglas Gregor 2008-02-05 13:29:43 +00:00 committed by Doug Gregor
parent 0f5098aef3
commit 1db54f4e49
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2008-02-05 Douglas Gregor <doug.gregor@gmail.com>
PR c++/35074
* decl2.c (save_template_attributes): When we're modifying the
TYPE_MAIN_VARIANT to add new attributes, be sure to also modify
all of the other variants to add those same attributes. Otherwise,
the main variant will be inconsistent with those other variants.
2008-02-04 Richard Guenther <rguenther@suse.de>
PR java/35035

22
gcc/cp/decl2.c
View File

@ -1068,6 +1068,7 @@ save_template_attributes (tree *attr_p, tree *decl_p)
{
tree late_attrs = splice_template_attributes (attr_p, *decl_p);
tree *q;
tree old_attrs = NULL_TREE;
if (!late_attrs)
return;
@ -1090,9 +1091,26 @@ save_template_attributes (tree *attr_p, tree *decl_p)
else
q = &TYPE_ATTRIBUTES (*decl_p);
if (*q)
q = &TREE_CHAIN (tree_last (*q));
old_attrs = *q;
/* Place the late attributes at the beginning of the attribute
list. */
TREE_CHAIN (tree_last (late_attrs)) = *q;
*q = late_attrs;
if (!DECL_P (*decl_p) && *decl_p == TYPE_MAIN_VARIANT (*decl_p))
{
/* We've added new attributes directly to the main variant, so
now we need to update all of the other variants to include
these new attributes. */
tree variant;
for (variant = TYPE_NEXT_VARIANT (*decl_p); variant;
variant = TYPE_NEXT_VARIANT (variant))
{
gcc_assert (TYPE_ATTRIBUTES (variant) == old_attrs);
TYPE_ATTRIBUTES (variant) = TYPE_ATTRIBUTES (*decl_p);
}
}
}
/* Like decl_attributes, but handle C++ complexity. */

8
gcc/testsuite/g++.dg/ext/attrib30.C Normal file
View File

@ -0,0 +1,8 @@
// { dg-do compile }
// PR c++/35074
template<typename T> struct A
{
void foo() const;
} __attribute((aligned(4)));
template<typename T> void A<T>::foo() const {}