From patchwork Thu Feb 17 22:50:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 51196 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 E17183858D20 for ; Thu, 17 Feb 2022 22:50:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E17183858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1645138254; bh=TasjwfED5Otq63Wu0gKTRzAiEKVX5+JhT3YqWvUhQok=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xOxip6Xn8I2R91tknxEfE4o58LwpO0EykNpd7QCCQs1MHrYLRz8DgQLTlaQqYy7Tc 6bXc/VnKQVU+S2ttFrRMnLEK4OsWw6VKSCPPy9JKbae3g7MQxL4DsXWnycRE+FoTbH UjVcYlrJW5YdRiI8jQy5h7iP6LeFbL/1T7C9Wh64= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id A96883858D20 for ; Thu, 17 Feb 2022 22:50:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A96883858D20 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-502-M0vJNj9fM0G_zb8KsU8x6w-1; Thu, 17 Feb 2022 17:50:22 -0500 X-MC-Unique: M0vJNj9fM0G_zb8KsU8x6w-1 Received: by mail-qv1-f70.google.com with SMTP id du13-20020a05621409ad00b0042c2949e2c1so6908991qvb.19 for ; Thu, 17 Feb 2022 14:50:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TasjwfED5Otq63Wu0gKTRzAiEKVX5+JhT3YqWvUhQok=; b=pFVTjFNdgDgtnf+u8FVxOLOfR/6xBJQVPp0Qpdr/AWRhNAUDqWzt0v9CEn9ddK3igx 8WhqzHyNNnwipETO8k2w5JE541pCZsMkE55G+29WsUGz8Nfg1G3UCneN8e/y5/BTqTwf zOrKQLQDWPAAWyBd2wpljuWQAghrGMQnsrq3Uwgcol6vv30pgtERMWl+sQUkrAYDQUcL b7Q2lG6hOxSsngAE/VtIRG4oDYepicHdp/R+ePeFlyktno7qzgusN+t+gD6ZAm5R3xro l9L4JYYDxzpe5OyfyDfomqd+zi5DJYOv8EolBC+PGdcsJX3FDoad0aNBpLrAcCEi/r3C wZrw== X-Gm-Message-State: AOAM5315eE6yflb1o7w1JwyCafSMqE2C3d1smKBHhZr9NPzWC6LslFsY P1+2Nf64dk9vab2ptqtLj91VyvR0pe3/5VHAcjCNEUOFCUPwI/M3iufELobD7YEnktC00JRxtrZ XPdOZGC9SNnQ7c+ewPg5alkxA3l4HfduwUWjzmcyEE3PH8mn2F3DUVa2eqDkNQMld+Q== X-Received: by 2002:ac8:5e48:0:b0:2ca:d91a:df1d with SMTP id i8-20020ac85e48000000b002cad91adf1dmr4379737qtx.683.1645138221240; Thu, 17 Feb 2022 14:50:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7kjX2UZk8XkCui70AQuhwH090kOeUN0zT2ybHuc2Zxcu+474j/dH9Drw1VeytTXEt8c2r6A== X-Received: by 2002:ac8:5e48:0:b0:2ca:d91a:df1d with SMTP id i8-20020ac85e48000000b002cad91adf1dmr4379713qtx.683.1645138220768; Thu, 17 Feb 2022 14:50:20 -0800 (PST) Received: from barrymore.redhat.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 ay41sm11169314qkb.127.2022.02.17.14.50.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Feb 2022 14:50:20 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] tree: tweak warn_deprecated_use Date: Thu, 17 Feb 2022 17:50:18 -0500 Message-Id: <20220217225018.2133758-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" While looking at PR90451 I noticed that this function was failing to find the attributes if called with a variant of the struct. And we were doing a redundant lookup_attribute. Tested x86_64-pc-linux-gnu, applying to trunk as obvious. 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/testsuite/g++.dg/warn/deprecated-16.C | 2 ++ gcc/tree.cc | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/deprecated-16.C base-commit: c352ef0ed90cfc07d494dfec111121bc683e337b diff --git a/gcc/testsuite/g++.dg/warn/deprecated-16.C b/gcc/testsuite/g++.dg/warn/deprecated-16.C new file mode 100644 index 00000000000..8d1f4191270 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/deprecated-16.C @@ -0,0 +1,2 @@ +struct __attribute((deprecated ("foo"))) A { }; // { dg-message "declared" } +void f(const A&) { } // { dg-warning "deprecated: foo" } diff --git a/gcc/tree.cc b/gcc/tree.cc index dd919ff0717..2bbef2d6b75 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); + } } }