* c-typeck.c (parser_build_binary_op): If result from

	build_binary_op is ERROR_MARK just return error_mark_node without
	further processing.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49066 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37c60bd..d026309 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-22  Hans-Peter Nilsson  <hp@axis.com>
+
+       * c-typeck.c (parser_build_binary_op): If result from
+       build_binary_op is ERROR_MARK just return error_mark_node without
+       further processing.
+
 2002-01-21  Jason Thorpe  <thorpej@wasabisystems.com>
 
        * config/netbsd.h (TARGET_HAS_F_SETLKW): define.

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 756832d..a1a00fc 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -1799,6 +1799,9 @@ parser_build_binary_op (code, arg1, arg2)
   enum tree_code code1 = ERROR_MARK;
   enum tree_code code2 = ERROR_MARK;
 
+  if (TREE_CODE (result) == ERROR_MARK)
+    return error_mark_node;
+
   if (IS_EXPR_CODE_CLASS (class1))
     code1 = C_EXP_ORIGINAL_CODE (arg1);
   if (IS_EXPR_CODE_CLASS (class2))