MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stmt.c (expand_cleanups): Add third parameter so that we can avoid marking a cleanup region if...

Browse Source 
* stmt.c (expand_cleanups): Add third parameter so that we can
	avoid marking a cleanup region if this cleanup is part of a fixup
	style goto.
	(expand_goto_internal): Pass a 1 to expand_cleanups.
	(bc_expand_goto_internal): Ditto.
	(fixup_gotos): Ditto.
	(expand_end_bindings): Pass a 0 to expand_cleanups.

From-SVN: r8694
This commit is contained in:
Mike Stump 1994-12-28 00:22:13 +00:00
parent 808cfea199
commit 4e44807bc4
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gcc/stmt.c
View File

@ -449,7 +449,7 @@ static void bc_expand_variable_local_init PROTO((tree));
static void bc_expand_decl_init PROTO((tree)); static void bc_expand_decl_init PROTO((tree));
static void expand_null_return_1 PROTO((rtx, int)); static void expand_null_return_1 PROTO((rtx, int));
static int tail_recursion_args PROTO((tree, tree)); static int tail_recursion_args PROTO((tree, tree));
static void expand_cleanups PROTO((tree, tree)); static void expand_cleanups PROTO((tree, tree, int));
static void bc_expand_start_case PROTO((struct nesting *, tree, static void bc_expand_start_case PROTO((struct nesting *, tree,
tree, char *)); tree, char *));
static int bc_pushcase PROTO((tree, tree)); static int bc_pushcase PROTO((tree, tree));
@ -804,7 +804,7 @@ expand_goto_internal (body, label, last_insn)
/* Execute the cleanups for blocks we are exiting. */ /* Execute the cleanups for blocks we are exiting. */
if (block->data.block.cleanups != 0) if (block->data.block.cleanups != 0)
{ {
expand_cleanups (block->data.block.cleanups, NULL_TREE); expand_cleanups (block->data.block.cleanups, NULL_TREE, 1);
do_pending_stack_adjust (); do_pending_stack_adjust ();
} }
} }
@ -868,7 +868,7 @@ bc_expand_goto_internal (opcode, label, body)
/* Execute the cleanups for blocks we are exiting. */ /* Execute the cleanups for blocks we are exiting. */
if (block->data.block.cleanups != 0) if (block->data.block.cleanups != 0)
{ {
expand_cleanups (block->data.block.cleanups, NULL_TREE); expand_cleanups (block->data.block.cleanups, NULL_TREE, 1);
do_pending_stack_adjust (); do_pending_stack_adjust ();
} }
} }
@ -1181,7 +1181,7 @@ fixup_gotos (thisblock, stack_level, cleanup_list, first_insn, dont_jump_in)
if (TREE_ADDRESSABLE (lists) if (TREE_ADDRESSABLE (lists)
&& TREE_VALUE (lists) != 0) && TREE_VALUE (lists) != 0)
{ {
expand_cleanups (TREE_VALUE (lists), 0); expand_cleanups (TREE_VALUE (lists), NULL_TREE, 1);
/* Pop any pushes done in the cleanups, /* Pop any pushes done in the cleanups,
in case function is about to return. */ in case function is about to return. */
do_pending_stack_adjust (); do_pending_stack_adjust ();
@ -3102,7 +3102,7 @@ expand_end_bindings (vars, mark_ends, dont_jump_in)
expr_stmts_for_value = 0; expr_stmts_for_value = 0;
/* Do the cleanups. */ /* Do the cleanups. */
expand_cleanups (thisblock->data.block.cleanups, NULL_TREE); expand_cleanups (thisblock->data.block.cleanups, NULL_TREE, 0);
do_pending_stack_adjust (); do_pending_stack_adjust ();
expr_stmts_for_value = old_expr_stmts_for_value; expr_stmts_for_value = old_expr_stmts_for_value;
@ -3679,22 +3679,27 @@ expand_anon_union_decl (decl, cleanup, decl_elts)
If DONT_DO is nonnull, then any list-element If DONT_DO is nonnull, then any list-element
whose TREE_PURPOSE matches DONT_DO is omitted. whose TREE_PURPOSE matches DONT_DO is omitted.
This is sometimes used to avoid a cleanup associated with This is sometimes used to avoid a cleanup associated with
a value that is being returned out of the scope. */ a value that is being returned out of the scope.
If IN_FIXUP is non-zero, we are generating this cleanup for a fixup
goto and handle protection regions specially in that case. */
static void static void
expand_cleanups (list, dont_do) expand_cleanups (list, dont_do, in_fixup)
tree list; tree list;
tree dont_do; tree dont_do;
int in_fixup;
{ {
tree tail; tree tail;
for (tail = list; tail; tail = TREE_CHAIN (tail)) for (tail = list; tail; tail = TREE_CHAIN (tail))
if (dont_do == 0 || TREE_PURPOSE (tail) != dont_do) if (dont_do == 0 || TREE_PURPOSE (tail) != dont_do)
{ {
if (TREE_CODE (TREE_VALUE (tail)) == TREE_LIST) if (TREE_CODE (TREE_VALUE (tail)) == TREE_LIST)
expand_cleanups (TREE_VALUE (tail), dont_do); expand_cleanups (TREE_VALUE (tail), dont_do, in_fixup);
else else
{ {
(*interim_eh_hook) (TREE_VALUE (tail)); if (! in_fixup)
(*interim_eh_hook) (TREE_VALUE (tail));
/* Cleanups may be run multiple times. For example, /* Cleanups may be run multiple times. For example,
when exiting a binding contour, we expand the when exiting a binding contour, we expand the