5 files changed, 7 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70bb606..29193e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-16  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* genemit.c (gen_exp): Remove ADDRESS handling.
+	* genoutput.c (scan_operands): Likewise.
+	* genpeep.c (match_rtx): Likewise.
+	* genrecog.c (add_to_sequence): Likewise.
+
 2012-04-16  David Edelsohn  <dje.gcc@gmail.com>
 
 	* doc/install.texi (Specific, *-ibm-aix*): Update assembler bug
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 173e4d3..91025e2 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -160,9 +160,6 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used)
       gen_rtx_scratch (x, subroutine_type);
       return;
 
-    case ADDRESS:
-      fatal ("ADDRESS expression code used in named instruction pattern");
-
     case PC:
       printf ("pc_rtx");
       return;
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index bc41b7b..bae2381 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -510,10 +510,6 @@ scan_operands (struct data *d, rtx part, int this_address_p,
 	scan_operands (d, XVECEXP (part, 2, i), 0, 0);
       return;
 
-    case ADDRESS:
-      scan_operands (d, XEXP (part, 0), 1, 0);
-      return;
-
     case STRICT_LOW_PART:
       scan_operands (d, XEXP (part, 0), 0, 1);
       return;
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index ac08d80..a6f1033 100644
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -231,10 +231,6 @@ match_rtx (rtx x, struct link *path, int fail_label)
 	}
       return;
 
-    case ADDRESS:
-      match_rtx (XEXP (x, 0), path, fail_label);
-      return;
-
     default:
       break;
     }
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 0d8be8f..9ce5106 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -687,7 +687,6 @@ add_to_sequence (rtx pattern, struct decision_head *last,
   sub = this_decision = new_decision (pos, last);
   place = &this_decision->tests;
 
- restart:
   mode = GET_MODE (pattern);
   code = GET_CODE (pattern);
 
@@ -854,10 +853,6 @@ add_to_sequence (rtx pattern, struct decision_head *last,
       test->u.dup = XINT (pattern, 0);
       goto fini;
 
-    case ADDRESS:
-      pattern = XEXP (pattern, 0);
-      goto restart;
-
     default:
       break;
     }