diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 77d93529f10..54297f26f68 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* mode-switching.c (commit_mode_sets): Change type of local
+	variable from rtx to rtx_insn *.
+
 2015-05-08  Jim Wilson  <jim.wilson@linaro.org>
 
 	* doc/install.texi (--enable-languages): Add missing jit and lto info.
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index c0f865c13b4..dd28a3eb572 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -131,7 +131,7 @@ commit_mode_sets (struct edge_list *edge_list, int e, struct bb_info *info)
 	  HARD_REG_SET live_at_edge;
 	  basic_block src_bb = eg->src;
 	  int cur_mode = info[src_bb->index].mode_out;
-	  rtx mode_set;
+	  rtx_insn *mode_set;
 
 	  REG_SET_TO_HARD_REG_SET (live_at_edge, df_get_live_out (src_bb));
 
@@ -145,7 +145,7 @@ commit_mode_sets (struct edge_list *edge_list, int e, struct bb_info *info)
 	  default_rtl_profile ();
 
 	  /* Do not bother to insert empty sequence.  */
-	  if (mode_set == NULL_RTX)
+	  if (mode_set == NULL)
 	    continue;
 
 	  /* We should not get an abnormal edge here.  */