re PR c++/31411 (ICE in gimplify_expr with throw/special copy constructor with…

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

gcc/cp/ChangeLog

+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

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);
     }
 

gcc/testsuite/g++.dg/eh/catch5.C

+// PR c++/31411
+
+struct allocator{
+  ~allocator() throw();
+};
+struct string
+{
+  string(const string& str, const allocator& al = allocator());
+};
+int main() {
+  try {}
+  catch (string smess) {}
+}