From 6fe5b5f1210a545928716f458fce805162a66e38 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 31 Dec 2013 05:36:56 -0500
Subject: [PATCH 044/159] FIXME: cse.c

---
 gcc/cse.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcc/cse.c b/gcc/cse.c
index 2309623..e4e958e 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -258,7 +258,7 @@ static struct qty_table_elem *qty_table;
    cse_change_cc_mode.  */
 struct change_cc_mode_args
 {
-  rtx insn;
+  rtx_base_insn insn;
   rtx newreg;
 };
 
@@ -607,8 +607,8 @@ static void flush_hash_table (void);
 static bool insn_live_p (rtx, int *);
 static bool set_live_p (rtx, rtx, int *);
 static int cse_change_cc_mode (rtx *, void *);
-static void cse_change_cc_mode_insn (rtx, rtx);
-static void cse_change_cc_mode_insns (rtx, rtx, rtx);
+static void cse_change_cc_mode_insn (rtx_base_insn, rtx);
+static void cse_change_cc_mode_insns (rtx_base_insn, rtx_base_insn, rtx);
 static enum machine_mode cse_cc_succs (basic_block, basic_block, rtx, rtx,
 				       bool);
 
@@ -7074,7 +7074,7 @@ cse_change_cc_mode (rtx *loc, void *data)
    GET_MODE (NEWREG) in INSN.  */
 
 static void
-cse_change_cc_mode_insn (rtx insn, rtx newreg)
+cse_change_cc_mode_insn (rtx_base_insn insn, rtx newreg)
 {
   struct change_cc_mode_args args;
   int success;
@@ -7101,9 +7101,9 @@ cse_change_cc_mode_insn (rtx insn, rtx newreg)
    any instruction which modifies NEWREG.  */
 
 static void
-cse_change_cc_mode_insns (rtx start, rtx end, rtx newreg)
+cse_change_cc_mode_insns (rtx_base_insn start, rtx_base_insn end, rtx newreg)
 {
-  rtx insn;
+  rtx_base_insn insn;
 
   for (insn = start; insn != end; insn = NEXT_INSN (insn))
     {
@@ -7141,9 +7141,9 @@ cse_cc_succs (basic_block bb, basic_block orig_bb, rtx cc_reg, rtx cc_src,
   enum machine_mode mode;
   unsigned int insn_count;
   edge e;
-  rtx insns[2];
+  rtx_base_insn insns[2];
   enum machine_mode modes[2];
-  rtx last_insns[2];
+  rtx_base_insn last_insns[2];
   unsigned int i;
   rtx newreg;
   edge_iterator ei;
@@ -7159,8 +7159,8 @@ cse_cc_succs (basic_block bb, basic_block orig_bb, rtx cc_reg, rtx cc_src,
   insn_count = 0;
   FOR_EACH_EDGE (e, ei, bb->succs)
     {
-      rtx insn;
-      rtx end;
+      rtx_base_insn insn;
+      rtx_base_insn end;
 
       if (e->flags & EDGE_COMPLEX)
 	continue;
@@ -7339,8 +7339,8 @@ cse_condition_code_reg (void)
     {
       rtx last_insn;
       rtx cc_reg;
-      rtx insn;
-      rtx cc_src_insn;
+      rtx_base_insn insn;
+      rtx_base_insn cc_src_insn;
       rtx cc_src;
       enum machine_mode mode;
       enum machine_mode orig_mode;
@@ -7365,7 +7365,7 @@ cse_condition_code_reg (void)
       else
 	continue;
 
-      cc_src_insn = NULL_RTX;
+      cc_src_insn = NULL_RTX_BASE_INSN;
       cc_src = NULL_RTX;
       for (insn = PREV_INSN (last_insn);
 	   insn && insn != PREV_INSN (BB_HEAD (bb));
-- 
1.7.11.7