From 9fc1fed43a7ea50803a7a95f3d6a6cea2faf0c27 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 4 Jul 2017 09:38:59 +0200 Subject: [PATCH] re PR c++/81258 (ICE on C++1z code with invalid decomposition declaration: in cp_finish_decl, at cp/decl.c:6760) PR c++/81258 * parser.c (cp_parser_decomposition_declaration): Diagnose invalid forms of structured binding initializers. * g++.dg/cpp1z/decomp21.C (foo): Adjust expected diagnostics. * g++.dg/cpp1z/decomp30.C: New test. From-SVN: r249947 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 10 ++++++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp1z/decomp21.C | 3 ++- gcc/testsuite/g++.dg/cpp1z/decomp30.C | 12 ++++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/decomp30.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 189edcb0975..59a71da0546 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-07-04 Jakub Jelinek + + PR c++/81258 + * parser.c (cp_parser_decomposition_declaration): Diagnose invalid + forms of structured binding initializers. + 2017-07-03 Paolo Carlini PR c++/65775 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3ea7c42ec1a..de87449283c 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -13210,6 +13210,16 @@ cp_parser_decomposition_declaration (cp_parser *parser, *init_loc = cp_lexer_peek_token (parser->lexer)->location; tree initializer = cp_parser_initializer (parser, &is_direct_init, &non_constant_p); + if (initializer == NULL_TREE + || (TREE_CODE (initializer) == TREE_LIST + && TREE_CHAIN (initializer)) + || (TREE_CODE (initializer) == CONSTRUCTOR + && CONSTRUCTOR_NELTS (initializer) != 1)) + { + error_at (loc, "invalid initializer for structured binding " + "declaration"); + initializer = error_mark_node; + } if (decl != error_mark_node) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 03f93575464..7a2e1f0982d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-07-04 Jakub Jelinek + + PR c++/81258 + * g++.dg/cpp1z/decomp21.C (foo): Adjust expected diagnostics. + * g++.dg/cpp1z/decomp30.C: New test. + 2017-07-03 Paolo Carlini PR c++/65775 diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp21.C b/gcc/testsuite/g++.dg/cpp1z/decomp21.C index d046ed54a14..7d3a465d3a3 100644 --- a/gcc/testsuite/g++.dg/cpp1z/decomp21.C +++ b/gcc/testsuite/g++.dg/cpp1z/decomp21.C @@ -12,5 +12,6 @@ foo () auto [ n, o, p ] { a }; auto [ q, r, t ] ( s ); auto [ u, v, w ] ( s, ); // { dg-error "expected primary-expression before '.' token" } - auto [ x, y, z ] ( a ); // { dg-error "expression list treated as compound expression in initializer" "" { target *-*-* } .-1 } + // { dg-error "invalid initializer for structured binding declaration" "" { target *-*-* } .-1 } + auto [ x, y, z ] ( a ); } diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp30.C b/gcc/testsuite/g++.dg/cpp1z/decomp30.C new file mode 100644 index 00000000000..23115ad1082 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/decomp30.C @@ -0,0 +1,12 @@ +// PR c++/81258 +// { dg-options -std=c++1z } + +int a[2]; +auto [b, c] (a); +auto [d, e] { a }; +auto [f, g] = a; +auto [h, i] ( a, a ); // { dg-error "invalid initializer for structured binding declaration" } +auto [j, k] { a, a }; // { dg-error "invalid initializer for structured binding declaration" } +auto [l, m] = { a }; // { dg-error "deducing from brace-enclosed initializer list requires" } +auto [n, o] {}; // { dg-error "invalid initializer for structured binding declaration" } +auto [p, q] (); // { dg-error "invalid initializer for structured binding declaration" } -- 2.30.2