From f92966c66105f5257645839bb9e29219fa1fd336 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 10 Jan 2014 16:49:37 -0500
Subject: [PATCH 159/159] FIXME: cse.c

---
 gcc/cse.c        | 20 ++++++++++----------
 gcc/postreload.c |  4 ++--
 gcc/recog.c      |  2 +-
 gcc/recog.h      |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gcc/cse.c b/gcc/cse.c
index 7c3b4b3..faa37f5 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -586,15 +586,15 @@ static rtx canon_reg (rtx, rtx);
 static enum rtx_code find_comparison_args (enum rtx_code, rtx *, rtx *,
 					   enum machine_mode *,
 					   enum machine_mode *);
-static rtx fold_rtx (rtx, rtx);
+static rtx fold_rtx (rtx, rtx_base_insn);
 static rtx equiv_constant (rtx);
-static void record_jump_equiv (rtx, bool);
+static void record_jump_equiv (rtx_base_insn, bool);
 static void record_jump_cond (enum rtx_code, enum machine_mode, rtx, rtx,
 			      int);
 static void cse_insn (rtx_base_insn);
 static void cse_prescan_path (struct cse_basic_block_data *);
-static void invalidate_from_clobbers (rtx);
-static void invalidate_from_sets_and_clobbers (rtx);
+static void invalidate_from_clobbers (rtx_base_insn);
+static void invalidate_from_sets_and_clobbers (rtx_base_insn);
 static rtx cse_process_notes (rtx, rtx, bool *);
 static void cse_extended_basic_block (struct cse_basic_block_data *);
 static int check_for_label_ref (rtx *, void *);
@@ -3092,7 +3092,7 @@ find_comparison_args (enum rtx_code code, rtx *parg1, rtx *parg2,
    of X before modifying it.  */
 
 static rtx
-fold_rtx (rtx x, rtx insn)
+fold_rtx (rtx x, rtx_base_insn insn)
 {
   enum rtx_code code;
   enum machine_mode mode;
@@ -3563,7 +3563,7 @@ fold_rtx (rtx x, rtx insn)
 	      if (y && CONST_INT_P (XEXP (y, 1)))
 		return fold_rtx (plus_constant (mode, copy_rtx (y),
 						-INTVAL (const_arg1)),
-				 NULL_RTX);
+				 NULL_RTX_BASE_INSN);
 	    }
 
 	  /* Fall through.  */
@@ -3827,7 +3827,7 @@ equiv_constant (rtx x)
    comparison is seen later, we will know its value.  */
 
 static void
-record_jump_equiv (rtx insn, bool taken)
+record_jump_equiv (rtx_base_insn insn, bool taken)
 {
   int cond_known_true;
   rtx op0, op1;
@@ -4218,7 +4218,7 @@ try_back_substitute_reg (rtx set, rtx_base_insn insn)
 /* Record all the SETs in this instruction into SETS_PTR,
    and return the number of recorded sets.  */
 static int
-find_sets_in_insn (rtx insn, struct set **psets)
+find_sets_in_insn (rtx_base_insn insn, struct set **psets)
 {
   struct set *sets = *psets;
   int n_sets = 0;
@@ -5952,7 +5952,7 @@ invalidate_memory (void)
    alias with something that is SET or CLOBBERed.  */
 
 static void
-invalidate_from_clobbers (rtx insn)
+invalidate_from_clobbers (rtx_base_insn insn)
 {
   rtx x = PATTERN (insn);
 
@@ -5994,7 +5994,7 @@ invalidate_from_clobbers (rtx insn)
    alias with something that is SET or CLOBBERed.  */
 
 static void
-invalidate_from_sets_and_clobbers (rtx insn)
+invalidate_from_sets_and_clobbers (rtx_base_insn insn)
 {
   rtx tem;
   rtx x = PATTERN (insn);
diff --git a/gcc/postreload.c b/gcc/postreload.c
index ee8a684..d9b0d23 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
 static int reload_cse_noop_set_p (rtx);
 static bool reload_cse_simplify (rtx_base_insn, rtx);
 static void reload_cse_regs_1 (void);
-static int reload_cse_simplify_set (rtx, rtx);
+static int reload_cse_simplify_set (rtx, rtx_base_insn);
 static int reload_cse_simplify_operands (rtx, rtx);
 
 static void reload_combine (void);
@@ -236,7 +236,7 @@ reload_cse_regs_1 (void)
    and change the set into a register copy.  */
 
 static int
-reload_cse_simplify_set (rtx set, rtx insn)
+reload_cse_simplify_set (rtx set, rtx_base_insn insn)
 {
   int did_change = 0;
   int dreg;
diff --git a/gcc/recog.c b/gcc/recog.c
index 29dfc24..4510dc9 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -281,7 +281,7 @@ validate_unshare_change (rtx object, rtx *loc, rtx new_rtx, bool in_group)
 
    Return true if anything was changed.  */
 bool
-canonicalize_change_group (rtx insn, rtx x)
+canonicalize_change_group (rtx_base_insn insn, rtx x)
 {
   if (COMMUTATIVE_P (x)
       && swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1)))
diff --git a/gcc/recog.h b/gcc/recog.h
index 3268301..17fc20e 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -77,7 +77,7 @@ extern int check_asm_operands (rtx);
 extern int asm_operand_ok (rtx, const char *, const char **);
 extern bool validate_change (rtx, rtx *, rtx, bool);
 extern bool validate_unshare_change (rtx, rtx *, rtx, bool);
-extern bool canonicalize_change_group (rtx insn, rtx x);
+extern bool canonicalize_change_group (rtx_base_insn insn, rtx x);
 extern int insn_invalid_p (rtx, bool);
 extern int verify_changes (int);
 extern void confirm_change_group (void);
-- 
1.7.11.7