reorg.c (fill_simple_delay_slots): Use stop_search_p to stop the forward scan as...

	* reorg.c (fill_simple_delay_slots): Use stop_search_p to stop the
	forward scan as well.

From-SVN: r175524

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e1bc76b09318ce7fe1c991609cf655c3edcd00b..ff7fe68d6790a29983d84a9ba3536d3e9a534ec2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * reorg.c (fill_simple_delay_slots): Use stop_search_p to stop the
+       forward scan as well.
+
 2011-06-27  Tristan Gingold  <gingold@adacore.com>
 
        PR target/44241

diff --git a/gcc/reorg.c b/gcc/reorg.c
index 28b6c7d6271a838a76e0c5f958f6f3f78c9b9465..4df9105cb9a92d488f66c3f3fa6ceb7a357c27c5 100644 (file)
--- 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;