diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/init11.C | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8ff836e..3ae8893 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2017-02-19 Jason Merrill <jason@redhat.com> + PR c++/79607 - ICE with T{} initializer + * decl.c (type_dependent_init_p): Check the type of a CONSTRUCTOR. + PR c++/79566 - elaborated-type-specifier in range for * parser.c (cp_parser_simple_declaration): Fix check for type definition. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 70c44fb..e5c2bab 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6662,6 +6662,9 @@ type_dependent_init_p (tree init) else if (TREE_CODE (init) == CONSTRUCTOR) /* A brace-enclosed initializer, e.g.: int i = { 3 }; ? */ { + if (dependent_type_p (TREE_TYPE (init))) + return true; + vec<constructor_elt, va_gc> *elts; size_t nelts; size_t i; diff --git a/gcc/testsuite/g++.dg/template/init11.C b/gcc/testsuite/g++.dg/template/init11.C new file mode 100644 index 0000000..ef337c0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/init11.C @@ -0,0 +1,9 @@ +// PR c++/79607 +// { dg-do compile { target c++11 } } + +template<typename T> struct A +{ + static const int i = int{T{}}; +}; + +A<int> a; |