Minor tweaks.
* except.c (expand_start_catch): Rename to start_catch_handler. (expand_end_catch): Delete function. (expand_end_all_catch): Remove catch status that expand_end_catch use to do. * except.h (expand_start_catch): Rename prototype. (expand_end_catch): Delete prototype. * semantics.c (finish_try_block): Rename expand_start_catch, and delete expand_end_catch. * parse.y (function_try_block): Rename expand_start_catch, and delete expand_end_catch. * except.c (expand_end_eh_spec): Rename expand_start_catch, and delete expand_end_catch. From-SVN: r20379
This commit is contained in:
parent
3398f47f04
commit
0d3453dfb6
|
@ -1,3 +1,12 @@
|
|||
Tue Jun 9 16:23:13 EDT 1998 Andrew MacLeod <amacleod@cygnus.com>
|
||||
|
||||
* except.c (expand_start_catch): Rename to start_catch_handler.
|
||||
(expand_end_catch): Delete function.
|
||||
(expand_end_all_catch): Remove catch status that expand_end_catch
|
||||
use to do.
|
||||
* except.h (expand_start_catch): Rename prototype.
|
||||
(expand_end_catch): Delete prototype.
|
||||
|
||||
Tue Jun 9 12:57:32 1998 Mark Mitchell <mark@markmitchell.com>
|
||||
|
||||
* invoke.texi: Add documentation for -mips4 and -mabi=*.
|
||||
|
|
|
@ -1,3 +1,12 @@
|
|||
1998-06-09 Andrew MacLeod <amacleod@cygnus.com>
|
||||
|
||||
* semantics.c (finish_try_block): Rename expand_start_catch, and delete
|
||||
expand_end_catch.
|
||||
* parse.y (function_try_block): Rename expand_start_catch, and delete
|
||||
expand_end_catch.
|
||||
* except.c (expand_end_eh_spec): Rename expand_start_catch, and delete
|
||||
expand_end_catch.
|
||||
|
||||
1998-06-09 Jason Merrill <jason@yorick.cygnus.com>
|
||||
|
||||
* search.c (lookup_member): New fn.
|
||||
|
|
|
@ -686,7 +686,7 @@ expand_end_eh_spec (raises)
|
|||
int count = 0;
|
||||
|
||||
expand_start_all_catch ();
|
||||
expand_start_catch (NULL);
|
||||
start_catch_handler (NULL);
|
||||
expand_start_catch_block (NULL_TREE, NULL_TREE);
|
||||
|
||||
/* Build up an array of type_infos. */
|
||||
|
@ -739,7 +739,6 @@ expand_end_eh_spec (raises)
|
|||
expand_expr (tmp, const0_rtx, VOIDmode, EXPAND_NORMAL);
|
||||
|
||||
expand_end_catch_block ();
|
||||
expand_end_catch ();
|
||||
expand_end_all_catch ();
|
||||
}
|
||||
|
||||
|
|
|
@ -3251,14 +3251,13 @@ function_try_block:
|
|||
ctor_initializer_opt compstmt
|
||||
{
|
||||
expand_start_all_catch ();
|
||||
expand_start_catch (NULL);
|
||||
start_catch_handler (NULL);
|
||||
}
|
||||
handler_seq
|
||||
{
|
||||
int nested = (hack_decl_function_context
|
||||
(current_function_decl) != NULL_TREE);
|
||||
expand_end_all_catch ();
|
||||
expand_end_catch ();
|
||||
finish_function (lineno, (int)$3, nested);
|
||||
}
|
||||
;
|
||||
|
|
|
@ -589,7 +589,7 @@ finish_try_block (try_block)
|
|||
else
|
||||
{
|
||||
expand_start_all_catch ();
|
||||
expand_start_catch (NULL);
|
||||
start_catch_handler (NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -604,7 +604,6 @@ finish_handler_sequence (try_block)
|
|||
RECHAIN_STMTS_FROM_CHAIN (try_block, TRY_HANDLERS (try_block));
|
||||
else
|
||||
{
|
||||
expand_end_catch ();
|
||||
expand_end_all_catch ();
|
||||
}
|
||||
}
|
||||
|
|
17
gcc/except.c
17
gcc/except.c
|
@ -1511,7 +1511,7 @@ expand_start_try_stmts ()
|
|||
/* Called to begin a catch clause. The parameter is the object which
|
||||
will be passed to the runtime type check routine. */
|
||||
void
|
||||
expand_start_catch (rtime)
|
||||
start_catch_handler (rtime)
|
||||
tree rtime;
|
||||
{
|
||||
rtx handler_label = catchstack.top->entry->exception_handler_label;
|
||||
|
@ -1529,16 +1529,6 @@ expand_start_catch (rtime)
|
|||
add_new_handler (eh_region_entry, get_new_handler (handler_label, rtime));
|
||||
}
|
||||
|
||||
/* End a catch clause by dequeuing the current region */
|
||||
|
||||
void
|
||||
expand_end_catch ()
|
||||
{
|
||||
struct eh_entry *entry;
|
||||
entry = pop_eh_entry (&catchstack);
|
||||
free (entry);
|
||||
}
|
||||
|
||||
/* Generate RTL for the start of a group of catch clauses.
|
||||
|
||||
It is responsible for starting a new instruction sequence for the
|
||||
|
@ -1641,10 +1631,15 @@ void
|
|||
expand_end_all_catch ()
|
||||
{
|
||||
rtx new_catch_clause, outer_context = NULL_RTX;
|
||||
struct eh_entry *entry;
|
||||
|
||||
if (! doing_eh (1))
|
||||
return;
|
||||
|
||||
/* Dequeue the current catch clause region. */
|
||||
entry = pop_eh_entry (&catchstack);
|
||||
free (entry);
|
||||
|
||||
if (! exceptions_via_longjmp)
|
||||
{
|
||||
outer_context = ehstack.top->entry->outer_context;
|
||||
|
|
|
@ -228,13 +228,9 @@ extern void add_eh_table_entry PROTO((int n));
|
|||
/* Start a catch clause, triggered by runtime value paramter. */
|
||||
|
||||
#ifdef TREE_CODE
|
||||
extern void expand_start_catch PROTO((tree));
|
||||
extern void start_catch_handler PROTO((tree));
|
||||
#endif
|
||||
|
||||
/* End a catch clause. */
|
||||
|
||||
extern void expand_end_catch PROTO((void));
|
||||
|
||||
/* Returns a non-zero value if we need to output an exception table. */
|
||||
|
||||
extern int exception_table_p PROTO((void));
|
||||
|
|
Loading…
Reference in New Issue