From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id A70BD3949F32; Fri, 14 May 2021 14:55:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A70BD3949F32 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-8-branch)] c++: Fix ICE with using and virtual function. [PR95719] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/vendors/redhat/heads/gcc-8-branch X-Git-Oldrev: b0a54a549563313c931870c5ce45785f5119a780 X-Git-Newrev: 1147c3ab5f1e91949f224962f75b675a14f4e989 Message-Id: <20210514145536.A70BD3949F32@sourceware.org> Date: Fri, 14 May 2021 14:55:36 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 14:55:36 -0000 https://gcc.gnu.org/g:1147c3ab5f1e91949f224962f75b675a14f4e989 commit 1147c3ab5f1e91949f224962f75b675a14f4e989 Author: Jason Merrill Date: Tue Jun 23 21:25:21 2020 -0400 c++: Fix ICE with using and virtual function. [PR95719] conversion_path points to the base where we found the using-declaration, not where the function is actually a member; look up the actual base. And then maybe look back to the derived class if the base is primary. gcc/cp/ChangeLog: PR c++/95719 * call.c (build_over_call): Look up the overrider in base_binfo. * class.c (lookup_vfn_in_binfo): Look through BINFO_PRIMARY_P. gcc/testsuite/ChangeLog: PR c++/95719 * g++.dg/tree-ssa/final4.C: New test. (cherry picked from commit 710df943389a854ef00c15ed0ad219b41db236aa) Diff: --- gcc/cp/call.c | 6 +++++- gcc/cp/class.c | 4 ++++ gcc/testsuite/g++.dg/tree-ssa/final4.C | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 89a3053081d..836ece3f56d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -7919,7 +7919,11 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) if (DECL_VINDEX (fn) && (flags & LOOKUP_NONVIRTUAL) == 0 && resolves_to_fixed_type_p (arg)) { - fn = lookup_vfn_in_binfo (DECL_VINDEX (fn), cand->conversion_path); + tree binfo = cand->conversion_path; + if (BINFO_TYPE (binfo) != DECL_CONTEXT (fn)) + binfo = lookup_base (binfo, DECL_CONTEXT (fn), ba_unique, + NULL, complain); + fn = lookup_vfn_in_binfo (DECL_VINDEX (fn), binfo); flags |= LOOKUP_NONVIRTUAL; } diff --git a/gcc/cp/class.c b/gcc/cp/class.c index b06aa6faedf..baf3bbed2c1 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2405,6 +2405,10 @@ lookup_vfn_in_binfo (tree idx, tree binfo) int ix = tree_to_shwi (idx); if (TARGET_VTABLE_USES_DESCRIPTORS) ix /= MAX (TARGET_VTABLE_USES_DESCRIPTORS, 1); + while (BINFO_PRIMARY_P (binfo)) + /* BINFO_VIRTUALS in a primary base isn't accurate, find the derived + class that actually owns the vtable. */ + binfo = BINFO_INHERITANCE_CHAIN (binfo); tree virtuals = BINFO_VIRTUALS (binfo); return TREE_VALUE (chain_index (ix, virtuals)); } diff --git a/gcc/testsuite/g++.dg/tree-ssa/final4.C b/gcc/testsuite/g++.dg/tree-ssa/final4.C new file mode 100644 index 00000000000..cce6e9afadb --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/final4.C @@ -0,0 +1,10 @@ +// PR c++/95719 +// { dg-do compile { target c++11 } } + +struct S1 { virtual ~S1(); }; +struct S2 { + virtual ~S2(); + virtual void f(); +}; +struct S3 final: S1, S2 { using S2::f; }; +void g(S3 & s) { s.f(); }