diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8b962c7a023..d4fa0f341d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-12  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* expr.c (expand_expr): Return const0_rtx, not error_mark_node.
+
 2000-07-12  Richard Henderson  <rth@cygnus.com>
 
 	* reload.c (push_secondary_reload): Make sure to add the new
diff --git a/gcc/expr.c b/gcc/expr.c
index 7fff07e2080..e514d0b3357 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -7105,7 +7105,7 @@ expand_expr (exp, target, tmode, modifier)
     case CONVERT_EXPR:
     case REFERENCE_EXPR:
       if (TREE_OPERAND (exp, 0) == error_mark_node)
-	return error_mark_node;
+	return const0_rtx;
 
       if (TREE_CODE (type) == UNION_TYPE)
 	{