* typeck.c (cp_build_unary_op): Check for ERROR_MARK.

From-SVN: r143212

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aad07d2ce673ee69b95b847ef80c4a3358722433..1c162966af009a53e8ca113a98b5fd0178aea823 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-09  Steve Ellcey  <sje@cup.hp.com>
+
+       * typeck.c (cp_build_unary_op): Check for ERROR_MARK.
+
 2009-01-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/35335

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4be7a25835583384a5e7d81f248fc21d71d8982c..577e026256fd72bfd6b52558df9f3c0ff4cd6167 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4189,7 +4189,7 @@ cp_build_unary_op (enum tree_code code, tree xarg, int noconvert,
   tree val;
   const char *invalid_op_diag;
 
-  if (arg == error_mark_node)
+  if (error_operand_p (arg))
     return error_mark_node;
 
   if ((invalid_op_diag