From 1b71bc7c8b18bd1b22debfde155f175fd1654942 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 15 Feb 2022 19:17:03 -0500 Subject: tree: tweak warn_deprecated_use While looking at PR90451 I noticed that this function was failing to find the attributes if called with a variant of the struct. gcc/ChangeLog: * tree.cc (warn_deprecated_use): Look for TYPE_STUB_DECL on TYPE_MAIN_VARIANT. gcc/testsuite/ChangeLog: * g++.dg/warn/deprecated-16.C: New test. --- gcc/tree.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc/tree.cc') diff --git a/gcc/tree.cc b/gcc/tree.cc index dd919ff..2bbef2d 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -12047,10 +12047,12 @@ warn_deprecated_use (tree node, tree attr) attr = DECL_ATTRIBUTES (node); else if (TYPE_P (node)) { - tree decl = TYPE_STUB_DECL (node); + tree decl = TYPE_STUB_DECL (TYPE_MAIN_VARIANT (node)); if (decl) - attr = lookup_attribute ("deprecated", - TYPE_ATTRIBUTES (TREE_TYPE (decl))); + { + node = TREE_TYPE (decl); + attr = TYPE_ATTRIBUTES (node); + } } } -- cgit v1.1