* call.c (perform_implicit_conversion): Deal with error_mark_node.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f3e45d0..88b123c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-17  Nathan Sidwell  <nathan@acm.org>
+
+       * call.c (perform_implicit_conversion): Deal with error_mark_node.
+
 1999-09-17  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-tree.h (poplevel_class): Declare.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4c9cdb8..809c457 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5130,7 +5130,8 @@ perform_implicit_conversion (type, expr)
                                   LOOKUP_NORMAL);
   if (!conv || ICS_BAD_FLAG (conv))
     {
-      cp_error ("could not convert `%E' to `%T'", expr, type);
+      if (expr != error_mark_node)
+        cp_error ("could not convert `%E' to `%T'", expr, type);
       return error_mark_node;
     }