From: Jason Merrill <jason@redhat.com>
Date: Tue, 4 Sep 2007 18:37:33 +0000 (-0400)
Subject: re PR c++/31411 (ICE in gimplify_expr with throw/special copy constructor with initia... 
X-Git-Tag: releases/gcc-4.3.0~2895
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba6c89a9a9bc724db5cd063fe9263f5761e826e3;p=thirdparty%2Fgcc.git

re PR c++/31411 (ICE in gimplify_expr with throw/special copy constructor with initializer with a deconstructor)

        PR c++/31411
        * except.c (initialize_handler_parm): Put a CLEANUP_POINT_EXPR inside
        the MUST_NOT_THROW_EXPR.

From-SVN: r128100
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 63b7b207ef12..e517f89d1127 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/31411
+	* except.c (initialize_handler_parm): Put a CLEANUP_POINT_EXPR inside
+	the MUST_NOT_THROW_EXPR.
+
 2007-09-04  Richard Sandiford  <richard@codesourcery.com>
 
 	* decl.c (cp_finish_decl): Call determine_visibility before
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index b6e8eeac7101..3217f27c0d5d 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -388,6 +388,9 @@ initialize_handler_parm (tree decl, tree exp)
 	 See also expand_default_init.  */
       init = ocp_convert (TREE_TYPE (decl), init,
 			  CONV_IMPLICIT|CONV_FORCE_TEMP, 0);
+      /* Force cleanups now to avoid nesting problems with the
+	 MUST_NOT_THROW_EXPR.  */
+      init = build1 (CLEANUP_POINT_EXPR, TREE_TYPE (init), init);
       init = build1 (MUST_NOT_THROW_EXPR, TREE_TYPE (init), init);
     }
 
diff --git a/gcc/testsuite/g++.dg/eh/catch5.C b/gcc/testsuite/g++.dg/eh/catch5.C
new file mode 100644
index 000000000000..6001b566e073
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/catch5.C
@@ -0,0 +1,13 @@
+// PR c++/31411
+
+struct allocator{
+  ~allocator() throw();
+};
+struct string
+{
+  string(const string& str, const allocator& al = allocator());
+};
+int main() {
+  try {}
+  catch (string smess) {}
+}