From 4c6567b4090d9363f90b5c68e238e7d0964b6e89 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 24 Jul 2022 23:26:59 -0400 Subject: 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. --- gcc/cp/class.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gcc/cp/class.cc') 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) -- cgit v1.1