[gcc r14-6790] c++: [[deprecated]] on template redecl [PR84542]

[Patrick Palka]

https://gcc.gnu.org/g:9a65c8ee659042babdb05ef15fea9910fa8d6e62

commit r14-6790-g9a65c8ee659042babdb05ef15fea9910fa8d6e62
Author: Patrick Palka <ppalka@redhat.com>
Date:   Thu Dec 21 14:33:56 2023 -0500

    c++: [[deprecated]] on template redecl [PR84542]
    
    The deprecated and unavailable attributes weren't working when used on
    a template redeclaration ultimately because we weren't merging the
    corresponding tree flags in duplicate_decls.
    
            PR c++/84542
    
    gcc/cp/ChangeLog:
    
            * decl.cc (merge_attribute_bits): Merge TREE_DEPRECATED
            and TREE_UNAVAILABLE.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/ext/attr-deprecated-2.C: No longer XFAIL.
            * g++.dg/ext/attr-unavailable-12.C: New test.

Diff:
---
 gcc/cp/decl.cc                                 |  5 ++++-
 gcc/testsuite/g++.dg/ext/attr-deprecated-2.C   |  4 ++--
 gcc/testsuite/g++.dg/ext/attr-unavailable-12.C | 12 ++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 409d8f15448..e044bfa6701 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -1545,6 +1545,10 @@ merge_attribute_bits (tree newdecl, tree olddecl)
   DECL_PURE_P (olddecl) |= DECL_PURE_P (newdecl);
   DECL_UNINLINABLE (newdecl) |= DECL_UNINLINABLE (olddecl);
   DECL_UNINLINABLE (olddecl) |= DECL_UNINLINABLE (newdecl);
+  TREE_DEPRECATED (newdecl) |= TREE_DEPRECATED (olddecl);
+  TREE_DEPRECATED (olddecl) |= TREE_DEPRECATED (newdecl);
+  TREE_UNAVAILABLE (newdecl) |= TREE_UNAVAILABLE (olddecl);
+  TREE_UNAVAILABLE (olddecl) |= TREE_UNAVAILABLE (newdecl);
 }
 
 #define GNU_INLINE_P(fn) (DECL_DECLARED_INLINE_P (fn)			\
@@ -1557,7 +1561,6 @@ merge_attribute_bits (tree newdecl, tree olddecl)
 static bool
 duplicate_function_template_decls (tree newdecl, tree olddecl)
 {
-
   tree newres = DECL_TEMPLATE_RESULT (newdecl);
   tree oldres = DECL_TEMPLATE_RESULT (olddecl);
   /* Function template declarations can be differentiated by parameter
diff --git a/gcc/testsuite/g++.dg/ext/attr-deprecated-2.C b/gcc/testsuite/g++.dg/ext/attr-deprecated-2.C
index bf9041506d1..6f6c210ddb5 100644
--- a/gcc/testsuite/g++.dg/ext/attr-deprecated-2.C
+++ b/gcc/testsuite/g++.dg/ext/attr-deprecated-2.C
@@ -23,8 +23,8 @@ fdeprecated_primary ();
 void use_primary ()
 {
   // Verify that uses of the now deprecacted primary are diagnosed.
-  fdeprecated_primary<void>();          // { dg-warning "deprecated" "bug 84542" { xfail *-*-* } }
-  fdeprecated_primary<int>();           // { dg-warning "deprecated" "bug 84542" { xfail *-*-* } }
+  fdeprecated_primary<void>();          // { dg-warning "deprecated" "bug 84542" }
+  fdeprecated_primary<int>();           // { dg-warning "deprecated" "bug 84542" }
 }
 
 void use_special ()
diff --git a/gcc/testsuite/g++.dg/ext/attr-unavailable-12.C b/gcc/testsuite/g++.dg/ext/attr-unavailable-12.C
new file mode 100644
index 00000000000..7174abc8bb9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-unavailable-12.C
@@ -0,0 +1,12 @@
+// PR c++/84542
+
+template<class T>
+void f(T);
+
+template<class T>
+__attribute__((unavailable))
+void f(T) { }
+
+int main() {
+  f(0); // { dg-error "unavailable" }
+}