From: ebotcazou Date: Thu, 2 Jun 2011 21:52:46 +0000 (+0000) Subject: 2011-06-02  Eric Botcazou   X-Git-Tag: upstream/4.9.2~20247 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c43a9988bd88e540c3415571576efd8a5e9e9fb;p=platform%2Fupstream%2Flinaro-gcc.git 2011-06-02  Eric Botcazou   * cse.c (cse_find_path): Refine change to exclude EDGE_ABNORMAL_CALL edges only, when there is a non-local label in the function. * postreload-gcse.c (bb_has_well_behaved_predecessors): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174585 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ceb5350..4533f58 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-06-02 Eric Botcazou + + * cse.c (cse_find_path): Refine change to exclude EDGE_ABNORMAL_CALL + edges only, when there is a non-local label in the function. + * postreload-gcse.c (bb_has_well_behaved_predecessors): Likewise. + 2011-06-02 Uros Bizjak * config/i386/constraints.md (Y3): New register constraint. diff --git a/gcc/cse.c b/gcc/cse.c index 5e2b4d8..cfa2b00 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -6193,7 +6193,7 @@ cse_find_path (basic_block first_bb, struct cse_basic_block_data *data, e = NULL; if (e - && (e->flags & EDGE_ABNORMAL) == 0 + && !((e->flags & EDGE_ABNORMAL_CALL) && cfun->has_nonlocal_label) && e->dest != EXIT_BLOCK_PTR && single_pred_p (e->dest) /* Avoid visiting basic blocks twice. The large comment diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c index 0ee50d8..bc55ead 100644 --- a/gcc/postreload-gcse.c +++ b/gcc/postreload-gcse.c @@ -912,12 +912,10 @@ get_avail_load_store_reg (rtx insn) static bool bb_has_well_behaved_predecessors (basic_block bb) { - unsigned int edge_count = EDGE_COUNT (bb->preds); edge pred; edge_iterator ei; - if (edge_count == 0 - || (edge_count == 1 && (single_pred_edge (bb)->flags & EDGE_ABNORMAL))) + if (EDGE_COUNT (bb->preds) == 0) return false; FOR_EACH_EDGE (pred, ei, bb->preds) @@ -925,6 +923,9 @@ bb_has_well_behaved_predecessors (basic_block bb) if ((pred->flags & EDGE_ABNORMAL) && EDGE_CRITICAL_P (pred)) return false; + if ((pred->flags & EDGE_ABNORMAL_CALL) && cfun->has_nonlocal_label) + return false; + if (JUMP_TABLE_DATA_P (BB_END (pred->src))) return false; }