diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d38a09c05479..c7005e7fcc7f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-24  Richard Henderson  <rth@redhat.com>
+            Aldy Hernandez  <aldyh@redhat.com>
+
+        * regrename.c (note_sets): Handle subregs.
+
 2005-01-24  Joseph S. Myers  <joseph@codesourcery.com>
 
 	PR bootstrap/18058
diff --git a/gcc/regrename.c b/gcc/regrename.c
index f2ab1f103383..744f181bd18f 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -94,6 +94,9 @@ note_sets (rtx x, rtx set ATTRIBUTE_UNUSED, void *data)
   HARD_REG_SET *pset = (HARD_REG_SET *) data;
   unsigned int regno;
   int nregs;
+
+  if (GET_CODE (x) == SUBREG)
+    x = SUBREG_REG (x);
   if (!REG_P (x))
     return;
   regno = REGNO (x);