diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 840c79f1f8a..b7b4f105410 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-21  David Malcolm  <dmalcolm@redhat.com>
+
+	* genattrtab.c (write_attr_get): Within the generated get_attr_
+	functions, rename param "insn" to "uncast_insn" and reintroduce
+	"insn" as an local rtx_insn * using a checked cast, so that "insn"
+	is an rtx_insn * within insn-attrtab.c
+
 2014-08-21  David Malcolm  <dmalcolm@redhat.com>
 
 	* output.h (peephole): Strengthen return type from rtx to
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 9db2ade01f8..49c78727657 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -4027,9 +4027,9 @@ write_attr_get (FILE *outf, struct attr_desc *attr)
   /* If the attribute name starts with a star, the remainder is the name of
      the subroutine to use, instead of `get_attr_...'.  */
   if (attr->name[0] == '*')
-    fprintf (outf, "%s (rtx insn ATTRIBUTE_UNUSED)\n", &attr->name[1]);
+    fprintf (outf, "%s (rtx uncast_insn ATTRIBUTE_UNUSED)\n", &attr->name[1]);
   else if (attr->is_const == 0)
-    fprintf (outf, "get_attr_%s (rtx insn ATTRIBUTE_UNUSED)\n", attr->name);
+    fprintf (outf, "get_attr_%s (rtx uncast_insn ATTRIBUTE_UNUSED)\n", attr->name);
   else
     {
       fprintf (outf, "get_attr_%s (void)\n", attr->name);
@@ -4050,6 +4050,9 @@ write_attr_get (FILE *outf, struct attr_desc *attr)
 
   fprintf (outf, "{\n");
 
+  if (attr->name[0] == '*' || attr->is_const == 0)
+    fprintf (outf, "  rtx_insn *insn = as_a <rtx_insn *> (uncast_insn);\n");
+
   /* Find attributes that are worth caching in the conditions.  */
   cached_attr_count = 0;
   attrs_seen_more_than_once = 0;