diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4814be31e394..c27d6d23dabf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-29  Roger Sayle  <roger@eyesopen.com>
+
+	* genpreds.c (write_match_code_switch): Correctly use XSTR instead
+	of XEXP to extract the operands of a MATCH_CODE rtx.
+
 2006-06-28  Andrew Pinski  <pinskia@gmail.com>
 
 	* tree.c (tree_size): Do not waste tail padding in
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index a9a7f2cc7bc8..655c4e652932 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -543,8 +543,8 @@ write_predicate_expr (rtx exp)
 static void
 write_match_code_switch (rtx exp)
 {
-  const char *codes = (const char *) XEXP (exp, 0);
-  const char *path = (const char *) XEXP (exp, 1);
+  const char *codes = XSTR (exp, 0);
+  const char *path = XSTR (exp, 1);
   const char *code;
 
   fputs ("  switch (GET_CODE (", stdout);