From ba76f5c569384a960491ee3f38f45b884287cae2 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 17 Sep 1999 10:59:07 +0000 Subject: [PATCH] * call.c (perform_implicit_conversion): Deal with error_mark_node. From-SVN: r29475 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f3e45d0fed3..88b123c0417 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1999-09-17 Nathan Sidwell + + * call.c (perform_implicit_conversion): Deal with error_mark_node. + 1999-09-17 Mark Mitchell * cp-tree.h (poplevel_class): Declare. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 4c9cdb8a02f..809c457b9d2 100644 --- 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; }