From f01da1a506d37f69913d0a998bd23aa16f63d8a1 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Fri, 21 Apr 2006 23:02:26 +0000 Subject: [PATCH] re PR c/25875 (ICE: segmentation fault) PR c/25875 * c-typeck.c (digest_init): Robustify. * gcc.dg/init-bad-4.c: New test. From-SVN: r113153 --- gcc/ChangeLog | 3 +++ gcc/c-typeck.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/init-bad-4.c | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/init-bad-4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b2840b6ded96..b50622486f8c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2006-04-21 Volker Reichelt + PR c/25875 + * c-typeck.c (digest_init): Robustify. + * c-typeck.c (pop_init_level): Simplify. 2006-04-21 Steve Ellcey diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 73c120d16a30..21fe12538a2a 100644 --- 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 544ec0d47c86..6cdaade89982 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-04-21 Volker Reichelt + + PR c/25875 + * gcc.dg/init-bad-4.c: New test. + 2006-04-21 Paul Brook * 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 index 000000000000..3f03002908a9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/init-bad-4.c @@ -0,0 +1,5 @@ +/* PR c/25875 */ +/* Origin: Richard Guenther */ +/* { dg-do compile } */ + +struct A { } a = (struct A) {{ (X)0 }}; /* { dg-error "no members|extra brace|near|undeclared|constant|compound" } */