Message ID | 5581DC47.5080008@redhat.com |
---|---|
State | New |
Headers | show |
spawn /daten/aranym/gcc/gcc-20150618/Build/gcc/testsuite/g++/../../xg++ -B/daten/aranym/gcc/gcc-20150618/Build/gcc/testsuite/g++/../../ /daten/aranym/gcc/gcc-20150618/gcc/testsuite/g++.dg/cpp0x/initlist96.C -fno-diagnostics-show-caret -fdiagnostics-color=never -nostdinc++ -I/daten/aranym/gcc/gcc-20150618/Build/m68k-linux/libstdc++-v3/include/m68k-linux -I/daten/aranym/gcc/gcc-20150618/Build/m68k-linux/libstdc++-v3/include -I/daten/aranym/gcc/gcc-20150618/libstdc++-v3/libsupc++ -I/daten/aranym/gcc/gcc-20150618/libstdc++-v3/include/backward -I/daten/aranym/gcc/gcc-20150618/libstdc++-v3/testsuite/util -fmessage-length=0 -std=c++11 -pedantic-errors -Wno-long-long -S -o initlist96.s. /daten/aranym/gcc/gcc-20150618/gcc/testsuite/g++.dg/cpp0x/initlist96.C:6:29: fatal error: definition of std::initializer_list does not match #include <initializer_list>. compilation terminated.. compiler exited with status 1 output is: /daten/aranym/gcc/gcc-20150618/gcc/testsuite/g++.dg/cpp0x/initlist96.C:6:29: fatal error: definition of std::initializer_list does not match #include <initializer_list>. compilation terminated.. FAIL: g++.dg/cpp0x/initlist96.C -std=c++11 (test for excess errors) Andreas.
Should be fixed, thanks. Jason
commit 3732672177a2f4893d79279d44b5caed24d6177b Author: Jason Merrill <jason@redhat.com> Date: Wed Jun 17 07:45:03 2015 -0400 PR c++/66515 * call.c (implicit_conversion): Call reshape_init here, early. (build_aggr_conv): Not here. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 2f0c53a..1787576 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -871,9 +871,7 @@ build_aggr_conv (tree type, tree ctor, int flags, tsubst_flags_t complain) tree field = next_initializable_field (TYPE_FIELDS (type)); tree empty_ctor = NULL_TREE; - ctor = reshape_init (type, ctor, tf_none); - if (ctor == error_mark_node) - return NULL; + /* We already called reshape_init in implicit_conversion. */ /* The conversions within the init-list aren't affected by the enclosing context; they're always simple copy-initialization. */ @@ -1762,6 +1760,17 @@ implicit_conversion (tree to, tree from, tree expr, bool c_cast_p, to that conversion. */ complain &= ~tf_error; + /* Call reshape_init early to remove redundant braces. */ + if (expr && BRACE_ENCLOSED_INITIALIZER_P (expr) + && COMPLETE_TYPE_P (complete_type (to)) + && CP_AGGREGATE_TYPE_P (to)) + { + expr = reshape_init (to, expr, complain); + if (expr == error_mark_node) + return NULL; + from = TREE_TYPE (expr); + } + if (TREE_CODE (to) == REFERENCE_TYPE) conv = reference_binding (to, from, expr, c_cast_p, flags, complain); else diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist96.C b/gcc/testsuite/g++.dg/cpp0x/initlist96.C new file mode 100644 index 0000000..305565c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist96.C @@ -0,0 +1,19 @@ +// PR c++/66515 +// { dg-do compile { target c++11 } } + +namespace std +{ + template <class _E> class initializer_list + { + const _E *_M_array; + unsigned long _M_len; + }; +} + +struct type_t { }; + +type_t & +get () +{ + std::initializer_list<type_t>{ { get () } }; +}