diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-04-03 19:56:12 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-04-03 19:56:12 +0200 |
| commit | 3fd17365de85bbfd005338e5b6f854e9ab79045f (patch) | |
| tree | d5b8453b5483258f7148fa1891c4a9add9101981 | |
| parent | 0fc74719c7d5b3224d4f2d83a059f4aebd4ed363 (diff) | |
backport: re PR c/54363 (ICE when compiling malformed struct initializers)
Backported from mainline
2012-08-24 Jakub Jelinek <jakub@redhat.com>
PR c/54363
* gimplify.c (optimize_compound_literals_in_ctor): Only recurse
if init is a CONSTRUCTOR.
* gcc.dg/pr54363.c: New test.
From-SVN: r197443
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimplify.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr54363.c | 12 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f20bcd1f9f..641bd65aa56 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2013-04-03 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2012-08-24 Jakub Jelinek <jakub@redhat.com> + + PR c/54363 + * gimplify.c (optimize_compound_literals_in_ctor): Only recurse + if init is a CONSTRUCTOR. + 2012-05-03 Jakub Jelinek <jakub@redhat.com> PR debug/53174 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 50cfc45ea0b..1af6de61bc2 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -3646,7 +3646,8 @@ optimize_compound_literals_in_ctor (tree orig_ctor) if (!TREE_ADDRESSABLE (value) && !TREE_ADDRESSABLE (decl) - && init) + && init + && TREE_CODE (init) == CONSTRUCTOR) newval = optimize_compound_literals_in_ctor (init); } if (newval == value) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6802836494..d51c2564e67 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2013-04-03 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2012-08-24 Jakub Jelinek <jakub@redhat.com> + + PR c/54363 + * gcc.dg/pr54363.c: New test. + 2012-05-03 Jakub Jelinek <jakub@redhat.com> PR debug/53174 diff --git a/gcc/testsuite/gcc.dg/pr54363.c b/gcc/testsuite/gcc.dg/pr54363.c new file mode 100644 index 00000000000..aea0f9057b0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr54363.c @@ -0,0 +1,12 @@ +/* PR c/54363 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99" } */ + +struct S { char **a; }; + +void +test (void) +{ + struct S b = { .a = (char **) { "a", "b" } }; /* { dg-warning "(initialization|excess elements)" } */ + struct S c = { .a = (char *[]) { "a", "b" } }; +} |