diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93c0fd57841..20961d73965 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep  8 00:33:43 1999  Alasdair Baird  <alasdair@wildcat.demon.co.uk>
+
+	* flow.c (insn_dead_p): Use XEXP rather than SUBREG_REG.
+	* haifa-sched.c (sched_analyze_1): Use XEXP rather than SUBREG_REG
+	and SET_DEST. Update comment.
+
 Wed Sep  8 18:55:17 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
 	* config/c4x/c4x.c: Include ggc.h. 
diff --git a/gcc/flow.c b/gcc/flow.c
index 9ee464022a3..60be87a5c01 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2967,7 +2967,7 @@ insn_dead_p (x, needed, call_ok, notes)
 
       while (GET_CODE (r) == SUBREG || GET_CODE (r) == STRICT_LOW_PART
 	     || GET_CODE (r) == ZERO_EXTRACT)
-	r = SUBREG_REG (r);
+	r = XEXP (r, 0);
 
       if (GET_CODE (r) == REG)
 	{
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 5aa69b69e1e..e50419210f2 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -3233,8 +3233,9 @@ flush_pending_lists (insn, only_write)
   last_pending_memory_flush = alloc_INSN_LIST (insn, NULL_RTX);
 }
 
-/* Analyze a single SET or CLOBBER rtx, X, creating all dependencies generated
-   by the write to the destination of X, and reads of everything mentioned.  */
+/* Analyze a single SET, CLOBBER, PRE_DEC, POST_DEC, PRE_INC or POST_INC
+   rtx, X, creating all dependencies generated by the write to the
+   destination of X, and reads of everything mentioned.  */
 
 static void
 sched_analyze_1 (x, insn)
@@ -3242,7 +3243,7 @@ sched_analyze_1 (x, insn)
      rtx insn;
 {
   register int regno;
-  register rtx dest = SET_DEST (x);
+  register rtx dest = XEXP (x, 0);
   enum rtx_code code = GET_CODE (x);
 
   if (dest == 0)
@@ -3268,7 +3269,7 @@ sched_analyze_1 (x, insn)
 	  sched_analyze_2 (XEXP (dest, 1), insn);
 	  sched_analyze_2 (XEXP (dest, 2), insn);
 	}
-      dest = SUBREG_REG (dest);
+      dest = XEXP (dest, 0);
     }
 
   if (GET_CODE (dest) == REG)