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

diff --git a/gcc/testsuite/g++.old-deja/g++.other/ambig3.C b/gcc/testsuite/g++.old-deja/g++.other/ambig3.C
new file mode 100644
index 000000000..3b14e75c7
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.other/ambig3.C
@@ -0,0 +1,34 @@
+// { dg-do assemble  }
+
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 23 June 2000 <nathan@codesourcery.com>
+
+// Origin GNATS bug report 69 from Glenn Ammons <ammons@cs.wisc.edu>
+// 
+// A base which derives a virtual base hides declarations in the virtual base,
+// even if that virtual base is accessible via another path [10.2]/6. Make
+// sure that non-virtual bases of the virtual base are also hidden, not matter
+// what order bases are declared in.
+
+struct A {int a;};
+struct B : A {};
+
+struct L1 : virtual B { int a; };
+struct L2 : virtual A { int a; };
+
+struct R1 : virtual B {};
+struct R2 : virtual A {};
+
+struct C1 : R1, L1 {};
+struct C2 : R2, L2 {};
+
+struct D1 : L1, R1 {};
+struct D2 : L2, R2 {};
+
+void fn (C1 *c1, D1 *d1, C2 *c2, D2 *d2)
+{
+  c1->a = 1;
+  d1->a = 1;
+  c2->a = 1;
+  d2->a = 1;
+}