diff options
| author | Jason Merrill <jason@redhat.com> | 2013-11-05 13:03:03 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-11-05 13:03:03 -0500 |
| commit | 136d4b89f0f3aca9acce466e00dab8ff0e5fc9b5 (patch) | |
| tree | d080f3194ea137f68f9a006b7ef28a26eb0534f1 /gcc | |
| parent | 02ac9503fda84a6a5973c0ddc02c4407194145bb (diff) | |
| download | gcc-136d4b89f0f3aca9acce466e00dab8ff0e5fc9b5.zip gcc-136d4b89f0f3aca9acce466e00dab8ff0e5fc9b5.tar.gz gcc-136d4b89f0f3aca9acce466e00dab8ff0e5fc9b5.tar.bz2 | |
re PR c++/58868 (ICE: in count_type_elements, at expr.c:5495 with -std=gnu++0x)
PR c++/58868
* decl.c (check_initializer): Don't use build_vec_init for arrays
of trivial type.
From-SVN: r204406
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/array35.C | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fb9e0c6..887ea615 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-11-05 Jason Merrill <jason@redhat.com> + + PR c++/58868 + * decl.c (check_initializer): Don't use build_vec_init for arrays + of trivial type. + 2013-11-05 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58724 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e662764..8b7a89f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5683,6 +5683,7 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **cleanups) && !(init && BRACE_ENCLOSED_INITIALIZER_P (init) && CP_AGGREGATE_TYPE_P (type) && (CLASS_TYPE_P (type) + || !TYPE_NEEDS_CONSTRUCTING (type) || type_has_extended_temps (type)))) { init_code = build_aggr_init_full_exprs (decl, init, flags); diff --git a/gcc/testsuite/g++.dg/init/array35.C b/gcc/testsuite/g++.dg/init/array35.C new file mode 100644 index 0000000..6ce6d5c --- /dev/null +++ b/gcc/testsuite/g++.dg/init/array35.C @@ -0,0 +1,3 @@ +// PR c++/58868 + +static struct { const int i; } a[] = { 1 }; |