From b01010c778a00440334ce38918a72940036cb534 Mon Sep 17 00:00:00 2001 From: rth Date: Wed, 28 Mar 2001 04:18:13 +0000 Subject: [PATCH] * bb-reorder.c, dwarf2out.c, except.c, except.h, flow.c, jump.c, toplev.c: Rename asynchronous_exceptions to flag_non_call_exceptions. * java/decl.c (end_java_method): Rename asynchronous_exceptions to flag_non_call_exceptions. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40902 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/bb-reorder.c | 2 +- gcc/dwarf2out.c | 4 ++-- gcc/except.c | 4 ++-- gcc/except.h | 2 +- gcc/flow.c | 4 ++-- gcc/java/ChangeLog | 5 +++++ gcc/java/decl.c | 8 ++++---- gcc/jump.c | 2 +- gcc/toplev.c | 4 ++-- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a9630a8d53d..bd68d3fcc31 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-03-27 Richard Henderson + + * bb-reorder.c, dwarf2out.c, except.c, except.h, flow.c, + jump.c, toplev.c: + Rename asynchronous_exceptions to flag_non_call_exceptions. + 2001-03-27 Kaveh R. Ghazi * configure.in: Don't check for bcopy. diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c index 740be9aff04..93b2034963c 100644 --- a/gcc/bb-reorder.c +++ b/gcc/bb-reorder.c @@ -396,7 +396,7 @@ make_reorder_chain_1 (bb, prev) /* Find the normal taken edge and the normal fallthru edge. Note that there may in fact be other edges due to - asynchronous_exceptions. + flag_non_call_exceptions. Note, conditional jumps with other side effects may not be fully optimized. In this case it is possible for diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index f791538aa5f..67ac7e2afca 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -951,7 +951,7 @@ dwarf2out_stack_adjust (insn) long offset; const char *label; - if (! asynchronous_exceptions && GET_CODE (insn) == CALL_INSN) + if (! flag_non_call_exceptions && GET_CODE (insn) == CALL_INSN) { /* Extract the size of the args from the CALL rtx itself. */ @@ -968,7 +968,7 @@ dwarf2out_stack_adjust (insn) /* If only calls can throw, and we have a frame pointer, save up adjustments until we see the CALL_INSN. */ - else if (! asynchronous_exceptions + else if (! flag_non_call_exceptions && cfa.reg != STACK_POINTER_REGNUM) return; diff --git a/gcc/except.c b/gcc/except.c index eb80b9b40e2..c432eaa801d 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -416,7 +416,7 @@ int exceptions_via_longjmp = 2; /* One to enable asynchronous exception support. */ -int asynchronous_exceptions = 0; +int flag_non_call_exceptions = 0; /* One to protect cleanup actions with a handler that calls __terminate, zero otherwise. */ @@ -2704,7 +2704,7 @@ can_throw (insn) return 1; } - if (asynchronous_exceptions) + if (flag_non_call_exceptions) { /* If we wanted asynchronous exceptions, then everything but NOTEs and CODE_LABELs could throw. */ diff --git a/gcc/except.h b/gcc/except.h index b6450d3535e..f4eda909f75 100644 --- a/gcc/except.h +++ b/gcc/except.h @@ -478,7 +478,7 @@ extern int exceptions_via_longjmp; /* One to enable asynchronous exception support. */ -extern int asynchronous_exceptions; +extern int flag_non_call_exceptions; /* One to protect cleanup actions with a handler that calls __terminate, zero otherwise. */ diff --git a/gcc/flow.c b/gcc/flow.c index 6625a6936f5..bf5043a5e7b 100644 --- a/gcc/flow.c +++ b/gcc/flow.c @@ -1324,7 +1324,7 @@ make_edges (label_value_list) Also mark the CALL_INSN as reaching any nonlocal goto handler. */ - else if (code == CALL_INSN || asynchronous_exceptions) + else if (code == CALL_INSN || flag_non_call_exceptions) { /* Add any appropriate EH edges. We do this unconditionally since there may be a REG_EH_REGION or REG_EH_RETHROW note @@ -1333,7 +1333,7 @@ make_edges (label_value_list) /* If we have asynchronous exceptions, do the same for *all* exception regions active in the block. */ - if (asynchronous_exceptions + if (flag_non_call_exceptions && bb->eh_beg != bb->eh_end) { if (bb->eh_beg >= 0) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index c558580a933..17bd9d5a42a 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-03-27 Richard Henderson + + * decl.c (end_java_method): Rename asynchronous_exceptions to + flag_non_call_exceptions. + 2001-03-27 Kaveh R. Ghazi * Make-lang.in: Depend on $(SYSTEM_H), not system.h. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 1a68a042138..a5b423bfa05 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1827,7 +1827,7 @@ void end_java_method () { tree fndecl = current_function_decl; - int flag_asynchronous_exceptions = asynchronous_exceptions; + int flag_flag_non_call_exceptions = flag_non_call_exceptions; expand_end_bindings (getdecls (), 1, 0); /* pop out of function */ @@ -1844,17 +1844,17 @@ end_java_method () expand_function_end (input_filename, lineno, 0); /* FIXME: If the current method contains any exception handlers, - force asynchronous_exceptions: this is necessary because signal + force flag_non_call_exceptions: this is necessary because signal handlers in libjava may throw exceptions. This is far from being a perfect solution, but it's better than doing nothing at all.*/ if (catch_clauses) - asynchronous_exceptions = 1; + flag_non_call_exceptions = 1; /* Run the optimizers and output assembler code for this function. */ rest_of_compilation (fndecl); current_function_decl = NULL_TREE; - asynchronous_exceptions = flag_asynchronous_exceptions; + flag_non_call_exceptions = flag_flag_non_call_exceptions; } /* Mark language-specific parts of T for garbage-collection. */ diff --git a/gcc/jump.c b/gcc/jump.c index bc80ba2e3b6..958f8582400 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -1447,7 +1447,7 @@ find_cross_jump (e1, e2, minimum, f1, f2) /* Avoid moving insns across EH regions if either of the insns can throw. */ if (flag_exceptions - && (asynchronous_exceptions || GET_CODE (i1) == CALL_INSN) + && (flag_non_call_exceptions || GET_CODE (i1) == CALL_INSN) && !in_same_eh_region (i1, i2)) break; diff --git a/gcc/toplev.c b/gcc/toplev.c index 3c7d0ab74aa..1263e216bbf 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1083,8 +1083,8 @@ lang_independent_options f_options[] = "Just generate unwind tables for exception handling" }, {"sjlj-exceptions", &exceptions_via_longjmp, 1, "Use setjmp/longjmp to handle exceptions" }, - {"asynchronous-exceptions", &asynchronous_exceptions, 1, - "Support asynchronous exceptions" }, + {"non-call-exceptions", &flag_non_call_exceptions, 1, + "Support synchronous non-call exceptions" }, {"profile-arcs", &profile_arc_flag, 1, "Insert arc based program profiling code" }, {"test-coverage", &flag_test_coverage, 1, -- 2.11.4.GIT