diff options
| author | Jason Merrill <jason@redhat.com> | 2022-07-24 23:26:59 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-07-25 09:23:46 -0400 |
| commit | 4c6567b4090d9363f90b5c68e238e7d0964b6e89 (patch) | |
| tree | f110f8f087c04d6359bbd8225a265c24810e4652 /gcc | |
| parent | 556b816b820f6749910784cbaca8bb0bb822a970 (diff) | |
| download | gcc-4c6567b4090d9363f90b5c68e238e7d0964b6e89.zip gcc-4c6567b4090d9363f90b5c68e238e7d0964b6e89.tar.gz gcc-4c6567b4090d9363f90b5c68e238e7d0964b6e89.tar.bz2 | |
c++: -Woverloaded-virtual false positive [PR87729]
My attempt to shortcut unnecessary checking after finding a match was
also wrong for multiple inheritance, so let's give up on it.
PR c++/87729
gcc/cp/ChangeLog:
* class.cc (warn_hidden): Remove shortcut.
gcc/testsuite/ChangeLog:
* g++.dg/warn/Woverloaded-virt4.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/class.cc | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Woverloaded-virt4.C | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index eb69e7f..a12d367 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 0000000..b4d8668 --- /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(); }; |