aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzadeck <zadeck@138bc75d-0d04-0410-961f-82ee72b054a4>2007-05-05 14:43:21 +0000
committerzadeck <zadeck@138bc75d-0d04-0410-961f-82ee72b054a4>2007-05-05 14:43:21 +0000
commit60224dcc64eea0f956a0dab1e55e811b5bffe939 (patch)
tree1fac973cd31bab60904f9da91de684e45656beab
parent2c752f7c8327633ea751b9ac8a8c1b4130a38956 (diff)
the last merge fix from dannys last merge. this bootstraps and
regression tests on x86-64, x86-32, ppc and ia-64. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/dataflow-branch@124461 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cfg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cfg.c b/gcc/cfg.c
index 5348c985601..61c8ef25a43 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -416,15 +416,16 @@ redirect_edge_pred (edge e, basic_block new_pred)
connect_src (e);
}
-/* Clear all basic block flags, with the exception of partitioning. */
+/* Clear all basic block flags, with the exception of partitioning and
+ setjmp_target. */
void
clear_bb_flags (void)
{
basic_block bb;
FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, NULL, next_bb)
- bb->flags = (BB_PARTITION (bb) | (bb->flags & BB_DISABLE_SCHEDULE)
- | (bb->flags & BB_RTL));
+ bb->flags = (BB_PARTITION (bb)
+ | (bb->flags & (BB_DISABLE_SCHEDULE + BB_RTL + BB_NON_LOCAL_GOTO_TARGET)));
}
/* Check the consistency of profile information. We can't do that