From patchwork Mon Jul 25 13:23:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1660356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=jrcVthsG; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ls13q45dpz9s2R for ; Mon, 25 Jul 2022 23:24:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5BA63875A31 for ; Mon, 25 Jul 2022 13:24:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5BA63875A31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658755473; bh=lixmBf4JIbE4RPco76hCC05/FJHoybs66d3kIWKhkh0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jrcVthsGC3XVYTbNED5A/HpD0+lEbdFbll/OrGUeulHBVQs1AQ1uYkop0G9oy2it3 jqq7DHrbcpvIyjdj2d2ti04JZuU+TjPX9K4dMeLFbuQ+WA5ghdOjsbiqzojaVz28rp R71kJmx4FlrRx4BhfFd78dPXBGMYumFMTCbS0IGY= 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 6B0D6385AE5E for ; Mon, 25 Jul 2022 13:23:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6B0D6385AE5E Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-9T3IZOHwOe65mGzrWuCtxA-1; Mon, 25 Jul 2022 09:23:38 -0400 X-MC-Unique: 9T3IZOHwOe65mGzrWuCtxA-1 Received: by mail-qk1-f199.google.com with SMTP id bi37-20020a05620a31a500b006b5ef0afedaso9884812qkb.22 for ; Mon, 25 Jul 2022 06:23:38 -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:mime-version :content-transfer-encoding; bh=lixmBf4JIbE4RPco76hCC05/FJHoybs66d3kIWKhkh0=; b=EurSzgeXwBrvcFY9e/vYBkv1TqsFY8bnkNmLsfjRMPaxchU8W85BeyIYHhUw0O51UL UyUj9LeSaUGGVcuC+VLE5BKGPiC1HsSPEOnowimg0TBGKeLAyhO8f4U0DjJcsokcM0c9 S4yYvQ96C1TAiOfBv9vNW31zeP15PkWVxWwe2urOM0A/krX1eBNdlY9vYPvcVEbSOOWU HI/km039f0qda+NP5oVSLpetA75BcjAeoz77hmId1QWBc8NSIt0AalfbfZ7lvgVbjqUg TaAlFKuhl3jLVD03sMyVQ+XAYG4HqLjQTDwujmJ9mMCPhn5dfetGkVMB8reHPlgcM5bT BuCA== X-Gm-Message-State: AJIora/jCIEpDMdOPwXEi56Nyjkfhg4Kt6xq1i6NNHq7mluKAT7/9YZL 9JGwhc28iPUKaMXb2rzOnEjpiYmpAyOQDIf+P1IWEoCgt96no3nantCr2GOm5sQY8Lygh5Iabyx fgk83W1JNZ4S3h6JBiS7DODZeBsDPw4qRdPyAIak92FAmkaPd+igQz/ZCRYYA6WEy3w== X-Received: by 2002:a05:6214:1d07:b0:473:fb07:5015 with SMTP id e7-20020a0562141d0700b00473fb075015mr10227256qvd.107.1658755417642; Mon, 25 Jul 2022 06:23:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s+q110Y1WcWxqS+XCnwXOc1jey3uRDcMf/0qERfiL8md34LamMvcV1GqW01gjULVWYvP6SkA== X-Received: by 2002:a05:6214:1d07:b0:473:fb07:5015 with SMTP id e7-20020a0562141d0700b00473fb075015mr10227217qvd.107.1658755417129; Mon, 25 Jul 2022 06:23:37 -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 fv27-20020a05622a4a1b00b0031eb5f07b95sm7488781qtb.57.2022.07.25.06.23.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 06:23:36 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: -Woverloaded-virtual false positive [PR87729] Date: Mon, 25 Jul 2022 09:23:35 -0400 Message-Id: <20220725132335.1106242-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=-13.5 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 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" My attempt to shortcut unnecessary checking after finding a match was also wrong for multiple inheritance, so let's give up on it. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/87729 gcc/cp/ChangeLog: * class.cc (warn_hidden): Remove shortcut. gcc/testsuite/ChangeLog: * g++.dg/warn/Woverloaded-virt4.C: New test. --- gcc/cp/class.cc | 11 +++++++---- gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C base-commit: 718cf8d0bd32689192200d2156722167fd21a647 diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index eb69e7f985c..a12d3673b96 100644 --- a/gcc/cp/class.cc +++ b/gcc/cp/class.cc @@ -3040,22 +3040,25 @@ warn_hidden (tree t) bool seen_non_override = false; for (tree fndecl : ovl_range (fns)) { + bool any_override = false; if (TREE_CODE (fndecl) == FUNCTION_DECL && DECL_VINDEX (fndecl)) { /* If the method from the base class has the same signature as the method from the derived class, it - has been overridden. */ + has been overridden. Note that we can't move on + after finding one match: fndecl might override + multiple base fns. */ for (size_t k = 0; k < base_fndecls.length (); k++) if (base_fndecls[k] && same_signature_p (fndecl, base_fndecls[k])) { base_fndecls[k] = NULL_TREE; - goto next; + any_override = true; } } - seen_non_override = true; - next:; + if (!any_override) + seen_non_override = true; } if (!seen_non_override && warn_overloaded_virtual == 1) diff --git a/gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C b/gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C new file mode 100644 index 00000000000..b4d86689cf5 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C @@ -0,0 +1,7 @@ +// PR c++/87729 +// { dg-additional-options -Woverloaded-virtual } + +struct S1 { virtual void f(); }; +struct S2: S1 {}; +struct S3: S1 {}; +struct S4: S2, S3 { void f(); };