From patchwork Sun Oct 13 11:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Martin X-Patchwork-Id: 1996525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nasilyan.com header.i=@nasilyan.com header.a=rsa-sha256 header.s=tey23rxsjton5kop5bydp3vc5ylkyjkg header.b=ec0Pp0QP; dkim=pass (1024-bit key; unprotected) header.d=amazonses.com header.i=@amazonses.com header.a=rsa-sha256 header.s=uku4taia5b5tsbglxyj6zym32efj7xqv header.b=aVIERf1l; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XRJjX6TcZz1xvC for ; Sun, 13 Oct 2024 22:56:16 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 597AB385AC3F for ; Sun, 13 Oct 2024 11:56:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from a51-16.smtp-out.eu-west-1.amazonses.com (a51-16.smtp-out.eu-west-1.amazonses.com [54.240.51.16]) by sourceware.org (Postfix) with ESMTPS id 9FEF7385701B for ; Sun, 13 Oct 2024 11:55:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9FEF7385701B Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=nasilyan.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eu-west-1.amazonses.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9FEF7385701B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.51.16 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728820533; cv=none; b=dpcTJTdlp/FgJvZQfcQAwcszcjSi7QfDVbnATmFiuwQDKimuvpyLqss26LNpbfW9F0JbDy4aP3nW80WN2Cel9+uQNZUSUSXjPWHCiuyOaxt2Ut/mY4SsEuWmJb4EkCpx3N6Fl+cT4PBg7679tEOOfrfz6Fl/bDvkChs89M/8b1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728820533; c=relaxed/simple; bh=BCDX83Mzv46UnVM/9y6Z0K/K29asQXc8xXbDYchOjB8=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=FM9RUzipmfol7otQgkHmRMtOfQvQlHx0VqH4cFVHTyxVXnUIvzpsLrpKhzE2DDXf3osnEefXzbHK6QDmrj2TrfuzNZJTfxQPX9ZQ5OR1gXR0VkLtPEugzf7uFt+3gqJqyzpUczNWQ7H7k2YVvKDlmuzelJjtcy3FY+E2dqC3Kas= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=tey23rxsjton5kop5bydp3vc5ylkyjkg; d=nasilyan.com; t=1728820530; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=BCDX83Mzv46UnVM/9y6Z0K/K29asQXc8xXbDYchOjB8=; b=ec0Pp0QPwI793X+2ncwKZ8Ef3C9vlf/I0UFLoMUW8IN305J/i5xvieBm9PrRYGne Bec/2qQ8EjEY3EXIfTtz+MiRgXwGiDubki/ZwEqbs7GL5BBqBKMkEh52W+fD0eB58Ml L89H355dQcxuSq5LNkEKpFbNbb2r+roeJlJ3HhWg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1728820530; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=BCDX83Mzv46UnVM/9y6Z0K/K29asQXc8xXbDYchOjB8=; b=aVIERf1lj94oPscngvy0RxjZ5nHCSCEEdt9JnGZg2NY0TmmihowKw77gEx0BOCx3 pgIuwoUEDAEig3hjoivG7r6a5203pk343RERJwYIyFkIs6b2g00IejSPWN9z7CWAL6B Y9nGsZEHWSr7CKc32TZQgqvM+QP6VLGUyDzmrad8= Subject: [PATCH] c++: Restore rust front-end build [PR117114] From: =?utf-8?q?Simon_Martin?= To: =?utf-8?q?gcc-patches=40gcc=2Egnu=2Eorg?= Cc: =?utf-8?q?jason=40redhat=2Ecom?= Date: Sun, 13 Oct 2024 11:55:30 +0000 Mime-Version: 1.0 References: <20241013115526.20968-1-simon@nasilyan.com> X-Mailer: Amazon WorkMail Thread-Index: AQHbHWbMnJAquBPtS269fQN4qnDC5g== Thread-Topic: [PATCH] c++: Restore rust front-end build [PR117114] X-Original-Mailer: git-send-email 2.44.0 X-Wm-Sent-Timestamp: 1728820529 Message-ID: <0102019285bbcc0e-390eea2a-7e7a-494d-ae4c-53bdf9d15410-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.10.13-54.240.51.16 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org The patch that I merged via r15-4282-g60163c85730e6b breaks the build for the rust front-end because it does not work well when virtual inheritance is in play. The problem is that in such a case, an overrider and its overridden base method might have a different DECL_VINDEX, and the derived method would be incorrectly considered as hiding the base one. This patch fixes this by not comparing the DECL_VINDEX anymore, but rather going back to comparing the signatures, only after having excluded conversion operators to different types. I'm currently running the testsuite on x86_64-pc-linux-gnu, and already verified that the rust front-end builds again with the patch applied. OK if the testsuite run finishes successfully? PR c++/117114 gcc/cp/ChangeLog: * class.cc (warn_hidden): Don't compare DECL_VINDEX but signatures, after having excluded operators to different types. gcc/testsuite/ChangeLog: * g++.dg/warn/Woverloaded-virt10.C: New test. --- gcc/cp/class.cc | 20 +++++++++---------- .../g++.dg/warn/Woverloaded-virt10.C | 7 +++++++ 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Woverloaded-virt10.C diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index f754886a60a..fce71483ccc 100644 --- a/gcc/cp/class.cc +++ b/gcc/cp/class.cc @@ -3279,25 +3279,25 @@ warn_hidden (tree t) { num_fns++; tree fndecl_vindex = DECL_VINDEX (fndecl); - /* If the method from the base class has the same DECL_VINDEX - as the method from the derived, it has been overridden. + /* If the methods from the base and derived classes have the + same signature and they are not conversion operators to + different types, then the base method has been overriden. 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] || !DECL_VINDEX (base_fndecls[k])) continue; - tree base_fndecl_vindex = DECL_VINDEX (base_fndecls[k]); - if (fndecl_vindex - && !tree_int_cst_compare (fndecl_vindex, - base_fndecl_vindex)) - overriden_base_fndecls.add (base_fndecls[k]); - else if (IDENTIFIER_CONV_OP_P (name) - && (DECL_NAME (fndecl) - != DECL_NAME (base_fndecls[k]))) + if (IDENTIFIER_CONV_OP_P (name) + && (DECL_NAME (fndecl) + != DECL_NAME (base_fndecls[k]))) /* If base_fndecl[k] and fndecl are conversion operators to different types, they're unrelated. */ ; + else if (same_signature_p (fndecl, base_fndecls[k])) + /* If fndecl has the same signature as base_fndecl[k], it + overrides it. */ + overriden_base_fndecls.add (base_fndecls[k]); else hidden_base_fndecls.put (base_fndecls[k], fndecl); } diff --git a/gcc/testsuite/g++.dg/warn/Woverloaded-virt10.C b/gcc/testsuite/g++.dg/warn/Woverloaded-virt10.C new file mode 100644 index 00000000000..5e669360ec9 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Woverloaded-virt10.C @@ -0,0 +1,7 @@ +// PR c++/117114 +// { dg-do compile { target c++11 } } +// { dg-additional-options -Wall } + +struct Troops { virtual ~Troops(); }; +struct Control { virtual int GetControl() const = 0; }; +struct Army : Troops, Control { int GetControl() const override; };