diff options
| author | Nathan Sidwell <nathan@acm.org> | 1999-09-17 10:59:07 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 1999-09-17 10:59:07 +0000 |
| commit | ba76f5c569384a960491ee3f38f45b884287cae2 (patch) | |
| tree | 3dc64ffd09a79296e70a725c48042c0b99940768 | |
| parent | fcc32134a04e3022fce5c026f3ef95184f21187f (diff) | |
| download | gcc-ba76f5c569384a960491ee3f38f45b884287cae2.zip gcc-ba76f5c569384a960491ee3f38f45b884287cae2.tar.gz gcc-ba76f5c569384a960491ee3f38f45b884287cae2.tar.bz2 | |
* call.c (perform_implicit_conversion): Deal with error_mark_node.
From-SVN: r29475
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f3e45d0..88b123c 100644 --- 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 --- 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; } |