* basic-block.h (basic_block_def): Kill rbi.

	(reorder_block_def): Kill; Remove next field (replaced by aux);
	move other fields to ...
	(rtl_bb_info): ... here.
	* bb-reorder.c (find_traces, rotate_loop, find_traces_1_round,
	copy_bb, connect_traces, add_labels_and_missing_jumps
	fix_up_fall_thru_edges, fix_crossing_conditional_branches,
	duplicate_computed_gotos, partition_hot_cold_basic-blocks):
	Update to new fields.
	* cfg.c (initialize_bb_rbi): Kill.
	* cfglayout.c (record_effective_endpoints, fixup_reorder_chain,
	fixup_fallthru_exit_predecessor, cfg_layout_duplicate_bb): Update.
	* cfgrtl.c (cfg_layout_create_basic_block): Do not initialize rbi.
	(try_redirect_by_replacing_jump): Update rbi references.
	(cfg_layout_split_block): Likewise.
	(cfg_layout_delete_block): Likewise.
	(cfg_layout_merge_blocks): Likewise.
	* function.c (thread_prologue_and_epilogue_insns): Likewise.
	* passes.c (rest_of_handle_sms): Likewise.
	* tracer.c (seen, tail_duplicate, layout_superblocks): Likewise.


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

1 files changed, 11 insertions, 11 deletions

diff --git a/gcc/tracer.c b/gcc/tracer.c
index cddc5b90a44..5d3aaf4bbbe 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -65,7 +65,7 @@ static int branch_ratio_cutoff;
 /* Return true if BB has been seen - it is connected to some trace
    already.  */
 
-#define seen(bb) (bb->rbi->visited || bb->rbi->next)
+#define seen(bb) (bb->il.rtl->visited || bb->aux)
 
 /* Return true if we should ignore the basic block for purposes of tracing.  */
 static bool
@@ -292,8 +292,8 @@ tail_duplicate (void)
 		fprintf (dump_file, "Duplicated %i as %i [%i]\n",
 			 old->index, bb2->index, bb2->frequency);
 	    }
-	  bb->rbi->next = bb2;
-	  bb2->rbi->visited = 1;
+	  bb->aux = bb2;
+	  bb2->il.rtl->visited = 1;
 	  bb = bb2;
 	  /* In case the trace became infrequent, stop duplicating.  */
 	  if (ignore_bb_p (bb))
@@ -328,28 +328,28 @@ layout_superblocks (void)
     {
       edge_iterator ei;
       edge e, best = NULL;
-      while (end->rbi->next)
-	end = end->rbi->next;
+      while (end->aux)
+	end = end->aux;
 
       FOR_EACH_EDGE (e, ei, end->succs)
 	if (e->dest != EXIT_BLOCK_PTR
 	    && e->dest != single_succ (ENTRY_BLOCK_PTR)
-	    && !e->dest->rbi->visited
+	    && !e->dest->il.rtl->visited
 	    && (!best || EDGE_FREQUENCY (e) > EDGE_FREQUENCY (best)))
 	  best = e;
 
       if (best)
 	{
-	  end->rbi->next = best->dest;
-	  best->dest->rbi->visited = 1;
+	  end->aux = best->dest;
+	  best->dest->il.rtl->visited = 1;
 	}
       else
 	for (; bb != EXIT_BLOCK_PTR; bb = bb->next_bb)
 	  {
-	    if (!bb->rbi->visited)
+	    if (!bb->il.rtl->visited)
 	      {
-		end->rbi->next = bb;
-		bb->rbi->visited = 1;
+		end->aux = bb;
+		bb->il.rtl->visited = 1;
 		break;
 	      }
 	  }