From 15213cf226d7fcb87c06fd1104f45cc15436589e Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 31 Dec 2013 15:30:55 -0500
Subject: [PATCH 053/159] FIXME: cfgexpand.c

---
 gcc/cfgexpand.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 95ae17d..3d9edd8 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -1890,7 +1890,7 @@ expand_used_vars (void)
    generated for STMT should have been appended.  */
 
 static void
-maybe_dump_rtl_for_gimple_stmt (gimple stmt, rtx since)
+maybe_dump_rtl_for_gimple_stmt (gimple stmt, rtx_base_insn since)
 {
   if (dump_file && (dump_flags & TDF_DETAILS))
     {
@@ -1951,7 +1951,7 @@ label_rtx_for_bb (basic_block bb ATTRIBUTE_UNUSED)
    last instruction before the just emitted jump sequence.  */
 
 static void
-maybe_cleanup_end_of_block (edge e, rtx last)
+maybe_cleanup_end_of_block (edge e, rtx_base_insn last)
 {
   /* Special case: when jumpif decides that the condition is
      trivial it emits an unconditional jump (and the necessary
@@ -2008,7 +2008,7 @@ expand_gimple_cond (basic_block bb, gimple stmt)
   edge new_edge;
   edge true_edge;
   edge false_edge;
-  rtx last2, last;
+  rtx_base_insn last2, last;
   enum tree_code code;
   tree op0, op1;
 
@@ -3287,11 +3287,11 @@ expand_gimple_stmt_1 (gimple stmt)
    sets REG_EH_REGION notes if necessary and sets the current source
    location for diagnostics.  */
 
-static rtx
+static rtx_base_insn
 expand_gimple_stmt (gimple stmt)
 {
   location_t saved_location = input_location;
-  rtx last = get_last_insn ();
+  rtx_base_insn last = get_last_insn ();
   int lp_nr;
 
   gcc_assert (cfun);
@@ -3344,7 +3344,7 @@ expand_gimple_stmt (gimple stmt)
 static basic_block
 expand_gimple_tailcall (basic_block bb, gimple stmt, bool *can_fallthru)
 {
-  rtx last2, last;
+  rtx_base_insn last2, last;
   edge e;
   edge_iterator ei;
   int probability;
@@ -4719,7 +4719,7 @@ expand_debug_source_expr (tree exp)
    deeper than that, create DEBUG_EXPRs and emit DEBUG_INSNs before INSN.  */
 
 static void
-avoid_complex_debug_insns (rtx insn, rtx *exp_p, int depth)
+avoid_complex_debug_insns (rtx_base_insn insn, rtx *exp_p, int depth)
 {
   rtx exp = *exp_p;
 
@@ -4772,7 +4772,7 @@ static void
 expand_debug_locations (void)
 {
   rtx_base_insn insn;
-  rtx last = get_last_insn ();
+  rtx_base_insn last = get_last_insn ();
   int save_strict_alias = flag_strict_aliasing;
 
   /* New alias sets while setting up memory attributes cause
@@ -4784,7 +4784,8 @@ expand_debug_locations (void)
     if (DEBUG_INSN_P (insn))
       {
 	tree value = (tree)INSN_VAR_LOCATION_LOC (insn);
-	rtx val, prev_insn, insn2;
+	rtx val;
+	rtx_base_insn prev_insn, insn2;
 	enum machine_mode mode;
 
 	if (value == NULL_TREE)
@@ -4830,7 +4831,7 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls)
   gimple_seq stmts;
   gimple stmt = NULL;
   rtx_note note;
-  rtx last;
+  rtx_base_insn last;
   edge e;
   edge_iterator ei;
   void **elt;
@@ -5267,13 +5268,13 @@ set_block_levels (tree block, int level)
 static void
 construct_exit_block (void)
 {
-  rtx head = get_last_insn ();
-  rtx end;
+  rtx_base_insn head = get_last_insn ();
+  rtx_base_insn end;
   basic_block exit_block;
   edge e, e2;
   unsigned ix;
   edge_iterator ei;
-  rtx orig_end = BB_END (EXIT_BLOCK_PTR_FOR_FN (cfun)->prev_bb);
+  rtx_base_insn orig_end = BB_END (EXIT_BLOCK_PTR_FOR_FN (cfun)->prev_bb);
 
   rtl_profile_for_bb (EXIT_BLOCK_PTR_FOR_FN (cfun));
 
@@ -5744,8 +5745,8 @@ gimple_expand_cfg (void)
 
   if (var_ret_seq)
     {
-      rtx after = return_label;
-      rtx next = NEXT_INSN (after);
+      rtx_base_insn after = return_label;
+      rtx_base_insn next = NEXT_INSN (after);
       if (next && NOTE_INSN_BASIC_BLOCK_P (next))
 	after = next;
       emit_insn_after (var_ret_seq, after);
-- 
1.7.11.7