From 3b01bdbdefcef4226fa05ad0705fd13840c990c6 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 10 Jan 2014 16:21:24 -0500
Subject: [PATCH 157/159] FIXME: cprop.c

---
 gcc/cprop.c | 13 +++++++------
 gcc/recog.c |  4 ++--
 gcc/recog.h |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gcc/cprop.c b/gcc/cprop.c
index 4f6facf..f415d68 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -728,7 +728,7 @@ find_used_regs (rtx *xptr, void *data ATTRIBUTE_UNUSED)
    Return nonzero if successful.  */
 
 static int
-try_replace_reg (rtx from, rtx to, rtx insn)
+try_replace_reg (rtx from, rtx to, rtx_base_insn insn)
 {
   rtx note = find_reg_equal_equiv_note (insn);
   rtx src = 0;
@@ -872,7 +872,8 @@ find_avail_set (int regno, rtx insn)
    if a change was made.  */
 
 static int
-cprop_jump (basic_block bb, rtx setcc, rtx jump, rtx from, rtx src)
+cprop_jump (basic_block bb, rtx_base_insn setcc, rtx_base_insn jump, rtx from,
+	    rtx src)
 {
   rtx new_rtx, set_src, note_src;
   rtx set = pc_set (jump);
@@ -904,7 +905,7 @@ cprop_jump (basic_block bb, rtx setcc, rtx jump, rtx from, rtx src)
 				      setcc_src);
     }
   else
-    setcc = NULL_RTX;
+    setcc = NULL_RTX_BASE_INSN;
 
   new_rtx = simplify_replace_rtx (set_src, from, src);
 
@@ -985,7 +986,7 @@ cprop_jump (basic_block bb, rtx setcc, rtx jump, rtx from, rtx src)
    it and INSN is the instruction where this will be happening.  */
 
 static int
-constprop_register (rtx from, rtx src, rtx insn)
+constprop_register (rtx from, rtx src, rtx_base_insn insn)
 {
   rtx sset;
 
@@ -1021,7 +1022,7 @@ constprop_register (rtx from, rtx src, rtx insn)
    Return nonzero if a change was made.  */
 
 static int
-cprop_insn (rtx insn)
+cprop_insn (rtx_base_insn insn)
 {
   unsigned i;
   int changed = 0, changed_this_round;
@@ -1161,7 +1162,7 @@ local_cprop_find_used_regs (rtx *xptr, void *data)
 /* Try to perform local const/copy propagation on X in INSN.  */
 
 static bool
-do_local_cprop (rtx x, rtx insn)
+do_local_cprop (rtx x, rtx_base_insn insn)
 {
   rtx newreg = NULL, newcnst = NULL;
 
diff --git a/gcc/recog.c b/gcc/recog.c
index c8ad932..29dfc24 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -838,7 +838,7 @@ struct validate_replace_src_data
 {
   rtx from;			/* Old RTX */
   rtx to;			/* New RTX */
-  rtx insn;			/* Insn in which substitution is occurring.  */
+  rtx_base_insn insn;		/* Insn in which substitution is occurring.  */
 };
 
 static void
@@ -854,7 +854,7 @@ validate_replace_src_1 (rtx *x, void *data)
    SET_DESTs.  */
 
 void
-validate_replace_src_group (rtx from, rtx to, rtx insn)
+validate_replace_src_group (rtx from, rtx to, rtx_base_insn insn)
 {
   struct validate_replace_src_data d;
 
diff --git a/gcc/recog.h b/gcc/recog.h
index d380a6a..3268301 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -98,7 +98,7 @@ extern int validate_replace_rtx (rtx, rtx, rtx);
 extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx);
 extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx);
 extern void validate_replace_rtx_group (rtx, rtx, rtx);
-extern void validate_replace_src_group (rtx, rtx, rtx);
+extern void validate_replace_src_group (rtx, rtx, rtx_base_insn);
 extern bool validate_simplify_insn (rtx insn);
 extern int num_changes_pending (void);
 #ifdef HAVE_cc0
-- 
1.7.11.7