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

From-SVN: r29475

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f3e45d0fed314371317cb2dc464c4335c3db2827..88b123c0417e2c1adf6b510cd9d6b2d28c80bbe8 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 4c9cdb8a02f7d668a0abf4b7dc43461150803c3e..809c457b9d2978bd4a4e6e3705e7f41fb437c1c5 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;
     }