diff options
| author | Jason Merrill <jason@redhat.com> | 2007-09-04 14:37:33 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2007-09-04 14:37:33 -0400 |
| commit | ba6c89a9a9bc724db5cd063fe9263f5761e826e3 (patch) | |
| tree | b8ec68650409252db64ca5211dab9986a5a11c3e /gcc | |
| parent | f202305d019c7a5d86bcbc14f9d6fe64c3fbe05b (diff) | |
| download | gcc-ba6c89a9a9bc724db5cd063fe9263f5761e826e3.zip gcc-ba6c89a9a9bc724db5cd063fe9263f5761e826e3.tar.gz gcc-ba6c89a9a9bc724db5cd063fe9263f5761e826e3.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/except.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/eh/catch5.C | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 63b7b20..e517f89 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 b6e8eea..3217f27 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 0000000..6001b56 --- /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) {} +} |