aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2004-11-05 22:21:30 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2004-11-05 22:21:30 +0000
commit0a880880ee06447e8846d08a03fd43740f825fcb (patch)
tree11eb2176a05882c0d5ec2a5fcae8d9326b7f66a4 /gcc
parentddd8e3ca2625ef3a1d15c363b79d02e9395b109a (diff)
downloadgcc-0a880880ee06447e8846d08a03fd43740f825fcb.zip
gcc-0a880880ee06447e8846d08a03fd43740f825fcb.tar.gz
gcc-0a880880ee06447e8846d08a03fd43740f825fcb.tar.bz2
c-typeck.c (output_init_element): Return early if value is error_mark_node.
* c-typeck.c (output_init_element): Return early if value is error_mark_node. testsuite: * gcc.dg/init-undef-1.c: New test. From-SVN: r90146
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-typeck.c2
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/init-undef-1.c8
4 files changed, 18 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a1a60e7..749e21d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05 Joseph S. Myers <joseph@codesourcery.com>
+
+ * c-typeck.c (output_init_element): Return early if value is
+ error_mark_node.
+
2004-11-05 James E Wilson <wilson@specifixinc.com>
* invoke.texi (-fno-guess-branch-probability): Rewrite.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 723bd5a..cf883b7 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5667,7 +5667,7 @@ static void
output_init_element (tree value, bool strict_string, tree type, tree field,
int pending)
{
- if (type == error_mark_node)
+ if (type == error_mark_node || value == error_mark_node)
{
constructor_erroneous = 1;
return;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f27f80b..11071c9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2004-11-05 Joseph S. Myers <joseph@codesourcery.com>
+ * gcc.dg/init-undef-1.c: New test.
+
+2004-11-05 Joseph S. Myers <joseph@codesourcery.com>
+
* gcc.dg/20040910-1.c, gcc.dg/cpp/digraph2.c,
gcc.dg/cpp/direct2.c, gcc.dg/cpp/direct2s.c,
gcc.dg/cpp/separate-1.c, gcc.dg/noncompile/951123-1.c,
diff --git a/gcc/testsuite/gcc.dg/init-undef-1.c b/gcc/testsuite/gcc.dg/init-undef-1.c
new file mode 100644
index 0000000..b775889
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/init-undef-1.c
@@ -0,0 +1,8 @@
+/* Invalid initializers should not receive an "is not constant"
+ error. */
+/* Origin: Joseph Myers <joseph@codesourcery.com> */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+int p = c; /* { dg-error "undeclared" } */
+struct s { int a; } x = { b }; /* { dg-error "undeclared" } */