* bb-reorder.c (fixup_reorder_chain): Don't look up new block again.

        (reorder_basic_blocks): If no epilogue in rtl, force last block last.


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

1 files changed, 17 insertions, 2 deletions

diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index e2f40f1657e..5f2e178c032 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -690,8 +690,7 @@ fixup_reorder_chain ()
 	      BASIC_BLOCK (nb->index)->local_set = 0;
 
 	      nb->aux = xcalloc (1, sizeof (struct reorder_block_def));
-	      REORDER_BLOCK_INDEX (BASIC_BLOCK (n_basic_blocks - 1))
-		= REORDER_BLOCK_INDEX (bbi) + 1;
+	      REORDER_BLOCK_INDEX (nb) = REORDER_BLOCK_INDEX (bbi) + 1;
 	      /* Relink to new block.  */
 	      nb->succ = bbi->succ;
 	      nb->succ->src = nb;
@@ -835,6 +834,22 @@ reorder_basic_blocks ()
 	  REORDER_BLOCK_EFF_HEAD (bbi) = NEXT_INSN (prev_eff_end);
 	}
     }
+
+  /* If we've not got epilogue in RTL, we must fallthru to the exit.
+     Force the last block to be at the end.  */
+  /* ??? Some ABIs (e.g. MIPS) require the return insn to be at the
+     end of the function for stack unwinding purposes.  */
+
+#ifndef HAVE_epilogue
+#define HAVE_epilogue 0
+#endif
+
+  if (! HAVE_epilogue)
+    {
+      basic_block last = BASIC_BLOCK (n_basic_blocks - 1);
+      REORDER_BLOCK_INDEX (last) = n_basic_blocks - 1;
+      REORDER_BLOCK_FLAGS (last) |= REORDER_BLOCK_VISITED;
+    }
       
   make_reorder_chain (BASIC_BLOCK (0));