From patchwork Mon Dec 18 19:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 82405 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B5353857BA0 for ; Mon, 18 Dec 2023 19:50:28 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id F21D038582B6 for ; Mon, 18 Dec 2023 19:50:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F21D038582B6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F21D038582B6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702929012; cv=none; b=aadIcM/vAd1/lSKKzUzHKV7DkLBMyYRAoFY8zgmYRpFkvyOh5/D0+vbc6vJkcOshWl4E7dlSNDXi+eFUP9UJidfECi5LRkFbwEohZG5xrktbcxwe9zddutcnIzKEkQu+qS6hhjjSdaaqfj/KeEuTWFm4hPTReSp7XTNSLW4lKmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702929012; c=relaxed/simple; bh=T1BoJpxNpt/Qkf4T7JiFtw6V4bhIyijiNG06SSlelvw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KBfJvhId9Qgl6/aMTyVwjkj14vhgCAyvxtSD9LETxtKV9ujhWfvcLgcTleJSWUaJp/Im0Ya5DFrpnGE6mB8vU5DtQrdkmywrCdycM5lHccGggaNL5u+ImzstRvYs2ySr7EZ5ccn0C7vBeqWw+4OaqE5kUg66odMNUKDp644iQ6c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702929010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdzx7i2hhzbYM7ccI8+n2H3w1tGvzbDL8q6iuuiXNq0=; b=Mb8nrXj2wzi7ree5bulTK7UU3/7NZCd1rJnLQxiPA9FxXDRb9ECn/eOKA2C87sWipKbdbB vGMGObDxL6b/xG6jVnXEAj7i2QE+hckL8zHTmQNKyHfEECbVfs2ztN/5S0oILv1M6cnfOV 0Iz+GdHEn5RtdpTuJdaJP40JyegbDcs= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-4hzW2BPmPquTTe3dfp3qBw-1; Mon, 18 Dec 2023 14:50:09 -0500 X-MC-Unique: 4hzW2BPmPquTTe3dfp3qBw-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-67ccd612093so67488706d6.1 for ; Mon, 18 Dec 2023 11:50:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702929007; x=1703533807; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mdzx7i2hhzbYM7ccI8+n2H3w1tGvzbDL8q6iuuiXNq0=; b=E6EM6shcJrmk+p2OymCcU0RTE+qxzYQNgJAPzBHCeqs1OWs/myGzQ3yUUEjFrNFMqP Upaz5WvL5FNqHbjq9gRvYeF1qWsYA75MdihfVfGvXLtipoGi3Z0NOnsgF3EgI0O2v4gm PZ/jAKaK20QfxuJuubX9C14yFuaBlZHwD7Xe05GbmtLaLXN45+UQT1bGbQHgscU689Y5 DKdFOBs4tzX+aVe2eFd6/KrC0GO6fZZkLuPgbmat+0aMi8Hn0/PKjKfSB2soYg9u3F5j vR7oHevNUVXHiO/w/jWNlzx30gVaEcu82PulX9+KG99hROfl2u0j+GLZ540+BGbeImg0 OPyA== X-Gm-Message-State: AOJu0YxjwSyJ1GwqRdjnlIuVkl+2mIlqrKHQ9D2UKJGj14u0Q6jKukiE PFLNposSQkjet4jn+PK4jB2V3AiloTyQhRINzf4lQiF7Bm2nfcKdjyAld/svP/51vzmpHLln9OW cXnN6E9LR/Ng68HvdnLQ5LYpIYt7/x2v8nZZjFfe4BoGVZ0hOEoy3XP6cpxefMA0QQyF6ra6N2z 8= X-Received: by 2002:ad4:5de4:0:b0:67f:3c55:4749 with SMTP id jn4-20020ad45de4000000b0067f3c554749mr3888956qvb.25.1702929007390; Mon, 18 Dec 2023 11:50:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHOMpYITFczvleWw7dwxkaQcRubD6287i5RdHrLbVqOw8N+J5Tlkw3qR1XUZk2chbE5UMIEZQ== X-Received: by 2002:ad4:5de4:0:b0:67f:3c55:4749 with SMTP id jn4-20020ad45de4000000b0067f3c554749mr3888940qvb.25.1702929006934; Mon, 18 Dec 2023 11:50:06 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id ff14-20020a0562140bce00b0067a2c201c95sm1744585qvb.51.2023.12.18.11.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:50:06 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: [[deprecated]] on template redecl [PR84542] Date: Mon, 18 Dec 2023 14:50:04 -0500 Message-ID: <20231218195004.1238589-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ec MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- The deprecated and unavailable attributes weren't working when used on a template redeclaration ultimately because the corresponding tree flags on the underlying decls weren't being merged across redeclarations. PR c++/84542 gcc/cp/ChangeLog: * decl.cc (merge_attribute_bits): gcc/testsuite/ChangeLog: * g++.dg/ext/attr-deprecated-2.C: No longer XFAIL. * g++.dg/ext/attr-unavailable-12.C: New test. --- 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(-) create mode 100644 gcc/testsuite/g++.dg/ext/attr-unavailable-12.C diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 1ffe4c82748..36375ea3c14 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -1530,6 +1530,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) \ @@ -1542,7 +1546,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(); // { dg-warning "deprecated" "bug 84542" { xfail *-*-* } } - fdeprecated_primary(); // { dg-warning "deprecated" "bug 84542" { xfail *-*-* } } + fdeprecated_primary(); // { dg-warning "deprecated" "bug 84542" } + fdeprecated_primary(); // { 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 +void f(T); + +template +__attribute__((unavailable)) +void f(T) { } + +int main() { + f(0); // { dg-error "unavailable" } +}