From 5a0f3af487a4a9d1cd763e91f4221388d7bfed89 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 14 Sep 2015 15:25:00 +0000 Subject: [PATCH] re PR c++/51911 ([C++11] G++ accepts new auto { list }) /cp 2015-09-14 Paolo Carlini PR c++/51911 * parser.c (cp_parser_new_expression): Enforce 5.3.4/2 (as amended per the spirit of DR 1467). /testsuite 2015-09-14 Paolo Carlini PR c++/51911 * g++.dg/cpp0x/new-auto1.C: New. From-SVN: r227753 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 20 ++++++++++++++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/new-auto1.C | 10 ++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/new-auto1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4101a2e123e..76e3b912ad0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-09-14 Paolo Carlini + + PR c++/51911 + * parser.c (cp_parser_new_expression): Enforce 5.3.4/2 (as amended + per the spirit of DR 1467). + 2015-09-11 Mark Wielaard PR c/28901 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 64eb5ea8803..3a68dd79168 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -7591,8 +7591,9 @@ cp_parser_new_expression (cp_parser* parser) type = cp_parser_new_type_id (parser, &nelts); /* If the next token is a `(' or '{', then we have a new-initializer. */ - if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN) - || cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) + cp_token *token = cp_lexer_peek_token (parser->lexer); + if (token->type == CPP_OPEN_PAREN + || token->type == CPP_OPEN_BRACE) initializer = cp_parser_new_initializer (parser); else initializer = NULL; @@ -7601,6 +7602,21 @@ cp_parser_new_expression (cp_parser* parser) expression. */ if (cp_parser_non_integral_constant_expression (parser, NIC_NEW)) ret = error_mark_node; + /* 5.3.4/2: "If the auto type-specifier appears in the type-specifier-seq + of a new-type-id or type-id of a new-expression, the new-expression shall + contain a new-initializer of the form ( assignment-expression )". + Additionally, consistently with the spirit of DR 1467, we want to accept + 'new auto { 2 }' too. */ + else if (type_uses_auto (type) + && (vec_safe_length (initializer) != 1 + || (BRACE_ENCLOSED_INITIALIZER_P ((*initializer)[0]) + && CONSTRUCTOR_NELTS ((*initializer)[0]) != 1))) + { + error_at (token->location, + "initialization of new-expression for type % " + "requires exactly one element"); + ret = error_mark_node; + } else { /* Create a representation of the new-expression. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a285ee22b90..0e0f904475e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-14 Paolo Carlini + + PR c++/51911 + * g++.dg/cpp0x/new-auto1.C: New. + 2015-09-11 Mark Wielaard PR c/28901 diff --git a/gcc/testsuite/g++.dg/cpp0x/new-auto1.C b/gcc/testsuite/g++.dg/cpp0x/new-auto1.C new file mode 100644 index 00000000000..be09f94dd69 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/new-auto1.C @@ -0,0 +1,10 @@ +// PR c++/51911 +// { dg-do compile { target c++11 } } + +#include + +auto foo1 = new auto { 3, 4, 5 }; // { dg-error "22:initialization of new-expression for type 'auto'" } +auto bar1 = new auto { 2 }; + +auto foo2 = new auto ( 3, 4, 5 ); // { dg-error "22:initialization of new-expression for type 'auto'" } +auto bar2 = new auto ( 2 ); -- 2.30.2