diff options
| -rw-r--r-- | gcc/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/doc/invoke.texi | 9 | ||||
| -rw-r--r-- | gcc/except.c | 146 | ||||
| -rw-r--r-- | gcc/flags.h | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/eh/forced1.C | 71 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/eh/forced2.C | 87 | ||||
| -rw-r--r-- | gcc/toplev.c | 6 |
7 files changed, 314 insertions, 24 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ed1698f..a252078 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2003-04-01 Richard Henderson <rth@redhat.com> + + * except.c (convert_from_eh_region_ranges_1): Smash REG_EH_REGION + notes for nothrow calls if flag_forced_unwind_exceptions. + (build_post_landing_pads): Mind flag_forced_unwind_exceptions. + (sjlj_find_directly_reachable_regions): Likewise. + (reachable_handlers): Likewise. + (can_throw_external): Likewise. + (collect_one_action_chain): Record cleanups after catch-all and + must-not-throw if flag_forced_unwind_exceptions. + * flags.h (flag_forced_unwind_exceptions): Declare. + * toplev.c (flag_forced_unwind_exceptions): New. + (lang_independent_options): Add it. + * doc/invoke.text: Add it. + 2003-04-01 David Mosberger <davidm@hpl.hp.com> * config/ia64/crti.asm: Clean up trailing whitespace. diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 67ae67f..3d8026c 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -705,7 +705,7 @@ in the following sections. -fcall-saved-@var{reg} -fcall-used-@var{reg} @gol -ffixed-@var{reg} -fexceptions @gol -fnon-call-exceptions -funwind-tables @gol --fasynchronous-unwind-tables @gol +-fasynchronous-unwind-tables -fforced-unwind-exceptions @gol -finhibit-size-directive -finstrument-functions @gol -fno-common -fno-ident -fno-gnu-linker @gol -fpcc-struct-return -fpic -fPIC @gol @@ -10843,6 +10843,13 @@ instructions to throw exceptions, i.e.@: memory references or floating point instructions. It does not allow exceptions to be thrown from arbitrary signal handlers such as @code{SIGALRM}. +@item -fforced-unwind-exceptions +@opindex fforced-unwind-exceptions +Generate code that checks for non-catchable exceptions derived from +@code{_Unwind_ForcedUnwind}, such as from @code{longjmp_unwind} or +from pthread cancellation. There is some amount of code-size +overhead associated with this, so it is not default. + @item -funwind-tables @opindex funwind-tables Similar to @option{-fexceptions}, except that it will just generate any needed diff --git a/gcc/except.c b/gcc/except.c index 3c80f60..00c5e5b 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -1111,21 +1111,40 @@ convert_from_eh_region_ranges_1 (pinsns, orig_sp, cur) } else if (INSN_P (insn)) { - if (cur > 0 - && ! find_reg_note (insn, REG_EH_REGION, NULL_RTX) - /* Calls can always potentially throw exceptions, unless - they have a REG_EH_REGION note with a value of 0 or less. - Which should be the only possible kind so far. */ - && (GET_CODE (insn) == CALL_INSN - /* If we wanted exceptions for non-call insns, then - any may_trap_p instruction could throw. */ - || (flag_non_call_exceptions - && GET_CODE (PATTERN (insn)) != CLOBBER - && GET_CODE (PATTERN (insn)) != USE - && may_trap_p (PATTERN (insn))))) + rtx note; + switch (cur) { - REG_NOTES (insn) = alloc_EXPR_LIST (REG_EH_REGION, GEN_INT (cur), + default: + /* An existing region note may be present to suppress + exception handling. Anything with a note value of -1 + cannot throw an exception of any kind. A note value + of 0 means that "normal" exceptions are suppressed, + but not necessarily "forced unwind" exceptions. */ + note = find_reg_note (insn, REG_EH_REGION, NULL_RTX); + if (note) + { + if (flag_forced_unwind_exceptions + && INTVAL (XEXP (note, 0)) >= 0) + XEXP (note, 0) = GEN_INT (cur); + break; + } + + /* Calls can always potentially throw exceptions; if we wanted + exceptions for non-call insns, then any may_trap_p + instruction can throw. */ + if (GET_CODE (insn) != CALL_INSN + && (!flag_non_call_exceptions + || GET_CODE (PATTERN (insn)) == CLOBBER + || GET_CODE (PATTERN (insn)) == USE + || !may_trap_p (PATTERN (insn)))) + break; + + REG_NOTES (insn) = alloc_EXPR_LIST (REG_EH_REGION, + GEN_INT (cur), REG_NOTES (insn)); + + case 0: + break; } if (GET_CODE (insn) == CALL_INSN @@ -1683,9 +1702,15 @@ build_post_landing_pads () struct eh_region *c; for (c = region->u.try.catch; c ; c = c->u.catch.next_catch) { - /* ??? _Unwind_ForcedUnwind wants no match here. */ if (c->u.catch.type_list == NULL) - emit_jump (c->label); + { + if (flag_forced_unwind_exceptions) + emit_cmp_and_jump_insns + (cfun->eh->filter, const0_rtx, GT, NULL_RTX, + word_mode, 0, c->label); + else + emit_jump (c->label); + } else { /* Need for one cmp/jump per type caught. Each type @@ -1746,10 +1771,35 @@ build_post_landing_pads () break; case ERT_CLEANUP: - case ERT_MUST_NOT_THROW: region->post_landing_pad = region->label; break; + case ERT_MUST_NOT_THROW: + /* See maybe_remove_eh_handler about removing region->label. */ + if (flag_forced_unwind_exceptions && region->label) + { + region->post_landing_pad = gen_label_rtx (); + + start_sequence (); + + emit_label (region->post_landing_pad); + emit_cmp_and_jump_insns (cfun->eh->filter, const0_rtx, GT, + NULL_RTX, word_mode, 0, region->label); + + region->resume + = emit_jump_insn (gen_rtx_RESX (VOIDmode, + region->region_number)); + emit_barrier (); + + seq = get_insns (); + end_sequence (); + + emit_insn_before (seq, region->label); + } + else + region->post_landing_pad = region->label; + break; + case ERT_CATCH: case ERT_THROW: /* Nothing to do. */ @@ -1927,6 +1977,19 @@ sjlj_find_directly_reachable_regions (lp_info) if (rc != RNL_NOT_CAUGHT) break; } + + /* Forced unwind exceptions aren't blocked. */ + if (flag_forced_unwind_exceptions && rc == RNL_BLOCKED) + { + struct eh_region *r; + for (r = region->outer; r ; r = r->outer) + if (r->type == ERT_CLEANUP) + { + rc = RNL_MAYBE_CAUGHT; + break; + } + } + if (rc == RNL_MAYBE_CAUGHT || rc == RNL_CAUGHT) { lp_info[region->region_number].directly_reachable = 1; @@ -2581,8 +2644,6 @@ reachable_next_level (region, type_thrown, info) for (c = region->u.try.catch; c ; c = c->u.catch.next_catch) { /* A catch-all handler ends the search. */ - /* ??? _Unwind_ForcedUnwind will want outer cleanups - to be run as well. */ if (c->u.catch.type_list == NULL) { add_reachable_handler (info, region, c); @@ -2767,7 +2828,21 @@ reachable_handlers (insn) while (region) { if (reachable_next_level (region, type_thrown, &info) >= RNL_CAUGHT) - break; + { + /* Forced unwind exceptions are neither BLOCKED nor CAUGHT. + Make sure the cleanup regions are reachable. */ + if (flag_forced_unwind_exceptions) + { + while ((region = region->outer) != NULL) + if (region->type == ERT_CLEANUP) + { + add_reachable_handler (&info, region, region); + break; + } + } + break; + } + /* If we have processed one cleanup, there is no point in processing any more of them. Each cleanup will have an edge to the next outer cleanup region, so the flow graph will be @@ -2889,6 +2964,10 @@ can_throw_external (insn) if (INTVAL (XEXP (note, 0)) <= 0) return false; + /* Forced unwind excptions are not catchable. */ + if (flag_forced_unwind_exceptions && GET_CODE (insn) == CALL_INSN) + return true; + region = cfun->eh->region_array[INTVAL (XEXP (note, 0))]; type_thrown = NULL_TREE; @@ -3243,12 +3322,26 @@ collect_one_action_chain (ar_hash, region) { if (c->u.catch.type_list == NULL) { + int filter; + + /* Forced exceptions run cleanups, always. Record them if + they exist. */ + next = 0; + if (flag_forced_unwind_exceptions) + { + struct eh_region *r; + for (r = c->outer; r ; r = r->outer) + if (r->type == ERT_CLEANUP) + { + next = add_action_record (ar_hash, 0, 0); + break; + } + } + /* Retrieve the filter from the head of the filter list where we have stored it (see assign_filter_values). */ - int filter - = TREE_INT_CST_LOW (TREE_VALUE (c->u.catch.filter_list)); - - next = add_action_record (ar_hash, filter, 0); + filter = TREE_INT_CST_LOW (TREE_VALUE (c->u.catch.filter_list)); + next = add_action_record (ar_hash, filter, next); } else { @@ -3293,6 +3386,13 @@ collect_one_action_chain (ar_hash, region) requires no call-site entry. Note that this differs from the no handler or cleanup case in that we do require an lsda to be generated. Return a magic -2 value to record this. */ + if (flag_forced_unwind_exceptions) + { + struct eh_region *r; + for (r = region->outer; r ; r = r->outer) + if (r->type == ERT_CLEANUP) + return 0; + } return -2; case ERT_CATCH: diff --git a/gcc/flags.h b/gcc/flags.h index aed3386..88ed465 100644 --- a/gcc/flags.h +++ b/gcc/flags.h @@ -476,6 +476,10 @@ extern int flag_unwind_tables; extern int flag_asynchronous_unwind_tables; +/* Nonzero means allow for forced unwinding. */ + +extern int flag_forced_unwind_exceptions; + /* Nonzero means don't place uninitialized global data in common storage by default. */ diff --git a/gcc/testsuite/g++.dg/eh/forced1.C b/gcc/testsuite/g++.dg/eh/forced1.C new file mode 100644 index 0000000..512d720 --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/forced1.C @@ -0,0 +1,71 @@ +// { dg-do run } +// { dg-options "-fforced-unwind-exceptions" } + +// Test that forced unwinding runs all cleanups, and only cleanups. + +#include <unwind.h> +#include <stdlib.h> + +static int test = 0; + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + { + if (test != 5) + abort (); + exit (0); + } + + return _URC_NO_REASON; +} + +static void force_unwind () +{ + _Unwind_Exception *exc = new _Unwind_Exception; + exc->exception_class = 0; + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + + abort (); +} + +struct S +{ + int bit; + S(int b) : bit(b) { } + ~S() { test |= bit; } +}; + +static void doit () +{ + try { + S four(4); + + try { + S one(1); + force_unwind (); + + } catch(...) { + test |= 2; + } + + } catch(...) { + test |= 8; + } +} + +int main() +{ + try { + doit (); + } catch (...) { + } + abort (); +} diff --git a/gcc/testsuite/g++.dg/eh/forced2.C b/gcc/testsuite/g++.dg/eh/forced2.C new file mode 100644 index 0000000..f681209 --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/forced2.C @@ -0,0 +1,87 @@ +// { dg-do run } +// { dg-options "-fforced-unwind-exceptions" } + +// Test that forced unwinding runs all cleanups, and only cleanups. + +#include <unwind.h> +#include <stdlib.h> + +static int test = 0; + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + { + if (test != 5) + abort (); + exit (0); + } + + return _URC_NO_REASON; +} + +// Note that neither the noreturn nor the nothrow specification +// affects forced unwinding. + +static void __attribute__((noreturn)) +force_unwind () throw() +{ + _Unwind_Exception *exc = new _Unwind_Exception; + exc->exception_class = 0; + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + + abort (); +} + +struct S +{ + int bit; + S(int b) : bit(b) { } + ~S() { test |= bit; } +}; + +static void doit_3 () +{ + S one(1); + force_unwind (); +} + +static void doit_2 () +{ + try { + doit_3 (); + } catch (...) { + test |= 2; + } +} + +static void doit_1 () +{ + S four(4); + doit_2 (); +} + +static void doit () +{ + try { + doit_1 (); + } catch(...) { + test |= 8; + } +} + +int main() +{ + try { + doit (); + } catch (...) { + } + abort (); +} diff --git a/gcc/toplev.c b/gcc/toplev.c index 67cd533..1be5202 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -744,6 +744,10 @@ int flag_unwind_tables = 0; int flag_asynchronous_unwind_tables = 0; +/* Nonzero means allow for forced unwinding. */ + +int flag_forced_unwind_exceptions; + /* Nonzero means don't place uninitialized global data in common storage by default. */ @@ -1128,6 +1132,8 @@ static const lang_independent_options f_options[] = N_("Generate unwind tables exact at each instruction boundary") }, {"non-call-exceptions", &flag_non_call_exceptions, 1, N_("Support synchronous non-call exceptions") }, + {"forced-unwind-exceptions", &flag_forced_unwind_exceptions, 1, + N_("Support forced unwinding, e.g. for thread cancellation") }, {"profile-arcs", &profile_arc_flag, 1, N_("Insert arc based program profiling code") }, {"test-coverage", &flag_test_coverage, 1, |