From 10b9cdb85ae281ffe3152226d8c0d95fd547d546 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 31 Dec 2013 05:16:02 -0500
Subject: [PATCH 039/159] FIXME: some locals within cfgrtl.c

---
 gcc/cfgrtl.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 6aa1417..74a3743 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -415,8 +415,8 @@ compute_bb_for_insn (void)
 
   FOR_EACH_BB (bb)
     {
-      rtx end = BB_END (bb);
-      rtx insn;
+      rtx_base_insn end = BB_END (bb);
+      rtx_base_insn insn;
 
       for (insn = BB_HEAD (bb); ; insn = NEXT_INSN (insn))
 	{
@@ -432,7 +432,7 @@ compute_bb_for_insn (void)
 unsigned int
 free_bb_for_insn (void)
 {
-  rtx insn;
+  rtx_base_insn insn;
   for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
     if (!BARRIER_P (insn))
       BLOCK_FOR_INSN (insn) = NULL;
@@ -571,7 +571,7 @@ flow_active_insn_p (const_rtx insn)
 bool
 contains_no_active_insn_p (const_basic_block bb)
 {
-  rtx insn;
+  rtx_base_insn insn;
 
   if (bb == EXIT_BLOCK_PTR_FOR_FN (cfun) || bb == ENTRY_BLOCK_PTR_FOR_FN (cfun)
       || !single_succ_p (bb))
@@ -676,16 +676,16 @@ bb_note (basic_block bb)
 /* Return the INSN immediately following the NOTE_INSN_BASIC_BLOCK
    note associated with the BLOCK.  */
 
-static rtx
+static rtx_base_insn
 first_insn_after_basic_block_note (basic_block block)
 {
-  rtx insn;
+  rtx_base_insn insn;
 
   /* Get the first instruction in the block.  */
   insn = BB_HEAD (block);
 
   if (insn == NULL_RTX)
-    return NULL_RTX;
+    return NULL_RTX_BASE_INSN;
   if (LABEL_P (insn))
     insn = NEXT_INSN (insn);
   gcc_assert (NOTE_INSN_BASIC_BLOCK_P (insn));
@@ -2086,7 +2086,7 @@ commit_edge_insertions (void)
 static void
 rtl_dump_bb (FILE *outf, basic_block bb, int indent, int flags)
 {
-  rtx insn;
+  rtx_base_insn insn;
   rtx last;
   char *s_indent;
 
@@ -2833,7 +2833,7 @@ rtl_verify_fallthru (void)
       e = find_fallthru_edge (bb->succs);
       if (!e)
 	{
-	  rtx insn;
+	  rtx_base_insn insn;
 
 	  /* Ensure existence of barrier in BB with no fallthru edges.  */
 	  for (insn = NEXT_INSN (BB_END (bb)); ; insn = NEXT_INSN (insn))
@@ -2851,7 +2851,7 @@ rtl_verify_fallthru (void)
       else if (e->src != ENTRY_BLOCK_PTR_FOR_FN (cfun)
 	       && e->dest != EXIT_BLOCK_PTR_FOR_FN (cfun))
 	{
-	  rtx insn;
+	  rtx_base_insn insn;
 
 	  if (e->src->next_bb != e->dest)
 	    {
@@ -3246,7 +3246,7 @@ fixup_abnormal_edges (void)
 
       if (e && !CALL_P (BB_END (bb)) && !can_throw_internal (BB_END (bb)))
 	{
-	  rtx insn;
+	  rtx_base_insn insn;
 
 	  /* Get past the new insns generated.  Allow notes, as the insns
 	     may be already deleted.  */
@@ -3258,7 +3258,7 @@ fixup_abnormal_edges (void)
 
 	  if (CALL_P (insn) || can_throw_internal (insn))
 	    {
-	      rtx stop, next;
+	      rtx_base_insn stop, next;
 
 	      e = find_fallthru_edge (bb->succs);
 
@@ -3436,7 +3436,7 @@ record_effective_endpoints (void)
 {
   rtx next_insn;
   basic_block bb;
-  rtx insn;
+  rtx_base_insn insn;
 
   for (insn = get_insns ();
        insn
@@ -4845,8 +4845,8 @@ rtl_flow_call_edges_add (sbitmap blocks)
   for (i = NUM_FIXED_BLOCKS; i < last_bb; i++)
     {
       basic_block bb = BASIC_BLOCK (i);
-      rtx insn;
-      rtx prev_insn;
+      rtx_base_insn insn;
+      rtx_base_insn prev_insn;
 
       if (!bb)
 	continue;
-- 
1.7.11.7