diff options
author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-20 19:59:56 +0000 |
---|---|---|
committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-20 19:59:56 +0000 |
commit | 2b073aa68143d9c2ce52cde0243eca27cae888d3 (patch) | |
tree | cc271a4402029d6096a19aed56d717400e6ea923 /gcc/cp/optimize.c | |
parent | 8a574c111102d77e90033c3d2a94e071cd69c5fb (diff) | |
download | gcc-2b073aa68143d9c2ce52cde0243eca27cae888d3.tar.gz |
cp/
PR c++/55635
* init.c (build_vec_delete_1): Protect operator delete call in try
finally.
(build_delete): Likewise.
* optimize.c (build_delete_destructor_body): Likewise.
testsuite/
PR c++/55635
* g++.dg/eh/delete1.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235297 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/optimize.c')
-rw-r--r-- | gcc/cp/optimize.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c index 6f80b3d6d84..e2032c1d90e 100644 --- a/gcc/cp/optimize.c +++ b/gcc/cp/optimize.c @@ -112,26 +112,24 @@ clone_body (tree clone, tree fn, void *arg_map) static void build_delete_destructor_body (tree delete_dtor, tree complete_dtor) { - tree call_dtor, call_delete; tree parm = DECL_ARGUMENTS (delete_dtor); tree virtual_size = cxx_sizeof (current_class_type); /* Call the corresponding complete destructor. */ gcc_assert (complete_dtor); - call_dtor = build_cxx_call (complete_dtor, 1, &parm, - tf_warning_or_error); - add_stmt (call_dtor); - - add_stmt (build_stmt (0, LABEL_EXPR, cdtor_label)); + tree call_dtor = build_cxx_call (complete_dtor, 1, &parm, + tf_warning_or_error); /* Call the delete function. */ - call_delete = build_op_delete_call (DELETE_EXPR, current_class_ptr, - virtual_size, - /*global_p=*/false, - /*placement=*/NULL_TREE, - /*alloc_fn=*/NULL_TREE, - tf_warning_or_error); - add_stmt (call_delete); + tree call_delete = build_op_delete_call (DELETE_EXPR, current_class_ptr, + virtual_size, + /*global_p=*/false, + /*placement=*/NULL_TREE, + /*alloc_fn=*/NULL_TREE, + tf_warning_or_error); + + /* Operator delete must be called, whether or not the dtor throws. */ + add_stmt (build2 (TRY_FINALLY_EXPR, void_type_node, call_dtor, call_delete)); /* Return the address of the object. */ if (targetm.cxx.cdtor_returns_this ()) |