aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2002-01-22 07:48:25 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2002-01-22 07:48:25 +0000
commit58bf601baeec94a1c6ed023021bd50e0821bc5bd (patch)
treee7ecf582e45c9e07d8241d5304747685b6e4b773
parent0c0c3c39952bd05d4f900820bcb3acf55df86f9c (diff)
downloadgcc-58bf601baeec94a1c6ed023021bd50e0821bc5bd.zip
gcc-58bf601baeec94a1c6ed023021bd50e0821bc5bd.tar.gz
gcc-58bf601baeec94a1c6ed023021bd50e0821bc5bd.tar.bz2
c-typeck.c (parser_build_binary_op): If result from build_binary_op is ERROR_MARK just return error_mark_node...
* c-typeck.c (parser_build_binary_op): If result from build_binary_op is ERROR_MARK just return error_mark_node without further processing. From-SVN: r49066
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-typeck.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37c60bd..d026309 100644
--- 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
--- 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))