diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75a77eaf8b8828928010185fc298d1b35e5b8d88..e6414bc79ae4f8effe17cf448f7a82d24c24d640 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2014-08-26  David Malcolm  <dmalcolm@redhat.com>
+
+	* cselib.h (cselib_record_sets_hook):  Strengthen initial param
+	"insn" from rtx to rtx_insn *.
+
+	* cselib.c (cselib_record_sets_hook): Likewise.
+
+	* var-tracking.c (add_with_sets): Likewise, renaming back from
+	"uncast_insn" to "insn" and eliminating the checked cast from rtx
+	to rtx_insn *.
+
 2014-08-26  David Malcolm  <dmalcolm@redhat.com>
 
 	* basic-block.h (struct rtl_bb_info): Strengthen fields "end_"
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 090cd35c33c22390f458910f238ef0b6ae9a349b..45dd99b79ef11cf51b906b93e2a028fd9e179f4f 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -258,7 +258,7 @@ void (*cselib_discard_hook) (cselib_val *);
    represented in the array sets[n_sets].  new_val_min can be used to
    tell whether values present in sets are introduced by this
    instruction.  */
-void (*cselib_record_sets_hook) (rtx insn, struct cselib_set *sets,
+void (*cselib_record_sets_hook) (rtx_insn *insn, struct cselib_set *sets,
 				 int n_sets);
 
 #define PRESERVED_VALUE_P(RTX) \
diff --git a/gcc/cselib.h b/gcc/cselib.h
index 62374c0d546119d71998ae66a45812ab6032e749..67ce6dac7c3ecfe68ef1931c53eb362c68e4d7eb 100644
--- a/gcc/cselib.h
+++ b/gcc/cselib.h
@@ -65,7 +65,7 @@ enum cselib_record_what
 };
 
 extern void (*cselib_discard_hook) (cselib_val *);
-extern void (*cselib_record_sets_hook) (rtx insn, struct cselib_set *sets,
+extern void (*cselib_record_sets_hook) (rtx_insn *insn, struct cselib_set *sets,
 					int n_sets);
 
 extern cselib_val *cselib_lookup (rtx, enum machine_mode,
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 3309b6dff815715c6c33201fee7bfc051f466d3d..b3bda998f87a2177724a76b4678ef97b94ca5baa 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -6464,9 +6464,8 @@ prepare_call_arguments (basic_block bb, rtx_insn *insn)
    first place, in which case sets and n_sets will be 0).  */
 
 static void
-add_with_sets (rtx uncast_insn, struct cselib_set *sets, int n_sets)
+add_with_sets (rtx_insn *insn, struct cselib_set *sets, int n_sets)
 {
-  rtx_insn *insn = as_a <rtx_insn *> (uncast_insn);
   basic_block bb = BLOCK_FOR_INSN (insn);
   int n1, n2;
   struct count_use_info cui;