Patch by Richard Henderson:

* tree-eh.c (tree_can_throw_internal, tree_can_throw_external):
	Handle RESX expressions properly.

From-SVN: r99698
This commit is contained in:
Jan Hubicka 2005-05-14 16:32:39 +02:00 committed by Jan Hubicka
parent a78b491f29
commit a8b3ba8b05
2 changed files with 19 additions and 4 deletions

View File

@ -1,5 +1,9 @@
2005-05-14 Jan Hubicka <jh@suse.cz>
Patch by Richard Henderson:
* tree-eh.c (tree_can_throw_internal, tree_can_throw_external):
Handle RESX expressions properly.
* tree-eh.c (record_stmt_eh_region): Use add_stmt_to_eh_region.
(add_stmt_to_eh_region_fn): Nest into CALL_EXPR.
(remove_stmt_from_eh_region_fn): Likewise.

View File

@ -2008,7 +2008,12 @@ tree_could_throw_p (tree t)
bool
tree_can_throw_internal (tree stmt)
{
int region_nr = lookup_stmt_eh_region (stmt);
int region_nr;
if (TREE_CODE (stmt) == RESX_EXPR)
region_nr = TREE_INT_CST_LOW (TREE_OPERAND (stmt, 0));
else
region_nr = lookup_stmt_eh_region (stmt);
if (region_nr < 0)
return false;
return can_throw_internal_1 (region_nr);
@ -2017,10 +2022,16 @@ tree_can_throw_internal (tree stmt)
bool
tree_can_throw_external (tree stmt)
{
int region_nr = lookup_stmt_eh_region (stmt);
int region_nr;
if (TREE_CODE (stmt) == RESX_EXPR)
region_nr = TREE_INT_CST_LOW (TREE_OPERAND (stmt, 0));
else
region_nr = lookup_stmt_eh_region (stmt);
if (region_nr < 0)
return false;
return can_throw_external_1 (region_nr);
return tree_could_throw_p (stmt);
else
return can_throw_external_1 (region_nr);
}
bool