diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-04-25 09:59:23 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-04-25 09:59:23 +0000 |
| commit | 66340652640ef85a9845547d30e26d4f1900cd79 (patch) | |
| tree | 798a15a1b2ac8b64d94ef7a54634f5e4609950ed /gcc/c-typeck.c | |
| parent | 6ea6bc65e6e575bc46ad18220148ab888d0ffc83 (diff) | |
svn merge -r113149:113242 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_1-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch@113244 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-typeck.c')
| -rw-r--r-- | gcc/c-typeck.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index ab1e2faaeb3..15cf10fb19a 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -4421,6 +4421,7 @@ digest_init (tree type, tree init, bool strict_string, int require_constant) tree inside_init = init; if (type == error_mark_node + || !init || init == error_mark_node || TREE_TYPE (init) == error_mark_node) return error_mark_node; |