diff options
| author | Jason Merrill <jason@redhat.com> | 2020-06-23 21:25:21 -0400 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2021-04-30 14:20:04 +0200 |
| commit | 4ccd63f07dc85911e4c76b350cdc19daeee7284a (patch) | |
| tree | 7eff929ce34adc25bbb840c9a44a561dd37bc183 | |
| parent | 491d549921d4e93fb8c751c4704070fa4bd940b2 (diff) | |
| download | gcc-4ccd63f07dc85911e4c76b350cdc19daeee7284a.zip gcc-4ccd63f07dc85911e4c76b350cdc19daeee7284a.tar.gz gcc-4ccd63f07dc85911e4c76b350cdc19daeee7284a.tar.bz2 | |
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)
| -rw-r--r-- | gcc/cp/call.c | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-ssa/final4.C | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 89a3053..836ece3 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 b06aa6f..baf3bbe 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 0000000..cce6e9a --- /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(); } |