diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb930ce284a..51b9f9e9c6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-22  David Malcolm  <dmalcolm@redhat.com>
+
+	* stmt.c (expand_case): Strengthen local "before_case" from rtx to
+	rtx_insn *.
+	(expand_sjlj_dispatch_table): Likewise.
+
 2014-08-22  David Malcolm  <dmalcolm@redhat.com>
 
 	* stack-ptr-mod.c (pass_stack_ptr_mod::execute): Strengthen local
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 8e6d3a5fd68..beafaa0bc1e 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -1239,7 +1239,7 @@ expand_case (gimple stmt)
      type, so we should never get a zero here.  */
   gcc_assert (count > 0);
 
-  rtx before_case = get_last_insn ();
+  rtx_insn *before_case = get_last_insn ();
 
   /* Decide how to expand this switch.
      The two options at this point are a dispatch table (casesi or
@@ -1283,7 +1283,7 @@ expand_sjlj_dispatch_table (rtx dispatch_index,
   int ncases = dispatch_table.length ();
 
   do_pending_stack_adjust ();
-  rtx before_case = get_last_insn ();
+  rtx_insn *before_case = get_last_insn ();
 
   /* Expand as a decrement-chain if there are 5 or fewer dispatch
      labels.  This covers more than 98% of the cases in libjava,