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

re PR c++/51930 (Explicitly instantiated template gets hidden visibility)

Browse Source 
PR c++/51930
	* decl.c (check_tag_decl): Move warning for misplaced attributes here.
	(shadow_tag): From here.
	* parser.c (cp_parser_explicit_instantiation): Don't warn here.

From-SVN: r184753
This commit is contained in:
Jason Merrill 2012-03-01 12:52:12 -05:00 committed by Jason Merrill
parent 116b061e74
commit ae45549b50
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-29 Jason Merrill <jason@redhat.com>
PR c++/51930
* decl.c (check_tag_decl): Move warning for misplaced attributes here.
(shadow_tag): From here.
* parser.c (cp_parser_explicit_instantiation): Don't warn here.
2012-02-21 Jakub Jelinek <jakub@redhat.com>
PR c++/52312

21
gcc/cp/decl.c
View File

@ -4216,6 +4216,19 @@ check_tag_decl (cp_decl_specifier_seq *declspecs)
error ("%<constexpr%> cannot be used for type declarations");
}
if (declspecs->attributes)
{
location_t loc = input_location;
if (!CLASSTYPE_TEMPLATE_INSTANTIATION (declared_type))
/* For a non-template class, use the name location; for a template
class (an explicit instantiation), use the current location. */
input_location = location_of (declared_type);
warning (0, "attribute ignored in declaration of %q#T", declared_type);
warning (0, "attribute for %q#T must follow the %qs keyword",
declared_type, class_key_or_enum_as_string (declared_type));
input_location = loc;
}
return declared_type;
}
@ -4240,14 +4253,6 @@ shadow_tag (cp_decl_specifier_seq *declspecs)
if (!t)
return NULL_TREE;
if (declspecs->attributes)
{
warning (0, "attribute ignored in declaration of %q+#T", t);
warning (0, "attribute for %q+#T must follow the %qs keyword",
t, class_key_or_enum_as_string (t));
}
if (maybe_process_partial_specialization (t) == error_mark_node)
return NULL_TREE;

3
gcc/cp/parser.c
View File

@ -13122,9 +13122,6 @@ cp_parser_explicit_instantiation (cp_parser* parser)
tree type;
type = check_tag_decl (&decl_specifiers);
if (decl_specifiers.attributes)
warning (OPT_Wattributes,
"attributes ignored on explicit type instantiation");
/* Turn access control back on for names used during
template instantiation. */
pop_deferring_access_checks ();

2
gcc/testsuite/g++.dg/ext/attrib43.C
View File

@ -2,4 +2,4 @@ template <class T> struct A { };
template
__attribute__ ((packed))
struct A<int>; // { dg-warning "attributes ignored" }
struct A<int>; // { dg-warning "attribute" }