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

diff --git a/gcc/testsuite/g++.dg/eh/cond1.C b/gcc/testsuite/g++.dg/eh/cond1.C
new file mode 100644
index 000000000..4f494267e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/cond1.C
@@ -0,0 +1,64 @@
+// PR c++/7050
+// { dg-do run }
+
+extern "C" void abort(void);
+
+#define CI(stmt) try { stmt; abort(); } catch (int) { }
+
+struct has_destructor
+{
+    ~has_destructor() { }
+};
+
+struct no_destructor
+{
+};
+
+int PI(int& i) { return i++; }
+
+int main(int argc, char *argv[])
+{
+    (argc+1 ? has_destructor() : throw 0);
+    CI((argc+1 ? throw 0 : has_destructor()));
+    CI((0 ? has_destructor() : throw 0));
+    CI((1 ? throw 0 : has_destructor()));
+    (0 ? throw 0 : has_destructor());
+    (1 ? has_destructor() : throw 0);
+
+    (argc+1 ? no_destructor() : throw 0);
+    CI((argc+1 ? throw 0 : no_destructor()));
+    CI((0 ? no_destructor() : throw 0));
+    CI((1 ? throw 0 : no_destructor()));
+    (0 ? throw 0 : no_destructor());
+    (1 ? no_destructor() : throw 0);
+
+    int i = 1;
+    CI(throw PI(i));
+    if (i != 2) abort();
+
+    (1 ? 0 : throw PI(i));
+    if (i != 2) abort();
+
+    CI(0 ? 0 : throw PI(i));
+    if (i != 3) abort();
+
+    CI(0 ? has_destructor() : throw PI(i));
+    if (i != 4) abort();
+    (argc+1 ? has_destructor() : throw PI(i));
+    if (i != 4) abort();
+
+    i = 1;
+    CI(throw i++);
+    if (i != 2) abort();
+
+    (1 ? 0 : throw i++);
+    if (i != 2) abort();
+
+    CI(0 ? 0 : throw i++);
+    if (i != 3) abort();
+
+    CI(0 ? has_destructor() : throw i++);
+    if (i != 4) abort();
+    (argc+1 ? has_destructor() : throw i++);
+    if (i != 4) abort();
+}