From 32dbfb3c17b32e39f92a729061641cbff61af7e9 Mon Sep 17 00:00:00 2001
From: Steve Ellcey <sje@cup.hp.com>
Date: Fri, 9 Jan 2009 17:29:34 +0000
Subject: [PATCH] * typeck.c (cp_build_unary_op): Check for ERROR_MARK.

From-SVN: r143212
---
 gcc/cp/ChangeLog | 4 ++++
 gcc/cp/typeck.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aad07d2ce67..1c162966af0 100644
--- 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 4be7a258355..577e026256f 100644
--- 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