From b82082972bbfbe47e3a2370f86d79100610662d5 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Tue, 24 Feb 2004 13:30:47 -0500
Subject: [PATCH] re PR c++/13944 (exception in constructor of a class to be
 thrown is not caught)

        PR c++/13944
        * except.c (do_free_exception): Remove #if 0 wrapper.
        (build_throw): Use it if we elide a copy into the exception object.

From-SVN: r78378
---
 gcc/testsuite/g++.dg/eh/elide1.C | 30 ++++++++++++++++++++++++++++
 gcc/testsuite/g++.dg/eh/elide2.C | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/eh/elide1.C
 create mode 100644 gcc/testsuite/g++.dg/eh/elide2.C

diff --git a/gcc/testsuite/g++.dg/eh/elide1.C b/gcc/testsuite/g++.dg/eh/elide1.C
new file mode 100644
index 000000000000..94d2a6982ce1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/elide1.C
@@ -0,0 +1,30 @@
+// PR c++/13944
+
+// Bug: When eliding the copy from the A temporary into the exception
+// object, we extended the throw prohibition to the constructor for the
+// temporary.  This is wrong; the throw from A() should propagate normally
+// regardless of the elision of the temporary.
+
+// { dg-do run }
+
+struct A
+{
+  A() { throw 0; }
+};
+
+int main()
+{
+  try
+    {
+      throw A();
+    }
+  catch(int i)
+    {
+      return i;
+    }
+  catch (...)
+    {
+      return 2;
+    }
+  return 3;
+}
diff --git a/gcc/testsuite/g++.dg/eh/elide2.C b/gcc/testsuite/g++.dg/eh/elide2.C
new file mode 100644
index 000000000000..618ee6f40063
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/elide2.C
@@ -0,0 +1,34 @@
+// PR c++/13944
+
+// Verify that we still call terminate() if we do run the copy constructor,
+// and it throws.
+
+// { dg-do run }
+
+#include <cstdlib>
+#include <exception>
+
+struct A
+{
+  A() { }
+  A(const A&) { throw 1; }
+};
+
+A a;
+
+void
+good_terminate() { std::exit (0); }
+
+int main()
+{
+  std::set_terminate (good_terminate);
+  try
+    {
+      throw a;
+    }
+  catch (...)
+    {
+      return 2;
+    }
+  return 3;
+}
-- 
2.47.2