diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 28f4178..81db24f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-06-26 J. David Anglin <dave@hiauly1.hia.nrc.ca> + + * c-typeck.c (digest_init): Return error_mark_node node when + TREE_TYPE (init) == error_mark_node. + 2000-06-26 Philipp Thomas <pthomas@suse.de> * aclocal.m4 (AM_WITH_NLS): Don't set MSGFMT or GMSGFMT to no, diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index ec7eaf9..cd9da65 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -4610,7 +4610,9 @@ digest_init (type, init, require_constant, constructor_constant) enum tree_code code = TREE_CODE (type); tree inside_init = init; - if (type == error_mark_node || init == error_mark_node) + if (type == error_mark_node + || init == error_mark_node + || TREE_TYPE (init) == error_mark_node) return error_mark_node; /* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */ |