mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-09 17:11:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Fix deprecated attribute handling on templates (PR c++/93228)

Browse Source 
As the following testcase shows, when deprecated attribute is on a template,
we'd never print the message if any, because the attribute is not
present on the TEMPLATE_DECL with which warn_deprecated_use is called,
but on its DECL_TEMPLATE_RESULT or its type.

2020-01-17  Jakub Jelinek  <jakub@redhat.com>

	PR c++/93228
	* parser.c (cp_parser_template_name): Look up deprecated attribute
	in DECL_TEMPLATE_RESULT or its type's attributes.

	* g++.dg/cpp1y/attr-deprecated-3.C: New test.
This commit is contained in:
Jakub Jelinek 2020-01-17 15:22:22 +01:00
parent bf09d886a4
commit c60a18f805
4 changed files with 35 additions and 1 deletions

6
gcc/cp/ChangeLog

@ -1,3 +1,9 @@
2020-01-17 Jakub Jelinek <jakub@redhat.com>
PR c++/93228
* parser.c (cp_parser_template_name): Look up deprecated attribute
in DECL_TEMPLATE_RESULT or its type's attributes.
2020-01-16 Jason Merrill <jason@redhat.com>
PR c++/93286 - ICE with __is_constructible and variadic template.

12
gcc/cp/parser.c

@ -16884,7 +16884,17 @@ cp_parser_template_name (cp_parser* parser,
{
if (TREE_DEPRECATED (decl)
&& deprecated_state != DEPRECATED_SUPPRESS)
warn_deprecated_use (decl, NULL_TREE);
{
tree d = DECL_TEMPLATE_RESULT (decl);
tree attr;
if (TREE_CODE (d) == TYPE_DECL)
attr = lookup_attribute ("deprecated",
TYPE_ATTRIBUTES (TREE_TYPE (d)));
else
attr = lookup_attribute ("deprecated",
DECL_ATTRIBUTES (d));
warn_deprecated_use (decl, attr);
}
}
else
{

5
gcc/testsuite/ChangeLog

@ -1,3 +1,8 @@
2020-01-17 Jakub Jelinek <jakub@redhat.com>
PR c++/93228
* g++.dg/cpp1y/attr-deprecated-3.C: New test.
2020-01-17 Richard Sandiford <richard.sandiford@arm.com>
* g++.target/aarch64/sve/acle/general-c++/gimplify_1.C: New test.

13
gcc/testsuite/g++.dg/cpp1y/attr-deprecated-3.C Normal file

@ -0,0 +1,13 @@
// PR c++/93228
// { dg-do compile { target c++14 } }
template <typename T>
struct [[deprecated("foo")]] bar {}; // { dg-message "declared here" }
struct [[deprecated("baz")]] qux {}; // { dg-message "declared here" }
void
quux ()
{
bar<int> b; // { dg-warning "is deprecated: foo" }
qux c; // { dg-warning "is deprecated: baz" }
}