diff options
| author | Jason Merrill <jason@redhat.com> | 2020-06-23 21:25:21 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-06-24 15:59:20 -0400 |
| commit | 7d6baf68fe22b6ef5b1d6fabbef97c0e1b4d7abf (patch) | |
| tree | 676456440a072d575814e75d8b37421aeeb30565 /gcc | |
| parent | 0c586913e61021681e3221e8760cd87b24142aea (diff) | |
| download | gcc-7d6baf68fe22b6ef5b1d6fabbef97c0e1b4d7abf.zip gcc-7d6baf68fe22b6ef5b1d6fabbef97c0e1b4d7abf.tar.gz gcc-7d6baf68fe22b6ef5b1d6fabbef97c0e1b4d7abf.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.
Diffstat (limited to 'gcc')
| -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 | 12 |
3 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 2b39a37..fe68fda 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -8694,7 +8694,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 629d27d..94a9585 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2455,6 +2455,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..387d4bb --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/final4.C @@ -0,0 +1,12 @@ +// PR c++/95719 +// { dg-do compile { target c++11 } } +// { dg-additional-options -fdump-tree-gimple } +// { dg-final { scan-tree-dump "S2::f" "gimple" } } + +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(); } |