diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 64ba2e69e0da..8ebc8449f91c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 17 00:13:48 1997  Christian Iseli  <Christian.Iseli@lslsun.epfl.ch>
+
+	* combine.c (force_to_mode): return immediately if operand is a CLOBBER.
+
 Tue Dec 16 23:44:54 1997  Manfred Hollstein  <manfred@s-direktnet.de>
 
 	* fixincludes (size_t): Add support for Motorola's stdlib.h
diff --git a/gcc/combine.c b/gcc/combine.c
index 339c94943cda..a17c999a85b3 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -6064,8 +6064,11 @@ force_to_mode (x, mode, mask, reg, just_select)
 
   /* If this is a CALL or ASM_OPERANDS, don't do anything.  Some of the
      code below will do the wrong thing since the mode of such an
-     expression is VOIDmode.  */
-  if (code == CALL || code == ASM_OPERANDS)
+     expression is VOIDmode. 
+
+     Also do nothing if X is a CLOBBER; this can happen if X was
+     the return value from a call to gen_lowpart_for_combine.  */
+  if (code == CALL || code == ASM_OPERANDS || code == CLOBBER)
     return x;
 
   /* We want to perform the operation is its present mode unless we know