diff options
| author | Jason Merrill <jason@redhat.com> | 2022-05-13 16:07:10 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-05-15 05:45:06 -0400 |
| commit | ce46d6041358052dfa26f3720732f0357c5d72e7 (patch) | |
| tree | 3e504b37d2f73d199cf1624a9ddf8daf0a761f13 /gcc/cp/init.cc | |
| parent | c5397682aff4ae9ced15ddc74971b9b6e218b664 (diff) | |
| download | gcc-ce46d6041358052dfa26f3720732f0357c5d72e7.zip gcc-ce46d6041358052dfa26f3720732f0357c5d72e7.tar.gz gcc-ce46d6041358052dfa26f3720732f0357c5d72e7.tar.bz2 | |
c++: array {}-init [PR105589]
My patch for 105191 made us use build_value_init more frequently from
build_vec_init_expr, but build_value_init doesn't like to be called to
initialize a class in a template. That's caused trouble in the past, and
seems like a strange restriction, so let's fix it.
PR c++/105589
PR c++/105191
PR c++/92385
gcc/cp/ChangeLog:
* init.cc (build_value_init): Handle class in template.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/initlist-array16.C: New test.
Diffstat (limited to 'gcc/cp/init.cc')
| -rw-r--r-- | gcc/cp/init.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index f1ed933..a4a0a0a 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -343,10 +343,6 @@ build_value_init (tree type, tsubst_flags_t complain) A program that calls for default-initialization or value-initialization of an entity of reference type is ill-formed. */ - /* The AGGR_INIT_EXPR tweaking below breaks in templates. */ - gcc_assert (!processing_template_decl - || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)); - if (CLASS_TYPE_P (type) && type_build_ctor_call (type)) { tree ctor @@ -354,6 +350,9 @@ build_value_init (tree type, tsubst_flags_t complain) NULL, type, LOOKUP_NORMAL, complain); if (ctor == error_mark_node || TREE_CONSTANT (ctor)) return ctor; + if (processing_template_decl) + /* The AGGR_INIT_EXPR tweaking below breaks in templates. */ + return build_min (CAST_EXPR, type, NULL_TREE); tree fn = NULL_TREE; if (TREE_CODE (ctor) == CALL_EXPR) fn = get_callee_fndecl (ctor); |