re PR c++/9400 (Warning -Wshadow warns of shadowed declaration of THIS in local classes.)

	PR c++/9400
	* decl.c (pushdecl): Don't check for shadowing of DECL_ARTIFICIAL
	PARM_DECLs.

	PR c++/9400
	* g++.dg/warn/Wshadow-2.C: New test.

From-SVN: r63904

gcc/cp/ChangeLog

 2003-03-06  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/9400
+	* decl.c (pushdecl): Don't check for shadowing of DECL_ARTIFICIAL
+	PARM_DECLs.
+
 	PR c++/9791
 	* class.c (get_basefndecls): Use lookup_fnfields_1.
 

gcc/cp/decl.c

@@ -4101,7 +4101,9 @@ pushdecl (tree x)
 	  if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x)
 	      /* Inline decls shadow nothing.  */
 	      && !DECL_FROM_INLINE (x)
-	      && TREE_CODE (oldlocal) == PARM_DECL)
+	      && TREE_CODE (oldlocal) == PARM_DECL
+	      /* Don't check the `this' parameter.  */
+	      && !DECL_ARTIFICIAL (oldlocal))
 	    {
 	      bool err = false;
 

gcc/testsuite/ChangeLog

 2003-03-06  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/9400
+	* g++.dg/warn/Wshadow-2.C: New test.
+
 	PR c++/9791
 	* g++.dg/warn/Woverloaded-1.C: New test.
 

gcc/testsuite/g++.dg/warn/Wshadow-2.C

+/* { dg-options "-Wshadow" } */
+
+struct A {
+  void a1 () {
+    struct B { B() {} }; // There should be no warning here.
+  }
+  void a2 () {
+      struct B { };
+  }
+};