Revert "Basic block renumbering removal", and two followup patches.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/gcc/conflict.c b/gcc/conflict.c
index 765b4e47f5f..d1fb1293cf9 100644
--- a/gcc/conflict.c
+++ b/gcc/conflict.c
@@ -447,18 +447,19 @@ conflict_graph_compute (regs, p)
      regset regs;
      partition p;
 {
+  int b;
   conflict_graph graph = conflict_graph_new (max_reg_num ());
   regset_head live_head;
   regset live = &live_head;
   regset_head born_head;
   regset born = &born_head;
-  basic_block bb;
 
   INIT_REG_SET (live);
   INIT_REG_SET (born);
 
-  FOR_ALL_BB_REVERSE (bb)
+  for (b = n_basic_blocks; --b >= 0; )
     {
+      basic_block bb = BASIC_BLOCK (b);
       rtx insn;
       rtx head;