From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 1C343385C30B for ; Thu, 7 Jul 2022 15:56:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C343385C30B Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-478-vNPpdjpxNLyg6MKRW5g-KQ-1; Thu, 07 Jul 2022 11:56:01 -0400 X-MC-Unique: vNPpdjpxNLyg6MKRW5g-KQ-1 Received: by mail-qk1-f198.google.com with SMTP id z9-20020a376509000000b006af1048e0caso18274027qkb.17 for ; Thu, 07 Jul 2022 08:56:01 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pp9/MTl1sH00PFVVj7FAYoMx7BxK/8XGuNNQ8BKQSRM=; b=7NzfxCogoUMxA6CFBBEAXDt1PawB9Z1otN+zBKoKWXBykRcKqj2+IixznBHsuH6rq6 URlunwwl1dmbkJC1coD2gp8VZ0QNtEGbDxLIbtRADCksb5x30210Raz72t1FUKiNRVNE GlLW/M6Z+cvBTUxpssBsgnPqh1PCcwgSVzX6Wm4NKAoRZoPfj86qlwly1tbRmvEIja5h QlhPdqyYd1yvn7gyR8tGa18iZ8GLpeMA/UgStrFW6l2LdrwCic/CdmEYpkjDacPIRoXn k6P6ck9Xz6pfEEbPiDGGQp9N+xdcAWoykz8PZt8BegsHyBYZ/pMJWz1pi87M6Acwoblt UGEw== X-Gm-Message-State: AJIora/nRbZdleLb4LHEYQLeaiq2+Uy2uG1/bNHSqwIx3KisyKgHrNSL V71XKH3wuCj9AeJIM1rJhJgLNff0ZUf1JHzjTH26RsGtmDxM5FSDt4ou001+L01sZNpHqUMxfog ZnmYCdh/OM64zKGJ5Ko1aR4ojHx5xcjn/QUCcRoAaFYAhjMBaO3ZegHFUXVeLhVLKdQ== X-Received: by 2002:ac8:7f8d:0:b0:31d:42f4:b8e8 with SMTP id z13-20020ac87f8d000000b0031d42f4b8e8mr21809066qtj.259.1657209360655; Thu, 07 Jul 2022 08:56:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vsw69pBNlYMvUBeLwn0eYAsd2k6JBVaas3BH1lNnyQ1TCIxwqHOhqAun9K9lthgk7aK+ug9g== X-Received: by 2002:ac8:7f8d:0:b0:31d:42f4:b8e8 with SMTP id z13-20020ac87f8d000000b0031d42f4b8e8mr21809042qtj.259.1657209360227; Thu, 07 Jul 2022 08:56:00 -0700 (PDT) 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 o12-20020a05622a138c00b0031e9fa40c2esm793439qtk.27.2022.07.07.08.55.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 08:55:59 -0700 (PDT) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: -Woverloaded-virtual and dtors [PR87729] Date: Thu, 7 Jul 2022 11:55:58 -0400 Message-Id: <20220707155558.1788129-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220624222604.335563-1-jason@redhat.com> References: <20220624222604.335563-1-jason@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.2 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, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2022 15:56:04 -0000 My earlier patch broke out of the loop over base members when we found a match, but that caused trouble for dtors, which can have multiple for which same_signature_p is true. But as the function comment says, we know this doesn't apply to [cd]tors, so skip them. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/87729 gcc/cp/ChangeLog: * class.cc (warn_hidden): Ignore [cd]tors. gcc/testsuite/ChangeLog: * g++.dg/warn/Woverloaded-virt3.C: New test. --- gcc/cp/class.cc | 3 +++ gcc/testsuite/g++.dg/warn/Woverloaded-virt3.C | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/Woverloaded-virt3.C diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index 17683f421a7..eb69e7f985c 100644 --- a/gcc/cp/class.cc +++ b/gcc/cp/class.cc @@ -3020,6 +3020,9 @@ warn_hidden (tree t) tree binfo; unsigned j; + if (IDENTIFIER_CDTOR_P (name)) + continue; + /* Iterate through all of the base classes looking for possibly hidden functions. */ for (binfo = TYPE_BINFO (t), j = 0; diff --git a/gcc/testsuite/g++.dg/warn/Woverloaded-virt3.C b/gcc/testsuite/g++.dg/warn/Woverloaded-virt3.C new file mode 100644 index 00000000000..34214ba2557 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Woverloaded-virt3.C @@ -0,0 +1,7 @@ +// PR c++/87729 +// { dg-additional-options -Woverloaded-virtual } + +struct S1 {}; +struct S2: S1 { virtual ~S2(); }; +struct S3 { virtual ~S3(); }; +struct S4: S2, S3 { virtual ~S4(); }; base-commit: c1b1c4e58bda152ae932b45396ab67b07dd8c3fe -- 2.31.1