PR c/25875

	* c-typeck.c (digest_init): Robustify.

	* gcc.dg/init-bad-4.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113153 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2840b6..b506224 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-21  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR c/25875
+       * c-typeck.c (digest_init): Robustify.
+
        * c-typeck.c (pop_init_level): Simplify.
 
 2006-04-21  Steve Ellcey  <sje@cup.hp.com>

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 73c120d..21fe125 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -4495,6 +4495,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;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 544ec0d..6cdaade 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-21  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       PR c/25875
+       * gcc.dg/init-bad-4.c: New test.
+
 2006-04-21  Paul Brook  <paul@codesourcery.com>
 
        * gcc.dg/arm-vfp1.c: Skip on iWMMXt cpus.

diff --git a/gcc/testsuite/gcc.dg/init-bad-4.c b/gcc/testsuite/gcc.dg/init-bad-4.c
new file mode 100644 (file)
index 0000000..3f03002
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/init-bad-4.c
@@ -0,0 +1,5 @@
+/* PR c/25875 */
+/* Origin: Richard Guenther <rguenth@gcc.gnu.org> */
+/* { dg-do compile } */
+
+struct A { } a = (struct A) {{ (X)0 }};  /* { dg-error "no members|extra brace|near|undeclared|constant|compound" } */