diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4945fd9c912c0ce5458c1321f1515d9c1694d8ca..92025a98e6bc32d77bc52cca0ca5d8a53a1c014f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-11-07 Jason Merrill <jason@redhat.com> + PR c++/50863 + * parser.c (cp_parser_initializer_list): Parse C99 + array designators tentatively. + PR c++/50870 * pt.c (tsubst_copy): Handle NAMESPACE_DECL. (tsubst_copy_and_build) [COMPONENT_REF]: Handle a still-dependent diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index fa0117ec3e44b3fd20dc6dd4548932ba24a82152..697be809adb036a627161f3c7f00cdf313840eef 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -17580,10 +17580,13 @@ cp_parser_initializer_list (cp_parser* parser, bool* non_constant_p) && !c_dialect_objc () && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_SQUARE)) { + /* In C++11, [ could start a lambda-introducer. */ + cp_parser_parse_tentatively (parser); cp_lexer_consume_token (parser->lexer); designator = cp_parser_constant_expression (parser, false, NULL); cp_parser_require (parser, CPP_CLOSE_SQUARE, RT_CLOSE_SQUARE); cp_parser_require (parser, CPP_EQ, RT_EQ); + cp_parser_parse_definitely (parser); } else designator = NULL_TREE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e2eccc556807b9fd50b461366d576151cae6abc2..c5f4118d2ad3b14dacd4e0b4717def5e430447d9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-11-07 Jason Merrill <jason@redhat.com> + PR c++/50863 + * g++.dg/cpp0x/lambda/lambda-initlist1.C: New. + PR c++/50870 * g++.dg/cpp0x/decltype35.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C new file mode 100644 index 0000000000000000000000000000000000000000..078ebaee183c49f9016448a21b9d38b2b5253c60 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist1.C @@ -0,0 +1,12 @@ +// PR c++/50863 +// { dg-options -std=gnu++0x } + +struct T { + template<typename F> + T(F) { } +}; + +int main() +{ + T t{ []{ } }; +}