diff options
| author | Jason Merrill <jason@redhat.com> | 2011-08-06 00:34:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-08-06 00:34:29 -0400 |
| commit | dd56ca9f1c8d3a236474453de81433a7c911f71b (patch) | |
| tree | f507a513187e58eb92c5baa96ea142645d6d2ea5 | |
| parent | 5c67ef9aef20c1be9e6214b2cf8ea86df1af5415 (diff) | |
| download | gcc-dd56ca9f1c8d3a236474453de81433a7c911f71b.zip gcc-dd56ca9f1c8d3a236474453de81433a7c911f71b.tar.gz gcc-dd56ca9f1c8d3a236474453de81433a7c911f71b.tar.bz2 | |
re PR c++/49669 ([C++0x] Compiler crashes with "internal compiler error: in perform_member_init, at cp/init.c:530")
PR c++/49669
* init.c (perform_member_init): Handle invalid array initializer.
From-SVN: r177497
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/init.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/array28.C | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3c1ad7f..964de15 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-08-05 Jason Merrill <jason@redhat.com> + PR c++/49669 + * init.c (perform_member_init): Handle invalid array initializer. + PR c++/49988 * semantics.c (cxx_eval_array_reference): Handle failure to reduce the array operand to something we can work with. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index d9e475e..4fa627b 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -554,8 +554,10 @@ perform_member_init (tree member, tree init) { if (init) { - gcc_assert (TREE_CHAIN (init) == NULL_TREE); - init = TREE_VALUE (init); + if (TREE_CHAIN (init)) + init = error_mark_node; + else + init = TREE_VALUE (init); if (BRACE_ENCLOSED_INITIALIZER_P (init)) init = digest_init (type, init, tf_warning_or_error); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index af49861..9ce5d9b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-08-05 Jason Merrill <jason@redhat.com> + PR c++/49669 + * g++.dg/init/array28.C: New. + PR c++/49988 * g++.dg/cpp0x/constexpr-non-const-arg3.C: New. diff --git a/gcc/testsuite/g++.dg/init/array28.C b/gcc/testsuite/g++.dg/init/array28.C new file mode 100644 index 0000000..8cf19ba --- /dev/null +++ b/gcc/testsuite/g++.dg/init/array28.C @@ -0,0 +1,7 @@ +// PR c++/49669 + +struct Foo { explicit Foo(int) { } }; +struct Goo { + Goo() : x(Foo(4), Foo(5)) { } // { dg-error "array" } + Foo x[2]; +}; |