From patchwork Wed Mar 22 16:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 66746 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 47C7D384D1B7 for ; Wed, 22 Mar 2023 16:05:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47C7D384D1B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679501123; bh=p1gbvyt2R0Fy7PlHLoilBOzbVS5gBTfHJcgU1LgltNk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EHHn1AtBylt+P9N5Eg24XUiMpLd7OKCtpAY2s5hu/a8PVRj+SHrC1MUAVjFrj6Pwb Fl9l9b31ZviZXy43RAVZ4XWeDAsZXKG74pqFIQo5omfYXarJBb+5ZkIo16JtfnpuiM 6AVqnqN1RhmFHAx4TC91cR/6Wc+sFkNKoJKE54CE= 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 7FB6D3858D3C for ; Wed, 22 Mar 2023 16:04:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7FB6D3858D3C Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-637-lPOrB8SoP_uSlsNdSdoaEg-1; Wed, 22 Mar 2023 12:04:53 -0400 X-MC-Unique: lPOrB8SoP_uSlsNdSdoaEg-1 Received: by mail-yb1-f199.google.com with SMTP id m6-20020a056902118600b00aeb1e3dbd1bso19731872ybu.9 for ; Wed, 22 Mar 2023 09:04:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679501093; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=p1gbvyt2R0Fy7PlHLoilBOzbVS5gBTfHJcgU1LgltNk=; b=WISZUvVw6N2/XTYDPE88q4J9sGACm/JilF1iMZDzUW+B0j9cjWxWmr7uha6raPkw9t 2sFEmt34OHFb6JhRenDC8GXa/l8/0nr0OxlOwNGnMbjBLjIJPcYZByPPMECQ6iBW6z1K WnEQcMQtWabtCplXMIraIIa6AIR7KicaCcsabOsh3u2Ao1BXZe0nSrRz/U+fDn6tDhfO qdMS9NHkhrrvFjupWcpkv5h1KOgXkMwyqaZ7/j/A3cFsDMpP0H5lyXSjL8BtP/KqiLDi yxerxNJhINUGdDqp73J/cLamFlRDWVWPduXsFwKojdH/1bftQt+Rm9V6CVByAntxyjqJ nLUA== X-Gm-Message-State: AAQBX9e2MrunoTak9Lib6utQx63LSSEe7xyOtxVORg8lDHy8745uIvKM kLlB1FGjXr/bMLf/1N2qkbYjZHQ8yMdlrX7teXZoOoMzbiqL9bllCf22EGSiNmnPvRArrT5tcRN DseY5u5Hz0eaGBMVYZtnIikedXoH9+wwEfzwiD9GKKpZuhyeK5CwOEth/JdogXc5faH7EITbj3A == X-Received: by 2002:a81:bb44:0:b0:544:7d28:1ff5 with SMTP id a4-20020a81bb44000000b005447d281ff5mr339104ywl.29.1679501092847; Wed, 22 Mar 2023 09:04:52 -0700 (PDT) X-Google-Smtp-Source: AKy350YhCyDef8aEWdsYMK1Ji0WleBqyab69afkLznDRUD1OD0tuBGLfs3W1A3V1m67vfBo0ZXzHYQ== X-Received: by 2002:a81:bb44:0:b0:544:7d28:1ff5 with SMTP id a4-20020a81bb44000000b005447d281ff5mr339057ywl.29.1679501092411; Wed, 22 Mar 2023 09:04:52 -0700 (PDT) Received: from jason.cygnus.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id f67-20020a37d246000000b00745daadd210sm11524997qkj.71.2023.03.22.09.04.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 09:04:51 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: attribute on dtor in template [PR108795] Date: Wed, 22 Mar 2023 12:04:48 -0400 Message-Id: <20230322160448.2494466-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Since r7-2549 we were throwing away the explicit C:: when we found that ~C has an attribute that we treat as making its type dependent. PR c++/108795 gcc/cp/ChangeLog: * semantics.cc (finish_id_expression_1): Check scope before returning id_expression. gcc/testsuite/ChangeLog: * g++.dg/ext/attr-tsafe1.C: New test. --- gcc/cp/semantics.cc | 1 + gcc/testsuite/g++.dg/ext/attr-tsafe1.C | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/attr-tsafe1.C base-commit: d3a6f174543816600b1f472997d492088e4e396a diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 87c2e8a7111..99a76e3ed65 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -4238,6 +4238,7 @@ finish_id_expression_1 (tree id_expression, : CP_ID_KIND_UNQUALIFIED))); if (dependent_p + && !scope && DECL_P (decl) && any_dependent_type_attributes_p (DECL_ATTRIBUTES (decl))) /* Dependent type attributes on the decl mean that the TREE_TYPE is diff --git a/gcc/testsuite/g++.dg/ext/attr-tsafe1.C b/gcc/testsuite/g++.dg/ext/attr-tsafe1.C new file mode 100644 index 00000000000..20c319f154d --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/attr-tsafe1.C @@ -0,0 +1,14 @@ +// PR c++/108795 + +template void g (T x) +{ + struct C + { + __attribute__((transaction_safe)) ~C(); + }; + C::~C(); // { dg-error "" } +} +void f () +{ + g (5); +}