c++: -Wshadow=compatible-local type vs var [PR100608]

The patch for PR92024 changed -Wshadow=compatible-local to warn if either
new or old decl was a type, but the rationale only talked about the case
where both are types.  If only one is, they aren't compatible.

	PR c++/100608

gcc/cp/ChangeLog:

	* name-lookup.cc (check_local_shadow): Use -Wshadow=local
	if exactly one of 'old' and 'decl' is a type.

gcc/testsuite/ChangeLog:

	* g++.dg/warn/Wshadow-compatible-local-3.C: New test.
This commit is contained in:
Jason Merrill 2022-04-05 16:02:04 -04:00
parent e1a5e7562d
commit fd0024e48e
2 changed files with 14 additions and 0 deletions

View File

@ -3249,6 +3249,10 @@ check_local_shadow (tree decl)
enum opt_code warning_code;
if (warn_shadow)
warning_code = OPT_Wshadow;
else if ((TREE_CODE (decl) == TYPE_DECL)
^ (TREE_CODE (old) == TYPE_DECL))
/* If exactly one is a type, they aren't compatible. */
warning_code = OPT_Wshadow_local;
else if ((TREE_TYPE (old)
&& TREE_TYPE (decl)
&& same_type_p (TREE_TYPE (old), TREE_TYPE (decl)))

View File

@ -0,0 +1,10 @@
// PR c++/100608
// { dg-do compile { target c++11 } }
// { dg-additional-options "-Wshadow=compatible-local" }
template <typename> class X {};
void foo()
{
auto a = X<class a>{}; // no warning, not compatible
}