2 files changed, 5 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df05c77..b01f321 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2000-07-09  Jason Merrill  <jason@redhat.com>
 
+	* expr.c (expand_expr): Bail earlier if we get an error_mark_node.
+
 	* tree.h (STRIP_NOPS): Check for error_mark_node.
 	(STRIP_SIGN_NOPS, STRIP_TYPE_NOPS): Likewise.
 	(dwarf2out_*): Remove duplicate declarations.
diff --git a/gcc/expr.c b/gcc/expr.c
index 02a7a35..7fff07e 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -7104,6 +7104,9 @@ expand_expr (exp, target, tmode, modifier)
     case NOP_EXPR:
     case CONVERT_EXPR:
     case REFERENCE_EXPR:
+      if (TREE_OPERAND (exp, 0) == error_mark_node)
+	return error_mark_node;
+
       if (TREE_CODE (type) == UNION_TYPE)
 	{
 	  tree valtype = TREE_TYPE (TREE_OPERAND (exp, 0));