PR c++/52671

	* decl.c (check_tag_decl): Only use CLASSTYPE_TEMPLATE_INSTANTIATION
	on CLASS_TYPE_P types.

	* g++.dg/ext/attrib44.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185709 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 370fd7a..7da7f59 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/52671
+       * decl.c (check_tag_decl): Only use CLASSTYPE_TEMPLATE_INSTANTIATION
+       on CLASS_TYPE_P types.
+
 2012-03-20  Jason Merrill  <jason@redhat.com>
 
        * lex.c (init_reswords): Use >= for cxx_dialect test.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2b2a551..e664d43 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4219,7 +4219,8 @@ check_tag_decl (cp_decl_specifier_seq *declspecs)
   if (declspecs->attributes && warn_attributes)
     {
       location_t loc;
-      if (!CLASSTYPE_TEMPLATE_INSTANTIATION (declared_type))
+      if (!CLASS_TYPE_P (declared_type)
+         || !CLASSTYPE_TEMPLATE_INSTANTIATION (declared_type))
        /* For a non-template class, use the name location.  */
        loc = location_of (declared_type);
       else

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0e66883..36bb18b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/52671
+       * g++.dg/ext/attrib44.C: New test.
+
 2012-03-22  Jan Hubicka  <jh@suse.cz>
 
        PR middle-end/51737

diff --git a/gcc/testsuite/g++.dg/ext/attrib44.C b/gcc/testsuite/g++.dg/ext/attrib44.C
new file mode 100644 (file)
index 0000000..ae08191
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attrib44.C
@@ -0,0 +1,4 @@
+// PR c++/52671
+// { dg-do compile }
+__attribute__ ((deprecated)) enum E { E0 };    // { dg-warning "attribute ignored in declaration of" }
+// { dg-message "must follow the" "" { target *-*-* } 3 }