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

diff --git a/gcc/testsuite/g++.dg/eh/scope1.C b/gcc/testsuite/g++.dg/eh/scope1.C
new file mode 100644
index 000000000..276e0d6e5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/scope1.C
@@ -0,0 +1,71 @@
+// Test that we've scoped the destructor properly for variables declared
+// in a conditional.
+// { dg-do run }
+
+extern "C" void abort ();
+
+class C
+{
+  bool live;
+ public:
+  C();
+  C(const C &);
+  ~C ();
+  operator bool() const;
+};
+
+void f1 ()
+{
+  while (C br = C()) abort ();
+}
+
+void f2 ()
+{
+  for (; C br = C(); ) abort ();
+}
+
+void f3 ()
+{
+  if (C br = C()) abort ();
+}
+
+void f4 ()
+{
+  switch (C br = C())
+    {
+    default:
+      abort ();
+    case false:
+      break;
+    }
+}
+
+int main()
+{
+  f1(); f2(); f3(); f4();
+  return 0;
+}
+
+C::C()
+{
+  live = true;
+}
+
+C::C(const C &o)
+{
+  if (!o.live)
+    abort ();
+  live = true;
+}
+
+C::~C()
+{
+  live = false;
+}
+
+C::operator bool() const
+{
+  if (!live)
+    abort ();
+  return false;
+}