summaryrefslogtreecommitdiff
path: root/gcc/reorg.c
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-27 12:59:56 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-27 12:59:56 +0000
commit2bb76f12cdb4a57d918439fc12e04a3091da4934 (patch)
treee9f3364a8b586a028e3fdb52a73ee68e76297d9c /gcc/reorg.c
parentded97e7736ded7de318c4cf6704e3fdb666ab72f (diff)
downloadgcc-2bb76f12cdb4a57d918439fc12e04a3091da4934.tar.gz
* reorg.c (fill_simple_delay_slots): Use stop_search_p to stop the
forward scan as well. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175524 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/reorg.c')
-rw-r--r--gcc/reorg.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 28b6c7d6271..4df9105cb9a 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2152,7 +2152,7 @@ fill_simple_delay_slots (int non_jumps_p)
/* This must be an INSN or CALL_INSN. */
pat = PATTERN (trial);
- /* USE and CLOBBER at this level was just for flow; ignore it. */
+ /* Stand-alone USE and CLOBBER are just for flow. */
if (GET_CODE (pat) == USE || GET_CODE (pat) == CLOBBER)
continue;
@@ -2271,15 +2271,12 @@ fill_simple_delay_slots (int non_jumps_p)
}
if (target == 0)
- for (trial = next_nonnote_insn (insn); trial; trial = next_trial)
+ for (trial = next_nonnote_insn (insn); !stop_search_p (trial, 1);
+ trial = next_trial)
{
next_trial = next_nonnote_insn (trial);
- if (LABEL_P (trial)
- || BARRIER_P (trial))
- break;
-
- /* We must have an INSN, JUMP_INSN, or CALL_INSN. */
+ /* This must be an INSN or CALL_INSN. */
pat = PATTERN (trial);
/* Stand-alone USE and CLOBBER are just for flow. */
@@ -2293,7 +2290,7 @@ fill_simple_delay_slots (int non_jumps_p)
else
trial_delay = trial;
- /* Stop our search when seeing an unconditional jump. */
+ /* Stop our search when seeing a jump. */
if (JUMP_P (trial_delay))
break;