aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-ssa-forwprop.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a112e17..acc2bcb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-18 Jeff Law <law@redhat.com>
+
+ * tree-ssa-forwprop.c (forward_propagate_addr_expr): Do not
+ propagate an ADDR_EXPR if the definition and use sites are
+ in different EH regions.
+
2005-05-18 Ian Lance Taylor <ian@airs.com>
* read-rtl.c (mode_attr_index): Use obstack_grow0, not
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index fb3dcaf..f65df57 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -537,6 +537,11 @@ forward_propagate_addr_expr (tree stmt)
if (bb_for_stmt (use_stmt)->loop_depth > stmt_loop_depth)
return false;
+ /* If the two statements belong to different EH regions, then there
+ is nothing we can or should try to do. */
+ if (lookup_stmt_eh_region (use_stmt) != lookup_stmt_eh_region (stmt))
+ return false;
+
/* Strip away any outer COMPONENT_REF/ARRAY_REF nodes from the LHS. */
lhs = TREE_OPERAND (use_stmt, 0);
while (TREE_CODE (lhs) == COMPONENT_REF || TREE_CODE (lhs) == ARRAY_REF)