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, 32 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/eh/shadow1.C b/gcc/testsuite/g++.dg/eh/shadow1.C
new file mode 100644
index 000000000..15f666a2c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/shadow1.C
@@ -0,0 +1,32 @@
+// Copyright (C) 2004 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 15 Oct 2004 <nathan@codesourcery.com>
+
+// We forgot to ignore current context and friends when determing
+// which exceptions shadowed eachother.
+
+struct E;
+
+struct B {};
+
+struct D : private B
+{
+  friend class E;
+  
+  static B *baz (D *);
+  virtual void V () throw (B);  // { dg-error "overriding" "" }
+};
+
+struct E : public D
+{
+  virtual void V () throw (D); // { dg-error "looser throw" "" }
+};
+
+B* foo (D *);
+
+B *D::baz (D *p)
+{
+  try {foo (p);}
+  catch (B const &b) {}
+  catch (D const &d) {}
+  return p;
+}