diff options
| -rw-r--r-- | gcc/cp/cp-gimplify.cc | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/except.cc | 5 | ||||
| -rw-r--r-- | gcc/except.h | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/eh/terminate2.C | 30 | ||||
| -rw-r--r-- | gcc/tree-eh.cc | 16 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_call.cc | 4 |
8 files changed, 63 insertions, 5 deletions
diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc index 216a623..853b1e4 100644 --- a/gcc/cp/cp-gimplify.cc +++ b/gcc/cp/cp-gimplify.cc @@ -343,7 +343,7 @@ gimplify_must_not_throw_expr (tree *expr_p, gimple_seq *pre_p) gimple *mnt; gimplify_and_add (body, &try_); - mnt = gimple_build_eh_must_not_throw (terminate_fn); + mnt = gimple_build_eh_must_not_throw (call_terminate_fn); gimple_seq_add_stmt_without_update (&catch_, mnt); mnt = gimple_build_try (try_, catch_, GIMPLE_TRY_CATCH); diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index ce2095c..101da35 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -217,6 +217,7 @@ enum cp_tree_index definitions. */ CPTI_ALIGN_TYPE, CPTI_TERMINATE_FN, + CPTI_CALL_TERMINATE_FN, CPTI_CALL_UNEXPECTED_FN, /* These are lazily inited. */ @@ -358,6 +359,7 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX]; /* Exception handling function declarations. */ #define terminate_fn cp_global_trees[CPTI_TERMINATE_FN] #define call_unexpected_fn cp_global_trees[CPTI_CALL_UNEXPECTED_FN] +#define call_terminate_fn cp_global_trees[CPTI_CALL_TERMINATE_FN] #define get_exception_ptr_fn cp_global_trees[CPTI_GET_EXCEPTION_PTR_FN] #define begin_catch_fn cp_global_trees[CPTI_BEGIN_CATCH_FN] #define end_catch_fn cp_global_trees[CPTI_END_CATCH_FN] diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 91a5e04..b04eb00 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -64,6 +64,9 @@ init_exception_processing (void) tmp = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); call_unexpected_fn = push_throw_library_fn (get_identifier ("__cxa_call_unexpected"), tmp); + call_terminate_fn + = push_library_fn (get_identifier ("__cxa_call_terminate"), tmp, NULL_TREE, + ECF_NORETURN | ECF_COLD | ECF_NOTHROW); } /* Returns an expression to be executed if an unhandled exception is @@ -76,7 +79,7 @@ cp_protect_cleanup_actions (void) When the destruction of an object during stack unwinding exits using an exception ... void terminate(); is called. */ - return terminate_fn; + return call_terminate_fn; } static tree diff --git a/gcc/except.h b/gcc/except.h index 5ecdbc0..378a9e4 100644 --- a/gcc/except.h +++ b/gcc/except.h @@ -155,7 +155,7 @@ struct GTY(()) eh_region_d struct eh_region_u_must_not_throw { /* A function decl to be invoked if this region is actually reachable from within the function, rather than implementable from the runtime. - The normal way for this to happen is for there to be a CLEANUP region + The normal way for this to happen is for there to be a TRY region contained within this MUST_NOT_THROW region. Note that if the runtime handles the MUST_NOT_THROW region, we have no control over what termination function is called; it will be decided by the diff --git a/gcc/testsuite/g++.dg/eh/terminate2.C b/gcc/testsuite/g++.dg/eh/terminate2.C new file mode 100644 index 0000000..1c69dab --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/terminate2.C @@ -0,0 +1,30 @@ +// PR c++/97720 +// { dg-do run } + +// Test that there is an active exception when we reach the terminate handler. + +#include <exception> +#include <cstdlib> + +void bad_guy() throw() { + try { throw 0; } + catch (float) { } + // Don't catch int. +} + +void level1() { + bad_guy(); + throw "dead code"; +} + +void my_term() +{ + try { throw; } + catch(...) { std::exit(0); } +} + +int main() { + std::set_terminate (my_term); + try { level1(); } + catch (int) { } +} diff --git a/gcc/tree-eh.cc b/gcc/tree-eh.cc index 934209d..e8ceff3 100644 --- a/gcc/tree-eh.cc +++ b/gcc/tree-eh.cc @@ -3382,8 +3382,22 @@ lower_resx (basic_block bb, gresx *stmt, lab = gimple_block_label (new_bb); gsi2 = gsi_start_bb (new_bb); + /* Handle failure fns that expect either no arguments or the + exception pointer. */ fn = dst_r->u.must_not_throw.failure_decl; - x = gimple_build_call (fn, 0); + if (TYPE_ARG_TYPES (TREE_TYPE (fn)) != void_list_node) + { + tree epfn = builtin_decl_implicit (BUILT_IN_EH_POINTER); + src_nr = build_int_cst (integer_type_node, src_r->index); + x = gimple_build_call (epfn, 1, src_nr); + tree var = create_tmp_var (ptr_type_node); + var = make_ssa_name (var, x); + gimple_call_set_lhs (x, var); + gsi_insert_after (&gsi2, x, GSI_CONTINUE_LINKING); + x = gimple_build_call (fn, 1, var); + } + else + x = gimple_build_call (fn, 0); gimple_set_location (x, dst_r->u.must_not_throw.failure_loc); gsi_insert_after (&gsi2, x, GSI_CONTINUE_LINKING); diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 768cd4a..a2e5f3b 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -2841,6 +2841,13 @@ CXXABI_1.3.14 { } CXXABI_1.3.13; +CXXABI_1.3.15 { + + global: + __cxa_call_terminate; + +} CXXABI_1.3.14; + # Symbols in the support library (libsupc++) supporting transactional memory. CXXABI_TM_1 { diff --git a/libstdc++-v3/libsupc++/eh_call.cc b/libstdc++-v3/libsupc++/eh_call.cc index 3cfc71a..2bec4e8 100644 --- a/libstdc++-v3/libsupc++/eh_call.cc +++ b/libstdc++-v3/libsupc++/eh_call.cc @@ -36,8 +36,10 @@ using namespace __cxxabiv1; // terminate. extern "C" void -__cxa_call_terminate(_Unwind_Exception* ue_header) throw () +__cxa_call_terminate(void* ue_header_in) throw () { + _Unwind_Exception* ue_header + = reinterpret_cast<_Unwind_Exception*>(ue_header_in); if (ue_header) { |