PR rtl-optimization/19462

	* reorg.c (find_end_label): Create return insn only if
	current_function_epilogue_delay_list is empty.


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

2 files changed, 12 insertions, 1 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e36882b6aed..87dff43f90d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR rtl-optimization/19462
+	* reorg.c (find_end_label): Create return insn only if
+	current_function_epilogue_delay_list is empty.
+
 2005-01-19  Paolo Bonzini  <bonzini@gnu.org>
 
 	* doc/passes.texi: Remove paragraph mentioning new-ra.
diff --git a/gcc/reorg.c b/gcc/reorg.c
index fbaf968df73..78940ff9a58 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -420,7 +420,12 @@ find_end_label (void)
 	     if needed.  */
 	  emit_label (end_of_function_label);
 #ifdef HAVE_return
-	  if (HAVE_return)
+	  /* We don't bother trying to create a return insn if the
+	     epilogue has filled delay-slots; we would have to try and
+	     move the delay-slot fillers to the delay-slots for the new
+	     return insn or in front of the new return insn.  */
+	  if (current_function_epilogue_delay_list == NULL
+	      && HAVE_return)
 	    {
 	      /* The return we make may have delay slots too.  */
 	      rtx insn = gen_return ();