aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. David Anglin <dave@hiauly1.hia.nrc.ca>2000-06-26 13:43:22 +0000
committerGavin Romig-Koch <gavin@gcc.gnu.org>2000-06-26 13:43:22 +0000
commitde9a31710355e889b79ae02ff1b4af3c46e352ac (patch)
treeef2e5ade52c3d62f2d75e8662b7bd44ee379d427
parented18e47e1835ca66b3c1bf339e825235ff046aa0 (diff)
downloadgcc-de9a31710355e889b79ae02ff1b4af3c46e352ac.zip
gcc-de9a31710355e889b79ae02ff1b4af3c46e352ac.tar.gz
gcc-de9a31710355e889b79ae02ff1b4af3c46e352ac.tar.bz2
c-typeck.c (digest_init): Return error_mark_node node when TREE_TYPE (init) == error_mark_node.
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. From-SVN: r34711
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-typeck.c4
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. */