From 71e6353e1b03021bc8bbcf4bd67a5f14d09b5fb1 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 8 Feb 2022 20:17:55 +0100
Subject: [PATCH] c++: Don't emit repeated -Wshadow warnings for
 templates/ctors [PR104379]

The following patch suppresses extraneous -Wshadow warnings.
On the testcase without the patch we emit 14 -Wshadow warnings,
with the patch just 4.  It is enough to warn once e.g. during parsing of the
template or the abstract ctor, while previously we'd warn also on the clones
of the ctors and on instantiation.
In GCC 8 and earlier we didn't warn because check_local_shadow did
  /* Inline decls shadow nothing.  */
  if (DECL_FROM_INLINE (decl))
    return;

2022-02-08  Jakub Jelinek  <jakub@redhat.com>

	PR c++/104379
	* name-lookup.cc (check_local_shadow): When diagnosing shadowing
	of a member or global declaration, add warning suppression for
	the decl and don't warn again on it.

	* g++.dg/warn/Wshadow-18.C: New test.
---
 gcc/cp/name-lookup.cc                  | 24 ++++++++++++++++--------
 gcc/testsuite/g++.dg/warn/Wshadow-18.C | 22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/warn/Wshadow-18.C

diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc
index 29b7f2ec1a09..93c4eb7193b3 100644
--- a/gcc/cp/name-lookup.cc
+++ b/gcc/cp/name-lookup.cc
@@ -3296,18 +3296,22 @@ check_local_shadow (tree decl)
 
 	/* Warn if a variable shadows a non-function, or the variable
 	   is a function or a pointer-to-function.  */
-	if (!OVL_P (member)
-	    || TREE_CODE (decl) == FUNCTION_DECL
-	    || (TREE_TYPE (decl)
-		&& (TYPE_PTRFN_P (TREE_TYPE (decl))
-		    || TYPE_PTRMEMFUNC_P (TREE_TYPE (decl)))))
+	if ((!OVL_P (member)
+	     || TREE_CODE (decl) == FUNCTION_DECL
+	     || (TREE_TYPE (decl)
+		 && (TYPE_PTRFN_P (TREE_TYPE (decl))
+		     || TYPE_PTRMEMFUNC_P (TREE_TYPE (decl)))))
+	    && !warning_suppressed_p (decl, OPT_Wshadow))
 	  {
 	    auto_diagnostic_group d;
 	    if (warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wshadow,
 			    "declaration of %qD shadows a member of %qT",
 			    decl, current_nonlambda_class_type ())
 		&& DECL_P (member))
-	      inform_shadowed (member);
+	      {
+		inform_shadowed (member);
+		suppress_warning (decl, OPT_Wshadow);
+	      }
 	  }
 	return;
       }
@@ -3319,14 +3323,18 @@ check_local_shadow (tree decl)
 	  || (TREE_CODE (old) == TYPE_DECL
 	      && (!DECL_ARTIFICIAL (old)
 		  || TREE_CODE (decl) == TYPE_DECL)))
-      && !instantiating_current_function_p ())
+      && !instantiating_current_function_p ()
+      && !warning_suppressed_p (decl, OPT_Wshadow))
     /* XXX shadow warnings in outer-more namespaces */
     {
       auto_diagnostic_group d;
       if (warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wshadow,
 		      "declaration of %qD shadows a global declaration",
 		      decl))
-	inform_shadowed (old);
+	{
+	  inform_shadowed (old);
+	  suppress_warning (decl, OPT_Wshadow);
+	}
       return;
     }
 
diff --git a/gcc/testsuite/g++.dg/warn/Wshadow-18.C b/gcc/testsuite/g++.dg/warn/Wshadow-18.C
new file mode 100644
index 000000000000..fcc1b3c3aca7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wshadow-18.C
@@ -0,0 +1,22 @@
+// PR c++/104379
+// { dg-do compile }
+// { dg-options "-Wshadow" }
+
+int x;
+
+template<typename T>
+struct S
+{
+  int i;
+  S(int i) { (void) i; }			// { dg-warning "declaration of 'i' shadows a member of 'S<T>'" }
+  S(float x) { (void) x; }			// { dg-warning "declaration of 'x' shadows a global declaration" }
+  S(int *p) { int a = 1; (void) p; (void) a;
+	      { int a = 2; (void) a; } }	// { dg-warning "declaration of 'a' shadows a previous local" }
+};
+
+S<int> i(1);
+S<long> j(1);
+S<int> k(1.0f);
+S<long> l(1.0f);
+S<int> m(&x);
+S<int> n(&x);
-- 
2.47.2