obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 33 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/warn/Wshadow-5.C b/gcc/testsuite/g++.dg/warn/Wshadow-5.C
new file mode 100644
index 000000000..66232913f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wshadow-5.C
@@ -0,0 +1,33 @@
+// Wshadows was giving warnings for nested function parameters in nested class
+// or structure that we didn't want.
+// { dg-do compile }
+// { dg-options "-Wshadow" }
+
+// PR c++/41825
+int f (int n)
+{
+    int bar (int n) { return n++; } // { dg-error "a function-definition is not allowed here" }
+    return bar (n); // { dg-error "was not declared in this scope" }
+}
+
+int g (int i)
+{
+    struct {
+        int bar (int i) { return i++; } // { dg-bogus "shadows" }
+    } s;
+
+    return s.bar (i);
+}
+
+// PR c++/30566
+void h( int x )
+{
+  class InnerClass
+    {
+      public:
+              static int g( int x ) // { dg-bogus "shadows" }
+                {
+                  // empty
+                }
+    };
+}