* reorg.c (fill_simple_delay_slots): Avoid calling optimize_skip

	with a return instruction.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193171 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd357b4..6128012 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-05  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+       * reorg.c (fill_simple_delay_slots): Avoid calling optimize_skip
+       with a return instruction.
+
 2012-11-05  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR rtl-optimization/55151

diff --git a/gcc/reorg.c b/gcc/reorg.c
index aa6ad78..90ea42e 100644 (file)
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2196,7 +2196,8 @@ fill_simple_delay_slots (int non_jumps_p)
       if (slots_filled != slots_to_fill
          && delay_list == 0
          && JUMP_P (insn)
-         && (condjump_p (insn) || condjump_in_parallel_p (insn)))
+         && (condjump_p (insn) || condjump_in_parallel_p (insn))
+         && !ANY_RETURN_P (JUMP_LABEL (insn)))
        {
          delay_list = optimize_skip (insn);
          if (delay_list)